From 8f854a210fc86a3c135575995e51d81e77e69062 Mon Sep 17 00:00:00 2001
From: Paolo Bignardi <paolo.bigno@gmail.com>
Date: Sat, 15 Jan 2022 01:05:17 +0100
Subject: [PATCH 001/821] Dark mode (#1661)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Panagiotis Georgakopoulos <panagiotis.georgakopoulos@juliacomputing.com>
Co-authored-by: Παναγιώτης Γεωργακόπουλος <pankgeorg@gmail.com>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/CellInput.js    |  45 +--
 frontend/components/ExportBanner.js |   2 +-
 frontend/components/FilePicker.js   |   3 +-
 frontend/dark_color.css             | 187 ++++++++++++
 frontend/editor.css                 | 444 +++++++++++++++++-----------
 frontend/editor.html                |   7 +-
 frontend/error.jl.html              |   4 +-
 frontend/highlightjs.css            |  72 +++++
 frontend/index.css                  |  47 +--
 frontend/index.html                 |   4 +-
 frontend/light_color.css            | 182 ++++++++++++
 frontend/sample.html                |   4 +-
 frontend/treeview.css               |  27 +-
 src/runner/PlutoRunner.jl           |  17 +-
 14 files changed, 805 insertions(+), 240 deletions(-)
 create mode 100644 frontend/dark_color.css
 create mode 100644 frontend/highlightjs.css
 create mode 100644 frontend/light_color.css

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index f931161a54..8822a8349f 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -57,29 +57,30 @@ import { cl } from "../common/ClassTable.js"
 export const pluto_syntax_colors = HighlightStyle.define([
     /* The following three need a specific version of the julia parser, will add that later (still messing with it 😈) */
     // Symbol
-    { tag: tags.literal, color: "#5e7ad3", fontWeight: 700 },
-    { tag: tags.macroName, color: "#5668a4", fontWeight: 700 },
+    { tag: tags.literal, color: "var(--cm-builtin-color)", fontWeight: 700 },
+    { tag: tags.macroName, color: "var(--cm-var-color)", fontWeight: 700 },
     // `nothing` I guess... Any others?
-    { tag: tags.standard(tags.variableName), color: "#5e7ad3", fontWeight: 700 },
-
-    { tag: tags.bool, color: "#5e7ad3", fontWeight: 700 },
-
-    { tag: tags.keyword, color: "#fc6" },
-    { tag: tags.comment, color: "#e96ba8", fontStyle: "italic" },
-    { tag: tags.atom, color: "#815ba4" },
-    { tag: tags.number, color: "#815ba4" },
-    { tag: tags.bracket, color: "#48b685" },
-    { tag: tags.keyword, color: "#ef6155" },
-    { tag: tags.string, color: "#da5616" },
-    { tag: tags.variableName, color: "#5668a4", fontWeight: 700 },
+    { tag: tags.standard(tags.variableName), color: "var(--cm-builtin-color)", fontWeight: 700 },
+
+    { tag: tags.bool, color: "var(--cm-builtin-color)", fontWeight: 700 },
+
+    { tag: tags.keyword, color: "var(--cm-keyword-color)" },
+    { tag: tags.comment, color: "var(--cm-comment-color)", fontStyle: "italic" },
+    { tag: tags.atom, color: "var(--cm-atom-color)" },
+    { tag: tags.number, color: "var(--cm-number-color)" },
+    // { tag: tags.property, color: "#48b685" },
+    // { tag: tags.attribute, color: "#48b685" },
+    { tag: tags.keyword, color: "var(--cm-keyword-color)" },
+    { tag: tags.string, color: "var(--cm-string-color)" },
+    { tag: tags.variableName, color: "var(--cm-var-color)", fontWeight: 700 },
     // { tag: tags.variable2, color: "#06b6ef" },
-    { tag: tags.definition(tags.variableName), color: "#f99b15" },
-    { tag: tags.bracket, color: "#41323f" },
-    { tag: tags.brace, color: "#41323f" },
-    { tag: tags.tagName, color: "#ef6155" },
-    { tag: tags.link, color: "#815ba4" },
-    { tag: tags.invalid, color: "#000", background: "#ef6155" },
-    // Object.keys(tags).map((x) => ({ tag: x, color: x })),
+    { tag: tags.definition(tags.variableName), color: "var(--cm-def-color)" },
+    { tag: tags.bracket, color: "var(--cm-bracket-color)" },
+    { tag: tags.brace, color: "var(--cm-bracket-color)" },
+    { tag: tags.tagName, color: "var(--cm-tag-color)" },
+    { tag: tags.link, color: "var(--cm-link-color)" },
+    { tag: tags.invalid, color: "var(--cm-error-color)", background: "var(--cm-error-bg-color)" },
+    // ...Object.keys(tags).map((x) => ({ tag: x, color: x })),
     // Markdown
     { tag: tags.heading, color: "#081e87", fontWeight: 500 },
     { tag: tags.heading1, color: "#081e87", fontWeight: 500, fontSize: "1.5em" },
@@ -348,12 +349,14 @@ export const CellInput = ({
         // TODO remove me
         //@ts-ignore
         window.tags = tags
+        const usesDarkTheme = window.matchMedia("(prefers-color-scheme: dark)").matches
         const newcm = (newcm_ref.current = new EditorView({
             /** Migration #0: New */
             state: EditorState.create({
                 doc: local_code,
 
                 extensions: [
+                    EditorView.theme({}, { dark: usesDarkTheme }),
                     // Compartments coming from react state/props
                     nbpkg_compartment,
                     used_variables_compartment,
diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index eaf9fd9702..f56f727a25 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -41,7 +41,7 @@ export const ExportBanner = ({ onClose, notebookfile_url, notebookexport_url, st
                     <section>An <b>.html</b> file for your web page, or to share online.</section>
                 </a>
                 <a href="#" class="export_card" onClick=${() => window.print()}>
-                    <header><${Square} fill="#3D6117" /> Static PDF</header>
+                    <header><${Square} fill="#619b3d" /> Static PDF</header>
                     <section>A static <b>.pdf</b> file for print or email.</section>
                 </a>
                 <!--
diff --git a/frontend/components/FilePicker.js b/frontend/components/FilePicker.js
index 7b869be009..14d3bc6c0d 100644
--- a/frontend/components/FilePicker.js
+++ b/frontend/components/FilePicker.js
@@ -61,6 +61,7 @@ export class FilePicker extends Component {
         }
     }
     componentDidMount() {
+        const usesDarkTheme = window.matchMedia('(prefers-color-scheme: dark)').matches;
         this.cm = new EditorView({
             /** Migration #0: New */
             state: EditorState.create({
@@ -100,7 +101,7 @@ export class FilePicker extends Component {
                             overflowY: "hidden",
                             overflowX: "auto",
                         },
-                    }),
+                    }, {dark : usesDarkTheme}),
                     // EditorView.updateListener.of(onCM6Update),
                     history(),
                     autocompletion({
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
new file mode 100644
index 0000000000..66c0fb6d15
--- /dev/null
+++ b/frontend/dark_color.css
@@ -0,0 +1,187 @@
+@media (prefers-color-scheme: dark) {
+    :root {
+        --image-filters: invert(1) hue-rotate(180deg) contrast(0.8);
+        --out-of-focus-opacity: 0.5;
+        --main-bg-color: hsl(0deg 0% 12%);
+        --rule-color: rgba(255, 255, 255, 0.15);
+        --kbd-border-color: #222222;
+        --header-bg-color: hsl(30deg 3% 16%);
+        --header-border-color: transparent;
+        --ui-button-color: rgb(255, 255, 255);
+        --cursor-color: white;
+
+        /* Cells */
+        --normal-cell: 100, 100, 100;
+        --error-color: 255, 125, 125;
+        --normal-cell-color: rgba(var(--normal-cell), 0.2);
+        --dark-normal-cell-color: rgba(var(--normal-cell), 0.4);
+        --selected-cell-color: rgb(40 147 189 / 65%);
+        --code-differs-cell-color: #9b906c;
+        --error-cell-color: rgba(var(--error-color), 0.6);
+        --bright-error-cell-color: rgba(var(--error-color), 0.9);
+        --light-error-cell-color: rgba(var(--error-color), 0);
+
+        /*Export styling*/
+        --export-bg-color: hsl(225deg 17% 18%);
+        --export-color: rgb(255 255 255 / 84%);
+        --export-card-bg-color: rgb(73 73 73);
+        --export-card-title-color: rgba(255, 255, 255, 0.85);
+        --export-card-text-color: rgb(255 255 255 / 70%);
+        --export-card-shadow-color: #0000001c;
+
+        /*Pluto output styling */
+        --pluto-schema-types-color: rgba(255, 255, 255, 0.6);
+        --pluto-schema-types-border-color: rgba(255, 255, 255, 0.2);
+        --pluto-dim-output-color: hsl(0, 0, 70%);
+        --pluto-output-color: hsl(0deg 0% 77%);
+        --pluto-output-h-color: hsl(0, 0%, 90%);
+        --pluto-output-bg-color: var(--main-bg-color);
+        --a-underline: #ffffff69;
+        --blockquote-color: inherit;
+        --blockquote-bg: #2e2e2e;
+        --admonition-title-color: black;
+        --admonition-bg-color: rgb(35 149 28 / 20%);
+        --admonition-focus-color: rgb(131 191 138);
+        --admonition-note-main-color: rgba(50, 115, 200, 0.2);
+        --admonition-note-focus-color: rgb(92 140 205);
+        --admonition-warn-main-color: rgba(162, 148, 30, 0.2);
+        --admonition-warn-focus-color: rgb(221 212 100);
+        --admonition-danger-main-color: rgba(200, 67, 50, 0.2);
+        --admonition-danger-focus-color: rgb(255, 117, 98);
+        --table-border-color: rgba(255, 255, 255, 0.2);
+        --table-bg-hover-color: rgba(193, 192, 235, 0.15);
+        --pluto-tree-color: rgba(191, 191, 191, 0.507);
+
+        /*pluto cell styling*/
+        --disabled-cell-bg-color: rgba(139, 139, 139, 0.25);
+        --selected-cell-bg-color: rgb(42 115 205 / 78%);
+        --hover-scrollbar-color-1: rgba(0, 0, 0, 0.15);
+        --hover-scrollbar-color-2: rgba(0, 0, 0, 0.05);
+
+        /* Pluto shoulders */
+        --shoulder-hover-bg-color: rgba(255, 255, 255, 0.05);
+
+        /*Top navbar styling*/
+        --nav-h1-text-color: white;
+        --nav-filepicker-color: #b6b6b6;
+        --nav-filepicker-border-color: #c7c7c7;
+        --nav-process-status-bg-color: rgb(82, 82, 82);
+        --nav-process-status-color: var(--pluto-output-h-color);
+
+        /*header*/
+        --restart-recc-header-color: rgb(44 106 157 / 56%);
+        --restart-req-header-color: rgb(145 66 60 / 56%);
+        --dead-process-header-color: rgba(250, 75, 21, 0.473);
+        --loading-header-color: hsl(0deg 0% 20% / 50%);
+        --disconnected-header-color: rgba(255, 169, 114, 0.56);
+        --binder-loading-header-color: hsl(51deg 64% 90% / 50%);
+
+        /*loading bar*/
+        --loading-grad-color-1: #a9d4f1;
+        --loading-grad-color-2: #d0d4d7;
+        /*saveall container*/
+        --overlay-button-bg: #2c2c2c;
+        --overlay-button-border: #c7a74670;
+        --overlay-button-color: white;
+
+        /*input_context_menu*/
+        --input-context-menu-border-color: rgba(255, 255, 255, 0.1);
+        --input-context-menu-bg-color: rgb(39, 40, 47);
+        --input-context-menu-soon-color: #b1b1b144;
+        --input-context-menu-hover-bg-color: rgba(255, 255, 255, 0.1);
+        --input-context-menu-li-color: #c7c7c7;
+
+        /*Pkg status*/
+        --pkg-popup-bg: #3d2f44;
+        --pkg-popup-border-color: #574f56;
+        --pkg-popup-buttons-bg-color: var(--input-context-menu-bg-color);
+        --black: white;
+        --white: black;
+        --pkg-terminal-bg-color: #252627;
+        --pkg-terminal-border-color: #c3c3c388;
+
+        /* run area*/
+        --pluto-runarea-bg-color: rgb(43, 43, 43);
+        --pluto-runarea-span-color: hsl(353, 5%, 64%);
+
+        /*drop ruler*/
+        --dropruler-bg-color: rgba(255, 255, 255, 0.1);
+
+        /* jlerror */
+        --jlerror-header-color: #d9baba;
+        --jlerror-mark-bg-color: rgb(0 0 0 / 18%);
+        --jlerror-a-bg-color: rgba(82, 58, 58, 0.5);
+        --jlerror-a-border-left-color: #704141;
+        --jlerror-mark-color: #b1a9a9;
+
+        /* helpbox */
+        --helpbox-bg-color: rgb(30 34 31);
+        --helpbox-box-shadow-color: #00000017;
+        --helpbox-header-bg-color: #2c3e36;
+        --helpbox-header-color: rgb(255 248 235);
+        --helpbox-notfound-header-color: rgb(139, 139, 139);
+        --helpbox-text-color: rgb(230, 230, 230);
+        --code-section-bg-color: rgb(44, 44, 44);
+        --code-section-border-color: #555a64;
+
+        /*footer*/
+        --footer-color: #cacaca;
+        --footer-bg-color: rgb(38, 39, 44);
+        --footer-atag-color: rgb(114, 161, 223);
+        --footer-input-border-color: #6c6c6c;
+        --footer-filepicker-button-color: black;
+        --footer-filepicker-focus-color: #9d9d9d;
+        --footnote-border-color: rgba(114, 225, 231, 0.15);
+
+        /* undo delete cell*/
+        --undo-delete-box-shadow-color: rgba(213, 213, 214, 0.2);
+
+        /*codemirror hints*/
+        --cm-editor-tooltip-border-color: rgba(0, 0, 0, 0.2);
+        --cm-editor-li-aria-selected-bg-color: #3271e7;
+        --cm-editor-li-aria-selected-color: white;
+        --cm-editor-li-notexported-color: rgba(255, 255, 255, 0.5);
+        --code-background: hsl(222deg 16% 19%);
+        --cm-code-differs-gutters-color: rgb(235 213 28 / 11%);
+        --cm-line-numbers-color: #8d86875e;
+        --cm-selection-background: hsl(215deg 64% 59% / 48%);
+        --cm-selection-background-blurred: hsl(215deg 0% 59% / 48%);
+
+        /* code highlighting */
+        --cm-editor-text-color: #ffe9fc;
+        --cm-comment-color: #e96ba8;
+        --cm-atom-color: #815ba4;
+        --cm-number-color: #815ba4;
+        --cm-property-color: #48b685;
+        --cm-keyword-color: #ff7a6f;
+        --cm-string-color: hsl(20deg 69% 59%);
+        --cm-var-color: #afb7d3;
+        --cm-var2-color: #06b6ef;
+        --cm-builtin-color: #5e7ad3;
+        --cm-def-color: #f99b15;
+        --cm-bracket-color: #a2a273;
+        --cm-tag-color: #ef6155;
+        --cm-link-color: #815ba4;
+        --cm-error-bg-color: #ef6155;
+        --cm-error-color: #f7f7f7;
+        --cm-matchingBracket-color: white;
+        --cm-matchingBracket-bg-color: #c58c237a;
+        --cm-placeholder-text-color: rgb(255 255 255 / 20%);
+
+        /*autocomplete menu*/
+        --autocomplete-menu-bg-color: var(--input-context-menu-bg-color);
+
+        /* Landing colors */
+        --index-text-color: rgb(199, 199, 199);
+        --index-clickable-text-color: rgb(235, 235, 235);
+
+        /* docs binding */
+        --docs-binding-bg: #323431;
+    }
+    body:not(.disable_ui):not(.more-specificity) {
+        /* background by SVGBackgrounds.com */
+        /* background-color: #0e2a2a; */
+        /* background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='300' height='150' viewBox='0 0 1600 800'%3E%3Cpath fill='%237A7A39' d='M1102.5 734.8c2.5-1.2 24.8-8.6 25.6-7.5.5.7-3.9 23.8-4.6 24.5C1123.3 752.1 1107.5 739.5 1102.5 734.8zM1226.3 229.1c0-.1-4.9-9.4-7-14.2-.1-.3-.3-1.1-.4-1.6-.1-.4-.3-.7-.6-.9-.3-.2-.6-.1-.8.1l-13.1 12.3c0 0 0 0 0 0-.2.2-.3.5-.4.8 0 .3 0 .7.2 1 .1.1 1.4 2.5 2.1 3.6 2.4 3.7 6.5 12.1 6.5 12.2.2.3.4.5.7.6.3 0 .5-.1.7-.3 0 0 1.8-2.5 2.7-3.6 1.5-1.6 3-3.2 4.6-4.7 1.2-1.2 1.6-1.4 2.1-1.6.5-.3 1.1-.5 2.5-1.9C1226.5 230.4 1226.6 229.6 1226.3 229.1zM33 770.3C33 770.3 33 770.3 33 770.3c0-.7-.5-1.2-1.2-1.2-.1 0-.3 0-.4.1-1.6.2-14.3.1-22.2 0-.3 0-.6.1-.9.4-.2.2-.4.5-.4.9 0 .2 0 4.9.1 5.9l.4 13.6c0 .3.2.6.4.9.2.2.5.3.8.3 0 0 .1 0 .1 0 7.3-.7 14.7-.9 22-.6.3 0 .7-.1.9-.3.2-.2.4-.6.4-.9C32.9 783.3 32.9 776.2 33 770.3z'/%3E%3Cpath fill='%232C8585' d='M171.1 383.4c1.3-2.5 14.3-22 15.6-21.6.8.3 11.5 21.2 11.5 22.1C198.1 384.2 177.9 384 171.1 383.4zM596.4 711.8c-.1-.1-6.7-8.2-9.7-12.5-.2-.3-.5-1-.7-1.5-.2-.4-.4-.7-.7-.8-.3-.1-.6 0-.8.3L574 712c0 0 0 0 0 0-.2.2-.2.5-.2.9 0 .3.2.7.4.9.1.1 1.8 2.2 2.8 3.1 3.1 3.1 8.8 10.5 8.9 10.6.2.3.5.4.8.4.3 0 .5-.2.6-.5 0 0 1.2-2.8 2-4.1 1.1-1.9 2.3-3.7 3.5-5.5.9-1.4 1.3-1.7 1.7-2 .5-.4 1-.7 2.1-2.4C596.9 713.1 596.8 712.3 596.4 711.8zM727.5 179.9C727.5 179.9 727.5 179.9 727.5 179.9c.6.2 1.3-.2 1.4-.8 0-.1 0-.2 0-.4.2-1.4 2.8-12.6 4.5-19.5.1-.3 0-.6-.2-.8-.2-.3-.5-.4-.8-.5-.2 0-4.7-1.1-5.7-1.3l-13.4-2.7c-.3-.1-.7 0-.9.2-.2.2-.4.4-.5.6 0 0 0 .1 0 .1-.8 6.5-2.2 13.1-3.9 19.4-.1.3 0 .6.2.9.2.3.5.4.8.5C714.8 176.9 721.7 178.5 727.5 179.9zM728.5 178.1c-.1-.1-.2-.2-.4-.2C728.3 177.9 728.4 178 728.5 178.1z'/%3E%3Cg fill-opacity='0.46' fill='%23FFF'%3E%3Cpath d='M699.6 472.7c-1.5 0-2.8-.8-3.5-2.3-.8-1.9 0-4.2 1.9-5 3.7-1.6 6.8-4.7 8.4-8.5 1.6-3.8 1.7-8.1.2-11.9-.3-.9-.8-1.8-1.2-2.8-.8-1.7-1.8-3.7-2.3-5.9-.9-4.1-.2-8.6 2-12.8 1.7-3.1 4.1-6.1 7.6-9.1 1.6-1.4 4-1.2 5.3.4 1.4 1.6 1.2 4-.4 5.3-2.8 2.5-4.7 4.7-5.9 7-1.4 2.6-1.9 5.3-1.3 7.6.3 1.4 1 2.8 1.7 4.3.5 1.1 1 2.2 1.5 3.3 2.1 5.6 2 12-.3 17.6-2.3 5.5-6.8 10.1-12.3 12.5C700.6 472.6 700.1 472.7 699.6 472.7zM740.4 421.4c1.5-.2 3 .5 3.8 1.9 1.1 1.8.4 4.2-1.4 5.3-3.7 2.1-6.4 5.6-7.6 9.5-1.2 4-.8 8.4 1.1 12.1.4.9 1 1.7 1.6 2.7 1 1.7 2.2 3.5 3 5.7 1.4 4 1.2 8.7-.6 13.2-1.4 3.4-3.5 6.6-6.8 10.1-1.5 1.6-3.9 1.7-5.5.2-1.6-1.4-1.7-3.9-.2-5.4 2.6-2.8 4.3-5.3 5.3-7.7 1.1-2.8 1.3-5.6.5-7.9-.5-1.3-1.3-2.7-2.2-4.1-.6-1-1.3-2.1-1.9-3.2-2.8-5.4-3.4-11.9-1.7-17.8 1.8-5.9 5.8-11 11.2-14C739.4 421.6 739.9 421.4 740.4 421.4zM261.3 590.9c5.7 6.8 9 15.7 9.4 22.4.5 7.3-2.4 16.4-10.2 20.4-3 1.5-6.7 2.2-11.2 2.2-7.9-.1-12.9-2.9-15.4-8.4-2.1-4.7-2.3-11.4 1.8-15.9 3.2-3.5 7.8-4.1 11.2-1.6 1.2.9 1.5 2.7.6 3.9-.9 1.2-2.7 1.5-3.9.6-1.8-1.3-3.6.6-3.8.8-2.4 2.6-2.1 7-.8 9.9 1.5 3.4 4.7 5 10.4 5.1 3.6 0 6.4-.5 8.6-1.6 4.7-2.4 7.7-8.6 7.2-15-.5-7.3-5.3-18.2-13-23.9-4.2-3.1-8.5-4.1-12.9-3.1-3.1.7-6.2 2.4-9.7 5-6.6 5.1-11.7 11.8-14.2 19-2.7 7.7-2.1 15.8 1.9 23.9.7 1.4.1 3.1-1.3 3.7-1.4.7-3.1.1-3.7-1.3-4.6-9.4-5.4-19.2-2.2-28.2 2.9-8.2 8.6-15.9 16.1-21.6 4.1-3.1 8-5.1 11.8-6 6-1.4 12 0 17.5 4C257.6 586.9 259.6 588.8 261.3 590.9z'/%3E%3Ccircle cx='1013.7' cy='153.9' r='7.1'/%3E%3Ccircle cx='1024.3' cy='132.1' r='7.1'/%3E%3Ccircle cx='1037.3' cy='148.9' r='7.1'/%3E%3Cpath d='M1508.7 297.2c-4.8-5.4-9.7-10.8-14.8-16.2 5.6-5.6 11.1-11.5 15.6-18.2 1.2-1.7.7-4.1-1-5.2-1.7-1.2-4.1-.7-5.2 1-4.2 6.2-9.1 11.6-14.5 16.9-4.8-5-9.7-10-14.7-14.9-1.5-1.5-3.9-1.5-5.3 0-1.5 1.5-1.5 3.9 0 5.3 4.9 4.8 9.7 9.8 14.5 14.8-1.1 1.1-2.3 2.2-3.5 3.2-4.1 3.8-8.4 7.8-12.4 12-1.4 1.5-1.4 3.8 0 5.3 0 0 0 0 0 0 1.5 1.4 3.9 1.4 5.3-.1 3.9-4 8.1-7.9 12.1-11.7 1.2-1.1 2.3-2.2 3.5-3.3 4.9 5.3 9.8 10.6 14.6 15.9.1.1.1.1.2.2 1.4 1.4 3.7 1.5 5.2.2C1510 301.2 1510.1 298.8 1508.7 297.2zM327.6 248.6l-.4-2.6c-1.5-11.1-2.2-23.2-2.3-37 0-5.5 0-11.5.2-18.5 0-.7 0-1.5 0-2.3 0-5 0-11.2 3.9-13.5 2.2-1.3 5.1-1 8.5.9 5.7 3.1 13.2 8.7 17.5 14.9 5.5 7.8 7.3 16.9 5 25.7-3.2 12.3-15 31-30 32.1L327.6 248.6zM332.1 179.2c-.2 0-.3 0-.4.1-.1.1-.7.5-1.1 2.7-.3 1.9-.3 4.2-.3 6.3 0 .8 0 1.7 0 2.4-.2 6.9-.2 12.8-.2 18.3.1 12.5.7 23.5 2 33.7 11-2.7 20.4-18.1 23-27.8 1.9-7.2.4-14.8-4.2-21.3l0 0C347 188.1 340 183 335 180.3 333.6 179.5 332.6 179.2 332.1 179.2zM516.3 60.8c-.1 0-.2 0-.4-.1-2.4-.7-4-.9-6.7-.7-.7 0-1.3-.5-1.4-1.2 0-.7.5-1.3 1.2-1.4 3.1-.2 4.9 0 7.6.8.7.2 1.1.9.9 1.6C517.3 60.4 516.8 60.8 516.3 60.8zM506.1 70.5c-.5 0-1-.3-1.2-.8-.8-2.1-1.2-4.3-1.3-6.6 0-.7.5-1.3 1.2-1.3.7 0 1.3.5 1.3 1.2.1 2 .5 3.9 1.1 5.8.2.7-.1 1.4-.8 1.6C506.4 70.5 506.2 70.5 506.1 70.5zM494.1 64.4c-.4 0-.8-.2-1-.5-.4-.6-.3-1.4.2-1.8 1.8-1.4 3.7-2.6 5.8-3.6.6-.3 1.4 0 1.7.6.3.6 0 1.4-.6 1.7-1.9.9-3.7 2-5.3 3.3C494.7 64.3 494.4 64.4 494.1 64.4zM500.5 55.3c-.5 0-.9-.3-1.2-.7-.5-1-1.2-1.9-2.4-3.4-.3-.4-.7-.9-1.1-1.4-.4-.6-.3-1.4.2-1.8.6-.4 1.4-.3 1.8.2.4.5.8 1 1.1 1.4 1.3 1.6 2.1 2.6 2.7 3.9.3.6 0 1.4-.6 1.7C500.9 55.3 500.7 55.3 500.5 55.3zM506.7 55c-.3 0-.5-.1-.8-.2-.6-.4-.7-1.2-.3-1.8 1.2-1.7 2.3-3.4 3.3-5.2.3-.6 1.1-.9 1.7-.5.6.3.9 1.1.5 1.7-1 1.9-2.2 3.8-3.5 5.6C507.4 54.8 507.1 55 506.7 55zM1029.3 382.8c-.1 0-.2 0-.4-.1-2.4-.7-4-.9-6.7-.7-.7 0-1.3-.5-1.4-1.2 0-.7.5-1.3 1.2-1.4 3.1-.2 4.9 0 7.6.8.7.2 1.1.9.9 1.6C1030.3 382.4 1029.8 382.8 1029.3 382.8zM1019.1 392.5c-.5 0-1-.3-1.2-.8-.8-2.1-1.2-4.3-1.3-6.6 0-.7.5-1.3 1.2-1.3.7 0 1.3.5 1.3 1.2.1 2 .5 3.9 1.1 5.8.2.7-.1 1.4-.8 1.6C1019.4 392.5 1019.2 392.5 1019.1 392.5zM1007.1 386.4c-.4 0-.8-.2-1-.5-.4-.6-.3-1.4.2-1.8 1.8-1.4 3.7-2.6 5.8-3.6.6-.3 1.4 0 1.7.6.3.6 0 1.4-.6 1.7-1.9.9-3.7 2-5.3 3.3C1007.7 386.3 1007.4 386.4 1007.1 386.4zM1013.5 377.3c-.5 0-.9-.3-1.2-.7-.5-1-1.2-1.9-2.4-3.4-.3-.4-.7-.9-1.1-1.4-.4-.6-.3-1.4.2-1.8.6-.4 1.4-.3 1.8.2.4.5.8 1 1.1 1.4 1.3 1.6 2.1 2.6 2.7 3.9.3.6 0 1.4-.6 1.7C1013.9 377.3 1013.7 377.3 1013.5 377.3zM1019.7 377c-.3 0-.5-.1-.8-.2-.6-.4-.7-1.2-.3-1.8 1.2-1.7 2.3-3.4 3.3-5.2.3-.6 1.1-.9 1.7-.5.6.3.9 1.1.5 1.7-1 1.9-2.2 3.8-3.5 5.6C1020.4 376.8 1020.1 377 1019.7 377zM1329.7 573.4c-1.4 0-2.9-.2-4.5-.7-8.4-2.7-16.6-12.7-18.7-20-.4-1.4-.7-2.9-.9-4.4-8.1 3.3-15.5 10.6-15.4 21 0 1.5-1.2 2.7-2.7 2.8 0 0 0 0 0 0-1.5 0-2.7-1.2-2.7-2.7-.1-6.7 2.4-12.9 7-18 3.6-4 8.4-7.1 13.7-8.8.5-6.5 3.1-12.9 7.4-17.4 7-7.4 18.2-8.9 27.3-10.1l.7-.1c1.5-.2 2.9.9 3.1 2.3.2 1.5-.9 2.9-2.3 3.1l-.7.1c-8.6 1.2-18.4 2.5-24 8.4-3 3.2-5 7.7-5.7 12.4 7.9-1 17.7 1.3 24.3 5.7 4.3 2.9 7.1 7.8 7.2 12.7.2 4.3-1.7 8.3-5.2 11.1C1335.2 572.4 1332.6 573.4 1329.7 573.4zM1311 546.7c.1 1.5.4 3 .8 4.4 1.7 5.8 8.7 14.2 15.1 16.3 2.8.9 5.1.5 7.2-1.1 2.7-2.1 3.2-4.8 3.1-6.6-.1-3.2-2-6.4-4.8-8.3C1326.7 547.5 1317.7 545.6 1311 546.7z'/%3E%3C/g%3E%3C/svg%3E"); */
+        /* background-attachment: fixed; */
+    }
+}
diff --git a/frontend/editor.css b/frontend/editor.css
index 9ce8caff2d..f6812beb6d 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -18,6 +18,9 @@
 @import url("https://cdn.jsdelivr.net/npm/@fontsource/lato@4.4.5/400.css");
 @import url("https://cdn.jsdelivr.net/npm/@fontsource/lato@4.4.5/400-italic.css");
 
+@import url("light_color.css");
+@import url("dark_color.css");
+
 /* VARIABLES */
 
 :root {
@@ -26,6 +29,8 @@
         for julia mono see here: https://cormullion.github.io/pages/2020-07-26-JuliaMono/#contextual_and_stylistic_alternates_and_ligatures */
     --pluto-operator-ligatures: none;
     --sans-serif-font-stack: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
+
+    color-scheme: light dark;
 }
 
 /* GENERAL PAGE LAYOUT */
@@ -46,6 +51,7 @@ body {
     display: flex;
     flex-direction: column;
     align-items: center;
+    background-color: var(--main-bg-color);
 }
 
 main {
@@ -86,6 +92,7 @@ body:not(.disable_ui) {
 
 pluto-notebook {
     display: block;
+    background: var(--main-bg-color);
 }
 
 /* STANDARD HTML ELEMENTS */
@@ -96,7 +103,7 @@ pluto-output {
     font-family: "Alegreya Sans", sans-serif;
     font-size: 1em;
     font-weight: 400;
-    color: hsl(0, 0%, 25%);
+    color: var(--pluto-output-color);
 }
 
 pluto-output h1,
@@ -108,7 +115,7 @@ pluto-output h6 {
     font-family: "Vollkorn", serif;
     font-feature-settings: "lnum", "pnum";
     font-weight: 600;
-    color: hsl(0, 0%, 12%);
+    color: var(--pluto-output-h-color);
     margin-block-start: 1rem;
     margin-block-end: 0rem;
 }
@@ -126,13 +133,13 @@ pluto-output h2:first-child {
 
 pluto-output h1 {
     font-size: 2.2rem;
-    border-bottom: 3px solid rgba(0, 0, 0, 0.15);
+    border-bottom: 3px solid var(--rule-color);
     margin-bottom: 0.5rem;
 }
 
 pluto-output h2 {
     font-size: 1.8rem;
-    border-bottom: 2px dotted rgba(0, 0, 0, 0.15);
+    border-bottom: 2px dotted var(--rule-color);
     margin-bottom: 0.5rem;
 }
 
@@ -199,8 +206,18 @@ pluto-output video {
 }
 
 a {
-    color: black;
-    font-weight: bold;
+    color: var(--black);
+    /* font-weight: bold; */
+    text-decoration-thickness: 2px;
+    text-decoration-color: var(--a-underline);
+    /* text-shadow: 1px -1px 0px #ffffff33; */
+}
+a:hover {
+    text-decoration-color: var(--black);
+}
+
+.cm-cursor {
+    border-left: 1.2px solid var(--cursor-color) !important;
 }
 
 pluto-output code {
@@ -220,10 +237,11 @@ pluto-output pre > code {
 pluto-output.rich_output code {
     padding: 3px;
     border-radius: 8px;
-    background-color: #f2f2f2;
+    background-color: var(--pluto-output-bg-color);
 }
 pluto-output.rich_output pre > code {
     padding: 0px;
+    background-color: transparent;
 }
 
 pluto-output pre {
@@ -245,7 +263,7 @@ pluto-display pre {
 
 pluto-output hr {
     border: none;
-    border-top: 3px solid rgba(0, 0, 0, 0.15);
+    border-top: 3px solid var(--rule-color);
     margin-left: 0;
     margin-right: 0;
 }
@@ -261,10 +279,9 @@ pluto-output blockquote {
     margin-block-end: var(--pluto-cell-spacing);
     display: block;
     padding: 15px;
-
     border-radius: 15px;
-    background-color: #f2f2f2;
-    color: #555;
+    background-color: var(--blockquote-bg);
+    color: var(--blockquote-color);
 }
 pluto-output.rich_output pre:not(.no-block):last-child,
 pluto-output blockquote:last-child {
@@ -279,7 +296,7 @@ pluto-output div.admonition {
 pluto-output div.admonition .admonition-title {
     font-family: "Vollkorn", sans-serif;
     font-feature-settings: "lnum", "pnum";
-    color: white;
+    color: var(--admonition-title-color);
     font-weight: 600;
     margin-block-end: 0px;
     padding-left: 0.3em;
@@ -292,38 +309,38 @@ pluto-output div.admonition .admonition-title ~ * {
 
 pluto-output div.admonition {
     padding-left: 0.5rem;
-    background: rgba(68, 149, 28, 0.2);
-    border: 5px solid rgb(158, 200, 137);
+    background: var(--admonition-bg-color);
+    border: 5px solid var(--admonition-focus-color);
 }
 pluto-output div.admonition .admonition-title {
-    background: rgb(158, 200, 137);
+    background: var(--admonition-focus-color);
     margin: -1px; /* Fixes a rendering glitch in Chrome */
     margin-left: -0.55rem;
 }
 pluto-output div.admonition.note,
 pluto-output div.admonition.info,
 pluto-output div.admonition.hint {
-    background: rgba(50, 115, 200, 0.2);
-    border: 5px solid rgb(148, 182, 226);
+    background: var(--admonition-note-main-color);
+    border: 5px solid var(--admonition-note-focus-color);
 }
 pluto-output div.admonition.note .admonition-title,
 pluto-output div.admonition.info .admonition-title,
 pluto-output div.admonition.hint .admonition-title {
-    background: rgb(148, 182, 226);
+    background: var(--admonition-note-focus-color);
 }
 pluto-output div.admonition.warning {
-    background: rgba(162, 148, 30, 0.2);
-    border: 5px solid rgb(207, 199, 138);
+    background: var(--admonition-warn-main-color);
+    border: 5px solid var(--admonition-warn-focus-color);
 }
 pluto-output div.admonition.warning .admonition-title {
-    background: rgb(207, 199, 138);
+    background: var(--admonition-warn-focus-color);
 }
 pluto-output div.admonition.danger {
-    background: rgba(200, 67, 50, 0.2);
-    border: 5px solid rgb(226, 157, 148);
+    background: var(--admonition-danger-main-color);
+    border: 5px solid var(--admonition-danger-focus-color);
 }
 pluto-output div.admonition.danger .admonition-title {
-    background: rgb(226, 157, 148);
+    background: var(--admonition-danger-focus-color);
 }
 
 pluto-output div.admonition.hint .admonition-title ~ * {
@@ -358,7 +375,7 @@ pluto-output div.footnote p.footnote-title {
 pluto-output div.footnote p.footnote-title ~ * {
     margin-left: 0.1em;
     padding-left: 0.4em;
-    border-left: 5px solid rgba(23, 115, 119, 0.15);
+    border-left: 5px solid var(--footnote-border-color);
     padding-bottom: var(--pluto-cell-spacing);
     margin-block-end: 0px;
 }
@@ -374,7 +391,7 @@ pluto-output.scroll_y {
 
 pluto-output table {
     border-collapse: collapse;
-    border: 2px solid rgba(0, 0, 0, 0.2);
+    border: 2px solid var(--table-border-color);
     border-left: none;
     border-right: none;
     margin: 0 auto;
@@ -383,7 +400,7 @@ pluto-output table {
 }
 
 pluto-output table > thead {
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+    border-bottom: 1px solid var(--table-border-color);
 }
 
 pluto-output table > tbody td {
@@ -401,7 +418,7 @@ pluto-output table th {
 }
 
 pluto-output table > tbody tr:hover {
-    background-color: rgba(224, 203, 158, 0.15);
+    background-color: var(--table-bg-hover-color);
 }
 pluto-output table pre {
     white-space: pre;
@@ -412,8 +429,8 @@ kbd {
     font-family: "Space Mono", monospace;
     font-size: 0.7rem;
     letter-spacing: -0.7px;
-    border: 1px solid #dfdfdf;
-    padding: 0px 2px;
+    border: 1px solid var(--kbd-border-color);
+    padding: 0px 5px;
     border-radius: 3px;
 }
 
@@ -430,10 +447,10 @@ body > header {
     width: 100%;
     min-height: 60px;
     z-index: 50;
-    background-color: white;
+    background-color: var(--header-bg-color);
     transform: translateY(0px);
     transition: background-color 0.5s ease-in-out, transform 0.25s cubic-bezier(0.18, 0.89, 0.49, 1.13);
-    border-bottom: solid 1px rgba(0, 0, 0, 0.1);
+    border-bottom: solid 1px var(--header-border-color);
     font-family: "Roboto Mono", monospace;
     font-weight: 400;
     font-size: 0.75rem;
@@ -450,9 +467,9 @@ aside#export {
     top: 0;
     width: 100%;
     height: 130px;
-    background: rgb(60, 67, 101);
-    color: rgba(255, 255, 255, 0.7);
-    transform: translateY(-101%);
+    background: var(--export-bg-color);
+    color: var(--export-color);
+    transform: translateY(-100%);
 }
 aside#export::before {
     content: "";
@@ -484,10 +501,10 @@ a.export_card {
     height: 90px;
 
     border: 5px solid transparent;
-    background: rgba(255, 255, 255, 0.8);
+    background: var(--export-card-bg-color);
     border-radius: 8px;
-    color: rgba(0, 0, 0, 0.7);
-    box-shadow: 0px 2px 10px #00000029;
+    color: var(--export-card-title-color);
+    box-shadow: 0px 2px 10px var(--export-card-shadow-color);
     text-decoration: none;
 }
 div.export_title {
@@ -507,12 +524,14 @@ div.export_title {
 a.export_card header {
     margin-block: 0px;
     font-family: "Vollkorn", sans;
+    /* font-family: system-ui; */
     font-feature-settings: "lnum", "pnum";
     font-size: 1rem;
 }
 a.export_card section {
-    color: rgba(0, 0, 0, 0.5);
+    color: var(--export-card-text-color);
     font-weight: 500;
+    /* font-family: system-ui; */
 }
 aside#export button.toggle_export {
     margin-left: auto;
@@ -523,7 +542,7 @@ body.static_preview button.toggle_export {
 }
 
 nav#at_the_top h1 {
-    color: black;
+    color: var(--nav-h1-text-color);
     letter-spacing: 2px;
 }
 
@@ -559,6 +578,7 @@ nav#at_the_top > a {
 nav#at_the_top img {
     height: 39px;
     margin-bottom: -8px;
+    filter: var(--image-filters);
 }
 
 nav#at_the_top h1 {
@@ -601,8 +621,8 @@ nav#at_the_top > pluto-filepicker .cm-editor {
     font-size: 0.8rem;
     letter-spacing: 1px;
     background: none;
-    color: #6f6f6f;
-    border: 2px solid #b2b2b2;
+    color: var(--nav-filepicker-color);
+    border: 2px solid var(--footer-input-border-color);
     border-radius: 3px;
     border-right: none;
     border-top-right-radius: 0;
@@ -644,11 +664,12 @@ nav#at_the_top button.start_stop_recording.stop span {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/stop-circle-outline.svg");
 }
 nav#at_the_top button.toggle_export span {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/shapes-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/shapes-outline.svg);
+    filter: var(--image-filters);
 }
 aside#export button.toggle_export span {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-outline.svg");
-    filter: invert();
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-outline.svg);
+    filter: var(--image-filters);
 }
 nav#at_the_top:after {
     margin-left: auto;
@@ -682,7 +703,7 @@ nav#at_the_top:after {
     }
     header:hover > nav#at_the_top > pluto-filepicker .cm-editor,
     header:focus-within > nav#at_the_top > pluto-filepicker .cm-editor {
-        border: 2px solid #b2b2b2;
+        border: 2px solid var(--footer-input-border-color);
         border-right: none;
     }
     header:hover > nav#at_the_top > pluto-filepicker button,
@@ -714,22 +735,22 @@ body.disconnected > header {
 }
 
 body.nbpkg_restart_recommended > header {
-    background-color: rgba(114, 192, 255, 0.56);
+    background-color: var(--restart-recc-header-color);
 }
 body.nbpkg_restart_required > header {
-    background-color: rgba(170, 41, 32, 0.56);
+    background-color: var(--restart-req-header-color);
 }
 body.process_dead > header {
-    background-color: rgb(230 88 46 / 38%);
+    background-color: var(--dead-process-header-color);
 }
 body.loading > header {
-    background-color: hsla(290, 10%, 80%, 0.5);
+    background-color: var(--loading-header-color);
 }
 body.disconnected > header {
-    background-color: rgba(255, 169, 114, 0.56);
+    background-color: var(--disconnected-header-color);
 }
 body.binder.loading > header {
-    background-color: hsl(51deg 64% 90% / 50%);
+    background-color: var(--binder-loading-header-color);
 }
 
 nav#at_the_top > #process_status {
@@ -737,7 +758,8 @@ nav#at_the_top > #process_status {
     font-weight: 500;
     padding: 5px 10px;
     margin: 5px;
-    background: white;
+    background: var(--nav-process-status-bg-color);
+    color: var(--nav-process-status-color);
     border-radius: 10px;
     z-index: 10;
     margin-left: 1em;
@@ -751,7 +773,7 @@ loading-bar {
     height: 6px;
     width: 10vw;
     /* background-color: #b1c9dd; */
-    background: linear-gradient(90deg, #f1dba9, #d7d7d0, #f1dba9);
+    background: linear-gradient(90deg, var(--loading-grad-color-1), var(--loading-grad-color-2), var(--loading-grad-color-1));
     background-size: 100vw 100%;
     position: fixed;
     top: 0px;
@@ -876,10 +898,26 @@ main > preamble {
     pointer-events: none;
 }
 
+main > preamble #saveall-container {
+    margin-left: auto;
+    pointer-events: all;
+    right: min(0px, 700px + 25px - 100vw);
+    position: relative;
+    background: var(--overlay-button-bg);
+    color: var(--overlay-button-color);
+    padding: 5px 8px;
+    border: 3px solid var(--overlay-button-border);
+    border-radius: 12px;
+    height: 35px;
+    font-family: "Segoe UI Emoji", "Roboto Mono", monospace;
+    font-size: 0.75rem;
+    pointer-events: all;
+}
+
 .overlay-button {
     background: #ffffff;
     padding: 5px 8px;
-    border: 3px solid #e3e3e3;
+    border: 3px solid var(--overlay-button-border);
     border-radius: 12px;
     height: 35px;
     font-family: "Segoe UI Emoji", "Roboto Mono", monospace;
@@ -888,6 +926,9 @@ main > preamble {
     /* break-inside: avoid; */
     white-space: nowrap;
 }
+.overlay-button button:not(.asdfdsf) {
+    color: var(--overlay-button-color);
+}
 
 main > preamble #saveall-container {
     margin-left: auto;
@@ -923,10 +964,13 @@ main > preamble #saveall-container.saved > span {
     background-repeat: no-repeat;
     background-position-x: right;
     background-position-y: 1px;
+    filter: var(--image-filters);
 }
 
+main > preamble span.saved-icon::after,
 .overlay-button span.saved-icon::after {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/checkmark-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/checkmark-outline.svg);
+    filter: var(--image-filters);
 }
 
 #saveall-container .only-on-hover {
@@ -958,7 +1002,7 @@ pluto-output {
     align-items: baseline;
     overflow-x: auto;
 
-    background-color: white;
+    background-color: var(--pluto-output-bg-color);
 }
 
 pluto-cell.depends_on_disabled_cells > pluto-output,
@@ -967,7 +1011,7 @@ pluto-cell.running_disabled > pluto-output {
 }
 
 pluto-cell.running_disabled > pluto-output {
-    background-color: rgba(139, 139, 139, 0.25);
+    background-color: var(--disabled-cell-bg-color);
 }
 
 .scroll_y {
@@ -1034,7 +1078,7 @@ pluto-display > div {
 /* SELECTION */
 
 pluto-cell.selected {
-    background: rgba(40, 78, 189, 0.24);
+    background: var(--selected-cell-bg-color);
     border-radius: 0 3px 3px 0;
 }
 
@@ -1058,7 +1102,7 @@ pluto-output > div {
 }
 
 pluto-cell:hover > pluto-output > div {
-    scrollbar-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.05);
+    scrollbar-color: var(--hover-scrollbar-color-1) var(--hover-scrollbar-color-2);
 }
 
 /* SCROLLBAR CHROME */
@@ -1073,11 +1117,11 @@ pluto-output > div::-webkit-scrollbar-thumb {
 }
 
 pluto-cell:hover > pluto-output > div::-webkit-scrollbar {
-    background: rgba(0, 0, 0, 0.05);
+    background: var(--hover-scrollbar-color-2);
 }
 
 pluto-cell:hover > pluto-output > div::-webkit-scrollbar-thumb {
-    background: rgba(0, 0, 0, 0.15);
+    background: var(--hover-scrollbar-color-1);
 }
 
 /* CELL INPUT */
@@ -1085,7 +1129,7 @@ pluto-cell:hover > pluto-output > div::-webkit-scrollbar-thumb {
 pluto-input .cm-editor {
     z-index: 20;
     border-bottom-right-radius: 4px;
-    border: 1px solid rgba(0, 0, 0, 0.1);
+    border: 1px solid var(--normal-cell-color);
     border-left: none;
     transition: border-color 0.15s ease-in-out;
 
@@ -1103,7 +1147,7 @@ pluto-cell:not(.show_input) > pluto-input {
 }
 
 pluto-cell.code_differs > pluto-input > .cm-editor {
-    border: 1px solid hsla(46, 70%, 37%, 0.68);
+    border: 1px solid var(--code-differs-cell-color);
     border-left: none;
 }
 
@@ -1113,7 +1157,7 @@ pluto-cell.running_disabled > pluto-input .cm-editor {
 }
 
 pluto-cell.running_disabled > pluto-input .cm-editor {
-    background-color: rgba(139, 139, 139, 0.25);
+    background-color: var(--disabled-cell-bg-color);
 }
 
 /* UI */
@@ -1132,7 +1176,7 @@ nav#slide_controls > button {
     background: none;
     cursor: pointer;
     /* color: hsl(204, 86%, 35%); */
-    color: black;
+    color: var(--ui-button-color);
     font-family: "Segoe UI Emoji", "Roboto Mono", monospace;
     font-size: 0.75rem;
     z-index: 30;
@@ -1164,7 +1208,7 @@ pluto-shoulder {
 }
 
 pluto-shoulder:hover {
-    background: rgba(0, 0, 0, 0.05);
+    background: var(--shoulder-hover-bg-color);
     background-clip: padding-box;
 }
 
@@ -1187,11 +1231,13 @@ pluto-cell:focus-within > pluto-shoulder > button {
 } */
 
 pluto-shoulder > button > span::after {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/eye-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/eye-outline.svg);
+    filter: var(--image-filters);
 }
 
 pluto-cell.code_folded > pluto-shoulder > button > span::after {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/eye-off-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/eye-off-outline.svg);
+    filter: var(--image-filters);
 }
 
 /* TRAFFIC LIGHT */
@@ -1209,8 +1255,8 @@ pluto-trafficlight {
     pointer-events: none;
     border-top-left-radius: 4px;
     border-bottom-left-radius: 4px;
-    border-left-color: rgba(0, 0, 0, 0.1);
-    background: rgba(0, 0, 0, 0.1);
+    border-left-color: var(--normal-cell-color);
+    background: var(--normal-cell-color);
     overflow: hidden;
 }
 
@@ -1242,7 +1288,7 @@ body:not(.___) pluto-cell.code_folded > pluto-trafficlight {
 
 @media screen and (any-pointer: fine) {
     body:not(.disable_ui) pluto-cell:hover > pluto-trafficlight {
-        background: rgba(0, 0, 0, 0.1);
+        background: var(--normal-cell-color);
         transition: background 0.05s ease-in;
     }
 }
@@ -1252,29 +1298,29 @@ body:not(.___) pluto-cell:focus-within > pluto-trafficlight {
     border-left-style: solid;
     margin-left: -4px;
     background-clip: padding-box;
-    background-color: rgba(0, 0, 0, 0.1);
+    background-color: var(--normal-cell-color);
 }
 
 body:not(.___) pluto-cell.selected > pluto-trafficlight {
-    background: rgba(40, 78, 189, 0.4);
-    border-left-color: rgba(40, 78, 189, 0.4);
+    background: var(--selected-cell-color);
+    border-left-color: var(--selected-cell-color);
     background-clip: padding-box;
 }
 
 body:not(.___) pluto-cell.code_differs > pluto-trafficlight {
-    background: hsla(46, 70%, 37%, 0.68);
-    border-left-color: hsla(46, 70%, 37%, 0.68);
+    background: var(--code-differs-cell-color);
+    border-left-color: var(--code-differs-cell-color);
     background-clip: padding-box;
 }
 
 body:not(.___) pluto-cell.errored > pluto-trafficlight {
-    background: hsla(0, 70%, 80%, 0.7);
-    border-left-color: hsla(0, 70%, 80%, 0.7);
+    background: var(--error-cell-color);
+    border-left-color: var(--error-cell-color);
     background-clip: padding-box;
 }
 
 body:not(.___) pluto-cell.queued > pluto-trafficlight::after {
-    background: repeating-linear-gradient(-45deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0) 8px, rgba(0, 0, 0, 0.1) 8px, rgba(0, 0, 0, 0.1) 16px);
+    background: repeating-linear-gradient(-45deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0) 8px, var(--normal-cell-color) 8px, var(--normal-cell-color) 16px);
     background-clip: padding-box;
     /* [1]
     Queued, Running, Errored are really fast changing props.
@@ -1290,7 +1336,13 @@ body:not(.___) pluto-cell.queued > pluto-trafficlight::after {
 }
 
 body:not(.___) pluto-cell.running > pluto-trafficlight::after {
-    background: repeating-linear-gradient(-45deg, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1) 8px, rgba(0, 0, 0, 0.2) 8px, rgba(0, 0, 0, 0.2) 16px);
+    background: repeating-linear-gradient(
+        -45deg,
+        var(--normal-cell-color),
+        var(--normal-cell-color) 8px,
+        var(--dark-normal-cell-color) 8px,
+        var(--dark-normal-cell-color) 16px
+    );
     background-clip: content-box;
     opacity: 0.99; /* [1] */
     background-size: 4px var(--patternHeight);
@@ -1299,10 +1351,10 @@ body:not(.___) pluto-cell.running > pluto-trafficlight::after {
 body:not(.___) pluto-cell.queued.errored > pluto-trafficlight::after {
     background: repeating-linear-gradient(
         -45deg,
-        hsla(0, 70%, 80%, 0.7),
-        hsla(0, 70%, 80%, 0.7) 8px,
-        hsla(0, 70%, 80%, 0.05) 8px,
-        hsla(0, 70%, 80%, 0.05) 16px
+        var(--light-error-cell-color),
+        var(--light-error-cell-color) 8px,
+        var(--bright-error-cell-color) 8px,
+        var(--bright-error-cell-color) 16px
     );
     background-clip: content-box;
     opacity: 0.99; /* [1] */
@@ -1310,7 +1362,13 @@ body:not(.___) pluto-cell.queued.errored > pluto-trafficlight::after {
 }
 
 body:not(.___) pluto-cell.running.errored > pluto-trafficlight::after {
-    background: repeating-linear-gradient(-45deg, hsla(0, 100%, 80%, 1), hsla(0, 100%, 80%, 1) 8px, hsla(0, 70%, 80%, 0.7) 8px, hsla(0, 70%, 80%, 0.7) 16px);
+    background: repeating-linear-gradient(
+        -45deg,
+        var(--light-error-cell-color),
+        var(--light-error-cell-color) 8px,
+        var(--bright-error-cell-color) 8px,
+        var(--bright-error-cell-color) 16px
+    );
     background-clip: content-box;
     opacity: 0.99; /* [1] */
     background-size: 4px var(--patternHeight); /* 16 * sqrt(2) */
@@ -1318,11 +1376,11 @@ body:not(.___) pluto-cell.running.errored > pluto-trafficlight::after {
 
 pluto-cell.depends_on_disabled_cells > pluto-trafficlight,
 pluto-cell.running_disabled > pluto-trafficlight {
-    background-color: rgb(255, 255, 255);
+    background-color: rgb(255, 0, 0);
 }
 
 pluto-cell.running_disabled:not(.asjkdhf) > pluto-trafficlight {
-    background-color: rgba(139, 139, 139, 0.25);
+    background-color: var(--disabled-cell-bg-color);
     opacity: 0.3;
 }
 
@@ -1359,7 +1417,7 @@ pluto-input > button > span {
     pluto-cell:hover > pluto-input > button,
     pluto-cell > pluto-runarea > button,
     pluto-cell:hover > pluto-shoulder > button {
-        opacity: 0.25;
+        opacity: 0.4;
         transition: opacity 0.25s ease-in-out;
     }
     button.toggle_export:hover,
@@ -1431,8 +1489,9 @@ pluto-cell > button.add_cell.after {
 }
 
 pluto-cell > button.add_cell > span::after {
-    /* background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/add-circle-outline.svg"); */
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/add-outline.svg");
+    /* background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/add-circle-outline.svg); */
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/add-outline.svg);
+    filter: var(--image-filters);
 }
 pluto-input > button.input_context_menu ul {
     --width: 156px;
@@ -1443,8 +1502,8 @@ pluto-input > button.input_context_menu ul {
     border-radius: 6px;
     display: block;
     position: absolute;
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    background-color: white;
+    border: 1px solid var(--input-context-menu-border-color);
+    background-color: var(--input-context-menu-bg-color);
 }
 @media screen and (min-width: 921px) {
     pluto-input > button.input_context_menu ul {
@@ -1464,7 +1523,7 @@ pluto-input > button.input_context_menu ul {
     font-size: 0.8rem;
     margin-block-end: 0px;
     letter-spacing: -0.02em;
-    color: #6b6a6a;
+    color: var(--input-context-menu-li-color);
     position: relative;
     list-style: none;
     padding: 8px;
@@ -1485,17 +1544,17 @@ pluto-input > button.input_context_menu ul {
 }
 
 .input_context_menu li.coming_soon {
-    color: #55555544;
+    color: var(--input-context-menu-soon-color);
 }
 .input_context_menu li.coming_soon:hover {
     cursor: not-allowed;
-    background-color: rgba(0, 0, 0, 0.1);
+    background-color: var(--input-context-menu-hover-bg-color);
 }
 
 .input_context_menu li:hover {
     transition-property: background-color;
     transition-duration: 200ms;
-    background-color: rgba(0, 0, 0, 0.1);
+    background-color: var(--input-context-menu-hover-bg-color);
 }
 
 .disable_cell_icon,
@@ -1513,19 +1572,23 @@ pluto-input > button.input_context_menu ul {
 }
 .bandage_icon {
     filter: opacity(0.3);
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/bandage-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/bandage-outline.svg);
+    filter: var(--image-filters);
 }
 .enable_cell_icon {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg);
+    filter: var(--image-filters);
 }
 
 .disable_cell_icon {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/ban-outline.svg");
     background-size: 15px;
     background-repeat: no-repeat;
+    filter: var(--image-filters);
 }
 .delete_icon {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-circle-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-circle-outline.svg);
+    filter: var(--image-filters);
 }
 
 pluto-input > button.input_context_menu {
@@ -1540,7 +1603,8 @@ pluto-input > button.input_context_menu.open {
 }
 
 pluto-input > button.input_context_menu > span.icon::after {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/ellipsis-horizontal-circle-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/ellipsis-horizontal-circle-outline.svg);
+    filter: var(--image-filters);
 }
 
 /* PKG UI */
@@ -1579,27 +1643,33 @@ pkg-status-mark > button > span::after {
 
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/time-outline.svg");
     opacity: 0.3;
+    filter: var(--image-filters);
 }
 
 pkg-status-mark.installed > button > span::after {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/checkmark-outline.svg");
-    /* background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/cloud-done-outline.svg); "*/
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/checkmark-outline.svg);
+    /* background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/cloud-done-outline.svg); */
+    filter: var(--image-filters);
 }
 pkg-status-mark.busy > button > span::after {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/sync-outline.svg");
     animation: loadspin 3s ease-in-out infinite;
+    filter: var(--image-filters);
 }
 pkg-status-mark.not_found > button > span::after {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/cloud-offline-outline.svg");
     opacity: 0.6;
+    filter: var(--image-filters);
 }
 pkg-status-mark.will_be_installed > button > span::after {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/cloud-download-outline.svg");
     opacity: 0.6;
+    filter: var(--image-filters);
 }
 pkg-status-mark.disable_pkg > button > span::after {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/chatbox-ellipses-outline.svg");
     opacity: 0.6;
+    filter: var(--image-filters);
 }
 
 pkg-popup {
@@ -1612,8 +1682,9 @@ pkg-popup {
     /* min-height: 80px; */
     margin-left: 1.1rem;
     margin-top: calc(0.5 * (1rem - 80px));
-    background: rgb(255, 255, 255);
-    border: 3px solid #f0e4ee;
+    background: var(--pkg-popup-bg);
+    border: 3px solid var(--pkg-popup-border-color);
+    color: var(--black);
     border-radius: 10px;
     padding: 8px;
     overflow-wrap: break-word;
@@ -1652,12 +1723,16 @@ pkg-popup .pkg-buttons {
     flex-direction: row;
 }
 
+pkg-popup .pkg-buttons img {
+    filter: var(--image-filters);
+}
+
 pkg-popup .pkg-buttons > * {
     display: block;
     height: 17px;
     padding: 4px;
     box-sizing: content-box;
-    background: white;
+    background: var(--pkg-popup-buttons-bg-color);
     border-radius: 10px;
     z-index: 52;
     margin-left: -4px;
@@ -1672,10 +1747,10 @@ pkg-terminal {
     /* width: 20rem; */
     cursor: text;
     margin-top: 6px;
-    background: #232433;
-    color: #ffffff;
+    background: var(--pkg-terminal-bg-color);
+    color: white;
     border-radius: 6px;
-    border: 3px solid #c3c3c3;
+    border: 3px solid var(--pkg-terminal-border-color);
     padding: 3px;
 }
 
@@ -1729,7 +1804,7 @@ pluto-runarea {
     position: absolute;
     right: 0px;
     min-width: 75px;
-    background-color: hsl(0, 0%, 97%);
+    background-color: var(--pluto-runarea-bg-color);
     /* border: 2px solid hsla(0, 0%, 0%, 0.1); */
     border-bottom-left-radius: 5px;
     border-bottom-right-radius: 5px;
@@ -1746,7 +1821,7 @@ pluto-runarea > span {
     font-family: "Roboto Mono", monospace;
     font-size: 0.6em;
     font-style: italic;
-    color: hsl(353, 5%, 64%);
+    color: var(--pluto-runarea-span-color);
     text-align: center;
 }
 
@@ -1756,18 +1831,22 @@ pluto-runarea > button.runcell {
 }
 
 pluto-runarea > button.runcell > span::after {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg);
+    filter: var(--image-filters);
 }
 
 pluto-runarea.interrupt > button.runcell > span::after {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/stop-circle-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/stop-circle-outline.svg);
+    filter: var(--image-filters);
 }
 
 pluto-runarea.jump > button.runcell > span::after {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-redo-circle-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-redo-circle-outline.svg);
+    filter: var(--image-filters);
 }
 pluto-runarea.save > button.runcell > span::after {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/chevron-forward-circle-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/chevron-forward-circle-outline.svg);
+    filter: var(--image-filters);
 }
 
 pluto-cell:not(.show_input) > pluto-runarea {
@@ -1807,7 +1886,7 @@ dropruler {
     right: 0px;
     height: 4px;
     margin-top: calc(-2px - 0.5 * var(--pluto-cell-spacing));
-    background: rgba(0, 0, 0, 0.5);
+    background: var(--dropruler-bg-color);
 }
 
 /* LIVE DOCS */
@@ -1837,19 +1916,20 @@ pluto-helpbox {
     height: 70vh; /* compat */
     height: min(70vh, 900px);
     /* overflow: hidden; */
-    background-color: white;
+    background-color: var(--helpbox-bg-color);
+    color: var(--helpbox-text-color);
     /* border: 2px solid darkgray; */
     border-right: none;
     border-bottom: none;
     border-top-left-radius: 9px;
     border-top-right-radius: 9px;
-    box-shadow: 0 0 11px 0px #00000010;
+    box-shadow: 0 0 11px 0px var(--helpbox-box-shadow-color);
 }
 pluto-helpbox > header {
     display: flex;
     padding: 15px;
-    background-color: #eef1f7;
-    color: hsl(230, 14%, 11%);
+    background-color: var(--helpbox-header-bg-color);
+    color: var(--helpbox-header-color);
     font-family: "Roboto Mono", monospace;
     font-size: 0.9rem;
     font-weight: 700;
@@ -1879,7 +1959,7 @@ pluto-helpbox > header > input {
     border: none;
 }
 pluto-helpbox.notfound > header > input {
-    color: rgb(139, 139, 139);
+    color: var(--helpbox-notfound-header-color);
 }
 pluto-helpbox > header > input:focus {
     outline: none;
@@ -1900,6 +1980,7 @@ pluto-helpbox > header > button > span {
     height: 1em;
     width: 1em;
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/chevron-down-outline.svg");
+    filter: var(--image-filters);
 }
 pluto-helpbox.hidden {
     height: initial;
@@ -1932,7 +2013,6 @@ pluto-helpbox pre code {
 
 pluto-helpbox pre code.hljs {
     padding: 0;
-    background: none;
 }
 
 pluto-helpbox code .cm-editor .cm-content {
@@ -1965,8 +2045,9 @@ pluto-helpbox > section pre {
     padding: 0.7rem 0.5rem;
     -webkit-overflow-scrolling: touch;
     overflow-x: auto;
-    background: whitesmoke;
-    border: 1px solid #dbdbdb;
+    background: var(--code-section-bg-color);
+    border: 1px solid var(--code-section-border-color);
+    border-radius: 4px;
     white-space: pre;
     word-wrap: normal;
 }
@@ -1976,7 +2057,29 @@ pluto-helpbox > section pre {
 } */
 pluto-helpbox > section hr {
     border: none;
-    border-top: 3px solid rgba(0, 0, 0, 0.15);
+    border-top: 3px solid var(--rule-color);
+}
+
+.pluto-docs-binding {
+    margin: 0.5em;
+    padding: 1em;
+    border-radius: 1em;
+    background: var(--docs-binding-bg);
+    color: var(--pluto-output-color);
+}
+
+.pluto-docs-binding > span {
+    display: inline-block;
+    transform: translate(-19px, -16px);
+    font-family: "JuliaMono", monospace;
+    font-size: 0.9rem;
+    font-weight: 700;
+    margin-top: -1em;
+    padding: 4px;
+    border-radius: 7px;
+
+    background: var(--pluto-output-bg-color);
+    color: var(--black);
 }
 
 /* FOOTER */
@@ -1986,8 +2089,8 @@ footer {
     height: 3.5rem;
     font-family: "Roboto Mono", monospace;
     font-size: 0.75rem;
-    background-color: #d7dcd3;
-    color: #333333;
+    background-color: var(--footer-bg-color);
+    color: var(--footer-color);
     z-index: 70;
 }
 
@@ -2016,7 +2119,7 @@ footer form > a {
 }
 
 footer a {
-    color: black;
+    color: var(--footer-atag-color);
     opacity: 0.6;
     font-weight: 700;
 }
@@ -2029,7 +2132,8 @@ footer a {
 
 footer input {
     margin: 0px;
-    border: 2px solid #818181;
+    border: 2px solid var(--footer-input-border-color);
+    background: transparent;
     font-family: inherit;
     font-size: inherit;
     border-radius: 3px 0 0 3px;
@@ -2040,10 +2144,10 @@ footer input {
 body > header pluto-filepicker button,
 footer button {
     margin: 0px;
-    background: #896c6c;
+    background: var(--footer-filepicker-focus-color);
     border-radius: 0 3px 3px 0;
-    border: 2px solid #896c6c;
-    color: white;
+    border: 3px solid var(--footer-filepicker-focus-color);
+    color: var(--footer-filepicker-button-color);
     /* border: none; */
     font-family: inherit;
     font-weight: 600;
@@ -2078,24 +2182,25 @@ nav#undo_delete {
     font-family: "Roboto Mono", monospace;
     font-size: 0.75rem;
 
-    background: white;
+    background-color: var(--white);
     border-radius: 3px;
+    color: var(--black);
 
-    box-shadow: 00px 00px 10px 2px #0003;
+    box-shadow: 00px 00px 10px 2px var(--undo-delete-box-shadow-color);
     opacity: 1;
     transition: 0.2s linear box-shadow, 0.2s ease-out margin-bottom, 0.05s linear opacity;
 }
 
 nav#undo_delete.hidden {
     margin-bottom: 0px;
-    box-shadow: 00px 00px 10px -5px #0003;
+    box-shadow: 00px 00px 10px -5px var(--undo-delete-box-shadow-color);
     opacity: 0;
     pointer-events: none;
 }
 
 @keyframes shadow-fadeout {
     0% {
-        box-shadow: 00px 00px 10px 2px #0003;
+        box-shadow: 00px 00px 10px 2px var(--undo-delete-box-shadow-color);
         opacity: 1;
     }
     80% {
@@ -2143,16 +2248,18 @@ body > nav#slide_controls > button > span::after {
     background-size: 30px 30px;
 }
 body > nav#slide_controls > button.prev > span::after {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-back-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-back-outline.svg);
+    filter: var(--image-filters);
 }
 body > nav#slide_controls > button.next > span::after {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-forward-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-forward-outline.svg);
+    filter: var(--image-filters);
 }
 
 /* CODEMIRROR HINTS */
 
 .cm-editor .cm-tooltip {
-    border: 1px solid rgba(0, 0, 0, 0.2);
+    border: 1px solid var(--cm-editor-tooltip-border-color);
     box-shadow: 3px 3px 4px rgb(0 0 0 / 20%);
     border-radius: 4px;
 }
@@ -2180,15 +2287,15 @@ pluto-input .cm-editor .cm-tooltip.cm-tooltip-autocomplete > ul > li {
 }
 
 .cm-editor .cm-tooltip.cm-tooltip-autocomplete > ul > li[aria-selected] {
-    color: white;
-    background: #16659d;
+    color: var(--cm-editor-li-aria-selected-color);
+    background: var(--cm-editor-li-aria-selected-bg-color);
 }
 .cm-editor .cm-tooltip.cm-tooltip-autocomplete > ul > li[aria-selected] .cm-completionLabel {
     border-color: transparent;
 }
 
 .cm-editor .cm-tooltip.cm-tooltip-autocomplete li.c_notexported {
-    color: rgba(0, 0, 0, 0.5);
+    color: var(--cm-editor-li-notexported-color);
 }
 
 .cm-editor .cm-completionIcon {
@@ -2251,7 +2358,7 @@ body.ctrl_down [data-cell-variable]:hover * {
 .cm-tooltip.cm-tooltip-autocomplete {
     padding: 0;
     margin-left: -1.5em;
-    background: white;
+    background: var(--autocomplete-menu-bg-color);
 }
 
 pluto-input .cm-editor .cm-content,
@@ -2266,9 +2373,16 @@ pluto-input .cm-editor .cm-content {
     padding: 2px 0px;
 }
 
+.cm-editor .cm-selectionBackground {
+    background: var(--cm-selection-background-blurred);
+}
+.cm-editor.cm-focused .cm-selectionBackground {
+    background: var(--cm-selection-background);
+}
+
 .cm-editor {
-    background: hsla(46, 90%, 98%, 1);
-    color: #41323f;
+    background: var(--code-background);
+    color: var(--cm-editor-text-color);
 }
 .cm-editor.cm-focused:not(.__) {
     outline: unset;
@@ -2288,11 +2402,11 @@ pluto-input .cm-editor .cm-content {
 
 pluto-cell.code_differs .cm-editor .cm-gutters {
     /* background: hsla(46, 70%, 88%, 1); */
-    background-color: rgba(214, 172, 35, 0.2);
+    background-color: var(--cm-code-differs-gutters-color);
 }
 
 .cm-editor .cm-lineNumbers .cm-gutterElement {
-    color: #8d86875e;
+    color: var(--cm-line-numbers-color);
 }
 
 .cm-editor .cm-lineNumbers .cm-gutterElement::after {
@@ -2313,33 +2427,33 @@ pluto-cell.code_differs .cm-editor .cm-gutters {
 }
 
 .cm-s-default span.cm-comment {
-    color: #e96ba8;
+    color: var(--cm-comment-color);
     font-style: italic;
 }
 
 .cm-s-default span.cm-atom {
-    color: #815ba4;
+    color: var(--cm-atom-color);
 }
 
 .cm-completionIcon-c_Number::before,
 .cm-s-default span.cm-number {
-    color: #815ba4;
+    color: var(--cm-number-color);
 }
 
 .cm-s-default span.cm-property,
 .cm-s-default span.cm-attribute {
-    color: #48b685;
+    color: var(--cm-property-color);
 }
 
 .cm-s-default span.cm-keyword {
-    color: #ef6155;
+    color: var(--cm-keyword-color);
 }
 
 .cm-completionIcon-c_String::before,
 .cm-completionIcon-completion_path::before,
 .cm-completionIcon-completion_dict::before,
 .cm-s-default span.cm-string {
-    color: #da5616;
+    color: var(--cm-string-color);
 }
 
 .cm-s-default span.cm-operator {
@@ -2349,42 +2463,42 @@ pluto-cell.code_differs .cm-editor .cm-gutters {
 .cm-completionIcon-c_Any::before,
 pluto-output > assignee,
 .cm-s-default span.cm-variable {
-    color: #5668a4;
+    color: var(--cm-var-color) !important;
     font-weight: 700;
 }
 
 .cm-s-default span.cm-builtin {
-    color: #5e7ad3;
+    color: var(--cm-builtin-color);
     font-weight: 700;
 }
 
 .cm-s-default span.cm-variable-2 {
-    color: #06b6ef;
+    color: var(--cm-var2-color);
 }
 
 .cm-completionIcon-c_Function::before,
 .cm-s-default span.cm-def {
-    color: #f99b15;
+    color: var(--cm-def-color);
 }
 
 .cm-completionIcon-c_Array::before,
 .cm-s-default span.cm-bracket {
-    color: #41323f;
+    color: var(--cm-bracket-color);
 }
 
 .cm-s-default span.cm-tag {
-    color: #ef6155;
+    color: var(--cm-tag-color);
 }
 
 .cm-completionIcon-c_package::before,
 .cm-completionIcon-c_Module::before,
 .cm-s-default span.cm-link {
-    color: #815ba4;
+    color: var(--cm-link-color);
 }
 
 .cm-s-default span.cm-error {
-    background: #ef6155;
-    color: #f7f7f7;
+    background: var(--cm-error-bg-color);
+    color: var(--cm-error-color);
 }
 .cm-editor .cm-activeLine {
     background: unset;
@@ -2396,14 +2510,14 @@ pluto-output > assignee,
     color: unset;
 }
 pluto-input:focus-within .cm-editor .cm-matchingBracket {
-    color: black !important;
+    color: var(--cm-matchingBracket-color) !important;
     font-weight: 700;
-    background-color: #1b4bbb21;
+    background-color: var(--cm-matchingBracket-bg-color);
     border-radius: 2px;
 }
 
 .cm-editor .cm-placeholder {
-    color: rgba(0, 0, 0, 0.2);
+    color: var(--cm-placeholder-text-color);
     font-style: italic;
 }
 
diff --git a/frontend/editor.html b/frontend/editor.html
index 6d3b9b1f42..40f8f2b10d 100644
--- a/frontend/editor.html
+++ b/frontend/editor.html
@@ -9,7 +9,10 @@
             "Pluto.jl, by Fons van der Plas (https://github.com/fonsp), Mikołaj Bochenski (https://github.com/malyvsen), Michiel Dral (https://github.com/dralletje) and friends 🌈"
         )
     </script>
-    <meta name="theme-color" content="#ffffff" />
+    <meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
+    <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#2a2928">
+    <meta name="color-scheme" content="light dark">
+
     <link rel="icon" type="image/png" sizes="16x16" href="./img/favicon-16x16.png" />
     <link rel="icon" type="image/png" sizes="32x32" href="./img/favicon-32x32.png" />
     <link rel="icon" type="image/png" sizes="96x96" href="./img/favicon-96x96.png" />
@@ -36,7 +39,7 @@
     <link rel="stylesheet" href="./treeview.css" type="text/css" />
     <link rel="preload" href="./juliamono.css" as="style" />
     <link rel="preload" href="./vollkorn.css" as="style" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.2.0/build/styles/atom-one-light.min.css" />
+    <link rel="stylesheet" href="./highlightjs.css" type="text/css">
 
     <!-- [automatically generated launch parameters can be inserted here] -->
 
diff --git a/frontend/error.jl.html b/frontend/error.jl.html
index ade78d481d..2a17418a2a 100644
--- a/frontend/error.jl.html
+++ b/frontend/error.jl.html
@@ -9,7 +9,9 @@
         console.log("Pluto.jl, by Fons van der Plas (https://github.com/fonsp) and Mikołaj Bochenski (https://github.com/malyvsen) 🌈");
     </script>
     <meta name="author" content="Fons van der Plas; Mikołaj Bochenski" />
-    <meta name="theme-color" content="#ffffff" />
+    <meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
+    <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#2a2928">
+    <meta name="color-scheme" content="light dark">
     <link rel="icon" type="image/png" sizes="16x16" href="img/favicon-16x16.png">
     <link rel="icon" type="image/png" sizes="32x32" href="img/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="96x96" href="img/favicon-96x96.png">
diff --git a/frontend/highlightjs.css b/frontend/highlightjs.css
new file mode 100644
index 0000000000..7ae6ec2dac
--- /dev/null
+++ b/frontend/highlightjs.css
@@ -0,0 +1,72 @@
+pre code.hljs {
+    display: block;
+    overflow-x: auto;
+    padding: 1em;
+}
+code.hljs {
+    padding: 3px 5px;
+}
+.hljs {
+    color: var(--cm-editor-text-color);
+}
+.hljs-comment,
+.hljs-quote {
+    color: var(--cm-comment-color);
+    font-style: italic;
+}
+.hljs-doctag,
+.hljs-formula,
+.hljs-keyword {
+    color: var(--cm-keyword-color);
+}
+.hljs-deletion,
+.hljs-name,
+.hljs-section,
+.hljs-selector-tag,
+.hljs-subst {
+    color: var(--cm-var2-color);
+}
+.hljs-literal {
+    color: var(--cm-builtin-color);
+}
+.hljs-addition,
+.hljs-attribute,
+.hljs-meta .hljs-string,
+.hljs-regexp,
+.hljs-string {
+    color: var(--cm-string-color);
+}
+.hljs-attr,
+.hljs-selector-attr,
+.hljs-selector-class,
+.hljs-selector-pseudo,
+.hljs-template-variable,
+.hljs-type,
+.hljs-variable {
+    color: var(--cm-var-color);
+}
+.hljs-number {
+    color: var(--cm-number-color);
+}
+.hljs-bullet,
+.hljs-link,
+.hljs-meta,
+.hljs-selector-id,
+.hljs-symbol,
+.hljs-title {
+    color: var(--cm-link-color);
+}
+.hljs-built_in,
+.hljs-class .hljs-title,
+.hljs-title.class_ {
+    color: var(--cm-var2-color);
+}
+.hljs-emphasis {
+    font-style: italic;
+}
+.hljs-strong {
+    font-weight: 700;
+}
+.hljs-link {
+    text-decoration: underline;
+}
diff --git a/frontend/index.css b/frontend/index.css
index e82c80d106..65448bd097 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -4,6 +4,9 @@
 @import url("vollkorn.css");
 @import url("juliamono.css");
 
+@import url("light_color.css");
+@import url("dark_color.css");
+
 * {
     box-sizing: border-box;
 }
@@ -32,9 +35,9 @@ body.error #title {
     letter-spacing: 0.08em;
     font-weight: 500;
     font-family: "Vollkorn", serif;
-    color: hsl(0, 0%, 26%);
+    color: var(--pluto-output-h-color);
     margin: 0px;
-    border-bottom: solid 2px hsl(0, 0%, 88%);
+    border-bottom: solid 2px var(--rule-color);
 }
 
 #title h2 {
@@ -46,6 +49,7 @@ body.error #title {
     margin-bottom: -0.27em;
     /* margin-right: -1.5em; */
     margin-left: 0.1em;
+    filter: var(--image-filters);
 }
 
 body {
@@ -53,7 +57,7 @@ body {
     position: absolute;
     width: 100%;
     min-height: 100%;
-    background: white;
+    background: var(--main-bg-color);
 }
 
 main {
@@ -62,7 +66,7 @@ main {
     margin-top: 20vh;
     text-align: left;
     font-family: "Roboto Mono", monospace;
-    color: hsl(0, 0%, 60%);
+    color: var(--index-text-color);
 }
 
 body.error main {
@@ -74,7 +78,7 @@ body.error main {
 }
 
 p {
-    color: hsl(0, 0%, 30%);
+    color: var(--index-clickable-text-color);
 }
 
 ul {
@@ -89,7 +93,7 @@ li {
 
 a {
     color: inherit;
-    color: hsl(0, 0%, 30%);
+    color: var(--index-clickable-text-color);
 }
 
 /* input {
@@ -118,8 +122,8 @@ pluto-filepicker .cm-editor {
     font-size: 0.75rem;
     letter-spacing: 1px;
     background: none;
-    color: #6f6f6f;
-    border: 2px solid #b2b2b2;
+    color: var(--nav-filepicker-color);
+    border: 2px solid var(--nav-filepicker-border-color);
     border-radius: 3px;
     border-right: none;
     border-top-right-radius: 0;
@@ -135,10 +139,10 @@ pluto-filepicker .cm-scroller::-webkit-scrollbar {
 
 pluto-filepicker button {
     margin: 0px;
-    background: #6c8489;
+    background: var(--footer-filepicker-focus-color);
     border-radius: 3px;
-    border: 2px solid #6c8489;
-    color: white;
+    border: 2px solid var(--nav-filepicker-focus-color);
+    color: var(--ui-button-color);
     /* border: none; */
     font-family: "Roboto Mono", monospace;
     font-weight: 600;
@@ -152,7 +156,7 @@ pluto-filepicker button {
 }
 
 .cm-editor .cm-tooltip {
-    border: 1px solid rgba(0, 0, 0, 0.2);
+    border: 1px solid var(--cm-editor-tooltip-border-color);
     box-shadow: 3px 3px 4px rgb(0 0 0 / 20%);
     border-radius: 4px;
 }
@@ -178,8 +182,8 @@ pluto-filepicker button {
 }
 
 .cm-editor .cm-tooltip.cm-tooltip-autocomplete > ul > li[aria-selected] {
-    color: white;
-    background: #16659d;
+    color: var(--cm-editor-li-aria-selected-color);
+    background: var(--cm-editor-li-aria-selected-bg-color);
 }
 
 .cm-editor .cm-completionIcon {
@@ -198,7 +202,7 @@ pluto-filepicker button {
 .cm-tooltip.cm-tooltip-autocomplete {
     padding: 0;
     margin-left: -1.5em;
-    background: white;
+    background: var(--autocomplete-menu-bg-color);
 }
 
 .cm-tooltip-autocomplete li.file.new:before {
@@ -244,7 +248,7 @@ body.nosessions ul#new ~ * {
     background: none;
     cursor: pointer;
     /* color: hsl(204, 86%, 35%); */
-    color: black;
+    color: var(--ui-button-color);
 }
 
 #recent button > span::after {
@@ -257,21 +261,24 @@ body.nosessions ul#new ~ * {
 }
 
 #recent li.running button > span::after {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-circle.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-circle.svg);
+    filter: var(--image-filters);
 }
 
 #recent li.recent button > span::after {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg);
+    filter: var(--image-filters);
 }
 
 #recent li.transitioning button > span::after {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/ellipsis-horizontal-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/ellipsis-horizontal-outline.svg);
+    filter: var(--image-filters);
 }
 
 loading-bar {
     height: 6px;
     width: 100vw;
-    background-color: #b1c9dd;
+    background-color: var(--loading-grad-color-1);
     position: fixed;
     top: 0px;
     display: none;
diff --git a/frontend/index.html b/frontend/index.html
index 5710112c8c..f0b5871cfd 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -9,7 +9,9 @@
         console.log("Pluto.jl, by Fons van der Plas (https://github.com/fonsp) and Mikołaj Bochenski (https://github.com/malyvsen) 🌈");
     </script>
     <meta name="author" content="Fons van der Plas; Mikołaj Bochenski" />
-    <meta name="theme-color" content="#ffffff" />
+    <meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
+    <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#2a2928">
+    <meta name="color-scheme" content="light dark">
     <link rel="icon" type="image/png" sizes="16x16" href="img/favicon-16x16.png">
     <link rel="icon" type="image/png" sizes="32x32" href="img/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="96x96" href="img/favicon-96x96.png">
diff --git a/frontend/light_color.css b/frontend/light_color.css
new file mode 100644
index 0000000000..4c2707aa2c
--- /dev/null
+++ b/frontend/light_color.css
@@ -0,0 +1,182 @@
+@media (prefers-color-scheme: light) {
+    :root {
+        --image-filters: none;
+        --out-of-focus-opacity: 0.25;
+
+        /* Color scheme */
+        --main-bg-color: white;
+        --rule-color: rgba(0, 0, 0, 0.15);
+        --kbd-border-color: #dfdfdf;
+        --header-bg-color: white;
+        --header-border-color: rgba(0, 0, 0, 0.1);
+        --ui-button-color: #2a2a2b;
+        --cursor-color: black;
+        --normal-cell: 0, 0, 0;
+        --code-differs: 160, 130, 28;
+        --error-color: 240, 168, 168;
+
+        /*Cells*/
+        --normal-cell-color: rgba(var(--normal-cell), 0.1);
+        --dark-normal-cell-color: rgba(var(--normal-cell), 0.2);
+        --selected-cell-color: rgba(40, 78, 189, 0.4);
+        --code-differs-cell-color: rgba(var(--code-differs), 0.68);
+        --error-cell-color: rgba(var(--error-color), 0.7);
+        --bright-error-cell-color: rgb(var(--error-color));
+        --light-error-cell-color: rgba(var(--error-color), 0.05);
+
+        /*Export styling*/
+        --export-bg-color: rgb(60, 67, 101);
+        --export-color: rgba(255, 255, 255, 0.7);
+        --export-card-bg-color: rgba(255, 255, 255, 0.8);
+        --export-card-title-color: rgba(0, 0, 0, 0.7);
+        --export-card-text-color: rgba(0, 0, 0, 0.5);
+        --export-card-shadow-color: #00000029;
+
+        /*Pluto output styling */
+        --pluto-schema-types-color: rgba(0, 0, 0, 0.4);
+        --pluto-schema-types-border-color: rgba(0, 0, 0, 0.2);
+        --pluto-output-color: hsl(0, 0%, 25%);
+        --pluto-output-h-color: hsl(0, 0%, 12%);
+        --pluto-output-bg-color: white;
+        --a-underline: #00000059;
+        --blockquote-color: #555;
+        --blockquote-bg: #f2f2f2;
+        --admonition-title-color: white;
+        --admonition-bg-color: rgba(68, 149, 28, 0.2);
+        --admonition-focus-color: rgb(158, 200, 137);
+        --admonition-note-main-color: rgba(50, 115, 200, 0.2);
+        --admonition-note-focus-color: rgb(148, 182, 226);
+        --admonition-warn-main-color: rgba(162, 148, 30, 0.2);
+        --admonition-warn-focus-color: rgb(207, 199, 138);
+        --admonition-danger-main-color: rgba(200, 67, 50, 0.2);
+        --admonition-danger-focus-color: rgb(226, 157, 148);
+        --footnote-border-color: rgba(23, 115, 119, 0.15);
+        --table-border-color: rgba(0, 0, 0, 0.2);
+        --table-bg-hover-color: rgba(159, 158, 224, 0.15);
+        --pluto-tree-color: rgb(0 0 0 / 38%);
+
+        /*pluto cell styling*/
+        --disabled-cell-bg-color: rgba(139, 139, 139, 0.25);
+        --selected-cell-bg-color: rgba(40, 78, 189, 0.24);
+        --hover-scrollbar-color-1: rgba(0, 0, 0, 0.15);
+        --hover-scrollbar-color-2: rgba(0, 0, 0, 0.05);
+
+        /* Pluto shoulders */
+        --shoulder-hover-bg-color: rgba(0, 0, 0, 0.05);
+
+        /*Top navbar styling*/
+        --nav-h1-text-color: black;
+        --nav-filepicker-color: #6f6f6f;
+        --nav-filepicker-border-color: #b2b2b2;
+        --nav-process-status-bg-color: white;
+        --nav-process-status-color: var(--pluto-output-h-color);
+
+        /*header*/
+        --restart-recc-header-color: rgba(114, 192, 255, 0.56);
+        --restart-req-header-color: rgba(170, 41, 32, 0.56);
+        --dead-process-header-color: rgb(230 88 46 / 38%);
+        --loading-header-color: hsla(290, 10%, 80%, 0.5);
+        --disconnected-header-color: rgba(255, 169, 114, 0.56);
+        --binder-loading-header-color: hsl(51deg 64% 90% / 50%);
+
+        /*loading bar*/
+        --loading-grad-color-1: #f1dba9;
+        --loading-grad-color-2: #d7d7d0;
+
+        /*saveall container*/
+        --overlay-button-bg: #ffffff;
+        --overlay-button-border: #f3f2f2;
+
+        /*input_context_menu*/
+        --input-context-menu-border-color: rgba(0, 0, 0, 0.1);
+        --input-context-menu-bg-color: white;
+        --input-context-menu-soon-color: #55555544;
+        --input-context-menu-hover-bg-color: rgba(0, 0, 0, 0.1);
+        --input-context-menu-li-color: #6b6a6a;
+
+        /*Pkg status*/
+        --pkg-popup-bg: white;
+        --pkg-popup-border-color: #f0e4ee;
+        --pkg-popup-buttons-bg-color: white;
+        --black: black;
+        --white: white;
+        --pkg-terminal-bg-color: #232433;
+        --pkg-terminal-border-color: #c3c3c3;
+
+        /* run area*/
+        --pluto-runarea-bg-color: hsl(0, 0, 97%);
+        --pluto-runarea-span-color: hsl(353, 5%, 64%);
+
+        /*drop ruler*/
+        --dropruler-bg-color: rgba(0, 0, 0, 0.5);
+
+        /* jlerror */
+        --jlerror-header-color: #4f1616;
+        --jlerror-mark-bg-color: rgb(243 243 243);
+        --jlerror-a-bg-color: #f5efd9;
+        --jlerror-a-border-left-color: #704141;
+        --jlerror-mark-color: black;
+
+        /* helpbox */
+        --helpbox-bg-color: white;
+        --helpbox-box-shadow-color: #00000010;
+        --helpbox-header-bg-color: #eef1f7;
+        --helpbox-header-color: hsl(230, 14%, 11%);
+        --helpbox-notfound-header-color: rgb(139, 139, 139);
+        --helpbox-text-color: black;
+        --code-section-bg-color: whitesmoke;
+        --code-section-bg-color: #dbdbdb;
+
+        /*footer*/
+        --footer-color: #333333;
+        --footer-bg-color: #d7dcd3;
+        --footer-atag-color: black;
+        --footer-input-border-color: #818181;
+        --footer-filepicker-button-color: white;
+        --footer-filepicker-focus-color: #896c6c;
+        --footnote-border-color: rgba(23, 115, 119, 0.15);
+
+        /* undo delete cell*/
+        --undo-delete-box-shadow-color: #0083;
+
+        /*codemirror hints*/
+        --cm-editor-tooltip-border-color: rgba(0, 0, 0, 0.2);
+        --cm-editor-li-aria-selected-bg-color: #16659d;
+        --cm-editor-li-aria-selected-color: white;
+        --cm-editor-li-notexported-color: rgba(0, 0, 0, 0.5);
+        --code-background: hsla(46, 90%, 98%, 1);
+        --cm-code-differs-gutters-color: rgba(214, 172, 35, 0.2);
+        --cm-line-numbers-color: #8d86875e;
+        --cm-selection-background: hsl(214deg 100% 73% / 48%);
+        --cm-selection-background-blurred: hsl(214deg 0% 73% / 48%);
+
+        /* code highlighting */
+        --cm-editor-text-color: #41323f;
+        --cm-comment-color: #e96ba8;
+        --cm-atom-color: #815ba4;
+        --cm-number-color: #815ba4;
+        --cm-property-color: #48b685;
+        --cm-keyword-color: #ef6155;
+        --cm-string-color: #da5616;
+        --cm-var-color: #5668a4;
+        --cm-var2-color: #06b6ef;
+        --cm-builtin-color: #5e7ad3;
+        --cm-def-color: #f99b15;
+        --cm-bracket-color: #41323f;
+        --cm-tag-color: #ef6155;
+        --cm-link-color: #815ba4;
+        --cm-error-bg-color: #ef6155;
+        --cm-error-color: #f7f7f7;
+        --cm-matchingBracket-color: black;
+        --cm-matchingBracket-bg-color: #1b4bbb21;
+        --cm-placeholder-text-color: rgba(0, 0, 0, 0.2);
+
+        /*autocomplete menu*/
+        --autocomplete-menu-bg-color: white;
+
+        /* Landing colors */
+        --index-text-color: hsl(0, 0, 60);
+        --index-clickable-text-color: hsl(0, 0, 30);
+        --docs-binding-bg: #8383830a;
+    }
+}
diff --git a/frontend/sample.html b/frontend/sample.html
index faf7ca189d..e7fb445210 100644
--- a/frontend/sample.html
+++ b/frontend/sample.html
@@ -9,7 +9,9 @@
         console.log("Pluto.jl, by Fons van der Plas (https://github.com/fonsp) and Mikołaj Bochenski (https://github.com/malyvsen) 🌈");
     </script>
     <meta name="author" content="Fons van der Plas; Mikołaj Bochenski" />
-    <meta name="theme-color" content="#ffffff" />
+    <meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
+    <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#2a2928">
+    <meta name="color-scheme" content="light dark">
     <link rel="icon" type="image/png" sizes="16x16" href="./img/favicon-16x16.png">
     <link rel="icon" type="image/png" sizes="32x32" href="./img/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="96x96" href="./img/favicon-96x96.png">
diff --git a/frontend/treeview.css b/frontend/treeview.css
index 1059ecedec..4a4448b8ae 100644
--- a/frontend/treeview.css
+++ b/frontend/treeview.css
@@ -12,7 +12,7 @@ pluto-tree-pair {
     font-size: 0.75rem;
 }
 pluto-tree {
-    color: hsl(0, 0%, 25%, 0.7);
+    color: var(--pluto-tree-color);
     white-space: pre;
     cursor: pointer;
 }
@@ -49,7 +49,8 @@ pluto-tree > pluto-tree-prefix::before {
     bottom: -2px;
     opacity: 0.5;
     cursor: pointer;
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-down-outline.svg");
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-down-outline.svg);
+    filter: var(--image-filters);
 }
 
 pluto-tree.collapsed pluto-tree > pluto-tree-prefix::before {
@@ -62,7 +63,7 @@ pluto-tree.collapsed > pluto-tree-prefix::before {
 
 pluto-tree p-r > p-v {
     display: inline-flex;
-    color: hsl(0, 0%, 25%, 1);
+    color: var(--pluto-output-color);
 }
 
 pluto-tree.collapsed pluto-tree-items.Array > p-r > p-k,
@@ -184,6 +185,7 @@ pluto-tree-more::before {
     height: 1em;
     width: 1em;
     opacity: 0.5;
+    filter: var(--image-filters);
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/ellipsis-vertical.svg");
 }
 
@@ -242,7 +244,7 @@ jlerror {
 }
 
 jlerror > header {
-    color: #330000;
+    color: var(--jlerror-header-color);
 }
 jlerror > header > p {
     margin-block-end: 0.2em;
@@ -251,17 +253,18 @@ jlerror > header > p:first-child {
     font-weight: bold;
 }
 jlerror > section > ol > li > mark {
-    background: #f3f2f1;
+    background: var(--jlerror-mark-bg-color);
     border-radius: 6px;
+    color: var(--jlerror-mark-color);
     font-family: JuliaMono, monospace;
     font-variant-ligatures: none;
 }
 jlerror > section > ol > li > em > a {
-    background: #f5efd9;
+    background: var(--jlerror-a-bg-color);
     border-radius: 4px;
     padding: 1px 7px;
     text-decoration: none;
-    border-left: 3px solid #9a7575;
+    border-left: 3px solid var(--jlerror-a-border-left-color);
 }
 jlerror > section > ol > li > span {
     opacity: 0.8;
@@ -278,15 +281,15 @@ table.pluto-table td {
 }
 
 table.pluto-table .schema-types {
-    color: rgba(0, 0, 0, 0.4);
+    color: var(--pluto-schema-types-color);
     font-family: "JuliaMono", monospace;
     font-size: 0.75rem;
     opacity: 0;
 }
 
 table.pluto-table .schema-types th {
-    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-    background-color: white;
+    border-bottom: 1px solid var(--pluto-schema-types-border-color);
+    background-color: var(--main-bg-color);
     height: 2rem;
 }
 
@@ -306,7 +309,7 @@ table.pluto-table .schema-types th:first-child {
 
 table.pluto-table .schema-names th,
 table.pluto-table .schema-types th:first-child {
-    background-color: white;
+    background-color: var(--main-bg-color);
     position: sticky;
     top: calc(0.25rem - var(--pluto-cell-spacing));
     height: 2rem;
@@ -318,7 +321,7 @@ table.pluto-table thead:hover .schema-names th {
 }
 
 table.pluto-table tbody th:first-child {
-    background-color: white;
+    background-color: var(--main-bg-color);
     position: sticky;
     left: -10px; /* padding-left of pluto-output*/
 }
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 688d6d5855..57534f7f63 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -912,21 +912,8 @@ end
 function format_output(binding::Base.Docs.Binding; context=default_iocontext)
     try
         ("""
-        <div class="pluto-docs-binding" style="margin: .5em; padding: 1em; background: #8383830a; border-radius: 1em;">
-        <span style="
-            display: inline-block;
-            transform: translate(-19px, -16px);
-            font-family: 'JuliaMono', monospace;
-            font-size: .9rem;
-            font-weight: 700;
-            /* height: 1px; */
-            margin-top: -1em;
-            background: white;
-            padding: 4px;
-            border-radius: 7px;
-            /* color: #646464; */
-            /* border: 3px solid #f99b1536;
-        ">$(binding.var)</span>
+        <div class="pluto-docs-binding">
+        <span>$(binding.var)</span>
         $(repr(MIME"text/html"(), Base.Docs.doc(binding)))
         </div>
         """, MIME"text/html"()) 

From 404bfcea6e8e66a89b8c43ca0d780b972cf5acc2 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Mon, 17 Jan 2022 14:14:50 +0100
Subject: [PATCH 002/821] Use newer keyword arg syntax (#1823)

---
 src/evaluation/Run.jl           | 6 +++---
 src/notebook/Export.jl          | 2 +-
 src/packages/PkgCompat.jl       | 2 +-
 src/webserver/Dynamic.jl        | 4 ++--
 src/webserver/SessionActions.jl | 4 ++--
 src/webserver/Static.jl         | 4 ++--
 test/Bonds.jl                   | 5 +----
 test/Configuration.jl           | 4 ++--
 test/webserver.jl               | 4 ++--
 9 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 5850a495ce..aa3cd8a794 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -92,7 +92,7 @@ function run_reactive!(session::ServerSession, notebook::Notebook, old_topology:
     to_delete_funcs = union!(to_delete_funcs, defined_functions(new_topology, new_errable)...)
 
     to_reimport = union!(Set{Expr}(), map(c -> new_topology.codes[c].module_usings_imports.usings, setdiff(notebook.cells, to_run))...)
-    deletion_hook((session, notebook), old_workspace_name, nothing, to_delete_vars, to_delete_funcs, to_reimport; to_run = to_run) # `deletion_hook` defaults to `WorkspaceManager.move_vars`
+    deletion_hook((session, notebook), old_workspace_name, nothing, to_delete_vars, to_delete_funcs, to_reimport; to_run) # `deletion_hook` defaults to `WorkspaceManager.move_vars`
 
     delete!.([notebook.bonds], to_delete_vars)
 
@@ -136,7 +136,7 @@ function run_reactive!(session::ServerSession, notebook::Notebook, old_topology:
             update_dependency_cache!(notebook)
             save_notebook(session, notebook)
 
-            return run_reactive!(session, notebook, new_topology, new_new_topology, to_run; deletion_hook = deletion_hook, user_requested_run = user_requested_run, already_in_run = true, already_run = to_run[1:i])
+            return run_reactive!(session, notebook, new_topology, new_new_topology, to_run; deletion_hook, user_requested_run, already_in_run = true, already_run = to_run[1:i])
         elseif !isempty(implicit_usings)
             new_soft_definitions = WorkspaceManager.collect_soft_definitions((session, notebook), implicit_usings)
             notebook.topology = new_new_topology = with_new_soft_definitions(new_topology, cell, new_soft_definitions)
@@ -145,7 +145,7 @@ function run_reactive!(session::ServerSession, notebook::Notebook, old_topology:
             update_dependency_cache!(notebook)
             save_notebook(session, notebook)
 
-            return run_reactive!(session, notebook, new_topology, new_new_topology, to_run; deletion_hook = deletion_hook, user_requested_run = user_requested_run, already_in_run = true, already_run = to_run[1:i])
+            return run_reactive!(session, notebook, new_topology, new_new_topology, to_run; deletion_hook, user_requested_run, already_in_run = true, already_run = to_run[1:i])
         end
     end
 
diff --git a/src/notebook/Export.jl b/src/notebook/Export.jl
index 6770d5a37f..5fb1a2c7fe 100644
--- a/src/notebook/Export.jl
+++ b/src/notebook/Export.jl
@@ -90,5 +90,5 @@ function generate_html(notebook; kwargs...)::String
     end
     
     # We don't set `notebook_id_js` because this is generated by the server, the option is only there for funky setups.
-    generate_html(; statefile_js=statefile_js, notebookfile_js=notebookfile_js, kwargs...)
+    generate_html(; statefile_js, notebookfile_js, kwargs...)
 end
diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index 414f8170d9..6fce2c0593 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -192,7 +192,7 @@ end
 # ⚠️✅ Internal API with fallback
 function instantiate(ctx; update_registry::Bool)
 	@static if hasmethod(Pkg.instantiate, Tuple{}, (:update_registry,))
-		Pkg.instantiate(ctx; update_registry=update_registry)
+		Pkg.instantiate(ctx; update_registry)
 	else
 		Pkg.instantiate(ctx)
 	end
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 7860f35033..e82cb17134 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -297,9 +297,9 @@ responses[:update_notebook] = function response_update_notebook(🙋::ClientRequ
             (mutator, matches, rest) = trigger_resolver(effects_of_changed_state, patch.path)
             
             current_changes = if isempty(rest) && applicable(mutator, matches...)
-                mutator(matches...; request=🙋, patch=patch)
+                mutator(matches...; request=🙋, patch)
             else
-                mutator(matches..., rest...; request=🙋, patch=patch)
+                mutator(matches..., rest...; request=🙋, patch)
             end
 
             push!(changes, current_changes...)
diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index eb02ba29f1..94cba17888 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -52,9 +52,9 @@ function open(session::ServerSession, path::AbstractString; run_async=true, comp
         c.queued = session.options.evaluation.run_notebook_on_load
     end
 
-    update_save_run!(session, nb, nb.cells; run_async=run_async, prerender_text=true)
+    update_save_run!(session, nb, nb.cells; run_async, prerender_text=true)
     
-    add(session, nb; run_async=run_async)
+    add(session, nb; run_async)
     try_event_call(session, OpenNotebookEvent(nb))
     nb
 end
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index f9f2057fa5..a42fd080af 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -170,10 +170,10 @@ function http_router_for(session::ServerSession)
     function try_launch_notebook_response(action::Function, path_or_url::AbstractString; title="", advice="", home_url="./", as_redirect=true, action_kwargs...)
         try
             nb = action(session, path_or_url; action_kwargs...)
-            notebook_response(nb; home_url=home_url, as_redirect=as_redirect)
+            notebook_response(nb; home_url, as_redirect)
         catch e
             if e isa SessionActions.NotebookIsRunningException
-                notebook_response(e.notebook; home_url=home_url, as_redirect=as_redirect)
+                notebook_response(e.notebook; home_url, as_redirect)
             else
                 error_response(500, title, advice, sprint(showerror, e, stacktrace(catch_backtrace())))
             end
diff --git a/test/Bonds.jl b/test/Bonds.jl
index cb698a5bf3..f934ec903e 100644
--- a/test/Bonds.jl
+++ b/test/Bonds.jl
@@ -183,10 +183,7 @@ import Distributed
         
         function set_bond_value(name, value, is_first_value=false)
             notebook.bonds[name] = Dict("value" => value)
-            Pluto.set_bond_values_reactive(;
-                session=🍭,
-                notebook=notebook,
-                bound_sym_names=[name],
+            Pluto.set_bond_values_reactive(; session=🍭, notebook, bound_sym_names=[name],
                 is_first_values=[is_first_value],
                 run_async=false,
             )
diff --git a/test/Configuration.jl b/test/Configuration.jl
index 9cd5bd739b..720427fbfe 100644
--- a/test/Configuration.jl
+++ b/test/Configuration.jl
@@ -46,8 +46,8 @@ end
 
 @testset "Authentication" begin
     port = 1238
-    options = Pluto.Configuration.from_flat_kwargs(; port=port, launch_browser=false, workspace_use_distributed=false)
-    🍭 = Pluto.ServerSession(; options=options)
+    options = Pluto.Configuration.from_flat_kwargs(; port, launch_browser=false, workspace_use_distributed=false)
+    🍭 = Pluto.ServerSession(; options)
     fakeclient = ClientSession(:fake, nothing)
     🍭.connected_clients[fakeclient.id] = fakeclient
     host = 🍭.options.server.host
diff --git a/test/webserver.jl b/test/webserver.jl
index 6d8a26d2af..d63f5e9b68 100644
--- a/test/webserver.jl
+++ b/test/webserver.jl
@@ -19,8 +19,8 @@ using Pluto.WorkspaceManager: WorkspaceManager, poll
     
 
     # without notebook at startup
-    options = Pluto.Configuration.from_flat_kwargs(; port=port, launch_browser=false, workspace_use_distributed=false, require_secret_for_access=false, require_secret_for_open_links=false)
-    🍭 = Pluto.ServerSession(; options=options)
+    options = Pluto.Configuration.from_flat_kwargs(; port, launch_browser=false, workspace_use_distributed=false, require_secret_for_access=false, require_secret_for_open_links=false)
+    🍭 = Pluto.ServerSession(; options)
     server_task = @async Pluto.run(🍭)
     @test poll(5) do
         server_running()

From ffb38d24521ea7264a019d0a35bf69706be4106c Mon Sep 17 00:00:00 2001
From: Zihua Wu <wuzihua@pku.edu.cn>
Date: Mon, 17 Jan 2022 22:42:36 +0800
Subject: [PATCH 003/821] Add support for JULIA_NUM_THREADS=auto (fixes #1813)
 (#1814)

---
 src/Configuration.jl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index b3db3ebabb..bbc863bc9f 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -143,7 +143,14 @@ end
 
 function default_number_of_threads()
     env_value = get(ENV, "JULIA_NUM_THREADS", "")
-    all(isspace, env_value) ? roughly_the_number_of_physical_cpu_cores() : parse(Int, env_value)
+
+    all(isspace, env_value) ?
+        roughly_the_number_of_physical_cpu_cores() :
+        try
+            parse(Int, env_value)
+        catch
+            env_value
+        end
 end
 
 function roughly_the_number_of_physical_cpu_cores()

From 665d99a885603bd0066b2443647805eb88fd20a3 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 17 Jan 2022 21:27:47 +0100
Subject: [PATCH 004/821] Logging in notebook (#437)

Co-authored-by: Panagiotis Georgakopoulos <panagiotis.georgakopoulos@juliacomputing.com>
Co-authored-by: Paul <paul@plutojl.org>
Co-authored-by: Michiel Dral <m.c.dral@gmail.com>
---
 frontend/components/Cell.js                   |   24 +-
 frontend/components/CellInput.js              |   44 +-
 .../components/CellInput/highlight_line.js    |   54 +
 frontend/components/Editor.js                 |   22 +-
 frontend/components/Logs.js                   |  162 +++
 frontend/components/Notebook.js               |   14 +
 frontend/components/TreeView.js               |    2 +-
 frontend/dark_color.css                       |   21 +-
 frontend/editor.css                           |  252 +++-
 frontend/light_color.css                      |   21 +-
 sample/logging.jl                             |   96 ++
 sample/test_logging.jl                        | 1179 +++++++++++++++++
 src/Pluto.jl                                  |    1 +
 src/evaluation/Run.jl                         |   60 +-
 src/evaluation/Throttled.jl                   |   49 +
 src/evaluation/WorkspaceManager.jl            |   38 +-
 src/notebook/Cell.jl                          |    2 +
 src/runner/PlutoRunner.jl                     |   26 +-
 src/webserver/AppendonlyMarkers.jl            |  178 +++
 src/webserver/Dynamic.jl                      |    6 +
 src/webserver/Firebasey.jl                    |  272 ++--
 21 files changed, 2276 insertions(+), 247 deletions(-)
 create mode 100644 frontend/components/CellInput/highlight_line.js
 create mode 100644 frontend/components/Logs.js
 create mode 100644 sample/logging.jl
 create mode 100644 sample/test_logging.jl
 create mode 100644 src/evaluation/Throttled.jl
 create mode 100644 src/webserver/AppendonlyMarkers.jl

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 7305cb0dc5..fb593ad253 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -1,7 +1,9 @@
+import _ from "../imports/lodash.js"
 import { html, useState, useEffect, useMemo, useRef, useContext, useLayoutEffect } from "../imports/Preact.js"
 
 import { CellOutput } from "./CellOutput.js"
 import { CellInput } from "./CellInput.js"
+import { Logs } from "./Logs.js"
 import { RunArea, useDebouncedTruth } from "./RunArea.js"
 import { cl } from "../common/ClassTable.js"
 import { PlutoContext } from "../common/PlutoContext.js"
@@ -41,7 +43,7 @@ const useCellApi = (node_ref, published_object_keys, pluto_actions) => {
  * */
 export const Cell = ({
     cell_input: { cell_id, code, code_folded, running_disabled },
-    cell_result: { queued, running, runtime, errored, output, published_object_keys, depends_on_disabled_cells },
+    cell_result: { queued, running, runtime, errored, output, logs, published_object_keys, depends_on_disabled_cells },
     cell_dependencies,
     cell_input_local,
     notebook_id,
@@ -64,6 +66,17 @@ export const Cell = ({
     const variables = Object.keys(notebook?.cell_dependencies?.[cell_id]?.downstream_cells_map || {})
     // cm_forced_focus is null, except when a line needs to be highlighted because it is part of a stack trace
     const [cm_forced_focus, set_cm_forced_focus] = useState(null)
+    const [cm_highlighted_line, set_cm_highlighted_line] = useState(null)
+    const [show_logs, set_show_logs] = useState(true)
+
+    const any_logs = useMemo(() => !_.isEmpty(logs), [logs])
+
+    useEffect(() => {
+        if (!any_logs) {
+            set_show_logs(true)
+        }
+    }, [any_logs])
+
     useEffect(() => {
         const focusListener = (e) => {
             if (e.detail.cell_id === cell_id) {
@@ -107,6 +120,7 @@ export const Cell = ({
     // during the initial page load, force_hide_input === true, so that cell outputs render fast, and codemirrors are loaded after
     let show_input = !force_hide_input && (errored || class_code_differs || !class_code_folded)
 
+    const [line_heights, set_line_heights] = useState([15])
     const node_ref = useRef(null)
 
     const disable_input_ref = useRef(disable_input)
@@ -131,6 +145,7 @@ export const Cell = ({
                 running_disabled: running_disabled,
                 depends_on_disabled_cells: depends_on_disabled_cells,
                 show_input: show_input,
+                shrunk: Object.values(logs).length > 0,
                 hooked_up: output?.has_pluto_hook_features ?? false,
             })}
             id=${cell_id}
@@ -197,11 +212,18 @@ export const Cell = ({
                 }}
                 on_update_doc_query=${on_update_doc_query}
                 on_focus_neighbor=${on_focus_neighbor}
+                on_line_heights=${set_line_heights}
                 nbpkg=${nbpkg}
                 cell_id=${cell_id}
                 notebook_id=${notebook_id}
                 running_disabled=${running_disabled}
+                any_logs=${any_logs}
+                show_logs=${show_logs}
+                set_show_logs=${set_show_logs}
+                cm_highlighted_line=${cm_highlighted_line}
+                set_cm_highlighted_line=${set_cm_highlighted_line}
             />
+            ${show_logs ? html`<${Logs} logs=${Object.values(logs)} line_heights=${line_heights} set_cm_highlighted_line=${set_cm_highlighted_line} />` : null}
             <${RunArea}
                 cell_id=${cell_id}
                 running_disabled=${running_disabled}
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 8822a8349f..f626c535bd 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -1,4 +1,5 @@
 import { html, useState, useEffect, useLayoutEffect, useRef, useContext, useMemo } from "../imports/Preact.js"
+import observablehq_for_myself from "../common/SetupCellEnvironment.js"
 import _ from "../imports/lodash.js"
 
 import { utf8index_to_ut16index } from "../common/UnicodeTools.js"
@@ -53,6 +54,7 @@ import { cell_movement_plugin, prevent_holding_a_key_from_doing_things_across_ce
 import { pluto_paste_plugin } from "./CellInput/pluto_paste_plugin.js"
 import { bracketMatching } from "./CellInput/block_matcher_plugin.js"
 import { cl } from "../common/ClassTable.js"
+import { HighlightLineFacet, highlightLinePlugin } from "./CellInput/highlight_line.js"
 
 export const pluto_syntax_colors = HighlightStyle.define([
     /* The following three need a specific version of the julia parser, will add that later (still messing with it 😈) */
@@ -157,11 +159,16 @@ export const CellInput = ({
     on_change,
     on_update_doc_query,
     on_focus_neighbor,
+    on_line_heights,
     nbpkg,
     cell_id,
     notebook_id,
     running_disabled,
     cell_dependencies,
+    any_logs,
+    show_logs,
+    set_show_logs,
+    cm_highlighted_line,
     variables_in_all_notebook,
 }) => {
     let pluto_actions = useContext(PlutoContext)
@@ -174,6 +181,7 @@ export const CellInput = ({
 
     let nbpkg_compartment = useCompartment(newcm_ref, NotebookpackagesFacet.of(nbpkg))
     let used_variables_compartment = useCompartment(newcm_ref, UsedVariablesFacet.of(variables_in_all_notebook))
+    let highlighted_line_compartment = useCompartment(newcm_ref, HighlightLineFacet.of(cm_highlighted_line))
     let editable_compartment = useCompartment(newcm_ref, EditorState.readOnly.of(disable_input))
 
     let on_change_compartment = useCompartment(
@@ -359,6 +367,7 @@ export const CellInput = ({
                     EditorView.theme({}, { dark: usesDarkTheme }),
                     // Compartments coming from react state/props
                     nbpkg_compartment,
+                    highlighted_line_compartment,
                     used_variables_compartment,
                     editable_compartment,
 
@@ -479,6 +488,21 @@ export const CellInput = ({
                 view.focus()
             })
         }
+
+        // @ts-ignore
+        const lines_wrapper_dom_node = dom_node_ref.current.querySelector("div.cm-content")
+        const lines_wrapper_resize_observer = new ResizeObserver(() => {
+            const line_nodes = lines_wrapper_dom_node.children
+            const tops = _.map(line_nodes, (c) => c.offsetTop)
+            const diffs = tops.slice(1).map((y, i) => y - tops[i])
+            const heights = [...diffs, 15]
+            on_line_heights(heights)
+        })
+
+        lines_wrapper_resize_observer.observe(lines_wrapper_dom_node)
+        return () => {
+            lines_wrapper_resize_observer.unobserve(lines_wrapper_dom_node)
+        }
     }, [])
 
     // Effect to apply "remote_code" to the cell when it changes...
@@ -542,12 +566,20 @@ export const CellInput = ({
 
     return html`
         <pluto-input ref=${dom_node_ref} class="CodeMirror" translate=${false}>
-            <${InputContextMenu} on_delete=${on_delete} cell_id=${cell_id} run_cell=${on_submit} running_disabled=${running_disabled} />
+            <${InputContextMenu}
+                on_delete=${on_delete}
+                cell_id=${cell_id}
+                run_cell=${on_submit}
+                running_disabled=${running_disabled}
+                any_logs=${any_logs}
+                show_logs=${show_logs}
+                set_show_logs=${set_show_logs}
+            />
         </pluto-input>
     `
 }
 
-const InputContextMenu = ({ on_delete, cell_id, run_cell, running_disabled }) => {
+const InputContextMenu = ({ on_delete, cell_id, run_cell, running_disabled, any_logs, show_logs, set_show_logs }) => {
     const timeout = useRef(null)
     let pluto_actions = useContext(PlutoContext)
     const [open, setOpen] = useState(false)
@@ -564,6 +596,7 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, running_disabled }) =>
         // we also 'run' the cell if it is disabled, this will make the backend propage the disabled state to dependent cells
         await run_cell()
     }
+    const toggle_logs = () => set_show_logs(!show_logs)
 
     return html` <button
         onClick=${() => setOpen(!open)}
@@ -585,6 +618,13 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, running_disabled }) =>
                       ${running_disabled ? html`<span class="enable_cell_icon" />` : html`<span class="disable_cell_icon" />`}
                       ${running_disabled ? html`<b>Enable cell</b>` : html`Disable cell`}
                   </li>
+                  ${any_logs
+                      ? html`<li title="" onClick=${toggle_logs}>
+                            ${show_logs
+                                ? html`<span class="hide_logs_icon" /><span>Hide logs</span>`
+                                : html`<span class="show_logs_icon" /><span>Show logs</span>`}
+                        </li>`
+                      : null}
                   <li class="coming_soon" title=""><span class="bandage_icon" /><em>Coming soon…</em></li>
               </ul>`
             : html``}
diff --git a/frontend/components/CellInput/highlight_line.js b/frontend/components/CellInput/highlight_line.js
new file mode 100644
index 0000000000..ea58961b58
--- /dev/null
+++ b/frontend/components/CellInput/highlight_line.js
@@ -0,0 +1,54 @@
+import { Decoration, ViewPlugin, EditorView, Facet } from "../../imports/CodemirrorPlutoSetup.js"
+
+const highlighted_line = Decoration.line({
+    attributes: { class: "cm-highlighted-line" },
+})
+
+/**
+ * @param {EditorView} view
+ */
+function create_line_decorations(view) {
+    let line_number = view.state.facet(HighlightLineFacet)
+    if (line_number == null || line_number == undefined || line_number > view.state.doc.lines) {
+        return Decoration.set([])
+    }
+
+    let line = view.state.doc.line(line_number)
+    return Decoration.set([highlighted_line.range(line.from, line.from)])
+}
+
+/**
+ * @type Facet<number?, number?>
+ */
+export const HighlightLineFacet = Facet.define({
+    combine: (values) => values[0],
+    compare: (a, b) => a === b,
+})
+
+export const highlightLinePlugin = () =>
+    ViewPlugin.fromClass(
+        class {
+            updateDecos(view) {
+                this.decorations = create_line_decorations(view)
+            }
+
+            /**
+             * @param {EditorView} view
+             */
+            constructor(view) {
+                this.updateDecos(view)
+            }
+
+            /**
+             * @param {ViewUpdate} update
+             */
+            update(update) {
+                if (update.docChanged || update.state.facet(HighlightLineFacet) !== update.startState.facet(HighlightLineFacet)) {
+                    this.updateDecos(update.view)
+                }
+            }
+        },
+        {
+            decorations: (v) => v.decorations,
+        }
+    )
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 5402d0f2e4..fd28fa9642 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -99,6 +99,17 @@ const first_true_key = (obj) => {
  * }}
  */
 
+/**
+ * @typedef LogEntryData
+ * @type {{
+ *   level: number,
+ *   msg: string,
+ *   file: string,
+ *   line: number,
+ *   kwargs: Object,
+ * }}
+ */
+
 /**
  * @typedef CellResultData
  * @type {{
@@ -120,6 +131,7 @@ const first_true_key = (obj) => {
  *      rootassignee: ?string,
  *      has_pluto_hook_features: boolean,
  *  },
+ *  logs: Array<LogEntryData>,
  *  published_object_keys: [string],
  * }}
  */
@@ -232,6 +244,7 @@ export class Editor extends Component {
                 down: false,
             },
             export_menu_open: false,
+            show_logs: true,
 
             last_created_cell: null,
             selected_cells: [],
@@ -638,9 +651,6 @@ patch: ${JSON.stringify(
                             apply_notebook_patches(message.patches)
                         }
                         break
-                    case "log":
-                        handle_log(message, this.state.notebook.path)
-                        break
                     default:
                         console.error("Received unknown update type!", update)
                         // alert("Something went wrong 🙈\n Try clearing your browser cache and refreshing the page")
@@ -1250,6 +1260,8 @@ patch: ${JSON.stringify(
                             on_cell_input=${this.actions.set_local_cell}
                             on_focus_neighbor=${this.actions.focus_on_neighbor}
                             disable_input=${this.state.disable_ui || !this.state.connected /* && this.state.binder_phase == null*/}
+                            show_logs=${this.state.show_logs}
+                            set_show_logs=${(enabled) => this.setState({ show_logs: enabled })}
                             last_created_cell=${this.state.last_created_cell}
                             selected_cells=${this.state.selected_cells}
                             is_initializing=${this.state.initializing}
@@ -1258,9 +1270,7 @@ patch: ${JSON.stringify(
                         <${DropRuler} 
                             actions=${this.actions}
                             selected_cells=${this.state.selected_cells}
-                            set_scroller=${(enabled) => {
-                                this.setState({ scroller: enabled })
-                            }}
+                            set_scroller=${(enabled) => this.setState({ scroller: enabled })}
                             serialize_selected=${this.serialize_selected}
                         />
                         ${
diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
new file mode 100644
index 0000000000..4666594e65
--- /dev/null
+++ b/frontend/components/Logs.js
@@ -0,0 +1,162 @@
+import _ from "../imports/lodash.js"
+import { cl } from "../common/ClassTable.js"
+import { html, useState, useEffect, useLayoutEffect, useRef, useMemo } from "../imports/Preact.js"
+import { SimpleOutputBody } from "./TreeView.js"
+
+// Defined in editor.css
+const GRID_WIDTH = 10
+const RESIZE_THROTTLE = 60
+
+const is_progress_log = (log) => {
+    return log.kwargs.find((kwarg) => kwarg[0] === "progress") !== undefined
+}
+
+export const Logs = ({ logs, line_heights, set_cm_highlighted_line }) => {
+    const container = useRef(null)
+    const [from, setFrom] = useState(0)
+    const [to, setTo] = useState(Math.round(1000 / GRID_WIDTH))
+    const logsWidth = logs.length * GRID_WIDTH
+    useEffect(() => {
+        if (!container.current) return
+        const elem = container.current
+        const fn = () => {
+            const w = elem.clientWidth
+            const scroll_left = elem.scrollLeft
+            setFrom(Math.min(logs.length - 1, Math.round((scroll_left - w) / GRID_WIDTH)))
+            setTo(Math.round((scroll_left + 2 * w) / GRID_WIDTH))
+        }
+        const l = fn // _.throttle(fn, RESIZE_THROTTLE)
+        document.addEventListener("resize", l)
+        elem.addEventListener("scroll", l)
+        return () => {
+            elem.removeEventListener("scroll", l)
+            document.removeEventListener("resize", l)
+        }
+    }, [container.current, logsWidth])
+    const logsStyle = useMemo(
+        () => `grid-template-rows: ${line_heights.map((y) => y + "px").join(" ")} repeat(auto-fill, 15px); width: ${logs.length * GRID_WIDTH}px;`,
+        [logs.length, line_heights]
+    )
+    const is_hidden_input = line_heights[0] === 0
+    if (logs.length === 0) {
+        return null
+    }
+
+    const progress_logs = logs.filter(is_progress_log)
+    const latest_progress_logs = progress_logs.reduce((progress_logs, log) => ({ ...progress_logs, [log.id]: log }), {})
+    const [_, grouped_progress_and_logs] = logs.reduce(
+        ([seen, final_logs], log) => {
+            const ipl = is_progress_log(log)
+            if (ipl && !(log.id in seen)) {
+                return [{ ...seen, [log.id]: true }, [...final_logs, latest_progress_logs[log.id]]]
+            } else if (!ipl) {
+                return [seen, [...final_logs, log]]
+            }
+            return [seen, final_logs]
+        },
+        [{}, []]
+    )
+
+    return html`
+        <pluto-logs-container ref=${container}>
+            <pluto-logs style="${logsStyle}">
+                ${grouped_progress_and_logs.map((log, i) => {
+                    return html`<${Dot}
+                        set_cm_highlighted_line=${set_cm_highlighted_line}
+                        show=${logs.length < 50 || (from <= i && i < to)}
+                        level=${log.level}
+                        msg=${log.msg}
+                        kwargs=${log.kwargs}
+                        mykey=${`log${i}`}
+                        key=${i}
+                        x=${i}
+                        y=${is_hidden_input ? 0 : log.line - 1}
+                    /> `
+                })}
+            </pluto-logs>
+        </pluto-logs-container>
+    `
+}
+
+const Progress = ({ progress }) => {
+    const bar_ref = useRef(null)
+
+    useLayoutEffect(() => {
+        bar_ref.current.style.width = `${progress * 100}%`
+    }, [progress])
+
+    return html`<pluto-progress-bar ref=${bar_ref}></pluto-progress-bar>`
+}
+
+const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${"adsf"} mime=${pair[1]} body=${pair[0]} persist_js_state=${false} />`
+
+const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
+    const node_ref = useRef(null)
+    // const label_ref = useRef(null)
+    // useEffect(() => {
+    //     label_ref.current.innerHTML = body
+    // }, [body])
+    const [inspecting, set_inspecting] = useState(false)
+
+    const is_progress = is_progress_log({ kwargs })
+    let progress = null
+    if (is_progress) {
+        progress = kwargs.find((p) => p[0] === "progress")[1][0]
+        if (progress === "nothing") {
+            progress = 0
+        } else if (progress === '"done"') {
+            progress = 1
+        } else {
+            progress = parseFloat(progress)
+        }
+
+        level = "Progress"
+        y = 0
+        msg = [`${Math.ceil(100*progress)}%            `, "text/plain"]
+    }
+
+    useLayoutEffect(() => {
+        node_ref.current.style.gridColumn = `${x + 1}`
+        node_ref.current.style.gridRow = `${y + 1}`
+    }, [x, y])
+
+    useLayoutEffect(() => {
+        if (inspecting && show) {
+            const f = (e) => {
+                if (!e.target.closest || e.target.closest("pluto-log-dot-positioner") !== node_ref.current) {
+                    set_inspecting(false)
+                    set_cm_highlighted_line(null)
+                }
+            }
+            window.addEventListener("click", f)
+            window.addEventListener("blur", f)
+
+            return () => {
+                window.removeEventListener("click", f)
+                window.removeEventListener("blur", f)
+            }
+        }
+    }, [inspecting])
+
+    return show
+        ? html` <pluto-log-dot-positioner
+              ref=${node_ref}
+              class=${cl({ inspecting })}
+              onClick=${() => {
+                  set_inspecting(true)
+                  is_progress || set_cm_highlighted_line(y + 1)
+              }}
+              onMouseenter=${() => is_progress || set_cm_highlighted_line(y + 1)}
+              onMouseleave=${() => set_cm_highlighted_line(null)}
+          >
+              <pluto-log-dot-sizer>
+                  <pluto-log-dot class=${level}
+                      >${mimepair_output(msg)}${(!is_progress ? kwargs : []).map(
+                          ([k, v]) =>
+                              html` <pluto-log-dot-kwarg><pluto-key>${k}</pluto-key> <pluto-value>${mimepair_output(v)}</pluto-value></pluto-log-dot-kwarg> `
+                      )}${is_progress ? html`<${Progress} progress=${progress} />` : null}</pluto-log-dot
+                  >
+              </pluto-log-dot-sizer>
+          </pluto-log-dot-positioner>`
+        : html`<pluto-log-dot-positioner ref=${node_ref}></pluto-log-dot-positioner>`
+}
diff --git a/frontend/components/Notebook.js b/frontend/components/Notebook.js
index e93a2404f0..71d52cd01b 100644
--- a/frontend/components/Notebook.js
+++ b/frontend/components/Notebook.js
@@ -19,10 +19,13 @@ let CellMemo = ({
     force_hide_input,
     is_process_ready,
     disable_input,
+    show_logs,
+    set_show_logs,
     nbpkg,
 }) => {
     const selected_cells_diffable_primitive = (selected_cells || []).join("")
     const { body, last_run_timestamp, mime, persist_js_state, rootassignee } = cell_result?.output || {}
+    const logs = cell_result?.logs ?? []
     const { queued, running, runtime, errored, depends_on_disabled_cells } = cell_result || {}
     const { cell_id, code, code_folded, running_disabled } = cell_input || {}
     return useMemo(() => {
@@ -42,6 +45,8 @@ let CellMemo = ({
                 focus_after_creation=${focus_after_creation}
                 is_process_ready=${is_process_ready}
                 disable_input=${disable_input}
+                show_logs=${show_logs}
+                set_show_logs=${set_show_logs}
                 nbpkg=${nbpkg}
             />
         `
@@ -58,6 +63,7 @@ let CellMemo = ({
         mime,
         persist_js_state,
         rootassignee,
+        logs,
         code,
         code_folded,
         cell_input_local,
@@ -72,6 +78,7 @@ let CellMemo = ({
         focus_after_creation,
         is_process_ready,
         disable_input,
+        show_logs,
         ...nbpkg_fingerprint(nbpkg),
     ])
 }
@@ -98,6 +105,8 @@ const render_cell_outputs_minimum = 20
  *  is_initializing: boolean,
  *  is_process_ready: boolean,
  *  disable_input: any,
+ *  show_logs: boolean,
+ *  set_show_logs: any,
  * }} props
  * */
 export const Notebook = ({
@@ -111,6 +120,8 @@ export const Notebook = ({
     is_initializing,
     is_process_ready,
     disable_input,
+    show_logs,
+    set_show_logs,
 }) => {
     let pluto_actions = useContext(PlutoContext)
 
@@ -148,6 +159,7 @@ export const Notebook = ({
                             errored: false,
                             runtime: null,
                             output: null,
+                            logs: [],
                         }}
                         cell_input=${notebook.cell_inputs[cell_id]}
                         cell_dependencies=${notebook.cell_dependencies[cell_id] ?? {}}
@@ -162,6 +174,8 @@ export const Notebook = ({
                         force_hide_input=${false}
                         is_process_ready=${is_process_ready}
                         disable_input=${disable_input}
+                        show_logs=${show_logs}
+                        set_show_logs=${set_show_logs}
                         nbpkg=${notebook.nbpkg}
                     />`
                 )}
diff --git a/frontend/components/TreeView.js b/frontend/components/TreeView.js
index b7de899f89..3613e39aac 100644
--- a/frontend/components/TreeView.js
+++ b/frontend/components/TreeView.js
@@ -9,7 +9,7 @@ import { PlutoContext } from "../common/PlutoContext.js"
 // whatever
 //
 // TODO: remove this, use OutputBody instead, and fix the CSS classes so that i all looks nice again
-const SimpleOutputBody = ({ mime, body, cell_id, persist_js_state }) => {
+export const SimpleOutputBody = ({ mime, body, cell_id, persist_js_state }) => {
     switch (mime) {
         case "image/png":
         case "image/jpg":
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index 66c0fb6d15..66ca2fbbbf 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -40,14 +40,16 @@
         --blockquote-color: inherit;
         --blockquote-bg: #2e2e2e;
         --admonition-title-color: black;
-        --admonition-bg-color: rgb(35 149 28 / 20%);
-        --admonition-focus-color: rgb(131 191 138);
-        --admonition-note-main-color: rgba(50, 115, 200, 0.2);
-        --admonition-note-focus-color: rgb(92 140 205);
-        --admonition-warn-main-color: rgba(162, 148, 30, 0.2);
-        --admonition-warn-focus-color: rgb(221 212 100);
-        --admonition-danger-main-color: rgba(200, 67, 50, 0.2);
-        --admonition-danger-focus-color: rgb(255, 117, 98);
+        --jl-message-color: rgb(38 90 32);
+        --jl-message-accent-color: rgb(131 191 138);
+        --jl-info-color: rgb(42 73 115);
+        --jl-info-accent-color: rgb(92 140 205);
+        --jl-warn-color: rgb(96 90 34);
+        --jl-warn-accent-color: rgb(221 212 100);
+        --jl-danger-color: rgb(100 47 39);
+        --jl-danger-accent-color: rgb(255, 117, 98);
+        --jl-debug-color: hsl(288deg 33% 27%);
+        --jl-debug-accent-color: hsl(283deg 59% 69%);
         --table-border-color: rgba(255, 255, 255, 0.2);
         --table-bg-hover-color: rgba(193, 192, 235, 0.15);
         --pluto-tree-color: rgba(191, 191, 191, 0.507);
@@ -61,6 +63,9 @@
         /* Pluto shoulders */
         --shoulder-hover-bg-color: rgba(255, 255, 255, 0.05);
 
+        /* Logs */
+        --pluto-logs-bg-color: hsl(240deg 10% 29%);
+
         /*Top navbar styling*/
         --nav-h1-text-color: white;
         --nav-filepicker-color: #b6b6b6;
diff --git a/frontend/editor.css b/frontend/editor.css
index f6812beb6d..8a5673c383 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -43,6 +43,7 @@ html {
 }
 
 body {
+    overscroll-behavior: contain;
     margin: 0px;
     overflow-anchor: none;
     overflow-x: hidden;
@@ -244,6 +245,7 @@ pluto-output.rich_output pre > code {
     background-color: transparent;
 }
 
+pluto-log-dot pre,
 pluto-output pre {
     display: inline-block;
     margin: 0px;
@@ -309,38 +311,38 @@ pluto-output div.admonition .admonition-title ~ * {
 
 pluto-output div.admonition {
     padding-left: 0.5rem;
-    background: var(--admonition-bg-color);
-    border: 5px solid var(--admonition-focus-color);
+    background: var(--jl-message-color);
+    border: 5px solid var(--jl-message-accent-color);
 }
 pluto-output div.admonition .admonition-title {
-    background: var(--admonition-focus-color);
+    background: var(--jl-message-accent-color);
     margin: -1px; /* Fixes a rendering glitch in Chrome */
     margin-left: -0.55rem;
 }
 pluto-output div.admonition.note,
 pluto-output div.admonition.info,
 pluto-output div.admonition.hint {
-    background: var(--admonition-note-main-color);
-    border: 5px solid var(--admonition-note-focus-color);
+    background: var(--jl-info-color);
+    border: 5px solid var(--jl-info-accent-color);
 }
 pluto-output div.admonition.note .admonition-title,
 pluto-output div.admonition.info .admonition-title,
 pluto-output div.admonition.hint .admonition-title {
-    background: var(--admonition-note-focus-color);
+    background: var(--jl-info-accent-color);
 }
 pluto-output div.admonition.warning {
-    background: var(--admonition-warn-main-color);
-    border: 5px solid var(--admonition-warn-focus-color);
+    background: var(--jl-warn-color);
+    border: 5px solid var(--jl-warn-accent-color);
 }
 pluto-output div.admonition.warning .admonition-title {
-    background: var(--admonition-warn-focus-color);
+    background: var(--jl-warn-accent-color);
 }
 pluto-output div.admonition.danger {
-    background: var(--admonition-danger-main-color);
-    border: 5px solid var(--admonition-danger-focus-color);
+    background: var(--jl-danger-color);
+    border: 5px solid var(--jl-danger-accent-color);
 }
 pluto-output div.admonition.danger .admonition-title {
-    background: var(--admonition-danger-focus-color);
+    background: var(--jl-danger-accent-color);
 }
 
 pluto-output div.admonition.hint .admonition-title ~ * {
@@ -1142,6 +1144,15 @@ pluto-input:focus-within .cm-editor {
     z-index: 21;
 }
 
+pluto-input .cm-editor .cm-line {
+    transition: background-color 0.15s ease-in-out;
+}
+
+pluto-input .cm-editor .cm-line.cm-highlighted-line {
+    background-color: #bdbdbd68;
+    border-radius: 3px;
+}
+
 pluto-cell:not(.show_input) > pluto-input {
     display: none;
 }
@@ -1561,6 +1572,8 @@ pluto-input > button.input_context_menu ul {
 .delete_icon,
 .enable_cell_icon,
 .bandage_icon,
+.show_logs_icon,
+.hide_logs_icon,
 .icon {
     --size: 17px;
     width: var(--size);
@@ -1570,6 +1583,14 @@ pluto-input > button.input_context_menu ul {
     background-position: center;
     margin-right: calc(var(--size) / 3);
 }
+.show_logs_icon {
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg);
+}
+
+.hide_logs_icon {
+    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg);
+}
+
 .bandage_icon {
     filter: opacity(0.3);
     background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/bandage-outline.svg);
@@ -2211,6 +2232,213 @@ nav#undo_delete.hidden {
     }
 }
 
+/* LOGS */
+
+@media screen and (max-width: calc(700px + 25px + 6px + 100px)) {
+    pluto-cell.shrunk {
+        /* max-width: calc(100% - 100px); */
+    }
+}
+
+pluto-logs-container {
+    display: block;
+    width: max(100px, 100vw - (700px + 25px));
+    /* Show logs up to the RunArea */
+    max-height: calc(100% + 14px);
+    position: absolute;
+    z-index: 25;
+    right: min(-100px, -100vw + (700px + 25px));
+    top: 1px;
+    overflow-x: auto;
+    /* overflow-y: hidden; */
+    background: hsl(0deg 0% 100% / 81%);
+}
+
+/* @media screen and (max-width: calc(700px + 25px + 6px + 150px)) { */
+pluto-logs {
+    display: flex !important;
+}
+
+pluto-logs-container {
+    position: static;
+    /* right: min(-6px, 700px + 25px - 100vw); */
+    /* width: 20px; */
+    /* transition: width ease-in-out 100ms; */
+    /* padding-left: 80px; */
+    width: 100%;
+}
+
+pluto-logs-container:not(:empty) {
+    background: var(--pluto-logs-bg-color);
+    padding: 10px;
+}
+
+pluto-logs-container:focus-within,
+pluto-logs-container:hover {
+    /* width: 30vw; */
+}
+
+pluto-logs-container pluto-logs {
+    /* grid-template-columns: repeat(auto-fill, 0px); */
+}
+pluto-logs-container:focus-within pluto-logs,
+pluto-logs-container:hover pluto-logs {
+    /* grid-template-columns: repeat(auto-fill, 10px); */
+}
+/* 
+    pluto-log-dot-positioner {
+        flex: 0 0 auto;
+        width: auto;
+    }
+    pluto-log-dot-sizer {
+        width: auto;
+    } */
+/* } */
+/* 
+@media screen and (min-width: calc(700px + 25px + 6px + 500px)) and (max-width: calc(700px + 25px + 6px + 500px + 500px)) {
+    pluto-logs-container {
+        right: calc(-500px - 6px);
+        width: calc(500px + 6px);
+    }
+}
+@media screen and (min-width: calc(700px + 25px + 6px + 500px + 500px)) {
+    pluto-logs-container {
+        width: calc(0.5 * (6px + 100vw - (700px + 25px)));
+        right: calc(-0.5 * (6px + 100vw - (700px + 25px)));
+    }
+} */
+
+pluto-logs-container pluto-progress-bars pluto-progress:not(:first-child) {
+    margin-top: 10px;
+}
+
+pluto-logs-container pluto-progress-bar {
+    top: 3px;
+    position: absolute;
+    left: 2px;
+    height: calc(100% - 6px);
+    max-width: calc(100% - 4px);
+    width: 0;
+    border-radius: 5px;
+    transition: width cubic-bezier(0.14, 0.71, 0, 0.99) 2s, opacity linear 0.2s;
+    background-color: salmon;
+}
+
+pluto-logs-container pluto-log-dot.Progress pre {
+    z-index: 1;
+    color: white;
+}
+
+pluto-logs-container pluto-progress-bar.collapsed {
+    height: 0;
+}
+
+pluto-logs {
+    display: grid;
+    grid-auto-rows: 15px;
+    flex-direction: row;
+    grid-template-rows: repeat(auto-fill, 15px);
+    grid-template-columns: repeat(auto-fill, 10px);
+    grid-auto-flow: column;
+}
+
+pluto-logs:not(:first-child):not(:empty) {
+    margin-top: 10px;
+}
+
+pluto-log-dot-positioner {
+    display: block;
+    width: 10px;
+    transition: transform 100ms ease-in-out;
+}
+
+pluto-log-dot-positioner:hover,
+pluto-log-dot-positioner.inspecting {
+    z-index: 5;
+    /* transform: translate(0px, -5px); */
+}
+
+/* pluto-log-dot-positioner {
+    transform: translateX(0px);
+} */
+pluto-log-dot-positioner.inspecting {
+    transform: translateX(5px);
+}
+pluto-log-dot-positioner.inspecting pluto-log-dot {
+    box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
+}
+pluto-log-dot-positioner.inspecting ~ pluto-log-dot-positioner {
+    transform: translateX(10px);
+}
+
+pluto-log-dot-sizer {
+    display: block;
+    width: 100px;
+    transform: translateZ(10px);
+    z-index: 300;
+    pointer-events: none; /* part 1: because the hit box is larger than the action log dot */
+}
+pluto-log-dot {
+    pointer-events: auto; /* part 2 */
+    box-shadow: -2px 0px 1px #00000014;
+    font-family: "Roboto Mono", monospace;
+    font-size: 0.6rem;
+
+    /* position: absolute; */
+    display: inline-flex;
+    flex-direction: column;
+    padding: 1px 3px;
+    min-width: 18px;
+    min-height: 18px;
+    border-radius: 7px;
+}
+pluto-log-dot {
+    background: var(--jl-info-color);
+    border: 3px solid var(--jl-info-accent-color);
+}
+pluto-log-dot.Warn {
+    background: var(--jl-warn-color);
+    border: 3px solid var(--jl-warn-accent-color);
+}
+pluto-log-dot.Error {
+    background: var(--jl-danger-color);
+    border: 3px solid var(--jl-danger-accent-color);
+}
+pluto-log-dot.Debug {
+    background: var(--jl-debug-color);
+    border: 3px solid var(--jl-debug-accent-color);
+}
+pluto-log-dot.Progress {
+    background: pink;
+    border: 3px solid hsla(0, 100%, 80%, 1);
+}
+
+pluto-log-dot jltree,
+pluto-log-dot jlpair {
+    font-size: 0.6rem;
+}
+pluto-log-dot > img {
+    max-width: 100px;
+}
+
+pluto-log-dot-kwarg {
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+}
+pluto-log-dot-kwarg > * {
+    flex: 0 0 auto;
+}
+pluto-log-dot-kwarg > pluto-key {
+    color: var(--pluto-schema-types-color);
+    margin-right: calc(1em - 30px);
+}
+pluto-log-dot-kwarg > pluto-key::after {
+    content: ": ";
+}
+pluto-log-dot-kwarg > pluto-value {
+    margin-left: 30px;
+}
 /* PRESENTATION MODE */
 
 body.presentation pluto-output h1,
diff --git a/frontend/light_color.css b/frontend/light_color.css
index 4c2707aa2c..7821f2b17b 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -42,14 +42,16 @@
         --blockquote-color: #555;
         --blockquote-bg: #f2f2f2;
         --admonition-title-color: white;
-        --admonition-bg-color: rgba(68, 149, 28, 0.2);
-        --admonition-focus-color: rgb(158, 200, 137);
-        --admonition-note-main-color: rgba(50, 115, 200, 0.2);
-        --admonition-note-focus-color: rgb(148, 182, 226);
-        --admonition-warn-main-color: rgba(162, 148, 30, 0.2);
-        --admonition-warn-focus-color: rgb(207, 199, 138);
-        --admonition-danger-main-color: rgba(200, 67, 50, 0.2);
-        --admonition-danger-focus-color: rgb(226, 157, 148);
+        --jl-message-color: rgb(219 233 212);
+        --jl-message-accent-color: rgb(158, 200, 137);
+        --jl-info-color: rgb(214 227 244);
+        --jl-info-accent-color: rgb(148, 182, 226);
+        --jl-warn-color: rgb(236 234 213);
+        --jl-warn-accent-color: rgb(207, 199, 138);
+        --jl-danger-color: rgb(245 218 215);
+        --jl-danger-accent-color: rgb(226, 157, 148);
+        --jl-debug-color: rgb(245 218 215);
+        --jl-debug-accent-color: rgb(226, 157, 148);
         --footnote-border-color: rgba(23, 115, 119, 0.15);
         --table-border-color: rgba(0, 0, 0, 0.2);
         --table-bg-hover-color: rgba(159, 158, 224, 0.15);
@@ -64,6 +66,9 @@
         /* Pluto shoulders */
         --shoulder-hover-bg-color: rgba(0, 0, 0, 0.05);
 
+        /* Logs */
+        --pluto-logs-bg-color: #efeff3;
+
         /*Top navbar styling*/
         --nav-h1-text-color: black;
         --nav-filepicker-color: #6f6f6f;
diff --git a/sample/logging.jl b/sample/logging.jl
new file mode 100644
index 0000000000..8ae18126e4
--- /dev/null
+++ b/sample/logging.jl
@@ -0,0 +1,96 @@
+### A Pluto.jl notebook ###
+# v0.14.1
+
+using Markdown
+using InteractiveUtils
+
+# This Pluto notebook uses @bind for interactivity. When running this notebook outside of Pluto, the following 'mock version' of @bind gives bound variables a default value (instead of an error).
+macro bind(def, element)
+    quote
+        local el = $(esc(element))
+        global $(esc(def)) = Core.applicable(Base.get, el) ? Base.get(el) : missing
+        el
+    end
+end
+
+# ╔═╡ 65e8cd4e-dcc0-4b06-bb4b-566c1f19f794
+using PlutoUI
+
+# ╔═╡ 091d33fe-fffe-11ea-131f-01f4248b30ea
+@info "23aaa"
+
+# ╔═╡ e35e35f4-71c8-4f3b-8c72-4b3ffe4766a3
+@info collect(1:100)
+
+# ╔═╡ 2d01cdaa-fffe-11ea-09f5-63527a1b0f87
+x = 233564653
+
+# ╔═╡ c50f7178-8c7d-4319-82d9-b9154e8892d9
+for x in 1:20
+	@info "This is too long."
+end
+
+# ╔═╡ e5a8e7bd-5734-4254-914d-6f87670bf7d4
+@bind wow html"<input type=checkbox>"
+
+# ╔═╡ 2883b3d8-fffe-11ea-0a0f-bbd85ec665ea
+begin
+	
+	wow && @info "a"
+	wow && @info "b"
+	wow && @info "c"
+	wow && @info "d"
+	
+	try
+		sqrt(-1)
+	catch e
+		@error "99" exception=(e, catch_backtrace())
+	end
+	nothing
+end
+
+# ╔═╡ 786b7146-8eab-4390-a746-3ccf25d1c4c8
+for i in 1:10
+	@info i
+	@debug i
+	sleep(.05)
+end
+
+# ╔═╡ 3599eb82-0003-11eb-3814-dfd0f5737846
+for i in 1:10
+	
+	@debug i
+	@info i*100
+	if isodd(i)
+		@warn "Oh no!" i
+		@error i
+	end
+	sleep(.1)
+end
+
+# ╔═╡ f6147e0c-796f-4f5d-b000-93d790683a54
+@info md"# hello"
+
+# ╔═╡ f017b4d5-38ac-4498-8e58-770337a0d17d
+md"""
+
+# Hello
+
+
+I am a footnote $(@info("Inside text!")), how cool is that!
+
+But im not working :(
+"""
+
+# ╔═╡ Cell order:
+# ╠═091d33fe-fffe-11ea-131f-01f4248b30ea
+# ╠═e35e35f4-71c8-4f3b-8c72-4b3ffe4766a3
+# ╠═2d01cdaa-fffe-11ea-09f5-63527a1b0f87
+# ╠═c50f7178-8c7d-4319-82d9-b9154e8892d9
+# ╠═e5a8e7bd-5734-4254-914d-6f87670bf7d4
+# ╠═2883b3d8-fffe-11ea-0a0f-bbd85ec665ea
+# ╠═786b7146-8eab-4390-a746-3ccf25d1c4c8
+# ╠═3599eb82-0003-11eb-3814-dfd0f5737846
+# ╠═65e8cd4e-dcc0-4b06-bb4b-566c1f19f794
+# ╠═f6147e0c-796f-4f5d-b000-93d790683a54
+# ╠═f017b4d5-38ac-4498-8e58-770337a0d17d
diff --git a/sample/test_logging.jl b/sample/test_logging.jl
new file mode 100644
index 0000000000..89b1966e1f
--- /dev/null
+++ b/sample/test_logging.jl
@@ -0,0 +1,1179 @@
+### A Pluto.jl notebook ###
+# v0.17.5
+
+using Markdown
+using InteractiveUtils
+
+# This Pluto notebook uses @bind for interactivity. When running this notebook outside of Pluto, the following 'mock version' of @bind gives bound variables a default value (instead of an error).
+macro bind(def, element)
+    quote
+        local iv = try Base.loaded_modules[Base.PkgId(Base.UUID("6e696c72-6542-2067-7265-42206c756150"), "AbstractPlutoDingetjes")].Bonds.initial_value catch; b -> missing; end
+        local el = $(esc(element))
+        global $(esc(def)) = Core.applicable(Base.get, el) ? Base.get(el) : iv(el)
+        el
+    end
+end
+
+# ╔═╡ ecc81850-8d79-4b6f-83c8-f2c9bcda23b3
+using ProgressLogging
+
+# ╔═╡ eebe1108-588a-4e81-a69c-f2c21e9cbbaa
+using PlutoUI
+
+# ╔═╡ 890b8d1d-1bf0-4497-ac64-9852f68e1577
+using Plots
+
+# ╔═╡ 24c5d164-b618-4e05-abe9-62d129c0b55f
+md"""
+# Progress
+"""
+
+# ╔═╡ 2e7dac1a-ef0d-4b76-a33a-9510b064c25c
+@progress for z in 1:1000
+	sleep(.001)
+end
+
+# ╔═╡ 3599eb82-0003-11eb-3814-dfd0f5737846
+for i in 1:1000
+	
+	@debug i
+	@info i*100
+	
+	if isodd(i)
+		@warn "Oh no!" i i+1
+	end
+end
+
+# ╔═╡ 54d5c34e-63b5-4b52-91fe-a5fd1b729182
+for z in 1:20
+	@info z
+	sleep(.1)
+end
+
+# ╔═╡ 0248c2de-7edf-4ff6-a450-9f6d79f8966d
+@warn "wow"
+
+# ╔═╡ 196080df-e8c0-4120-a97c-443cf66295ff
+md"""
+# Positioning
+"""
+
+# ╔═╡ a22411c8-24e0-4a80-9b91-bc1f0999cc3c
+Dict([1,"asdf"] => (123, [1,[2,3,[4,5, md"# asdf"]]], md"## asdf", DomainError("asdf")))
+
+# ╔═╡ dd183c9d-c070-43bc-95ff-cf64ba27071e
+
+
+# ╔═╡ 5f8496cb-d29e-4c4c-b378-1173242c7a78
+collect(rand(1000))
+
+# ╔═╡ a93ac790-7a04-418d-8117-01f01e4608c8
+:asdf  => 123
+
+# ╔═╡ 88f87c39-89ef-4492-92ae-c6cd33699c59
+let
+	@info "a asdf   as"
+	123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123123
+	@info "b"
+	@info "c"
+end
+
+# ╔═╡ 2d01cdaa-fffe-11ea-09f5-63527a1b0f87
+@bind x TextField(default="asdfassdf")
+
+# ╔═╡ 2883b3d8-fffe-11ea-0a0f-bbd85ec665ea
+begin
+	
+	
+	
+	try
+		sqrt(-1)
+	catch e
+		@error "99" exception=(e, catch_backtrace())
+	end
+end
+
+# ╔═╡ 2fbbb413-213f-4556-b5f9-df7cf6331451
+b = @bind hello Slider(1:100)
+
+# ╔═╡ 449541e2-351d-41d2-9623-34d243fe6a97
+b
+
+# ╔═╡ 0e823733-4668-47db-8d17-f079b7ed8c75
+hello
+
+# ╔═╡ dfcf652e-ca15-43ad-8307-d40367de6986
+@warn "Oh no!" 12
+
+# ╔═╡ 5d023cd2-4fe6-4bd0-9a54-7512f52b7916
+begin
+	
+	
+	@warn md"""
+	_Writing a notebook is not just about writing the final document — Pluto empowers the experiments and discoveries that are essential to getting there._
+
+	**Explore models and share results** in a notebook that is
+
+	-   **_reactive_** - when changing a function or variable, Pluto automatically updates all affected cells.
+	-   **_lightweight_** - Pluto is written in pure Julia and is easy to install.
+	-   **_simple_** - no hidden workspace state; friendly UI.
+	"""
+end
+
+# ╔═╡ e5f2703b-198c-4926-867e-7f914fa10253
+md"""
+# Rich output in logs
+"""
+
+# ╔═╡ b52f7e61-c6b5-46ae-8025-d2b4649fed99
+svg_data = download("https://diffeq.sciml.ai/stable/assets/multiODEplot.png") |> read
+
+# ╔═╡ 52b8c0be-64f7-4950-ab4a-983c6fa50d1a
+cool_plot = Show(MIME"image/png"(), svg_data)
+
+# ╔═╡ 091d33fe-fffe-11ea-131f-01f4248b30ea
+begin
+	@info "23dafs lkjlkjsadf lkj asdflkj asdlkfj alskdjflkasdjflkjasdlfk jsdlkjf sdlkjf   laskjdf lkasdjflkajs df   lkjas dflkjasdlfkjsadf
+	
+	
+	
+	asdf" x [x,x,cool_plot,x]
+	
+	
+	
+	
+	@error "asfdasdf"
+	
+end
+
+# ╔═╡ 504dfdc1-41da-4fcb-ba8e-aa69643d57a1
+plot(args...; kwargs...) = Plots.plot(args...; kwargs..., size=(150,120)) |> as_svg
+
+# ╔═╡ 6a7824d0-06e4-4569-9fa8-b9884d299f80
+begin
+	
+	simulation_data = [1,2,23,2,3]
+	
+	@info plot(simulation_data)
+
+
+	
+end
+
+# ╔═╡ 7c7b11a2-69cf-4cd5-b9e5-f2517211579f
+md"""
+# @bind in logs
+"""
+
+# ╔═╡ d48fb1c0-b88a-4a23-8a87-7fdcd74bf3cc
+begin
+	
+	@info @bind wow Slider(1:100)
+	
+end
+
+# ╔═╡ 6355afae-d4ad-40f4-9917-3f228a63ddaa
+t = collect(1:wow)
+
+# ╔═╡ 70fc79bb-6118-4a0d-ac6e-fbdf1ba9722a
+let
+	result = sin.(t)
+	@info plot(t, result)
+
+	
+	result
+end
+
+# ╔═╡ d1a1bca1-d01a-4722-8bd9-b759b8ef72d4
+md"""
+# External logs
+"""
+
+# ╔═╡ 4ca5f24f-3139-4dee-a28a-007c936c7363
+md"""
+### Function defined in another cell:
+"""
+
+# ╔═╡ 25bca319-2b63-4013-88be-7607eff3630f
+function f(x)
+	
+	@warn "x might be too large!" x
+end
+
+# ╔═╡ 2ade9e4d-11cc-47ae-aaa6-76864757bd21
+f(123)
+
+
+
+
+
+
+
+
+# ╔═╡ 37108eb9-77db-49fa-b168-f9c1c25955fa
+md"""
+### Function defined in another file:
+"""
+
+# ╔═╡ 0bf3e7bd-1da7-441a-9807-6c9473944048
+external_src = let
+	f = tempname()
+	code = """
+	function g(x)
+
+		@warn "x might be too large!" x
+	end
+	"""
+	write(f, code)
+	f
+end
+
+# ╔═╡ cd6c50f6-16d6-4a07-8f20-7450392cd643
+function ingredients(path::String)
+	# this is from the Julia source code (evalfile in base/loading.jl)
+	# but with the modification that it returns the module instead of the last object
+	name = Symbol(basename(path))
+	m = Module(name)
+	Core.eval(m,
+        Expr(:toplevel,
+             :(eval(x) = $(Expr(:core, :eval))($name, x)),
+             :(include(x) = $(Expr(:top, :include))($name, x)),
+             :(include(mapexpr::Function, x) = $(Expr(:top, :include))(mapexpr, $name, x)),
+             :(include($path))))
+	m
+end
+
+# ╔═╡ 9cc753a0-f8be-4045-a432-295a05388a4a
+m = ingredients(external_src)
+
+# ╔═╡ 1a088b03-ac41-440b-8c82-bd5760590665
+m.g(123)
+
+# ╔═╡ 0c9de395-19a9-4ec3-a918-ea3f9835ef18
+
+
+# ╔═╡ 00000000-0000-0000-0000-000000000001
+PLUTO_PROJECT_TOML_CONTENTS = """
+[deps]
+Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
+PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
+ProgressLogging = "33c8b6b6-d38a-422a-b730-caa89a2f386c"
+
+[compat]
+Plots = "~1.22.6"
+PlutoUI = "~0.7.16"
+ProgressLogging = "~0.1.4"
+"""
+
+# ╔═╡ 00000000-0000-0000-0000-000000000002
+PLUTO_MANIFEST_TOML_CONTENTS = """
+# This file is machine-generated - editing it directly is not advised
+
+[[Adapt]]
+deps = ["LinearAlgebra"]
+git-tree-sha1 = "84918055d15b3114ede17ac6a7182f68870c16f7"
+uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
+version = "3.3.1"
+
+[[ArgTools]]
+uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
+
+[[Artifacts]]
+uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+
+[[Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+
+[[Bzip2_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "19a35467a82e236ff51bc17a3a44b69ef35185a2"
+uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0"
+version = "1.0.8+0"
+
+[[Cairo_jll]]
+deps = ["Artifacts", "Bzip2_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"]
+git-tree-sha1 = "4b859a208b2397a7a623a03449e4636bdb17bcf2"
+uuid = "83423d85-b0ee-5818-9007-b63ccbeb887a"
+version = "1.16.1+1"
+
+[[ChainRulesCore]]
+deps = ["Compat", "LinearAlgebra", "SparseArrays"]
+git-tree-sha1 = "8d954297bc51cc64f15937c2093799c3617b73e4"
+uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
+version = "1.10.0"
+
+[[ColorSchemes]]
+deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random"]
+git-tree-sha1 = "a851fec56cb73cfdf43762999ec72eff5b86882a"
+uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
+version = "3.15.0"
+
+[[ColorTypes]]
+deps = ["FixedPointNumbers", "Random"]
+git-tree-sha1 = "024fe24d83e4a5bf5fc80501a314ce0d1aa35597"
+uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
+version = "0.11.0"
+
+[[Colors]]
+deps = ["ColorTypes", "FixedPointNumbers", "Reexport"]
+git-tree-sha1 = "417b0ed7b8b838aa6ca0a87aadf1bb9eb111ce40"
+uuid = "5ae59095-9a9b-59fe-a467-6f913c188581"
+version = "0.12.8"
+
+[[Compat]]
+deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
+git-tree-sha1 = "31d0151f5716b655421d9d75b7fa74cc4e744df2"
+uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
+version = "3.39.0"
+
+[[CompilerSupportLibraries_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
+
+[[Contour]]
+deps = ["StaticArrays"]
+git-tree-sha1 = "9f02045d934dc030edad45944ea80dbd1f0ebea7"
+uuid = "d38c429a-6771-53c6-b99e-75d170b6e991"
+version = "0.5.7"
+
+[[DataAPI]]
+git-tree-sha1 = "cc70b17275652eb47bc9e5f81635981f13cea5c8"
+uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
+version = "1.9.0"
+
+[[DataStructures]]
+deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
+git-tree-sha1 = "7d9d316f04214f7efdbb6398d545446e246eff02"
+uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
+version = "0.18.10"
+
+[[DataValueInterfaces]]
+git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6"
+uuid = "e2d170a0-9d28-54be-80f0-106bbe20a464"
+version = "1.0.0"
+
+[[Dates]]
+deps = ["Printf"]
+uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
+
+[[DelimitedFiles]]
+deps = ["Mmap"]
+uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
+
+[[Distributed]]
+deps = ["Random", "Serialization", "Sockets"]
+uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
+
+[[DocStringExtensions]]
+deps = ["LibGit2"]
+git-tree-sha1 = "a32185f5428d3986f47c2ab78b1f216d5e6cc96f"
+uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
+version = "0.8.5"
+
+[[Downloads]]
+deps = ["ArgTools", "LibCURL", "NetworkOptions"]
+uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
+
+[[EarCut_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "3f3a2501fa7236e9b911e0f7a588c657e822bb6d"
+uuid = "5ae413db-bbd1-5e63-b57d-d24a61df00f5"
+version = "2.2.3+0"
+
+[[Expat_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "b3bfd02e98aedfa5cf885665493c5598c350cd2f"
+uuid = "2e619515-83b5-522b-bb60-26c02a35a201"
+version = "2.2.10+0"
+
+[[FFMPEG]]
+deps = ["FFMPEG_jll"]
+git-tree-sha1 = "b57e3acbe22f8484b4b5ff66a7499717fe1a9cc8"
+uuid = "c87230d0-a227-11e9-1b43-d7ebe4e7570a"
+version = "0.4.1"
+
+[[FFMPEG_jll]]
+deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "LAME_jll", "Libdl", "Ogg_jll", "OpenSSL_jll", "Opus_jll", "Pkg", "Zlib_jll", "libass_jll", "libfdk_aac_jll", "libvorbis_jll", "x264_jll", "x265_jll"]
+git-tree-sha1 = "d8a578692e3077ac998b50c0217dfd67f21d1e5f"
+uuid = "b22a6f82-2f65-5046-a5b2-351ab43fb4e5"
+version = "4.4.0+0"
+
+[[FixedPointNumbers]]
+deps = ["Statistics"]
+git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc"
+uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
+version = "0.8.4"
+
+[[Fontconfig_jll]]
+deps = ["Artifacts", "Bzip2_jll", "Expat_jll", "FreeType2_jll", "JLLWrappers", "Libdl", "Libuuid_jll", "Pkg", "Zlib_jll"]
+git-tree-sha1 = "21efd19106a55620a188615da6d3d06cd7f6ee03"
+uuid = "a3f928ae-7b40-5064-980b-68af3947d34b"
+version = "2.13.93+0"
+
+[[Formatting]]
+deps = ["Printf"]
+git-tree-sha1 = "8339d61043228fdd3eb658d86c926cb282ae72a8"
+uuid = "59287772-0a20-5a39-b81b-1366585eb4c0"
+version = "0.4.2"
+
+[[FreeType2_jll]]
+deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]
+git-tree-sha1 = "87eb71354d8ec1a96d4a7636bd57a7347dde3ef9"
+uuid = "d7e528f0-a631-5988-bf34-fe36492bcfd7"
+version = "2.10.4+0"
+
+[[FriBidi_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "aa31987c2ba8704e23c6c8ba8a4f769d5d7e4f91"
+uuid = "559328eb-81f9-559d-9380-de523a88c83c"
+version = "1.0.10+0"
+
+[[GLFW_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Pkg", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll"]
+git-tree-sha1 = "0c603255764a1fa0b61752d2bec14cfbd18f7fe8"
+uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89"
+version = "3.3.5+1"
+
+[[GR]]
+deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Printf", "Random", "Serialization", "Sockets", "Test", "UUIDs"]
+git-tree-sha1 = "d189c6d2004f63fd3c91748c458b09f26de0efaa"
+uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
+version = "0.61.0"
+
+[[GR_jll]]
+deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Pkg", "Qt5Base_jll", "Zlib_jll", "libpng_jll"]
+git-tree-sha1 = "cafe0823979a5c9bff86224b3b8de29ea5a44b2e"
+uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
+version = "0.61.0+0"
+
+[[GeometryBasics]]
+deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"]
+git-tree-sha1 = "58bcdf5ebc057b085e58d95c138725628dd7453c"
+uuid = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
+version = "0.4.1"
+
+[[Gettext_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"]
+git-tree-sha1 = "9b02998aba7bf074d14de89f9d37ca24a1a0b046"
+uuid = "78b55507-aeef-58d4-861c-77aaff3498b1"
+version = "0.21.0+0"
+
+[[Glib_jll]]
+deps = ["Artifacts", "Gettext_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE_jll", "Pkg", "Zlib_jll"]
+git-tree-sha1 = "a32d672ac2c967f3deb8a81d828afc739c838a06"
+uuid = "7746bdde-850d-59dc-9ae8-88ece973131d"
+version = "2.68.3+2"
+
+[[Graphite2_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "344bf40dcab1073aca04aa0df4fb092f920e4011"
+uuid = "3b182d85-2403-5c21-9c21-1e1f0cc25472"
+version = "1.3.14+0"
+
+[[Grisu]]
+git-tree-sha1 = "53bb909d1151e57e2484c3d1b53e19552b887fb2"
+uuid = "42e2da0e-8278-4e71-bc24-59509adca0fe"
+version = "1.0.2"
+
+[[HTTP]]
+deps = ["Base64", "Dates", "IniFile", "Logging", "MbedTLS", "NetworkOptions", "Sockets", "URIs"]
+git-tree-sha1 = "14eece7a3308b4d8be910e265c724a6ba51a9798"
+uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
+version = "0.9.16"
+
+[[HarfBuzz_jll]]
+deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"]
+git-tree-sha1 = "129acf094d168394e80ee1dc4bc06ec835e510a3"
+uuid = "2e76f6c2-a576-52d4-95c1-20adfe4de566"
+version = "2.8.1+1"
+
+[[Hyperscript]]
+deps = ["Test"]
+git-tree-sha1 = "8d511d5b81240fc8e6802386302675bdf47737b9"
+uuid = "47d2ed2b-36de-50cf-bf87-49c2cf4b8b91"
+version = "0.0.4"
+
+[[HypertextLiteral]]
+git-tree-sha1 = "f6532909bf3d40b308a0f360b6a0e626c0e263a8"
+uuid = "ac1192a8-f4b3-4bfe-ba22-af5b92cd3ab2"
+version = "0.9.1"
+
+[[IOCapture]]
+deps = ["Logging", "Random"]
+git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a"
+uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89"
+version = "0.2.2"
+
+[[IniFile]]
+deps = ["Test"]
+git-tree-sha1 = "098e4d2c533924c921f9f9847274f2ad89e018b8"
+uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f"
+version = "0.5.0"
+
+[[InteractiveUtils]]
+deps = ["Markdown"]
+uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+
+[[IrrationalConstants]]
+git-tree-sha1 = "7fd44fd4ff43fc60815f8e764c0f352b83c49151"
+uuid = "92d709cd-6900-40b7-9082-c6be49f344b6"
+version = "0.1.1"
+
+[[IterTools]]
+git-tree-sha1 = "05110a2ab1fc5f932622ffea2a003221f4782c18"
+uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
+version = "1.3.0"
+
+[[IteratorInterfaceExtensions]]
+git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856"
+uuid = "82899510-4779-5014-852e-03e436cf321d"
+version = "1.0.0"
+
+[[JLLWrappers]]
+deps = ["Preferences"]
+git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e"
+uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
+version = "1.3.0"
+
+[[JSON]]
+deps = ["Dates", "Mmap", "Parsers", "Unicode"]
+git-tree-sha1 = "8076680b162ada2a031f707ac7b4953e30667a37"
+uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
+version = "0.21.2"
+
+[[JpegTurbo_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "d735490ac75c5cb9f1b00d8b5509c11984dc6943"
+uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8"
+version = "2.1.0+0"
+
+[[LAME_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "f6250b16881adf048549549fba48b1161acdac8c"
+uuid = "c1c5ebd0-6772-5130-a774-d5fcae4a789d"
+version = "3.100.1+0"
+
+[[LZO_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "e5b909bcf985c5e2605737d2ce278ed791b89be6"
+uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac"
+version = "2.10.1+0"
+
+[[LaTeXStrings]]
+git-tree-sha1 = "c7f1c695e06c01b95a67f0cd1d34994f3e7db104"
+uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
+version = "1.2.1"
+
+[[Latexify]]
+deps = ["Formatting", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "Printf", "Requires"]
+git-tree-sha1 = "a4b12a1bd2ebade87891ab7e36fdbce582301a92"
+uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
+version = "0.15.6"
+
+[[LibCURL]]
+deps = ["LibCURL_jll", "MozillaCACerts_jll"]
+uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
+
+[[LibCURL_jll]]
+deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
+uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
+
+[[LibGit2]]
+deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
+uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
+
+[[LibSSH2_jll]]
+deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
+uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
+
+[[Libdl]]
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
+[[Libffi_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "0b4a5d71f3e5200a7dff793393e09dfc2d874290"
+uuid = "e9f186c6-92d2-5b65-8a66-fee21dc1b490"
+version = "3.2.2+1"
+
+[[Libgcrypt_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll", "Pkg"]
+git-tree-sha1 = "64613c82a59c120435c067c2b809fc61cf5166ae"
+uuid = "d4300ac3-e22c-5743-9152-c294e39db1e4"
+version = "1.8.7+0"
+
+[[Libglvnd_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll", "Xorg_libXext_jll"]
+git-tree-sha1 = "7739f837d6447403596a75d19ed01fd08d6f56bf"
+uuid = "7e76a0d4-f3c7-5321-8279-8d96eeed0f29"
+version = "1.3.0+3"
+
+[[Libgpg_error_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "c333716e46366857753e273ce6a69ee0945a6db9"
+uuid = "7add5ba3-2f88-524e-9cd5-f83b8a55f7b8"
+version = "1.42.0+0"
+
+[[Libiconv_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "42b62845d70a619f063a7da093d995ec8e15e778"
+uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531"
+version = "1.16.1+1"
+
+[[Libmount_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "9c30530bf0effd46e15e0fdcf2b8636e78cbbd73"
+uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9"
+version = "2.35.0+0"
+
+[[Libtiff_jll]]
+deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"]
+git-tree-sha1 = "340e257aada13f95f98ee352d316c3bed37c8ab9"
+uuid = "89763e89-9b03-5906-acba-b20f662cd828"
+version = "4.3.0+0"
+
+[[Libuuid_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "7f3efec06033682db852f8b3bc3c1d2b0a0ab066"
+uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700"
+version = "2.36.0+0"
+
+[[LinearAlgebra]]
+deps = ["Libdl", "libblastrampoline_jll"]
+uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+
+[[LogExpFunctions]]
+deps = ["ChainRulesCore", "DocStringExtensions", "IrrationalConstants", "LinearAlgebra"]
+git-tree-sha1 = "34dc30f868e368f8a17b728a1238f3fcda43931a"
+uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
+version = "0.3.3"
+
+[[Logging]]
+uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
+
+[[MacroTools]]
+deps = ["Markdown", "Random"]
+git-tree-sha1 = "5a5bc6bf062f0f95e62d0fe0a2d99699fed82dd9"
+uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
+version = "0.5.8"
+
+[[Markdown]]
+deps = ["Base64"]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+
+[[MbedTLS]]
+deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"]
+git-tree-sha1 = "1c38e51c3d08ef2278062ebceade0e46cefc96fe"
+uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
+version = "1.0.3"
+
+[[MbedTLS_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
+
+[[Measures]]
+git-tree-sha1 = "e498ddeee6f9fdb4551ce855a46f54dbd900245f"
+uuid = "442fdcdd-2543-5da2-b0f3-8c86c306513e"
+version = "0.3.1"
+
+[[Missings]]
+deps = ["DataAPI"]
+git-tree-sha1 = "bf210ce90b6c9eed32d25dbcae1ebc565df2687f"
+uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28"
+version = "1.0.2"
+
+[[Mmap]]
+uuid = "a63ad114-7e13-5084-954f-fe012c677804"
+
+[[MozillaCACerts_jll]]
+uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
+
+[[NaNMath]]
+git-tree-sha1 = "bfe47e760d60b82b66b61d2d44128b62e3a369fb"
+uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
+version = "0.3.5"
+
+[[NetworkOptions]]
+uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
+
+[[Ogg_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "887579a3eb005446d514ab7aeac5d1d027658b8f"
+uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051"
+version = "1.3.5+1"
+
+[[OpenBLAS_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
+uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
+
+[[OpenSSL_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "15003dcb7d8db3c6c857fda14891a539a8f2705a"
+uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
+version = "1.1.10+0"
+
+[[Opus_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "51a08fb14ec28da2ec7a927c4337e4332c2a4720"
+uuid = "91d4177d-7536-5919-b921-800302f37372"
+version = "1.3.2+0"
+
+[[OrderedCollections]]
+git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c"
+uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
+version = "1.4.1"
+
+[[PCRE_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "b2a7af664e098055a7529ad1a900ded962bca488"
+uuid = "2f80f16e-611a-54ab-bc61-aa92de5b98fc"
+version = "8.44.0+0"
+
+[[Parsers]]
+deps = ["Dates"]
+git-tree-sha1 = "98f59ff3639b3d9485a03a72f3ab35bab9465720"
+uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
+version = "2.0.6"
+
+[[Pixman_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "b4f5d02549a10e20780a24fce72bea96b6329e29"
+uuid = "30392449-352a-5448-841d-b1acce4e97dc"
+version = "0.40.1+0"
+
+[[Pkg]]
+deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
+uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+
+[[PlotThemes]]
+deps = ["PlotUtils", "Requires", "Statistics"]
+git-tree-sha1 = "a3a964ce9dc7898193536002a6dd892b1b5a6f1d"
+uuid = "ccf2f8ad-2431-5c83-bf29-c5338b663b6a"
+version = "2.0.1"
+
+[[PlotUtils]]
+deps = ["ColorSchemes", "Colors", "Dates", "Printf", "Random", "Reexport", "Statistics"]
+git-tree-sha1 = "b084324b4af5a438cd63619fd006614b3b20b87b"
+uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043"
+version = "1.0.15"
+
+[[Plots]]
+deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs"]
+git-tree-sha1 = "ba43b248a1f04a9667ca4a9f782321d9211aa68e"
+uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
+version = "1.22.6"
+
+[[PlutoUI]]
+deps = ["Base64", "Dates", "Hyperscript", "HypertextLiteral", "IOCapture", "InteractiveUtils", "JSON", "Logging", "Markdown", "Random", "Reexport", "UUIDs"]
+git-tree-sha1 = "4c8a7d080daca18545c56f1cac28710c362478f3"
+uuid = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
+version = "0.7.16"
+
+[[Preferences]]
+deps = ["TOML"]
+git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a"
+uuid = "21216c6a-2e73-6563-6e65-726566657250"
+version = "1.2.2"
+
+[[Printf]]
+deps = ["Unicode"]
+uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[[ProgressLogging]]
+deps = ["Logging", "SHA", "UUIDs"]
+git-tree-sha1 = "80d919dee55b9c50e8d9e2da5eeafff3fe58b539"
+uuid = "33c8b6b6-d38a-422a-b730-caa89a2f386c"
+version = "0.1.4"
+
+[[Qt5Base_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "xkbcommon_jll"]
+git-tree-sha1 = "ad368663a5e20dbb8d6dc2fddeefe4dae0781ae8"
+uuid = "ea2cea3b-5b76-57ae-a6ef-0a8af62496e1"
+version = "5.15.3+0"
+
+[[REPL]]
+deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
+uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+
+[[Random]]
+deps = ["SHA", "Serialization"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[RecipesBase]]
+git-tree-sha1 = "44a75aa7a527910ee3d1751d1f0e4148698add9e"
+uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
+version = "1.1.2"
+
+[[RecipesPipeline]]
+deps = ["Dates", "NaNMath", "PlotUtils", "RecipesBase"]
+git-tree-sha1 = "7ad0dfa8d03b7bcf8c597f59f5292801730c55b8"
+uuid = "01d81517-befc-4cb6-b9ec-a95719d0359c"
+version = "0.4.1"
+
+[[Reexport]]
+git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b"
+uuid = "189a3867-3050-52da-a836-e630ba90ab69"
+version = "1.2.2"
+
+[[Requires]]
+deps = ["UUIDs"]
+git-tree-sha1 = "4036a3bd08ac7e968e27c203d45f5fff15020621"
+uuid = "ae029012-a4dd-5104-9daa-d747884805df"
+version = "1.1.3"
+
+[[SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+
+[[Scratch]]
+deps = ["Dates"]
+git-tree-sha1 = "0b4b7f1393cff97c33891da2a0bf69c6ed241fda"
+uuid = "6c6a2e73-6563-6170-7368-637461726353"
+version = "1.1.0"
+
+[[Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[SharedArrays]]
+deps = ["Distributed", "Mmap", "Random", "Serialization"]
+uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
+
+[[Showoff]]
+deps = ["Dates", "Grisu"]
+git-tree-sha1 = "91eddf657aca81df9ae6ceb20b959ae5653ad1de"
+uuid = "992d4aef-0814-514b-bc4d-f2e9a6c4116f"
+version = "1.0.3"
+
+[[Sockets]]
+uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
+
+[[SortingAlgorithms]]
+deps = ["DataStructures"]
+git-tree-sha1 = "b3363d7460f7d098ca0912c69b082f75625d7508"
+uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c"
+version = "1.0.1"
+
+[[SparseArrays]]
+deps = ["LinearAlgebra", "Random"]
+uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[[StaticArrays]]
+deps = ["LinearAlgebra", "Random", "Statistics"]
+git-tree-sha1 = "3c76dde64d03699e074ac02eb2e8ba8254d428da"
+uuid = "90137ffa-7385-5640-81b9-e52037218182"
+version = "1.2.13"
+
+[[Statistics]]
+deps = ["LinearAlgebra", "SparseArrays"]
+uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+
+[[StatsAPI]]
+git-tree-sha1 = "1958272568dc176a1d881acb797beb909c785510"
+uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0"
+version = "1.0.0"
+
+[[StatsBase]]
+deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
+git-tree-sha1 = "eb35dcc66558b2dda84079b9a1be17557d32091a"
+uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
+version = "0.33.12"
+
+[[StructArrays]]
+deps = ["Adapt", "DataAPI", "StaticArrays", "Tables"]
+git-tree-sha1 = "2ce41e0d042c60ecd131e9fb7154a3bfadbf50d3"
+uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
+version = "0.6.3"
+
+[[TOML]]
+deps = ["Dates"]
+uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
+
+[[TableTraits]]
+deps = ["IteratorInterfaceExtensions"]
+git-tree-sha1 = "c06b2f539df1c6efa794486abfb6ed2022561a39"
+uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c"
+version = "1.0.1"
+
+[[Tables]]
+deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"]
+git-tree-sha1 = "fed34d0e71b91734bf0a7e10eb1bb05296ddbcd0"
+uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
+version = "1.6.0"
+
+[[Tar]]
+deps = ["ArgTools", "SHA"]
+uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
+
+[[Test]]
+deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
+uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[[URIs]]
+git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355"
+uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
+version = "1.3.0"
+
+[[UUIDs]]
+deps = ["Random", "SHA"]
+uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
+[[Unicode]]
+uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
+
+[[Wayland_jll]]
+deps = ["Artifacts", "Expat_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg", "XML2_jll"]
+git-tree-sha1 = "3e61f0b86f90dacb0bc0e73a0c5a83f6a8636e23"
+uuid = "a2964d1f-97da-50d4-b82a-358c7fce9d89"
+version = "1.19.0+0"
+
+[[Wayland_protocols_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Wayland_jll"]
+git-tree-sha1 = "2839f1c1296940218e35df0bbb220f2a79686670"
+uuid = "2381bf8a-dfd0-557d-9999-79630e7b1b91"
+version = "1.18.0+4"
+
+[[XML2_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"]
+git-tree-sha1 = "1acf5bdf07aa0907e0a37d3718bb88d4b687b74a"
+uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a"
+version = "2.9.12+0"
+
+[[XSLT_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Libgpg_error_jll", "Libiconv_jll", "Pkg", "XML2_jll", "Zlib_jll"]
+git-tree-sha1 = "91844873c4085240b95e795f692c4cec4d805f8a"
+uuid = "aed1982a-8fda-507f-9586-7b0439959a61"
+version = "1.1.34+0"
+
+[[Xorg_libX11_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll", "Xorg_xtrans_jll"]
+git-tree-sha1 = "5be649d550f3f4b95308bf0183b82e2582876527"
+uuid = "4f6342f7-b3d2-589e-9d20-edeb45f2b2bc"
+version = "1.6.9+4"
+
+[[Xorg_libXau_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "4e490d5c960c314f33885790ed410ff3a94ce67e"
+uuid = "0c0b7dd1-d40b-584c-a123-a41640f87eec"
+version = "1.0.9+4"
+
+[[Xorg_libXcursor_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXfixes_jll", "Xorg_libXrender_jll"]
+git-tree-sha1 = "12e0eb3bc634fa2080c1c37fccf56f7c22989afd"
+uuid = "935fb764-8cf2-53bf-bb30-45bb1f8bf724"
+version = "1.2.0+4"
+
+[[Xorg_libXdmcp_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "4fe47bd2247248125c428978740e18a681372dd4"
+uuid = "a3789734-cfe1-5b06-b2d0-1dd0d9d62d05"
+version = "1.1.3+4"
+
+[[Xorg_libXext_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"]
+git-tree-sha1 = "b7c0aa8c376b31e4852b360222848637f481f8c3"
+uuid = "1082639a-0dae-5f34-9b06-72781eeb8cb3"
+version = "1.3.4+4"
+
+[[Xorg_libXfixes_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"]
+git-tree-sha1 = "0e0dc7431e7a0587559f9294aeec269471c991a4"
+uuid = "d091e8ba-531a-589c-9de9-94069b037ed8"
+version = "5.0.3+4"
+
+[[Xorg_libXi_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll", "Xorg_libXfixes_jll"]
+git-tree-sha1 = "89b52bc2160aadc84d707093930ef0bffa641246"
+uuid = "a51aa0fd-4e3c-5386-b890-e753decda492"
+version = "1.7.10+4"
+
+[[Xorg_libXinerama_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll"]
+git-tree-sha1 = "26be8b1c342929259317d8b9f7b53bf2bb73b123"
+uuid = "d1454406-59df-5ea1-beac-c340f2130bc3"
+version = "1.1.4+4"
+
+[[Xorg_libXrandr_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll"]
+git-tree-sha1 = "34cea83cb726fb58f325887bf0612c6b3fb17631"
+uuid = "ec84b674-ba8e-5d96-8ba1-2a689ba10484"
+version = "1.5.2+4"
+
+[[Xorg_libXrender_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"]
+git-tree-sha1 = "19560f30fd49f4d4efbe7002a1037f8c43d43b96"
+uuid = "ea2f1a96-1ddc-540d-b46f-429655e07cfa"
+version = "0.9.10+4"
+
+[[Xorg_libpthread_stubs_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "6783737e45d3c59a4a4c4091f5f88cdcf0908cbb"
+uuid = "14d82f49-176c-5ed1-bb49-ad3f5cbd8c74"
+version = "0.1.0+3"
+
+[[Xorg_libxcb_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "XSLT_jll", "Xorg_libXau_jll", "Xorg_libXdmcp_jll", "Xorg_libpthread_stubs_jll"]
+git-tree-sha1 = "daf17f441228e7a3833846cd048892861cff16d6"
+uuid = "c7cfdc94-dc32-55de-ac96-5a1b8d977c5b"
+version = "1.13.0+3"
+
+[[Xorg_libxkbfile_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"]
+git-tree-sha1 = "926af861744212db0eb001d9e40b5d16292080b2"
+uuid = "cc61e674-0454-545c-8b26-ed2c68acab7a"
+version = "1.1.0+4"
+
+[[Xorg_xcb_util_image_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"]
+git-tree-sha1 = "0fab0a40349ba1cba2c1da699243396ff8e94b97"
+uuid = "12413925-8142-5f55-bb0e-6d7ca50bb09b"
+version = "0.4.0+1"
+
+[[Xorg_xcb_util_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll"]
+git-tree-sha1 = "e7fd7b2881fa2eaa72717420894d3938177862d1"
+uuid = "2def613f-5ad1-5310-b15b-b15d46f528f5"
+version = "0.4.0+1"
+
+[[Xorg_xcb_util_keysyms_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"]
+git-tree-sha1 = "d1151e2c45a544f32441a567d1690e701ec89b00"
+uuid = "975044d2-76e6-5fbe-bf08-97ce7c6574c7"
+version = "0.4.0+1"
+
+[[Xorg_xcb_util_renderutil_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"]
+git-tree-sha1 = "dfd7a8f38d4613b6a575253b3174dd991ca6183e"
+uuid = "0d47668e-0667-5a69-a72c-f761630bfb7e"
+version = "0.3.9+1"
+
+[[Xorg_xcb_util_wm_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"]
+git-tree-sha1 = "e78d10aab01a4a154142c5006ed44fd9e8e31b67"
+uuid = "c22f9ab0-d5fe-5066-847c-f4bb1cd4e361"
+version = "0.4.1+1"
+
+[[Xorg_xkbcomp_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxkbfile_jll"]
+git-tree-sha1 = "4bcbf660f6c2e714f87e960a171b119d06ee163b"
+uuid = "35661453-b289-5fab-8a00-3d9160c6a3a4"
+version = "1.4.2+4"
+
+[[Xorg_xkeyboard_config_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xkbcomp_jll"]
+git-tree-sha1 = "5c8424f8a67c3f2209646d4425f3d415fee5931d"
+uuid = "33bec58e-1273-512f-9401-5d533626f822"
+version = "2.27.0+4"
+
+[[Xorg_xtrans_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "79c31e7844f6ecf779705fbc12146eb190b7d845"
+uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10"
+version = "1.4.0+3"
+
+[[Zlib_jll]]
+deps = ["Libdl"]
+uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
+
+[[Zstd_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "cc4bf3fdde8b7e3e9fa0351bdeedba1cf3b7f6e6"
+uuid = "3161d3a3-bdf6-5164-811a-617609db77b4"
+version = "1.5.0+0"
+
+[[libass_jll]]
+deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "HarfBuzz_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]
+git-tree-sha1 = "5982a94fcba20f02f42ace44b9894ee2b140fe47"
+uuid = "0ac62f75-1d6f-5e53-bd7c-93b484bb37c0"
+version = "0.15.1+0"
+
+[[libblastrampoline_jll]]
+deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
+uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
+
+[[libfdk_aac_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "daacc84a041563f965be61859a36e17c4e4fcd55"
+uuid = "f638f0a6-7fb0-5443-88ba-1cc74229b280"
+version = "2.0.2+0"
+
+[[libpng_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]
+git-tree-sha1 = "94d180a6d2b5e55e447e2d27a29ed04fe79eb30c"
+uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f"
+version = "1.6.38+0"
+
+[[libvorbis_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"]
+git-tree-sha1 = "c45f4e40e7aafe9d086379e5578947ec8b95a8fb"
+uuid = "f27f6e37-5d2b-51aa-960f-b287f2bc3b7a"
+version = "1.3.7+0"
+
+[[nghttp2_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
+
+[[p7zip_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
+
+[[x264_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "4fea590b89e6ec504593146bf8b988b2c00922b2"
+uuid = "1270edf5-f2f9-52d2-97e9-ab00b5d0237a"
+version = "2021.5.5+0"
+
+[[x265_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "ee567a171cce03570d77ad3a43e90218e38937a9"
+uuid = "dfaa095f-4041-5dcd-9319-2fabd8486b76"
+version = "3.5.0+0"
+
+[[xkbcommon_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Wayland_jll", "Wayland_protocols_jll", "Xorg_libxcb_jll", "Xorg_xkeyboard_config_jll"]
+git-tree-sha1 = "ece2350174195bb31de1a63bea3a41ae1aa593b6"
+uuid = "d8fb68d0-12a3-5cfd-a85a-d49703b185fd"
+version = "0.9.1+5"
+"""
+
+# ╔═╡ Cell order:
+# ╠═24c5d164-b618-4e05-abe9-62d129c0b55f
+# ╠═ecc81850-8d79-4b6f-83c8-f2c9bcda23b3
+# ╠═2e7dac1a-ef0d-4b76-a33a-9510b064c25c
+# ╠═3599eb82-0003-11eb-3814-dfd0f5737846
+# ╠═eebe1108-588a-4e81-a69c-f2c21e9cbbaa
+# ╠═54d5c34e-63b5-4b52-91fe-a5fd1b729182
+# ╠═0248c2de-7edf-4ff6-a450-9f6d79f8966d
+# ╟─196080df-e8c0-4120-a97c-443cf66295ff
+# ╠═a22411c8-24e0-4a80-9b91-bc1f0999cc3c
+# ╠═091d33fe-fffe-11ea-131f-01f4248b30ea
+# ╠═dd183c9d-c070-43bc-95ff-cf64ba27071e
+# ╠═5f8496cb-d29e-4c4c-b378-1173242c7a78
+# ╠═a93ac790-7a04-418d-8117-01f01e4608c8
+# ╟─88f87c39-89ef-4492-92ae-c6cd33699c59
+# ╠═2d01cdaa-fffe-11ea-09f5-63527a1b0f87
+# ╠═2883b3d8-fffe-11ea-0a0f-bbd85ec665ea
+# ╠═2fbbb413-213f-4556-b5f9-df7cf6331451
+# ╠═449541e2-351d-41d2-9623-34d243fe6a97
+# ╠═0e823733-4668-47db-8d17-f079b7ed8c75
+# ╠═dfcf652e-ca15-43ad-8307-d40367de6986
+# ╠═5d023cd2-4fe6-4bd0-9a54-7512f52b7916
+# ╟─e5f2703b-198c-4926-867e-7f914fa10253
+# ╠═b52f7e61-c6b5-46ae-8025-d2b4649fed99
+# ╠═52b8c0be-64f7-4950-ab4a-983c6fa50d1a
+# ╠═504dfdc1-41da-4fcb-ba8e-aa69643d57a1
+# ╠═6a7824d0-06e4-4569-9fa8-b9884d299f80
+# ╟─7c7b11a2-69cf-4cd5-b9e5-f2517211579f
+# ╠═d48fb1c0-b88a-4a23-8a87-7fdcd74bf3cc
+# ╠═890b8d1d-1bf0-4497-ac64-9852f68e1577
+# ╠═6355afae-d4ad-40f4-9917-3f228a63ddaa
+# ╠═70fc79bb-6118-4a0d-ac6e-fbdf1ba9722a
+# ╟─d1a1bca1-d01a-4722-8bd9-b759b8ef72d4
+# ╟─4ca5f24f-3139-4dee-a28a-007c936c7363
+# ╠═25bca319-2b63-4013-88be-7607eff3630f
+# ╠═2ade9e4d-11cc-47ae-aaa6-76864757bd21
+# ╟─37108eb9-77db-49fa-b168-f9c1c25955fa
+# ╠═0bf3e7bd-1da7-441a-9807-6c9473944048
+# ╟─cd6c50f6-16d6-4a07-8f20-7450392cd643
+# ╠═9cc753a0-f8be-4045-a432-295a05388a4a
+# ╠═1a088b03-ac41-440b-8c82-bd5760590665
+# ╠═0c9de395-19a9-4ec3-a918-ea3f9835ef18
+# ╟─00000000-0000-0000-0000-000000000001
+# ╟─00000000-0000-0000-0000-000000000002
diff --git a/src/Pluto.jl b/src/Pluto.jl
index a62dd86d6a..c1a209276b 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -23,6 +23,7 @@ include("./notebook/Export.jl")
 include("./Configuration.jl")
 
 include("./evaluation/Tokens.jl")
+include("./evaluation/Throttled.jl")
 include("./runner/PlutoRunner.jl")
 include("./analysis/ExpressionExplorer.jl")
 include("./analysis/FunctionDependencies.jl")
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index aa3cd8a794..d0dc39a2f3 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -99,9 +99,12 @@ function run_reactive!(session::ServerSession, notebook::Notebook, old_topology:
     local any_interrupted = false
     for (i, cell) in enumerate(to_run)
 
-        cell.queued = false
-        cell.running = true
-        send_notebook_changes_throttled()
+		cell.queued = false
+		cell.running = true
+		# Important to not use empty! here because AppendonlyMarker requires a new array identity.
+		# Eventually we could even make AppendonlyArray to enforce this but idk if it's worth it. yadiyadi.
+		cell.logs = []
+		send_notebook_changes_throttled()
 
         if any_interrupted || notebook.wants_to_interrupt
             relay_reactivity_error!(cell, InterruptException())
@@ -563,54 +566,3 @@ function update_from_file(session::ServerSession, notebook::Notebook; kwargs...)
 	
 	return true
 end
-
-
-
-"""
-throttled(f::Function, timeout::Real)
-
-Return a function that when invoked, will only be triggered at most once
-during `timeout` seconds.
-The throttled function will run as much as it can, without ever
-going more than once per `wait` duration.
-
-This throttle is 'leading' and has some other properties that are specifically designed for our use in Pluto, see the tests.
-
-Inspired by FluxML
-See: https://github.com/FluxML/Flux.jl/blob/8afedcd6723112ff611555e350a8c84f4e1ad686/src/utils.jl#L662
-"""
-function throttled(f::Function, timeout::Real)
-    tlock = ReentrantLock()
-    iscoolnow = Ref(false)
-    run_later = Ref(false)
-
-    function flush()
-        lock(tlock) do
-            run_later[] = false
-            f()
-        end
-    end
-
-    function schedule()
-        @async begin
-            sleep(timeout)
-            if run_later[]
-                flush()
-            end
-            iscoolnow[] = true
-        end
-    end
-    schedule()
-
-    function throttled_f()
-        if iscoolnow[]
-            iscoolnow[] = false
-            flush()
-            schedule()
-        else
-            run_later[] = true
-        end
-    end
-
-    return throttled_f, flush
-end
diff --git a/src/evaluation/Throttled.jl b/src/evaluation/Throttled.jl
new file mode 100644
index 0000000000..7c99af546e
--- /dev/null
+++ b/src/evaluation/Throttled.jl
@@ -0,0 +1,49 @@
+
+"""
+throttled(f::Function, timeout::Real)
+
+Return a function that when invoked, will only be triggered at most once
+during `timeout` seconds.
+The throttled function will run as much as it can, without ever
+going more than once per `wait` duration.
+
+This throttle is 'leading' and has some other properties that are specifically designed for our use in Pluto, see the tests.
+
+Inspired by FluxML
+See: https://github.com/FluxML/Flux.jl/blob/8afedcd6723112ff611555e350a8c84f4e1ad686/src/utils.jl#L662
+"""
+function throttled(f::Function, timeout::Real)
+    tlock = ReentrantLock()
+    iscoolnow = Ref(false)
+    run_later = Ref(false)
+
+    function flush()
+        lock(tlock) do
+            run_later[] = false
+            f()
+        end
+    end
+
+    function schedule()
+        @async begin
+            sleep(timeout)
+            if run_later[]
+                flush()
+            end
+            iscoolnow[] = true
+        end
+    end
+    schedule()
+
+    function throttled_f()
+        if iscoolnow[]
+            iscoolnow[] = false
+            flush()
+            schedule()
+        else
+            run_later[] = true
+        end
+    end
+
+    return throttled_f, flush
+end
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 9489c33534..c2313126ae 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -127,10 +127,44 @@ function start_relaying_self_updates((session, notebook)::SN, run_channel::Distr
 end
 
 function start_relaying_logs((session, notebook)::SN, log_channel::Distributed.RemoteChannel)
+    update_throttled, flush_throttled = Pluto.throttled(0.1) do 
+        Pluto.send_notebook_changes!(Pluto.ClientRequest(session=session, notebook=notebook))
+    end
+    
     while true
         try
-            next_log = take!(log_channel)
-            putnotebookupdates!(session, notebook, UpdateMessage(:log, next_log, notebook))
+            next_log::Dict{String,Any} = take!(log_channel)
+
+            fn = next_log["file"]
+            match = findfirst("#==#", fn)
+            
+            # We always show the log at the currently running cell, which is given by
+            running_cell_id = UUID(next_log["cell_id"])
+            running_cell = notebook.cells_dict[running_cell_id]
+            
+            # Some logs originate from outside of the running code, through function calls. Some code here to deal with that:
+            begin
+                source_cell_id = if match !== nothing
+                    # the log originated from within the notebook
+                    
+                    UUID(fn[findfirst("#==#", fn)[end]+1:end])
+                else
+                    # the log originated from a function call defined outside of the notebook
+                    
+                    # we will show the log at the currently running cell, at "line -1", i.e. without line info.
+                    next_log["line"] = -1
+                    UUID(next_log["cell_id"])
+                end
+                
+                if running_cell_id != source_cell_id
+                    # the log originated from a function in another cell of the notebook
+                    # we will show the log at the currently running cell, at "line -1", i.e. without line info.
+                    next_log["line"] = -1
+                end
+            end
+
+            push!(running_cell.logs, next_log)
+            Pluto.@asynclog update_throttled()
         catch e
             if !isopen(log_channel)
                 break
diff --git a/src/notebook/Cell.jl b/src/notebook/Cell.jl
index b9240167b5..f8b7212657 100644
--- a/src/notebook/Cell.jl
+++ b/src/notebook/Cell.jl
@@ -36,6 +36,8 @@ Base.@kwdef mutable struct Cell
 
     published_objects::Dict{String,Any}=Dict{String,Any}()
     
+    logs::Vector{Dict{String,Any}}=Vector{Dict{String,Any}}()
+    
     errored::Bool=false
     runtime::Union{Nothing,UInt64}=nothing
 
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 57534f7f63..a721624ac4 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1983,19 +1983,27 @@ function Logging.shouldlog(::PlutoLogger, level, _module, _...)
     # - Info level and above for other modules
     (_module isa Module && is_pluto_workspace(_module)) || convert(Logging.LogLevel, level) >= Logging.Info
 end
+
 Logging.min_enabled_level(::PlutoLogger) = Logging.Debug
 Logging.catch_exceptions(::PlutoLogger) = false
 function Logging.handle_message(::PlutoLogger, level, msg, _module, group, id, file, line; kwargs...)
+    # println("receiving msg from ", _module, " ", group, " ", id, " ", msg, " ", level, " ", line, " ", file)
+
     try
-        put!(log_channel, (level=string(level),
-            msg=(msg isa String) ? msg : repr(msg),
-            group=group,
-            # id=id,
-            file=file,
-            line=line,
-            kwargs=Dict((k=>repr(v) for (k, v) in kwargs)...),))
-        # also print to console
-        Logging.handle_message(old_logger[], level, msg, _module, group, id, file, line; kwargs...)
+        put!(log_channel, Dict{String,Any}(
+            "level" => string(level),
+            "msg" => format_output_default(msg isa String ? Text(msg) : msg),
+            "group" => group,
+            "id" => id,
+            "file" => file,
+            "cell_id" => currently_running_cell_id[],
+            "line" => line,
+            "kwargs" => Any[(string(k), format_output_default(v)) for (k, v) in kwargs],
+            )
+        )
+        
+        # Also print to console (disabled)
+        # Logging.handle_message(old_logger[], level, msg, _module, group, id, file, line; kwargs...)
     catch e
         println(stderr, "Failed to relay log from PlutoRunner")
         showerror(stderr, e, stacktrace(catch_backtrace()))
diff --git a/src/webserver/AppendonlyMarkers.jl b/src/webserver/AppendonlyMarkers.jl
new file mode 100644
index 0000000000..3f4b8532dc
--- /dev/null
+++ b/src/webserver/AppendonlyMarkers.jl
@@ -0,0 +1,178 @@
+### A Pluto.jl notebook ###
+# v0.17.5
+
+using Markdown
+using InteractiveUtils
+
+# ╔═╡ 273c7c85-8178-44a7-99f0-581754aeb8c8
+begin
+	"""
+	Mark a vector as being append-only: let Firebasey know that it can diff this array simply by comparing lengths, without looking at its contents.
+
+	It was made specifically for logs: Logs are always appended, OR the whole log stream is reset. AppendonlyMarker is like SubArray (a view into another array) except we agree to only ever append to the source array. This way, firebase can just look at the index and diff based on that.
+	"""
+	struct AppendonlyMarker{T} <: AbstractVector{T}
+		mutable_source::Vector{T}
+		length_at_time_of_creation::Int
+	end
+	AppendonlyMarker(arr) = AppendonlyMarker(arr, length(arr))
+	
+	# Poor mans vector-proxy
+	# I think this is enough for Pluto to show, and for msgpack to pack
+	function Base.size(arr::AppendonlyMarker)
+		return (arr.length_at_time_of_creation,)
+	end
+	Base.getindex(arr::AppendonlyMarker, index::Int) = arr.mutable_source[index]
+	Base.iterate(arr::AppendonlyMarker, args...) = Base.iterate(arr.mutable_source, args...)
+end
+
+# ╔═╡ 183cef1f-bfe9-42cd-8239-49e9ed00a7b6
+md"""
+## AppendonlyMarker(s)
+
+Example of how to solve performance problems with Firebasey:
+We make a new type with a specific diff function.
+It might be very specific per problem, but that's fine for performance problems (I think).
+It also keeps the performance solutions as separate modules/packages to whatever it is you're actually modeling.
+"""
+
+# ╔═╡ 971709de-074e-49cf-8bd4-9c675b037dfd
+md"## `@skip_as_script`"
+
+# ╔═╡ 9fce9aa9-d3c6-4134-9692-8a8756fa3cff
+function is_inside_pluto(m::Module)
+	if isdefined(m, :PlutoForceDisplay)
+		return m.PlutoForceDisplay
+	else
+		isdefined(m, :PlutoRunner) && parentmodule(m) == Main
+	end
+end
+
+# ╔═╡ db9167c4-7ba7-42e1-949b-0ad18e2d7b25
+"""
+	@skip_as_script expression
+
+Marks a expression as Pluto-only, which means that it won't be executed when running outside Pluto. Do not use this for your own projects.
+"""
+macro skip_as_script(ex)
+	if is_inside_pluto(__module__)
+		esc(ex)
+	else
+		nothing
+	end
+end
+
+# ╔═╡ 35d3bcd7-af51-466a-b4c4-cc055e74d01d
+@skip_as_script appendonly_1, appendonly_2 = let
+	array_1 = [1,2,3,4]
+	appendonly_1 = AppendonlyMarker(array_1)
+	push!(array_1, 5)
+	appendonly_2 = AppendonlyMarker(array_1)
+
+	appendonly_1, appendonly_2
+end;
+
+# ╔═╡ 1017f6cc-58ac-4c7b-a6d0-a03f5e387f1b
+@skip_as_script appendonly_1_large, appendonly_2_large = let
+	large_array_1 = [
+		Dict{String,Any}(
+			"x" => 1,
+			"y" => [1,2,3,4],
+			"z" => "hi",
+		)
+		for i in 1:10000
+	];
+	appendonly_1 = AppendonlyMarker(large_array_1)
+	push!(large_array_1, Dict("x" => 5))
+	appendonly_2 = AppendonlyMarker(large_array_1)
+
+	appendonly_1, appendonly_2
+end;
+
+# ╔═╡ 33facb62-af28-4e94-946d-545637f320e9
+"The opposite of `@skip_as_script`"
+macro only_as_script(ex) is_inside_pluto(__module__) ? nothing : esc(ex) end
+
+# ╔═╡ 092c4b11-8b75-446f-b3ad-01fa858daebb
+# Only define this in Pluto - assume we are `using Test` otherwise
+begin
+	@skip_as_script begin
+		import Pkg
+		Pkg.activate(mktempdir())
+		Pkg.add(Pkg.PackageSpec(name="PlutoTest"))
+		using PlutoTest
+	end
+	# Do nothing inside pluto (so we don't need to have Test as dependency)
+	# test/Firebasey is `using Test` before including this file
+	@only_as_script begin
+		if !isdefined(@__MODULE__, Symbol("@test"))
+			macro test(e...) nothing; end
+			macro test_throws(e...) nothing; end
+			macro test_broken(e...) nothing; end
+			macro testset(e...) nothing; end
+		end
+	end
+end
+
+# ╔═╡ 06492e8d-4500-4efe-80ee-55bf1ee2348c
+@skip_as_script @test length([AppendonlyMarker([1,2,3])...]) == 3
+
+# ╔═╡ 2284ae12-5b8c-4542-81fa-c4d34f2483e7
+@skip_as_script @test length([AppendonlyMarker([1,2,3], 1)...]) == 1
+
+# ╔═╡ dc5cd268-9cfb-49bf-87fb-5b7db4fa6e3c
+md"## Import Firebasey when running inside notebook"
+
+# ╔═╡ 0c2f23d8-8e98-47b7-9c4f-5daa70a6c7fb
+# OH how I wish I would put in the time to refactor with fromFile or SOEMTGHINLAS LDKJ JULIA WHY ARE YOU LIKE THIS GROW UP
+@skip_as_script Firebasey = let
+	wrapper_module = Module()
+	Core.eval(wrapper_module, :(module Firebasey
+			include("Firebasey.jl")
+		end
+	))
+	wrapper_module.Firebasey
+end
+
+# ╔═╡ 2903d17e-c6fd-4cea-8585-4db26a00b0e7
+function Firebasey.diff(a::AppendonlyMarker, b::AppendonlyMarker)
+	if a.mutable_source !== b.mutable_source
+		[Firebasey.ReplacePatch([], b)]
+	else
+		if a.length_at_time_of_creation > b.length_at_time_of_creation
+			throw(ErrorException("Not really supposed to diff AppendonlyMarker with the original being longer than the next version (you know, 'append only' and al)"))
+		end
+		
+		map(a.length_at_time_of_creation+1:b.length_at_time_of_creation) do index
+			Firebasey.AddPatch([index], b.mutable_source[index])
+		end
+	end
+end
+
+# ╔═╡ 8537488d-2ff9-42b7-8bfc-72d43fca713f
+@skip_as_script @test array_diff(appendonly_1, appendonly_2) == [Firebasey.AddPatch([5], 5)]
+
+# ╔═╡ 70179239-357a-424d-bac3-3a1431aff536
+var"@track" = Firebasey.var"@track"
+
+# ╔═╡ 37fe8c10-09f0-4f72-8cfd-9ce044c78c13
+@skip_as_script @track for _ in 1:1000 array_diff(appendonly_1_large, appendonly_2_large) end
+
+# ╔═╡ Cell order:
+# ╟─183cef1f-bfe9-42cd-8239-49e9ed00a7b6
+# ╠═273c7c85-8178-44a7-99f0-581754aeb8c8
+# ╠═2903d17e-c6fd-4cea-8585-4db26a00b0e7
+# ╠═35d3bcd7-af51-466a-b4c4-cc055e74d01d
+# ╠═1017f6cc-58ac-4c7b-a6d0-a03f5e387f1b
+# ╠═06492e8d-4500-4efe-80ee-55bf1ee2348c
+# ╠═2284ae12-5b8c-4542-81fa-c4d34f2483e7
+# ╠═8537488d-2ff9-42b7-8bfc-72d43fca713f
+# ╠═37fe8c10-09f0-4f72-8cfd-9ce044c78c13
+# ╟─971709de-074e-49cf-8bd4-9c675b037dfd
+# ╟─9fce9aa9-d3c6-4134-9692-8a8756fa3cff
+# ╟─db9167c4-7ba7-42e1-949b-0ad18e2d7b25
+# ╟─33facb62-af28-4e94-946d-545637f320e9
+# ╟─dc5cd268-9cfb-49bf-87fb-5b7db4fa6e3c
+# ╠═0c2f23d8-8e98-47b7-9c4f-5daa70a6c7fb
+# ╠═70179239-357a-424d-bac3-3a1431aff536
+# ╠═092c4b11-8b75-446f-b3ad-01fa858daebb
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index e82cb17134..a351100b27 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -78,6 +78,11 @@ Besides `:update_notebook`, you will find more functions in [`responses`](@ref)
 
 """
 module Firebasey include("./Firebasey.jl") end
+module AppendonlyMarkers
+    # I put Firebasey here manually THANKS JULIA
+    import ..Firebasey
+    include("./AppendonlyMarkers.jl")
+end
 
 # All of the arrays in the notebook_to_js object are 'immutable' (we write code as if they are), so we can enable this optimization:
 Firebasey.use_triple_equals_for_arrays[] = true
@@ -138,6 +143,7 @@ function notebook_to_js(notebook::Notebook)
                 "running" => cell.running,
                 "errored" => cell.errored,
                 "runtime" => cell.runtime,
+                "logs" => AppendonlyMarkers.AppendonlyMarker(cell.logs),
             )
         for (id, cell) in notebook.cells_dict),
         "cell_order" => notebook.cell_order,
diff --git a/src/webserver/Firebasey.jl b/src/webserver/Firebasey.jl
index 22f99f2257..ee36b912bd 100644
--- a/src/webserver/Firebasey.jl
+++ b/src/webserver/Firebasey.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.16.1
+# v0.17.5
 
 using Markdown
 using InteractiveUtils
@@ -21,26 +21,6 @@ md"""
 Computing a diff:
 """
 
-# ╔═╡ d8e73b90-24c5-4e50-830b-b1dbe6224c8e
-dict_1 = Dict{String,Any}(
-	"a" => 1,
-	"b" => Dict(
-		"c" => [3,4],
-		"d" => 99,
-	),
-	"e" => "hello!"
-);
-
-# ╔═╡ 19646596-b35b-44fa-bfcf-891f9ffb748c
-dict_2 = Dict{String,Any}(
-	"a" => 1,
-	"b" => Dict(
-		"c" => [3,4,5],
-		"d" => 99,
-		"🏝" => "👍",
-	),
-);
-
 # ╔═╡ 9d2c07d9-16a9-4b9f-a375-2adb6e5b907a
 md"""
 Applying a set of patches:
@@ -317,75 +297,16 @@ function diff(o1::Nothing, o2::Nothing)
 	NoChanges
 end
 
-# ╔═╡ 7ca087b8-73ac-49ea-9c5a-2971f0da491f
-example_patches = diff(dict_1, dict_2)
-
 # ╔═╡ 59b46bfe-da74-43af-9c11-cb0bdb2c13a2
 md"""
 ### Dict example
 """
 
-# ╔═╡ 200516da-8cfb-42fe-a6b9-cb4730168923
-celldict1 = Dict(:x => 1, :y => 2, :z => 3)
-
-# ╔═╡ 76326e6c-b95a-4b2d-a78c-e283e5fadbe2
-celldict2 = Dict(:x => 1, :y => 2, :z => 4)
-
-# ╔═╡ 664cd334-91c7-40dd-a2bf-0da720307cfc
-notebook1 = Dict(
-	:x => 1,
-	:y => 2,
-)
-
-# ╔═╡ b7fa5625-6178-4da8-a889-cd4f014f43ba
-notebook2 = Dict(
-	:y => 4,
-	:z => 5
-)
-
-# ╔═╡ dbdd1df0-2de1-11eb-152f-8d1af1ad02fe
-notebook1_to_notebook2 = diff(notebook1, notebook2)
-
 # ╔═╡ 3924953f-787a-4912-b6ee-9c9d3030f0f0
 md"""
 ### Large Dict example 1
 """
 
-# ╔═╡ 80689881-1b7e-49b2-af97-9e3ab639d006
-big_array = rand(UInt8, 1_000_000)
-
-# ╔═╡ fd22b6af-5fd2-428a-8291-53e223ea692c
-big_string = repeat('a', 1_000_000);
-
-# ╔═╡ bcd5059b-b0d2-49d8-a756-92349aa56aca
-large_dict_1 = Dict{String,Any}(
-	"cell_$(i)" => Dict{String,Any}(
-		"x" => 1,
-		"y" => big_array,
-		"z" => big_string,
-	)
-	for i in 1:10
-);
-
-# ╔═╡ e7fd6bab-c114-4f3e-b9ad-1af2d1147770
-begin
-	large_dict_2 = Dict{String,Any}(
-		"cell_$(i)" => Dict{String,Any}(
-			"x" => 1,
-			"y" => big_array,
-			"z" => big_string,
-		)
-		for i in 1:10
-	)
-	large_dict_2["cell_5"]["y"] = [2,20]
-	delete!(large_dict_2, "cell_2")
-	large_dict_2["hello"] = Dict("a" => 1, "b" => 2)
-	large_dict_2
-end;
-
-# ╔═╡ 43c36ab7-e9ac-450a-8abe-435412f2be1d
-diff(large_dict_1, large_dict_2)
-
 # ╔═╡ 1cf22fe6-4b58-4220-87a1-d7a18410b4e8
 md"""
 With `===` comparison for arrays:
@@ -396,34 +317,6 @@ md"""
 ### Large Dict example 2
 """
 
-# ╔═╡ 8188de75-ae6e-48aa-9495-111fd27ffd26
-many_items_1 = Dict{String,Any}(
-	"cell_$(i)" => Dict{String,Any}(
-		"x" => 1,
-		"y" => [2,3],
-		"z" => "four",
-	)
-	for i in 1:100
-)
-
-# ╔═╡ d807195e-ba27-4015-92a7-c9294d458d47
-begin
-	many_items_2 = deepcopy(many_items_1)
-	many_items_2["cell_5"]["y"][2] = 20
-	delete!(many_items_2, "cell_2")
-	many_items_2["hello"] = Dict("a" => 1, "b" => 2)
-	many_items_2
-end
-
-# ╔═╡ 2e91a1a2-469c-4123-a0d7-3dcc49715738
-diff(many_items_1, many_items_2)
-
-# ╔═╡ b8061c1b-dd03-4cd1-b275-90359ae2bb39
-fairly_equal(a,b) = Set(a) == Set(b)
-
-# ╔═╡ aeab3363-08ba-47c2-bd33-04a004ed72c4
-diff(many_items_1, many_items_1)
-
 # ╔═╡ c7de406d-ccfe-41cf-8388-6bd2d7c42d64
 md"### Struct example"
 
@@ -588,12 +481,6 @@ function applypatch!(value, patch::RemovePatch)
 	return value
 end
 
-# ╔═╡ e65d483a-4c13-49ba-bff1-1d54de78f534
-let
-	dict_1_copy = deepcopy(dict_1)
-	applypatch!(dict_1_copy, example_patches)
-end
-
 # ╔═╡ df41caa7-f0fc-4b0d-ab3d-ebdab4804040
 md"*Should throw in strict mode:*"
 
@@ -631,6 +518,119 @@ macro skip_as_script(ex)
 	end
 end
 
+# ╔═╡ d8e73b90-24c5-4e50-830b-b1dbe6224c8e
+@skip_as_script dict_1 = Dict{String,Any}(
+	"a" => 1,
+	"b" => Dict(
+		"c" => [3,4],
+		"d" => 99,
+	),
+	"e" => "hello!"
+);
+
+# ╔═╡ 19646596-b35b-44fa-bfcf-891f9ffb748c
+@skip_as_script dict_2 = Dict{String,Any}(
+	"a" => 1,
+	"b" => Dict(
+		"c" => [3,4,5],
+		"d" => 99,
+		"🏝" => "👍",
+	),
+);
+
+# ╔═╡ 7ca087b8-73ac-49ea-9c5a-2971f0da491f
+@skip_as_script example_patches = diff(dict_1, dict_2)
+
+# ╔═╡ e65d483a-4c13-49ba-bff1-1d54de78f534
+@skip_as_script let
+	dict_1_copy = deepcopy(dict_1)
+	applypatch!(dict_1_copy, example_patches)
+end
+
+# ╔═╡ 200516da-8cfb-42fe-a6b9-cb4730168923
+@skip_as_script celldict1 = Dict(:x => 1, :y => 2, :z => 3)
+
+# ╔═╡ 76326e6c-b95a-4b2d-a78c-e283e5fadbe2
+@skip_as_script celldict2 = Dict(:x => 1, :y => 2, :z => 4)
+
+# ╔═╡ 664cd334-91c7-40dd-a2bf-0da720307cfc
+@skip_as_script notebook1 = Dict(
+	:x => 1,
+	:y => 2,
+)
+
+# ╔═╡ b7fa5625-6178-4da8-a889-cd4f014f43ba
+@skip_as_script notebook2 = Dict(
+	:y => 4,
+	:z => 5
+)
+
+# ╔═╡ dbdd1df0-2de1-11eb-152f-8d1af1ad02fe
+@skip_as_script notebook1_to_notebook2 = diff(notebook1, notebook2)
+
+# ╔═╡ 80689881-1b7e-49b2-af97-9e3ab639d006
+@skip_as_script big_array = rand(UInt8, 1_000_000)
+
+# ╔═╡ fd22b6af-5fd2-428a-8291-53e223ea692c
+@skip_as_script big_string = repeat('a', 1_000_000);
+
+# ╔═╡ bcd5059b-b0d2-49d8-a756-92349aa56aca
+@skip_as_script large_dict_1 = Dict{String,Any}(
+	"cell_$(i)" => Dict{String,Any}(
+		"x" => 1,
+		"y" => big_array,
+		"z" => big_string,
+	)
+	for i in 1:10
+);
+
+# ╔═╡ e7fd6bab-c114-4f3e-b9ad-1af2d1147770
+@skip_as_script begin
+	large_dict_2 = Dict{String,Any}(
+		"cell_$(i)" => Dict{String,Any}(
+			"x" => 1,
+			"y" => big_array,
+			"z" => big_string,
+		)
+		for i in 1:10
+	)
+	large_dict_2["cell_5"]["y"] = [2,20]
+	delete!(large_dict_2, "cell_2")
+	large_dict_2["hello"] = Dict("a" => 1, "b" => 2)
+	large_dict_2
+end;
+
+# ╔═╡ 43c36ab7-e9ac-450a-8abe-435412f2be1d
+@skip_as_script diff(large_dict_1, large_dict_2)
+
+# ╔═╡ 8188de75-ae6e-48aa-9495-111fd27ffd26
+@skip_as_script many_items_1 = Dict{String,Any}(
+	"cell_$(i)" => Dict{String,Any}(
+		"x" => 1,
+		"y" => [2,3],
+		"z" => "four",
+	)
+	for i in 1:100
+)
+
+# ╔═╡ d807195e-ba27-4015-92a7-c9294d458d47
+@skip_as_script begin
+	many_items_2 = deepcopy(many_items_1)
+	many_items_2["cell_5"]["y"][2] = 20
+	delete!(many_items_2, "cell_2")
+	many_items_2["hello"] = Dict("a" => 1, "b" => 2)
+	many_items_2
+end
+
+# ╔═╡ 2e91a1a2-469c-4123-a0d7-3dcc49715738
+@skip_as_script diff(many_items_1, many_items_2)
+
+# ╔═╡ b8061c1b-dd03-4cd1-b275-90359ae2bb39
+@skip_as_script fairly_equal(a,b) = Set(a) == Set(b)
+
+# ╔═╡ aeab3363-08ba-47c2-bd33-04a004ed72c4
+@skip_as_script diff(many_items_1, many_items_1)
+
 # ╔═╡ c2c2b057-a88f-4cc6-ada4-fc55ac29931e
 "The opposite of `@skip_as_script`"
 macro only_as_script(ex) is_inside_pluto(__module__) ? nothing : esc(ex) end
@@ -678,33 +678,33 @@ end
 		Base.hash(AddPatch(["asd"], Dict("a" => 2)))
 
 # ╔═╡ 595fdfd4-3960-4fbd-956c-509c4cf03473
-@test applypatch!(deepcopy(notebook1), notebook1_to_notebook2) == notebook2
+@skip_as_script @test applypatch!(deepcopy(notebook1), notebook1_to_notebook2) == notebook2
 
 # ╔═╡ 2983f6d4-c1ca-4b66-a2d3-f858b0df2b4c
-@test fairly_equal(diff(large_dict_1, large_dict_2), [
+@skip_as_script @test fairly_equal(diff(large_dict_1, large_dict_2), [
 	ReplacePatch(["cell_5","y"], [2,20]),
 	RemovePatch(["cell_2"]),
 	AddPatch(["hello"], Dict("b" => 2, "a" => 1)),
 ])
 
 # ╔═╡ fdc427f0-dfe8-4114-beca-48fc15434534
-@test isempty(diff(many_items_1, many_items_1))
+@skip_as_script @test isempty(diff(many_items_1, many_items_1))
 
 # ╔═╡ 61b81430-d26e-493c-96da-b6818e58c882
-@test fairly_equal(diff(many_items_1, many_items_2), [
+@skip_as_script @test fairly_equal(diff(many_items_1, many_items_2), [
 	ReplacePatch(["cell_5","y"], [2,20]),
 	RemovePatch(["cell_2"]),
 	AddPatch(["hello"], Dict("b" => 2, "a" => 1)),
 ])
 
 # ╔═╡ 62de3e79-4b4e-41df-8020-769c3c255c3e
-@test isempty(diff(many_items_1, many_items_1))
+@skip_as_script @test isempty(diff(many_items_1, many_items_1))
 
 # ╔═╡ c3e4738f-4568-4910-a211-6a46a9d447ee
-@test applypatch!(Dict(:y => "x"), AddPatch([:x], "-")) == Dict(:y => "x", :x => "-")
+@skip_as_script @test applypatch!(Dict(:y => "x"), AddPatch([:x], "-")) == Dict(:y => "x", :x => "-")
 
 # ╔═╡ 0f094932-10e5-40f9-a3fc-db27a85b4999
-@test applypatch!(Dict(:x => "x"), AddPatch([:x], "-")) == Dict(:x => "-")
+@skip_as_script @test applypatch!(Dict(:x => "x"), AddPatch([:x], "-")) == Dict(:x => "-")
 
 # ╔═╡ a560fdca-ee12-469c-bda5-62d7203235b8
 @test applypatch!(Dict(:x => "x"), ReplacePatch([:x], "-")) == Dict(:x => "-")
@@ -713,26 +713,14 @@ end
 @test applypatch!(Dict(:y => "x"), ReplacePatch([:x], "-")) == Dict(:x => "-", :y => "x")
 
 # ╔═╡ 96a80a23-7c56-4c41-b489-15bc1c4e3700
-@test applypatch!(Dict(:x => "x"), RemovePatch([:x])) == Dict()
+@skip_as_script @test applypatch!(Dict(:x => "x"), RemovePatch([:x])) == Dict()
 
 # ╔═╡ fac65755-2a2a-4a3c-b5a8-fc4f6d256754
-@test applypatch!(Dict(:y => "x"), RemovePatch([:x])) == Dict(:y => "x")
+@skip_as_script @test applypatch!(Dict(:y => "x"), RemovePatch([:x])) == Dict(:y => "x")
 
 # ╔═╡ e7e8d076-2de1-11eb-0214-8160bb81370a
 @skip_as_script @test notebook1 == deepcopy(notebook1)
 
-# ╔═╡ e9d2eba8-2de1-11eb-16bf-bd2a16537a97
-@skip_as_script x = 2
-
-# ╔═╡ ea45104e-2de1-11eb-3248-5dd833d350e4
-@skip_as_script @test 1 + 1 == x
-
-# ╔═╡ ea6650bc-2de1-11eb-3016-4542c5c333a5
-@skip_as_script @test 1 + 1 + 1 == x
-
-# ╔═╡ ea934d9c-2de1-11eb-3f1d-3b60465decde
-@skip_as_script @test_throws String throw("Oh my god") == x
-
 # ╔═╡ ee70e282-36d5-4772-8585-f50b9a67ca54
 md"## Track"
 
@@ -878,13 +866,13 @@ macro track(expr)
 end
 
 # ╔═╡ 7b8ab89b-bf56-4ddf-b220-b4881f4a2050
-@track Base.convert(JSONPatch, convert(Dict, add_patch)) == add_patch
+@skip_as_script @track Base.convert(JSONPatch, convert(Dict, add_patch)) == add_patch
 
 # ╔═╡ 48ccd28a-060d-4214-9a39-f4c4e506d1aa
-@track Base.convert(JSONPatch, convert(Dict, remove_patch)) == remove_patch
+@skip_as_script @track Base.convert(JSONPatch, convert(Dict, remove_patch)) == remove_patch
 
 # ╔═╡ 34d86e02-dd34-4691-bb78-3023568a5d16
-@track Base.convert(JSONPatch, convert(Dict, replace_patch)) == replace_patch
+@skip_as_script @track Base.convert(JSONPatch, convert(Dict, replace_patch)) == replace_patch
 
 # ╔═╡ 95ff676d-73c8-44cb-ac35-af94418737e9
 @skip_as_script @track for _ in 1:100 diff(celldict1, celldict2) end
@@ -1014,7 +1002,7 @@ end
 # ╠═fd22b6af-5fd2-428a-8291-53e223ea692c
 # ╠═bcd5059b-b0d2-49d8-a756-92349aa56aca
 # ╠═e7fd6bab-c114-4f3e-b9ad-1af2d1147770
-# ╠═43c36ab7-e9ac-450a-8abe-435412f2be1d
+# ╟─43c36ab7-e9ac-450a-8abe-435412f2be1d
 # ╟─2983f6d4-c1ca-4b66-a2d3-f858b0df2b4c
 # ╟─fdc427f0-dfe8-4114-beca-48fc15434534
 # ╟─8c069015-d922-4c60-9340-8d65c80b1a06
@@ -1067,11 +1055,7 @@ end
 # ╟─e8d0c98a-2de1-11eb-37b9-e1df3f5cfa25
 # ╟─e907d862-2de1-11eb-11a9-4b3ac37cb0f3
 # ╟─e924a0be-2de1-11eb-2170-71d56e117af2
-# ╟─c2c2b057-a88f-4cc6-ada4-fc55ac29931e
-# ╠═e9d2eba8-2de1-11eb-16bf-bd2a16537a97
-# ╠═ea45104e-2de1-11eb-3248-5dd833d350e4
-# ╠═ea6650bc-2de1-11eb-3016-4542c5c333a5
-# ╠═ea934d9c-2de1-11eb-3f1d-3b60465decde
+# ╠═c2c2b057-a88f-4cc6-ada4-fc55ac29931e
 # ╟─ee70e282-36d5-4772-8585-f50b9a67ca54
 # ╟─1a26eed8-670c-43bf-9726-2db84b1afdab
 # ╟─0e1c6442-9040-49d9-b754-173583db7ba2

From 0884d29100566b123fdebc18791ca9ae632dbc3b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 18 Jan 2022 13:07:55 +0100
Subject: [PATCH 005/821] Add unique ID to `<bond>` element to force re-render
 after bond definition (#1827)

---
 src/runner/PlutoRunner.jl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index a721624ac4..3f40a05340 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1697,7 +1697,8 @@ The actual reactive-interactive functionality is not done in Julia - it is handl
 struct Bond
     element::Any
     defines::Symbol
-    Bond(element, defines::Symbol) = showable(MIME"text/html"(), element) ? new(element, defines) : error("""Can only bind to html-showable objects, ie types T for which show(io, ::MIME"text/html", x::T) is defined.""")
+    unique_id::String
+    Bond(element, defines::Symbol) = showable(MIME"text/html"(), element) ? new(element, defines, Base64.base64encode(rand(UInt8,9))) : error("""Can only bind to html-showable objects, ie types T for which show(io, ::MIME"text/html", x::T) is defined.""")
 end
 
 function create_bond(element, defines::Symbol)
@@ -1706,10 +1707,9 @@ function create_bond(element, defines::Symbol)
     Bond(element, defines)
 end
 
-import Base: show
-function show(io::IO, ::MIME"text/html", bond::Bond)
-    withtag(io, :bond, :def => bond.defines) do
-        show(io, MIME"text/html"(), bond.element)
+function Base.show(io::IO, m::MIME"text/html", bond::Bond)
+    withtag(io, :bond, :def => bond.defines, :unique_id => bond.unique_id) do
+        show(io, m, bond.element)
     end
 end
 
@@ -1718,7 +1718,9 @@ const transform_value_ref = Ref{Function}((element, x) -> x)
 const possible_bond_values_ref = Ref{Function}((_args...; _kwargs...) -> :NotGiven)
 
 """
-    `@bind symbol element`
+```julia
+@bind symbol element
+```
 
 Return the HTML `element`, and use its latest JavaScript value as the definition of `symbol`.
 

From 6f52dbdeefba7de286482fc195427089340232b8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 18 Jan 2022 17:36:22 +0100
Subject: [PATCH 006/821] nothing

---
 src/runner/PlutoRunner.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 3f40a05340..337cad8eb5 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1408,7 +1408,7 @@ const integrations = Integration[
         id = Base.PkgId(UUID("91a5bcdd-55d7-5caf-9e0b-520d859cae80"), "Plots"),
         code = quote
             approx_size(p::Plots.Plot) = try
-                sum(p.series_list) do series
+                sum(p.series_list; init=0) do series
                     length(series[:y])
                 end
             catch e

From e3e59477c81a1735f4f67810fd5391297e254464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Wed, 19 Jan 2022 14:18:20 +0200
Subject: [PATCH 007/821] Use polyfill library to support sha256'ing in
 insecure contexts (#1825)

* use polyfill library to support sha256'ing in insecure contexts

* ES6 import for js-sha256
---
 frontend/common/PlutoHash.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/common/PlutoHash.js b/frontend/common/PlutoHash.js
index 8c8333738a..8c1eadef4c 100644
--- a/frontend/common/PlutoHash.js
+++ b/frontend/common/PlutoHash.js
@@ -1,3 +1,5 @@
+import "https://cdn.jsdelivr.net/npm/js-sha256@0.9.0"
+
 export const base64_arraybuffer = async (/** @type {BufferSource} */ data) => {
     /** @type {string} */
     const base64url = await new Promise((r) => {
@@ -12,7 +14,10 @@ export const base64_arraybuffer = async (/** @type {BufferSource} */ data) => {
 
 export const hash_arraybuffer = async (/** @type {BufferSource} */ data) => {
     // @ts-ignore
-    const hashed_buffer = await window.crypto.subtle.digest("SHA-256", data)
+    const hash = window.sha256.create()
+    hash.update(data)
+    const hashed_buffer = hash.arrayBuffer()
+    // const hashed_buffer = await window.crypto.subtle.digest("SHA-256", data)
     return await base64_arraybuffer(hashed_buffer)
 }
 

From f250722da3bd2377782073bb0b4cf95b88719dec Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Jan 2022 13:32:20 +0100
Subject: [PATCH 008/821] Update index.css

---
 frontend/index.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/index.css b/frontend/index.css
index 65448bd097..28ec2b92b1 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -142,7 +142,7 @@ pluto-filepicker button {
     background: var(--footer-filepicker-focus-color);
     border-radius: 3px;
     border: 2px solid var(--nav-filepicker-focus-color);
-    color: var(--ui-button-color);
+    color: var(--white);
     /* border: none; */
     font-family: "Roboto Mono", monospace;
     font-weight: 600;

From f4955135e6638929ccb864c5b8f2f14060dced00 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Jan 2022 13:36:59 +0100
Subject: [PATCH 009/821] Use ES6 transformed import for js-sha256

---
 frontend/common/PlutoHash.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/common/PlutoHash.js b/frontend/common/PlutoHash.js
index 8c1eadef4c..334c897bbc 100644
--- a/frontend/common/PlutoHash.js
+++ b/frontend/common/PlutoHash.js
@@ -1,4 +1,4 @@
-import "https://cdn.jsdelivr.net/npm/js-sha256@0.9.0"
+import { sha256 } from "https://cdn.jsdelivr.net/npm/js-sha256@0.9.0/+esm"
 
 export const base64_arraybuffer = async (/** @type {BufferSource} */ data) => {
     /** @type {string} */
@@ -13,8 +13,7 @@ export const base64_arraybuffer = async (/** @type {BufferSource} */ data) => {
 }
 
 export const hash_arraybuffer = async (/** @type {BufferSource} */ data) => {
-    // @ts-ignore
-    const hash = window.sha256.create()
+    const hash = sha256.create()
     hash.update(data)
     const hashed_buffer = hash.arrayBuffer()
     // const hashed_buffer = await window.crypto.subtle.digest("SHA-256", data)
@@ -26,6 +25,8 @@ export const hash_str = async (/** @type {string} */ s) => {
     return await hash_arraybuffer(data)
 }
 
+hash_str("Hannes").then((r) => console.assert(r === "OI48wVWerxEEnz5lIj6CPPRB8NOwwba+LkFYTDp4aUU=", r))
+
 export const debounced_promises = (async_function) => {
     let currently_running = false
     let rerun_when_done = false

From 947e3dbe4e982c86496348963777fdea64309ba2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Jan 2022 13:43:46 +0100
Subject: [PATCH 010/821] esm.sh instead of esm.run

---
 frontend/common/PlutoHash.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/common/PlutoHash.js b/frontend/common/PlutoHash.js
index 334c897bbc..7c691388a8 100644
--- a/frontend/common/PlutoHash.js
+++ b/frontend/common/PlutoHash.js
@@ -1,4 +1,4 @@
-import { sha256 } from "https://cdn.jsdelivr.net/npm/js-sha256@0.9.0/+esm"
+import { sha256 } from "https://cdn.esm.sh/v62/js-sha256@0.9.0/es2021/js-sha256.js"
 
 export const base64_arraybuffer = async (/** @type {BufferSource} */ data) => {
     /** @type {string} */

From 0e744b35e889b96515c6e85dab8ba7427460d882 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Jan 2022 18:06:13 +0100
Subject: [PATCH 011/821] remove some old stufff

---
 src/webserver/WebServer.jl | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 098b6a4c19..be49b83689 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -3,13 +3,6 @@ import UUIDs: UUID
 import HTTP
 import Sockets
 
-import Base: endswith
-function endswith(vec::Vector{T}, suffix::Vector{T}) where T
-    local liv = lastindex(vec)
-    local lis = lastindex(suffix)
-    liv >= lis && (view(vec, (liv - lis + 1):liv) == suffix)
-end
-
 include("./WebSocketFix.jl")
 
 # from https://github.com/JuliaLang/julia/pull/36425

From dfb879eba7745744f291e59b82cee229d6824a90 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Jan 2022 18:06:52 +0100
Subject: [PATCH 012/821] window.enable_secret_pluto_recording = false

---
 frontend/components/ExportBanner.js | 39 ++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index f56f727a25..7877371686 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -26,6 +26,9 @@ const Square = ({ fill }) => html`
     </svg>
 `
 
+//@ts-ignore
+window.enable_secret_pluto_recording = false
+
 export const ExportBanner = ({ onClose, notebookfile_url, notebookexport_url, start_recording }) => {
     return html`
         <aside id="export">
@@ -44,21 +47,27 @@ export const ExportBanner = ({ onClose, notebookfile_url, notebookexport_url, st
                     <header><${Square} fill="#619b3d" /> Static PDF</header>
                     <section>A static <b>.pdf</b> file for print or email.</section>
                 </a>
-                <!--
-                <div class="export_title">record</div>
-                <a
-                    href="#"
-                    onClick=${(e) => {
-                    start_recording()
-                    onClose()
-                    e.preventDefault()
-                }}
-                    class="export_card"
-                >
-                    <header><${Circle} fill="#E86F51" /> Recording</header>
-                    <section>Capture the entire notebook, and any changes you make.</section>
-                </a>
--->
+                ${
+                    //@ts-ignore
+                    window.enable_secret_pluto_recording
+                        ? html`
+                              <div class="export_title">record</div>
+                              <a
+                                  href="#"
+                                  onClick=${(e) => {
+                                      start_recording()
+                                      onClose()
+                                      e.preventDefault()
+                                  }}
+                                  class="export_card"
+                              >
+                                  <header><${Circle} fill="#E86F51" /> Recording</header>
+                                  <section>Capture the entire notebook, and any changes you make.</section>
+                              </a>
+                          `
+                        : null
+                }
+
                 <button title="Close" class="toggle_export" onClick=${() => onClose()}>
                     <span></span>
                 </button>

From 9172f8b31e2125ce83b58058bfd530dfddf0e230 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Jan 2022 18:57:11 +0100
Subject: [PATCH 013/821] =?UTF-8?q?=F0=9F=90=8C=20Fix=20#787?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/webserver/WebServer.jl | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index be49b83689..4a6e2a2551 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -244,11 +244,20 @@ function run(session::ServerSession, pluto_router)
             end
         end
     end
-
+    
+    server_running() = try
+        HTTP.get("http://$(hostIP):$(port)/ping"; status_exception=false, retry=false, connect_timeout=10, readtimeout=10).status == 200
+    catch
+        false
+    end
+    
     address = pretty_address(session, hostIP, port)
-
     println()
-    if session.options.server.launch_browser && open_in_default_browser(address)
+    if session.options.server.launch_browser && (
+        # Wait for the server to start up before opening the browser. We have a 5 second grace period for allowing the connection, and then 10 seconds for the server to write data.
+        WorkspaceManager.poll(server_running, 5.0, 1.0) && 
+        open_in_default_browser(address)
+    )
         println("Opening $address in your default browser... ~ have fun!")
     else
         println("Go to $address in your browser to start writing ~ have fun!")

From 82907a28f4dfb118eb6da5dfc480fabce0d75c13 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Jan 2022 18:58:25 +0100
Subject: [PATCH 014/821] Updated Pkg compat for update_registries

---
 src/packages/Packages.jl  |  2 +-
 src/packages/PkgCompat.jl | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 60735abd26..a785deddba 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -200,7 +200,7 @@ function sync_nbpkg_core(notebook::Notebook; on_terminal_output::Function=((args
                         pushfirst!(LOAD_PATH, env_dir)
 
                         # update registries if this is the first time
-                        PkgCompat.update_registries(notebook.nbpkg_ctx)
+                        PkgCompat.update_registries(; force=false)
                         # instantiate without forcing registry update
                         PkgCompat.instantiate(notebook.nbpkg_ctx; update_registry=false)
                         
diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index 6fce2c0593..8fcc3b54eb 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -175,17 +175,18 @@ function refresh_registry_cache()
 	_parsed_registries[] = _get_registries()
 end
 
-const _updated_registries_compat = Ref(false)
+# ⚠️✅ Internal API with fallback
+const _updated_registries_compat = @static if isdefined(Pkg, :UPDATED_REGISTRY_THIS_SESSION) && Pkg.UPDATED_REGISTRY_THIS_SESSION isa Ref{Bool}
+	Pkg.UPDATED_REGISTRY_THIS_SESSION
+else
+	Ref(false)
+end
 
-# ⚠️✅ Internal API with good fallback
-function update_registries(ctx)
-	@static if isdefined(Pkg, :Types) && isdefined(Pkg.Types, :update_registries)
-		Pkg.Types.update_registries(ctx)
-	else
-		if !_updated_registries_compat[]
-			_updated_registries_compat[] = true
-			Pkg.Registry.update()
-		end
+# ✅ Public API
+function update_registries(; force::Bool=false)
+	if force || !_updated_registries_compat[]
+		_updated_registries_compat[] = true
+		Pkg.Registry.update()
 	end
 end
 

From ea5e04fcceb0351df3bac8a87faf73f2bf0d912c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Jan 2022 19:03:10 +0100
Subject: [PATCH 015/821] Pkg compat tweak

---
 src/packages/PkgCompat.jl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index 8fcc3b54eb..22aa74deb1 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -185,8 +185,12 @@ end
 # ✅ Public API
 function update_registries(; force::Bool=false)
 	if force || !_updated_registries_compat[]
-		_updated_registries_compat[] = true
 		Pkg.Registry.update()
+		try
+			refresh_registry_cache()
+		catch
+		end
+		_updated_registries_compat[] = true		
 	end
 end
 

From 42c09318151aa635c0aaf4906b506144ac47f415 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Jan 2022 20:01:17 +0100
Subject: [PATCH 016/821] Update registry before resolve

---
 src/packages/Packages.jl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index a785deddba..8f80168b10 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -360,6 +360,7 @@ function update_nbpkg_core(notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.UPLEV
                 notebook.nbpkg_ctx = PkgCompat.clear_stdlib_compat_entries(notebook.nbpkg_ctx)
                 PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
                     withinteractive(false) do
+                        PkgCompat.update_registries(;force=false)
                         try
                             Pkg.resolve(notebook.nbpkg_ctx)
                         catch e

From 78b2428dc38d7b77edc06a40f8aa7ac37c0910c8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Jan 2022 21:30:51 +0100
Subject: [PATCH 017/821] whitespace

---
 src/evaluation/WorkspaceManager.jl | 16 +++++++---------
 src/packages/PkgCompat.jl          |  8 ++++++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index c2313126ae..fc57e0ca2f 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -22,12 +22,12 @@ Base.@kwdef mutable struct Workspace
 end
 
 "These expressions get evaluated whenever a new `Workspace` process is created."
-const process_preamble = [
-    :(ccall(:jl_exit_on_sigint, Cvoid, (Cint,), 0)),
-    :(include($(project_relative_path("src", "runner", "Loader.jl")))),
-    :(ENV["GKSwstype"] = "nul"), 
-    :(ENV["JULIA_REVISE_WORKER_ONLY"] = "1"), 
-]
+const process_preamble = quote
+    ccall(:jl_exit_on_sigint, Cvoid, (Cint,), 0)
+    include($(project_relative_path("src", "runner", "Loader.jl")))
+    ENV["GKSwstype"] = "nul"
+    ENV["JULIA_REVISE_WORKER_ONLY"] = "1"
+end
 
 const workspaces = Dict{UUID,Promise{Workspace}}()
 
@@ -217,9 +217,7 @@ function create_workspaceprocess(;compiler_options=CompilerOptions())::Integer
         $(Distributed_expr).addprocs(1; exeflags=$(_convert_to_flags(compiler_options))) |> first
     end)
 
-    for expr in process_preamble
-        Distributed.remotecall_eval(Main, [pid], expr)
-    end
+    Distributed.remotecall_eval(Main, [pid], process_preamble)
 
     # so that we NEVER break the workspace with an interrupt 🤕
     @async Distributed.remotecall_eval(Main, [pid],
diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index 22aa74deb1..9d5d812385 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -194,6 +194,11 @@ function update_registries(; force::Bool=false)
 	end
 end
 
+
+###
+# Instantiate
+###
+
 # ⚠️✅ Internal API with fallback
 function instantiate(ctx; update_registry::Bool)
 	@static if hasmethod(Pkg.instantiate, Tuple{}, (:update_registry,))
@@ -204,6 +209,9 @@ function instantiate(ctx; update_registry::Bool)
 end
 
 
+###
+# Standard Libraries
+###
 
 # (⚠️ Internal API with fallback)
 _stdlibs() = try

From 7a0019135d187eadd6e5c79a88c2cd11733ec584 Mon Sep 17 00:00:00 2001
From: Panagiotis Georgakopoulos <panagiotis.georgakopoulos@juliacomputing.com>
Date: Wed, 19 Jan 2022 23:58:30 +0200
Subject: [PATCH 018/821] Quickfix weird bug with empty logs on empty notebook

---
 frontend/components/Notebook.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/components/Notebook.js b/frontend/components/Notebook.js
index 71d52cd01b..bfc0caa650 100644
--- a/frontend/components/Notebook.js
+++ b/frontend/components/Notebook.js
@@ -25,13 +25,13 @@ let CellMemo = ({
 }) => {
     const selected_cells_diffable_primitive = (selected_cells || []).join("")
     const { body, last_run_timestamp, mime, persist_js_state, rootassignee } = cell_result?.output || {}
-    const logs = cell_result?.logs ?? []
+    const cell_result_nonemptylogs = useMemo(() => ({ ...cell_result, logs: cell_result?.logs ?? {} }), [cell_result])
     const { queued, running, runtime, errored, depends_on_disabled_cells } = cell_result || {}
     const { cell_id, code, code_folded, running_disabled } = cell_input || {}
     return useMemo(() => {
         return html`
             <${Cell}
-                cell_result=${cell_result}
+                cell_result=${cell_result_nonemptylogs}
                 cell_dependencies=${cell_dependencies}
                 cell_input=${cell_input}
                 cell_input_local=${cell_input_local}
@@ -63,7 +63,7 @@ let CellMemo = ({
         mime,
         persist_js_state,
         rootassignee,
-        logs,
+        cell_result_nonemptylogs,
         code,
         code_folded,
         cell_input_local,

From 873276b2e8f8b94191baf53666d0d0e78a0d9761 Mon Sep 17 00:00:00 2001
From: Panagiotis Georgakopoulos <panagiotis.georgakopoulos@juliacomputing.com>
Date: Thu, 20 Jan 2022 00:18:25 +0200
Subject: [PATCH 019/821] Cleanup previous fix

---
 frontend/components/Notebook.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/components/Notebook.js b/frontend/components/Notebook.js
index bfc0caa650..2c6677ec48 100644
--- a/frontend/components/Notebook.js
+++ b/frontend/components/Notebook.js
@@ -25,13 +25,12 @@ let CellMemo = ({
 }) => {
     const selected_cells_diffable_primitive = (selected_cells || []).join("")
     const { body, last_run_timestamp, mime, persist_js_state, rootassignee } = cell_result?.output || {}
-    const cell_result_nonemptylogs = useMemo(() => ({ ...cell_result, logs: cell_result?.logs ?? {} }), [cell_result])
-    const { queued, running, runtime, errored, depends_on_disabled_cells } = cell_result || {}
+    const { queued, running, runtime, errored, depends_on_disabled_cells, logs } = cell_result || {}
     const { cell_id, code, code_folded, running_disabled } = cell_input || {}
     return useMemo(() => {
         return html`
             <${Cell}
-                cell_result=${cell_result_nonemptylogs}
+                cell_result=${cell_result}
                 cell_dependencies=${cell_dependencies}
                 cell_input=${cell_input}
                 cell_input_local=${cell_input_local}
@@ -63,7 +62,7 @@ let CellMemo = ({
         mime,
         persist_js_state,
         rootassignee,
-        cell_result_nonemptylogs,
+        logs,
         code,
         code_folded,
         cell_input_local,

From 4e07d336c10d5b42dbb657af114d372831daf674 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 20 Jan 2022 00:14:23 +0100
Subject: [PATCH 020/821] color tweaks

---
 frontend/dark_color.css | 2 +-
 sample/JavaScript.jl    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index 66ca2fbbbf..7acf203f34 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -52,7 +52,7 @@
         --jl-debug-accent-color: hsl(283deg 59% 69%);
         --table-border-color: rgba(255, 255, 255, 0.2);
         --table-bg-hover-color: rgba(193, 192, 235, 0.15);
-        --pluto-tree-color: rgba(191, 191, 191, 0.507);
+        --pluto-tree-color: rgb(209 207 207 / 61%);
 
         /*pluto cell styling*/
         --disabled-cell-bg-color: rgba(139, 139, 139, 0.25);
diff --git a/sample/JavaScript.jl b/sample/JavaScript.jl
index cfa36d2273..343e240778 100644
--- a/sample/JavaScript.jl
+++ b/sample/JavaScript.jl
@@ -136,6 +136,7 @@ currentScript.previousElementSibling.innerText = "Hello from JavaScript!"
 .blue-background {
 	padding: .5em;
 	background: lightblue;
+	color: black;
 }
 </style>
 
@@ -284,6 +285,7 @@ my_data = [
 		.join("text")
 		.attr("x", d => d.coordinate[0])
 		.attr("y", d => d.coordinate[1])
+		.style("fill", "red")
 		.text(d => d.name)
 
 	return svg
@@ -763,7 +765,7 @@ details(md"""
 	<style>
 
 		article.learning {
-			background: #fde6ea9c;
+			background: #fde6ea4c;
 			padding: 1em;
 			border-radius: 5px;
 		}
@@ -815,6 +817,7 @@ details(md"""
 		.join("text")
 		.attr("x", d => d.coordinate[0])
 		.attr("y", d => d.coordinate[1])
+		.style("fill", "red")
 		.text(d => d.name)
 
 	return svg

From 4a5fbc899d41e2d38bd7985c5785f3cf8ec17dbd Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 20 Jan 2022 01:12:42 +0100
Subject: [PATCH 021/821] tweaks

---
 frontend/components/CellInput.js | 1 -
 frontend/light_color.css         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index f626c535bd..48ce704da9 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -76,7 +76,6 @@ export const pluto_syntax_colors = HighlightStyle.define([
     { tag: tags.string, color: "var(--cm-string-color)" },
     { tag: tags.variableName, color: "var(--cm-var-color)", fontWeight: 700 },
     // { tag: tags.variable2, color: "#06b6ef" },
-    { tag: tags.definition(tags.variableName), color: "var(--cm-def-color)" },
     { tag: tags.bracket, color: "var(--cm-bracket-color)" },
     { tag: tags.brace, color: "var(--cm-bracket-color)" },
     { tag: tags.tagName, color: "var(--cm-tag-color)" },
diff --git a/frontend/light_color.css b/frontend/light_color.css
index 7821f2b17b..96ee8bbf92 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -164,7 +164,7 @@
         --cm-keyword-color: #ef6155;
         --cm-string-color: #da5616;
         --cm-var-color: #5668a4;
-        --cm-var2-color: #06b6ef;
+        --cm-var2-color: #37768a;
         --cm-builtin-color: #5e7ad3;
         --cm-def-color: #f99b15;
         --cm-bracket-color: #41323f;

From 72e812aea8b30196e043d831981825a4cf15246f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 20 Jan 2022 01:19:42 +0100
Subject: [PATCH 022/821] Remove old CM CSS

---
 frontend/editor.css | 57 +++++----------------------------------------
 1 file changed, 6 insertions(+), 51 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 8a5673c383..c5a6535dd3 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2654,80 +2654,35 @@ pluto-cell.code_differs .cm-editor .cm-gutters {
     font-size: 0px;
 }
 
-.cm-s-default span.cm-comment {
-    color: var(--cm-comment-color);
-    font-style: italic;
-}
-
-.cm-s-default span.cm-atom {
-    color: var(--cm-atom-color);
-}
-
-.cm-completionIcon-c_Number::before,
-.cm-s-default span.cm-number {
+.cm-completionIcon-c_Number::before {
     color: var(--cm-number-color);
 }
 
-.cm-s-default span.cm-property,
-.cm-s-default span.cm-attribute {
-    color: var(--cm-property-color);
-}
-
-.cm-s-default span.cm-keyword {
-    color: var(--cm-keyword-color);
-}
-
 .cm-completionIcon-c_String::before,
 .cm-completionIcon-completion_path::before,
-.cm-completionIcon-completion_dict::before,
-.cm-s-default span.cm-string {
+.cm-completionIcon-completion_dict::before {
     color: var(--cm-string-color);
 }
 
-.cm-s-default span.cm-operator {
-    font-variant-ligatures: var(--pluto-operator-ligatures);
-}
-
 .cm-completionIcon-c_Any::before,
-pluto-output > assignee,
-.cm-s-default span.cm-variable {
+pluto-output > assignee {
     color: var(--cm-var-color) !important;
     font-weight: 700;
 }
 
-.cm-s-default span.cm-builtin {
-    color: var(--cm-builtin-color);
-    font-weight: 700;
-}
-
-.cm-s-default span.cm-variable-2 {
-    color: var(--cm-var2-color);
-}
-
-.cm-completionIcon-c_Function::before,
-.cm-s-default span.cm-def {
+.cm-completionIcon-c_Function::before {
     color: var(--cm-def-color);
 }
 
-.cm-completionIcon-c_Array::before,
-.cm-s-default span.cm-bracket {
+.cm-completionIcon-c_Array::before {
     color: var(--cm-bracket-color);
 }
 
-.cm-s-default span.cm-tag {
-    color: var(--cm-tag-color);
-}
-
 .cm-completionIcon-c_package::before,
-.cm-completionIcon-c_Module::before,
-.cm-s-default span.cm-link {
+.cm-completionIcon-c_Module::before {
     color: var(--cm-link-color);
 }
 
-.cm-s-default span.cm-error {
-    background: var(--cm-error-bg-color);
-    color: var(--cm-error-color);
-}
 .cm-editor .cm-activeLine {
     background: unset;
 }

From 9f3dea1a02d2d20a7b9c16eb5e33995090e2ee75 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 20 Jan 2022 22:03:51 +0100
Subject: [PATCH 023/821] CSS tweak

---
 frontend/editor.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index c5a6535dd3..f0344bb08b 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1387,11 +1387,6 @@ body:not(.___) pluto-cell.running.errored > pluto-trafficlight::after {
 
 pluto-cell.depends_on_disabled_cells > pluto-trafficlight,
 pluto-cell.running_disabled > pluto-trafficlight {
-    background-color: rgb(255, 0, 0);
-}
-
-pluto-cell.running_disabled:not(.asjkdhf) > pluto-trafficlight {
-    background-color: var(--disabled-cell-bg-color);
     opacity: 0.3;
 }
 

From d48dba39cebfdef309a003044b40b0300bccb52b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 20 Jan 2022 22:09:29 +0100
Subject: [PATCH 024/821] default_number_of_threads tweak

---
 src/Configuration.jl | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index bbc863bc9f..562fc8f602 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -146,11 +146,7 @@ function default_number_of_threads()
 
     all(isspace, env_value) ?
         roughly_the_number_of_physical_cpu_cores() :
-        try
-            parse(Int, env_value)
-        catch
-            env_value
-        end
+        env_value
 end
 
 function roughly_the_number_of_physical_cpu_cores()

From 6d82f5c84fa6022ff6a3e78f1f5b9447dc9a52ed Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Fri, 21 Jan 2022 00:24:01 +0100
Subject: [PATCH 025/821] Fixes in julia-lezer (#1830)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/CellInput.js              |  41 ++-
 .../CellInput/LiveDocsFromCursor.js           |   7 +-
 .../CellInput/go_to_definition_plugin.js      | 252 ++++++++++++------
 frontend/dark_color.css                       |  10 +-
 frontend/editor.css                           |   8 +-
 frontend/imports/CodemirrorPlutoSetup.js      |   4 +-
 frontend/light_color.css                      |   4 +-
 7 files changed, 232 insertions(+), 94 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 48ce704da9..88b1f7d82b 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -59,10 +59,19 @@ import { HighlightLineFacet, highlightLinePlugin } from "./CellInput/highlight_l
 export const pluto_syntax_colors = HighlightStyle.define([
     /* The following three need a specific version of the julia parser, will add that later (still messing with it 😈) */
     // Symbol
+    // { tag: tags.controlKeyword, color: "var(--cm-keyword-color)", fontWeight: 700 },
+
+    { tag: tags.propertyName, color: "var(--cm-property-color)" },
+    { tag: tags.unit, color: "var(--cm-tag-color)" },
     { tag: tags.literal, color: "var(--cm-builtin-color)", fontWeight: 700 },
-    { tag: tags.macroName, color: "var(--cm-var-color)", fontWeight: 700 },
+    { tag: tags.macroName, color: "var(--cm-macro-color)", fontWeight: 700 },
+
     // `nothing` I guess... Any others?
-    { tag: tags.standard(tags.variableName), color: "var(--cm-builtin-color)", fontWeight: 700 },
+    {
+        tag: tags.standard(tags.variableName),
+        color: "var(--cm-builtin-color)",
+        fontWeight: 700,
+    },
 
     { tag: tags.bool, color: "var(--cm-builtin-color)", fontWeight: 700 },
 
@@ -76,12 +85,19 @@ export const pluto_syntax_colors = HighlightStyle.define([
     { tag: tags.string, color: "var(--cm-string-color)" },
     { tag: tags.variableName, color: "var(--cm-var-color)", fontWeight: 700 },
     // { tag: tags.variable2, color: "#06b6ef" },
+    { tag: tags.typeName, color: "var(--cm-type-color)", fontStyle: "italic" },
+    { tag: tags.typeOperator, color: "var(--cm-type-color)", fontStyle: "italic" },
     { tag: tags.bracket, color: "var(--cm-bracket-color)" },
     { tag: tags.brace, color: "var(--cm-bracket-color)" },
     { tag: tags.tagName, color: "var(--cm-tag-color)" },
     { tag: tags.link, color: "var(--cm-link-color)" },
-    { tag: tags.invalid, color: "var(--cm-error-color)", background: "var(--cm-error-bg-color)" },
+    {
+        tag: tags.invalid,
+        color: "var(--cm-error-color)",
+        background: "var(--cm-error-bg-color)",
+    },
     // ...Object.keys(tags).map((x) => ({ tag: x, color: x })),
+
     // Markdown
     { tag: tags.heading, color: "#081e87", fontWeight: 500 },
     { tag: tags.heading1, color: "#081e87", fontWeight: 500, fontSize: "1.5em" },
@@ -89,7 +105,12 @@ export const pluto_syntax_colors = HighlightStyle.define([
     { tag: tags.heading3, color: "#081e87", fontWeight: 500, fontSize: "1.25em" },
     { tag: tags.heading4, color: "#081e87", fontWeight: 500, fontSize: "1.1em" },
     { tag: tags.heading5, color: "#081e87", fontWeight: 500, fontSize: "1em" },
-    { tag: tags.heading6, color: "#081e87", fontWeight: "bold", fontSize: "0.8em" },
+    {
+        tag: tags.heading6,
+        color: "#081e87",
+        fontWeight: "bold",
+        fontSize: "0.8em",
+    },
     { tag: tags.url, color: "#48b685", textDecoration: "underline" },
     { tag: tags.quote, color: "#444", fontStyle: "italic" },
     { tag: tags.literal, color: "#232227", fontWeight: 700 },
@@ -277,7 +298,11 @@ export const CellInput = ({
                 cm.dispatch({
                     changes: [
                         { from: 0, to: 0, insert: prefix },
-                        { from: cm.state.doc.length, to: cm.state.doc.length, insert: suffix },
+                        {
+                            from: cm.state.doc.length,
+                            to: cm.state.doc.length,
+                            insert: suffix,
+                        },
                     ],
                     selection:
                         selection.from === 0
@@ -334,7 +359,7 @@ export const CellInput = ({
             { key: "Ctrl-Backspace", run: keyMapBackspace },
         ]
 
-        let DOCS_UPDATER_VERBOSE = true
+        let DOCS_UPDATER_VERBOSE = false
         const docs_updater = EditorView.updateListener.of((update) => {
             if (!update.view.hasFocus) {
                 return
@@ -450,7 +475,9 @@ export const CellInput = ({
                     keymap.of(plutoKeyMaps),
                     // Before default keymaps (because we override some of them)
                     // but after the autocomplete plugin, because we don't want to move cell when scrolling through autocomplete
-                    cell_movement_plugin({ focus_on_neighbor: ({ cell_delta, line, character }) => on_focus_neighbor(cell_id, cell_delta, line, character) }),
+                    cell_movement_plugin({
+                        focus_on_neighbor: ({ cell_delta, line, character }) => on_focus_neighbor(cell_id, cell_delta, line, character),
+                    }),
                     keymap.of([...closeBracketsKeymap, ...defaultKeymap, ...historyKeymap, ...foldKeymap, ...commentKeymap]),
                     placeholder("Enter cell code..."),
 
diff --git a/frontend/components/CellInput/LiveDocsFromCursor.js b/frontend/components/CellInput/LiveDocsFromCursor.js
index a9c4a71d90..ea8036e4f1 100644
--- a/frontend/components/CellInput/LiveDocsFromCursor.js
+++ b/frontend/components/CellInput/LiveDocsFromCursor.js
@@ -24,6 +24,7 @@ let VALID_DOCS_TYPES = [
     "MacroFieldExpression",
     "MacroIdentifier",
     "Operator",
+    "Definition",
     "ParameterizedIdentifier",
 ]
 let keywords_that_have_docs_and_are_cool = ["import", "export", "try", "catch", "finally", "quote", "do", "struct", "mutable"]
@@ -42,6 +43,9 @@ let is_docs_searchable = (/** @type {import("../../imports/CodemirrorPlutoSetup.
                 if (cursor.name === "TypeArgumentList") {
                     continue
                 }
+                if (cursor.name === "FieldName" || cursor.name === "MacroName" || cursor.name === "MacroFieldName") {
+                    continue
+                }
                 if (!is_docs_searchable(cursor)) {
                     return false
                 }
@@ -158,7 +162,7 @@ export let get_selected_doc_from_state = (/** @type {EditorState} */ state, verb
                 }
 
                 // `html"asd"` should yield "html"
-                if (cursor.name === "Identifier" && parent.name === "PrefixedString") {
+                if (cursor.name === "Identifier" && parent.name === "Prefix") {
                     continue
                 }
                 if (cursor.name === "PrefixedString") {
@@ -269,6 +273,7 @@ export let get_selected_doc_from_state = (/** @type {EditorState} */ state, verb
 
                 if (VALID_DOCS_TYPES.includes(cursor.name) || keywords_that_have_docs_and_are_cool.includes(cursor.name)) {
                     if (!is_docs_searchable(cursor)) {
+                        console.log("NOT DOCS SEARCHABLE")
                         return undefined
                     }
 
diff --git a/frontend/components/CellInput/go_to_definition_plugin.js b/frontend/components/CellInput/go_to_definition_plugin.js
index 42b2c7ad5d..96cd0a42d6 100644
--- a/frontend/components/CellInput/go_to_definition_plugin.js
+++ b/frontend/components/CellInput/go_to_definition_plugin.js
@@ -46,10 +46,13 @@ let node_is_variable_usage = (node) => {
         }
     }
 
+    if (parent.name === "Type") {
+        return true
+    }
+
     if (parent.name === "TypedExpression") return node_is_variable_usage(parent)
     if (parent.name === "NamedField") return node_is_variable_usage(parent)
     if (parent.name === "BareTupleExpression") return node_is_variable_usage(parent)
-    if (parent.name === "MacroIdentifier") return node_is_variable_usage(parent)
 
     return true
 }
@@ -98,6 +101,16 @@ let clone_scope_state = (scopestate) => {
  * @returns {Array<Range>}
  */
 let get_variables_from_assignment = (cursor) => {
+    if (cursor.name === "Definition") {
+        if (cursor.firstChild()) {
+            try {
+                return get_variables_from_assignment(cursor)
+            } finally {
+                cursor.parent()
+            }
+        }
+    }
+
     if (cursor.name === "Identifier") {
         return [{ to: cursor.to, from: cursor.from }]
     }
@@ -182,6 +195,61 @@ let go_through_quoted_expression_looking_for_interpolations = function* (cursor)
     }
 }
 
+/**
+ * @param {import("../../imports/CodemirrorPlutoSetup.js").TreeCursor} cursor
+ * @param {any} doc
+ * @param {ScopeState} scopestate
+ * @returns {ScopeState}
+ */
+let parse_definitions = function (cursor, doc, scopestate) {
+    if (cursor.name === "TypeArgumentList" && cursor.firstChild()) {
+        try {
+            do {
+                scopestate = parse_definitions(cursor, doc, scopestate)
+            } while (cursor.nextSibling())
+        } finally {
+            cursor.parent()
+        }
+        return scopestate
+    } else if (cursor.name === "TypedExpression" && cursor.node.getChildren("<:").length === 1 && cursor.firstChild()) {
+        // X <: Y
+        try {
+            // X
+            scopestate = parse_definitions(cursor, doc, scopestate)
+            cursor.nextSibling()
+            // <:
+            cursor.nextSibling()
+            // Y
+            scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
+            return scopestate
+        } finally {
+            cursor.parent()
+        }
+    } else if (cursor.name === "ParameterizedIdentifier" && cursor.firstChild()) {
+        // X{Y}
+        try {
+            // X
+            scopestate = parse_definitions(cursor, doc, scopestate)
+            cursor.nextSibling()
+            // Y
+            scopestate = parse_definitions(cursor, doc, scopestate)
+            return scopestate
+        } finally {
+            cursor.parent()
+        }
+    } else if (cursor.name === "Identifier") {
+        let name = doc.sliceString(cursor.from, cursor.to)
+        scopestate.definitions.set(name, {
+            from: cursor.from,
+            to: cursor.to,
+        })
+        return scopestate
+    } else {
+        // console.warn(`UNKNOWN NODE in parse_definition cursor.toString():`, cursor.toString())
+        return scopestate
+    }
+}
+
 /**
  * @param {import("../../imports/CodemirrorPlutoSetup.js").TreeCursor} cursor
  * @param {any} doc
@@ -217,35 +285,12 @@ let explore_variable_usage = (
 
                 // We're at the identifier (possibly ParameterizedIdentifier)
                 // @ts-ignore
-                if (cursor.name === "Identifier") {
-                    let name = doc.sliceString(cursor.from, cursor.to)
-                    scopestate.definitions.set(name, {
-                        from: cursor.from,
-                        to: cursor.to,
-                    })
-                    cursor.nextSibling()
-                }
-                // @ts-ignore
-                if (cursor.name === "ParameterizedIdentifier" && cursor.firstChild()) {
+                if (cursor.name === "Definition" && cursor.firstChild()) {
                     try {
-                        let name = doc.sliceString(cursor.from, cursor.to)
-                        scopestate.definitions.set(name, {
-                            from: cursor.from,
-                            to: cursor.to,
-                        })
-
-                        cursor.nextSibling() // Typed part
-                        scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
+                        scopestate = parse_definitions(cursor, doc, scopestate)
                     } finally {
                         cursor.parent()
                     }
-                    cursor.nextSibling()
-                }
-
-                // @ts-ignore
-                if (cursor.name === "TypedExpression" && cursor.node.getChildren("Identifier").length === 1) {
-                    scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
-                    cursor.nextSibling()
                 }
 
                 // We are now in the actual struct body
@@ -319,31 +364,6 @@ let explore_variable_usage = (
             } finally {
                 cursor.parent()
             }
-        } else if (cursor.name === "ExportStatement" && cursor.firstChild()) {
-            try {
-                // @ts-ignore
-                if (cursor.name === "export") cursor.nextSibling()
-                do {
-                    // @ts-ignore
-                    if (cursor.name === "Identifier") {
-                        // Because lezer-julia isn't smart enough yet, we have to check if this is a macro
-                        // by plainly checking if there is an @ in front of the identifier :P
-                        let name_with_possibly_an_at = doc.sliceString(cursor.from - 1, cursor.to)
-                        if (name_with_possibly_an_at[0] !== "@") {
-                            name_with_possibly_an_at = name_with_possibly_an_at.slice(1)
-                        }
-                        scopestate.usages.add({
-                            usage: {
-                                from: cursor.to - name_with_possibly_an_at.length,
-                                to: cursor.to,
-                            },
-                            definition: scopestate.definitions.get(name_with_possibly_an_at) ?? null,
-                        })
-                    }
-                } while (cursor.nextSibling())
-            } finally {
-                cursor.parent()
-            }
         } else if (cursor.name === "CompoundExpression" && cursor.firstChild()) {
             // begin ... end, go through all the children one by one and keep adding their definitions
             try {
@@ -451,30 +471,34 @@ let explore_variable_usage = (
             }
         } else if (cursor.name === "DoClause" && cursor.firstChild()) {
             try {
-                // It's not yet possible to be SURE that we have the arguments, because of the way @lezer/julia works...
-                // But imma do my best, and soon contribute to @lezer/julia
-
-                cursor.nextSibling() // We are now supposed to be in the argumentlist..
-                // Problem is: we might also be in the first statement of the function...
-                // So we'll make sure that we have something that is valid as arguments,
-                // but then still someone MIGHT have a plain identifier in the first statement.
-
                 let nested_scope = {
                     usages: new Set(),
                     definitions: new Map(scopestate.definitions),
                 }
-                for (let variable_node of get_variables_from_assignment(cursor)) {
-                    let name = doc.sliceString(variable_node.from, variable_node.to)
-                    nested_scope.definitions.set(name, {
-                        from: variable_node.from,
-                        to: variable_node.to,
-                    })
-                }
-
-                cursor.nextSibling()
 
                 do {
-                    nested_scope = merge_scope_state(nested_scope, explore_variable_usage(cursor, doc, nested_scope))
+                    // @ts-ignore
+                    if (cursor.name === "DoClauseArguments" && cursor.firstChild()) {
+                        // Don't ask me why, but currently `do (x, y)` is parsed as `DoClauseArguments(ArgumentList(x, y))`
+                        // while an actual argumentslist, `do x, y` is parsed as `DoClauseArguments(BareTupleExpression(x, y))`
+                        let did_go_on_level_deeper = cursor.name === "ArgumentList" && cursor.firstChild()
+                        try {
+                            for (let variable_node of get_variables_from_assignment(cursor)) {
+                                let name = doc.sliceString(variable_node.from, variable_node.to)
+                                nested_scope.definitions.set(name, {
+                                    from: variable_node.from,
+                                    to: variable_node.to,
+                                })
+                            }
+                        } finally {
+                            if (did_go_on_level_deeper) {
+                                cursor.parent()
+                            }
+                            cursor.parent()
+                        }
+                    } else {
+                        nested_scope = merge_scope_state(nested_scope, explore_variable_usage(cursor, doc, nested_scope))
+                    }
                 } while (cursor.nextSibling())
 
                 scopestate = {
@@ -484,6 +508,15 @@ let explore_variable_usage = (
             } finally {
                 cursor.parent()
             }
+        } else if (cursor.name === "NamedField" && cursor.firstChild()) {
+            try {
+                // NamedField's in the wild indicate there is no assignment, just a property name
+                if (cursor.nextSibling()) {
+                    scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
+                }
+            } finally {
+                cursor.parent()
+            }
         } else if (cursor.name === "FunctionDefinition" || cursor.name === "MacroDefinition") {
             let full_node = cursor.node
             if (cursor.firstChild()) {
@@ -506,14 +539,19 @@ let explore_variable_usage = (
                     }
                     // @ts-ignore
                     // Function name, add to current scope
-                    if (cursor.name === "Identifier") {
-                        let name = doc.sliceString(cursor.from, cursor.to)
-                        if (in_macro) {
-                            name = `@${name}`
+                    if (cursor.name === "Definition" && cursor.firstChild()) {
+                        try {
+                            if (cursor.name === "Identifier") {
+                                let name = doc.sliceString(cursor.from, cursor.to)
+                                if (in_macro) {
+                                    name = `@${name}`
+                                }
+                                scopestate.definitions.set(name, { from: cursor.from, to: cursor.to })
+                                cursor.nextSibling()
+                            }
+                        } finally {
+                            cursor.parent()
                         }
-                        // Add the full node as position, so it selects the whole thing
-                        // scopestate.definitions.set(name, { from: full_node.from, to: full_node.to })
-                        scopestate.definitions.set(name, { from: cursor.from, to: cursor.to })
                         cursor.nextSibling()
                     }
 
@@ -521,14 +559,70 @@ let explore_variable_usage = (
                         usages: new Set(),
                         definitions: new Map(scopestate.definitions),
                     }
+
+                    let type_parameters = full_node.getChild("TypeParameters")
+                    if (type_parameters) {
+                        nested_scope = parse_definitions(type_parameters.firstChild.cursor, doc, nested_scope)
+                    }
+
                     // @ts-ignore
                     // Cycle through arguments
                     if (cursor.name === "ArgumentList" && cursor.firstChild()) {
                         try {
                             do {
-                                // I tried doing this the way it is, but lezer-julia isn't there yet.
-                                // It is too hard (and not worth it) to do it the way it is now.
-                                // So we only take simple identifiers, and we don't care about the rest.
+                                // @ts-ignore
+                                if (cursor.name === "NamedArgument" && cursor.firstChild()) {
+                                    try {
+                                        if (cursor.name === "NamedField" && cursor.firstChild()) {
+                                            try {
+                                                // First child is the name of the argument
+                                                if (cursor.name === "TypedExpression" && cursor.firstChild()) {
+                                                    try {
+                                                        do {
+                                                            // @ts-ignore
+                                                            if (cursor.name === "Type") {
+                                                                scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
+                                                            }
+                                                        } while (cursor.nextSibling())
+                                                    } finally {
+                                                        cursor.parent()
+                                                    }
+                                                }
+                                                for (let variable_node of get_variables_from_assignment(cursor)) {
+                                                    let name = doc.sliceString(variable_node.from, variable_node.to)
+                                                    nested_scope.definitions.set(name, {
+                                                        from: variable_node.from,
+                                                        to: variable_node.to,
+                                                    })
+                                                }
+
+                                                // Next sibling is the default value
+                                                if (cursor.nextSibling()) {
+                                                    scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
+                                                }
+                                            } finally {
+                                                cursor.parent()
+                                            }
+                                        }
+                                    } finally {
+                                        cursor.parent()
+                                    }
+                                }
+
+                                // @ts-ignore
+                                if (cursor.name === "TypedExpression" && cursor.firstChild()) {
+                                    try {
+                                        do {
+                                            // @ts-ignore
+                                            if (cursor.name === "Type") {
+                                                scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, nested_scope))
+                                            }
+                                        } while (cursor.nextSibling())
+                                    } finally {
+                                        cursor.parent()
+                                    }
+                                }
+
                                 for (let variable_node of get_variables_from_assignment(cursor)) {
                                     let name = doc.sliceString(variable_node.from, variable_node.to)
                                     nested_scope.definitions.set(name, {
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index 7acf203f34..1bfa1d2f95 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -155,15 +155,17 @@
         /* code highlighting */
         --cm-editor-text-color: #ffe9fc;
         --cm-comment-color: #e96ba8;
-        --cm-atom-color: #815ba4;
-        --cm-number-color: #815ba4;
-        --cm-property-color: #48b685;
+        --cm-atom-color: hsl(8deg 72% 62%);
+        --cm-number-color: hsl(271deg 45% 64%);
+        --cm-property-color: #f99b15;
         --cm-keyword-color: #ff7a6f;
         --cm-string-color: hsl(20deg 69% 59%);
         --cm-var-color: #afb7d3;
         --cm-var2-color: #06b6ef;
+        --cm-macro-color: #82b38b;
         --cm-builtin-color: #5e7ad3;
-        --cm-def-color: #f99b15;
+        --cm-function-color: #f99b15;
+        --cm-type-color: #3e7385;
         --cm-bracket-color: #a2a273;
         --cm-tag-color: #ef6155;
         --cm-link-color: #815ba4;
diff --git a/frontend/editor.css b/frontend/editor.css
index f0344bb08b..f172db894c 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2559,6 +2559,12 @@ Based on "Paraíso (Light)" by Jan T. Sott:
     text-decoration-skip-ink: none;
 }
 
+@media (prefers-color-scheme: dark) {
+    [data-pluto-variable] {
+        text-decoration-color: #5d5f70;
+    }
+}
+
 body.ctrl_down [data-pluto-variable],
 body.ctrl_down [data-cell-variable] {
     text-decoration-color: #d177e6;
@@ -2666,7 +2672,7 @@ pluto-output > assignee {
 }
 
 .cm-completionIcon-c_Function::before {
-    color: var(--cm-def-color);
+    color: var(--cm-function-color);
 }
 
 .cm-completionIcon-c_Array::before {
diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index 0132dd044e..54d2203995 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -55,7 +55,8 @@ import {
     sql,
     javascript,
     python,
-} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.19.6/dist/index.es.min.js"
+    Text,
+} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.24.0/dist/index.es.min.js"
 
 export {
     EditorState,
@@ -114,4 +115,5 @@ export {
     sql,
     javascript,
     python,
+    Text,
 }
diff --git a/frontend/light_color.css b/frontend/light_color.css
index 96ee8bbf92..7db1aeba6a 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -164,9 +164,11 @@
         --cm-keyword-color: #ef6155;
         --cm-string-color: #da5616;
         --cm-var-color: #5668a4;
+        --cm-macro-color: #5c8c5f;
         --cm-var2-color: #37768a;
         --cm-builtin-color: #5e7ad3;
-        --cm-def-color: #f99b15;
+        --cm-function-color: #cc80ac;
+        --cm-type-color: lightblue;
         --cm-bracket-color: #41323f;
         --cm-tag-color: #ef6155;
         --cm-link-color: #815ba4;

From a489aa530f1d0b0c216710c36d3b862f99ca3b6e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 00:24:30 +0100
Subject: [PATCH 026/821] tweaks

---
 frontend/dark_color.css  |   2 +-
 frontend/light_color.css |   2 +-
 sample/test1.jl          | 335 ++++++++++++++++++++++++++-------------
 3 files changed, 223 insertions(+), 116 deletions(-)

diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index 1bfa1d2f95..8e79177b4c 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -165,7 +165,7 @@
         --cm-macro-color: #82b38b;
         --cm-builtin-color: #5e7ad3;
         --cm-function-color: #f99b15;
-        --cm-type-color: #3e7385;
+        --cm-type-color: hsl(51deg 32% 44%);
         --cm-bracket-color: #a2a273;
         --cm-tag-color: #ef6155;
         --cm-link-color: #815ba4;
diff --git a/frontend/light_color.css b/frontend/light_color.css
index 7db1aeba6a..cbb83f3e1b 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -168,7 +168,7 @@
         --cm-var2-color: #37768a;
         --cm-builtin-color: #5e7ad3;
         --cm-function-color: #cc80ac;
-        --cm-type-color: lightblue;
+        --cm-type-color: hsl(170deg 32% 44%);
         --cm-bracket-color: #41323f;
         --cm-tag-color: #ef6155;
         --cm-link-color: #815ba4;
diff --git a/sample/test1.jl b/sample/test1.jl
index ac3fffb6a6..7005463cd6 100644
--- a/sample/test1.jl
+++ b/sample/test1.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.11.3
+# v0.17.5
 
 using Markdown
 using InteractiveUtils
@@ -7,12 +7,16 @@ using InteractiveUtils
 # This Pluto notebook uses @bind for interactivity. When running this notebook outside of Pluto, the following 'mock version' of @bind gives bound variables a default value (instead of an error).
 macro bind(def, element)
     quote
+        local iv = try Base.loaded_modules[Base.PkgId(Base.UUID("6e696c72-6542-2067-7265-42206c756150"), "AbstractPlutoDingetjes")].Bonds.initial_value catch; b -> missing; end
         local el = $(esc(element))
-        global $(esc(def)) = Core.applicable(Base.get, el) ? Base.get(el) : missing
+        global $(esc(def)) = Core.applicable(Base.get, el) ? Base.get(el) : iv(el)
         el
     end
 end
 
+# ╔═╡ 878a4750-b15e-11ea-2584-8feba490699f
+using Test
+
 # ╔═╡ fd0763a0-b163-11ea-23b4-a7bae7052e19
 md"# File picker"
 
@@ -22,6 +26,15 @@ md"# Notebook interaction"
 # ╔═╡ 6dde0352-b15e-11ea-2fa8-7327cc366c1a
 md"## Running multiple cells"
 
+# ╔═╡ 7370dcc0-b15e-11ea-234b-23584c864b61
+ma = 1
+
+# ╔═╡ 75b21a30-b15e-11ea-3046-2170ec097e63
+mb = 2
+
+# ╔═╡ 7b74dd40-b15e-11ea-291a-d7e10a185718
+@test ma + mb == 3
+
 # ╔═╡ f0b821b0-b15f-11ea-1f64-dd33aa85b54e
 md"## Moving cells"
 
@@ -31,6 +44,66 @@ md"## Stopping cells"
 # ╔═╡ d2c1d090-b162-11ea-0c17-2b234c098cf9
 md"# CodeMirror"
 
+# ╔═╡ bc5bf64e-8b47-45ac-baf2-3cbb8e35d916
+"""
+Some sample code from https://juliamono.netlify.app/
+"""
+function T(𝛉::AbstractArray,
+           𝒞::Tuple{AbstractArray,
+           Vararg{AbstractArray}},
+           𝒟::Tuple{AbstractArray, Vararg{AbstractArray}})
+    ⊗ = kron
+    l = length(𝛉)
+    𝐈ₗ = SMatrix{l,l}(1.0I)
+    𝐈ₘ = SMatrix{1,1}(1.0I)
+    𝐓 = @SMatrix zeros(l,l)
+    N = length(𝒟[1])
+    ℳ, ℳʹ = 𝒟
+    Λ₁, Λ₂ = 𝒞
+    𝚲ₙ = @MMatrix zeros(4,4)
+    𝐞₁ = @SMatrix [1.0; 0.0; 0.0]
+    𝐞₂ = @SMatrix [0.0; 1.0; 0.0]
+    for n = 1:N
+        index = SVector(1,2)
+        𝚲ₙ[1:2,1:2] .=  Λ₁[n][index,index]
+        𝚲ₙ[3:4,3:4] .=  Λ₂[n][index,index]
+        𝐦    = hom(ℳ[n])
+        𝐦ʹ   = hom(ℳʹ[n])
+        𝐔ₙ   = (𝐦 ⊗ 𝐦ʹ)
+        ∂ₓ𝐮ₙ = [(𝐞₁ ⊗ 𝐦ʹ) (𝐞₂ ⊗ 𝐦ʹ) (𝐦 ⊗ 𝐞₁) (𝐦 ⊗ 𝐞₂)]
+        𝐁ₙ   = ∂ₓ𝐮ₙ * 𝚲ₙ * ∂ₓ𝐮ₙ'
+        𝚺ₙ   = 𝛉' * 𝐁ₙ * 𝛉
+        𝚺ₙ⁻¹ = inv(𝚺ₙ)
+        𝐓₁   = @SMatrix zeros(Float64,l,l)
+        for k = 1:l
+            𝐞ₖ = 𝐈ₗ[:,k]
+            ∂𝐞ₖ𝚺ₙ = (𝐈ₘ ⊗ 𝐞ₖ') * 𝐁ₙ * (𝐈ₘ ⊗ 𝛉) + (𝐈ₘ ⊗ 𝛉') * 𝐁ₙ * (𝐈ₘ ⊗ 𝐞ₖ)
+            # Accumulating the result in 𝐓₁ allocates memory,
+            # even though the two terms in the
+            # summation are both SArrays.
+            𝐓₁ = 𝐓₁ + 𝐔ₙ * 𝚺ₙ⁻¹ * (∂𝐞ₖ𝚺ₙ) * 𝚺ₙ⁻¹ * 𝐔ₙ' * 𝛉 * 𝐞ₖ'
+        end
+        𝐓 = 𝐓 + 𝐓₁
+    end
+    𝐓
+end
+
+# ╔═╡ a28395ed-4004-4731-a0bd-be3398505a0e
+# Some sample code from https://juliamono.netlify.app/
+quote
+	using Zygote: @adjoint
+	function ignore(f)
+		try return f()
+		catch e; return 0; end
+	end
+	@adjoint function ignore(f)
+		try Zygote._pullback(__context__, f)
+		catch e
+			0, ȳ -> nothing
+		end
+	end
+end;
+
 # ╔═╡ d890a190-b162-11ea-31dd-8d603787e5c5
 md"## Autocomplete"
 
@@ -62,6 +135,26 @@ md"## Stack traces"
 # ╔═╡ 84888e20-b160-11ea-1d61-c5934251d6dd
 html"<div style='height: 100vh'></div>"
 
+# ╔═╡ 9dc4a0a0-b15f-11ea-361c-87742cf3f2a2
+function ef(x)
+	
+	
+	sqrt(-x)
+end
+
+# ╔═╡ aab109c0-b15f-11ea-275d-31e21fcda8c4
+ef(1)
+
+# ╔═╡ 976bc2a0-b160-11ea-3e7a-9f033b0f2daf
+function eg(x)
+	
+	
+	sqrt(-x)
+end
+
+# ╔═╡ 9c74f9b2-b160-11ea-35fb-917cb1120f5b
+eg(1)
+
 # ╔═╡ ea3f77f0-b166-11ea-046e-ef39bfc57d0f
 md"## Bad errors"
 
@@ -74,6 +167,21 @@ md"# Bonds"
 # ╔═╡ 3a14b3f0-b165-11ea-153d-796416ee5ccc
 md"## Lossy"
 
+# ╔═╡ 41a75500-b165-11ea-2519-bbd0feaef6cf
+@bind bl1 html"<input type='range' max='100000'>"
+
+# ╔═╡ 4ccbf670-b165-11ea-1951-c17ffb8a58cf
+sleep(.5); bl1
+
+# ╔═╡ 8bb26902-b165-11ea-048c-d7f7a72006ee
+@assert bl1 isa Int64
+
+# ╔═╡ e559eaf0-b165-11ea-0d81-ffc480afe8f3
+@bind bl2 html"<input type='range' max='100000'>"
+
+# ╔═╡ e63be680-b165-11ea-0fd3-bd4e0bf92eb8
+bl2
+
 # ╔═╡ 59966a90-b163-11ea-1786-e56e45f06dd0
 md"## Recursive"
 
@@ -83,20 +191,73 @@ md"## Scrolling"
 # ╔═╡ 431d17c0-cfff-11ea-39b5-394b34438544
 md"### `text/html`"
 
+# ╔═╡ f2c0bb90-b162-11ea-24a1-3f864a09e5ee
+@bind bw1 html"<input type='range' value='0'>"
+
+# ╔═╡ a4d4ac28-cfff-11ea-3f14-15d2928d2c88
+zeros((bw1, bw1))
+
+# ╔═╡ 56e6f440-b15e-11ea-1327-09932af5b5bd
+HTML("<div style='height: $(bw1)vh'></div>")
+
+# ╔═╡ 2296ac80-b163-11ea-3d00-ed366fa9ce3e
+@bind bw2 html"<input type='range' value='0'>"
+
+# ╔═╡ 20d72230-b163-11ea-39c2-69bf2c422d50
+HTML("<div style='height: $(bw2)vh'></div>")
+
+# ╔═╡ 55d116d6-cfff-11ea-25fc-056ce62c8bcd
+zeros((bw2, bw2))
+
+# ╔═╡ 76c98394-cfff-11ea-0b6c-25260a8a3bb9
+zeros((10,10));
+
 # ╔═╡ 32b5edc0-b15d-11ea-09d6-3b889f6d397a
 md"# Rich display
 
 ## `image/svg+xml` and `image/jpeg`"
 
+# ╔═╡ 52cb1264-d824-11ea-332a-55964f3d8b90
+begin
+	struct A end
+	struct B end
+	
+	function Base.show(io::IO, ::MIME"image/svg+xml", x::A)
+		write(io, read(download("https://raw.githubusercontent.com/fonsp/Pluto.jl/main/frontend/img/logo.svg")))
+	end
+	function Base.show(io::IO, ::MIME"image/jpg", x::B)
+		write(io, read(download("https://fonsp.com/img/doggoSmall.jpg?raw=true")))
+	end
+	nothing
+end
+
+# ╔═╡ 5d59acfe-d824-11ea-1d7b-07551a2b11d4
+A()
+
+# ╔═╡ 64d929aa-d824-11ea-2cc1-835fbe38be11
+B()
+
+# ╔═╡ 661c112e-d824-11ea-3612-4104449c409e
+[A(), B()]
+
 # ╔═╡ 3be84600-b166-11ea-1d24-59212363543f
 md"## `text/plain`"
 
+# ╔═╡ 42f0a872-b166-11ea-0c71-355d62f67fca
+ra = 1:100
+
+# ╔═╡ 794bc212-b166-11ea-0840-fddb29190841
+1:13
+
 # ╔═╡ 95898660-b166-11ea-1db1-df7f3c4f1353
 "<b>I am not bold</b>"
 
 # ╔═╡ 2859a890-b161-11ea-14e9-b7ddaf08195a
 md"## Tree view"
 
+# ╔═╡ 23f41dd2-b15c-11ea-17d2-45b3e83093ba
+Ref(Dict(:a => [1,md"![](https://upload.wikimedia.org/wikipedia/commons/thumb/1/1c/PDS_70.jpg/567px-PDS_70.jpg)", md"# Hello"], [3,4] => (:b, (x=3, y=2))))
+
 # ╔═╡ 88bd7aae-b15f-11ea-270e-ab00e6a01203
 ["asdf", "<b>I am not bold</b>"]
 
@@ -278,6 +439,18 @@ asdfdasd
 # ╔═╡ 46fc284a-d682-11ea-34b6-69874efcaf65
 md"### Text wrapping"
 
+# ╔═╡ 4d452956-d682-11ea-3aeb-cd7d1b2f67dc
+s="12345678012345678012345678012345678012345678012345678012345678012345678012345678012345678012345678012345678056780123456780123456780123456780123456780123456780123456780123456780123456780120123456780\n\n\"\"\n\n5678012345678012
+
+7801234567801234567801234567 7801234567801234567801234567 7801234567801234567801234567 7801234567801234567801234567 7801234567801234567801234567
+
+👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧❤❤❤✔
+
+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."
+
+# ╔═╡ 4e320206-d682-11ea-3dfe-b77f6e96f33a
+Text(s)
+
 # ╔═╡ 1bb05fc0-b15d-11ea-3dae-7734f66a0c56
 md"# Testing machinery"
 
@@ -314,118 +487,6 @@ html"""
 
 """
 
-# ╔═╡ 878a4750-b15e-11ea-2584-8feba490699f
-using Test
-
-# ╔═╡ 7370dcc0-b15e-11ea-234b-23584c864b61
-ma = 1
-
-# ╔═╡ 75b21a30-b15e-11ea-3046-2170ec097e63
-mb = 2
-
-# ╔═╡ 7b74dd40-b15e-11ea-291a-d7e10a185718
-@test ma + mb == 3
-
-# ╔═╡ 9dc4a0a0-b15f-11ea-361c-87742cf3f2a2
-function ef(x)
-	
-	
-	sqrt(-x)
-end
-
-# ╔═╡ aab109c0-b15f-11ea-275d-31e21fcda8c4
-ef(1)
-
-# ╔═╡ 976bc2a0-b160-11ea-3e7a-9f033b0f2daf
-function eg(x)
-	
-	
-	sqrt(-x)
-end
-
-# ╔═╡ 9c74f9b2-b160-11ea-35fb-917cb1120f5b
-eg(1)
-
-# ╔═╡ 41a75500-b165-11ea-2519-bbd0feaef6cf
-@bind bl1 html"<input type='range' max='100000'>"
-
-# ╔═╡ 4ccbf670-b165-11ea-1951-c17ffb8a58cf
-sleep(.5); bl1
-
-# ╔═╡ 8bb26902-b165-11ea-048c-d7f7a72006ee
-@assert bl1 isa Int64
-
-# ╔═╡ e559eaf0-b165-11ea-0d81-ffc480afe8f3
-@bind bl2 html"<input type='range' max='100000'>"
-
-# ╔═╡ e63be680-b165-11ea-0fd3-bd4e0bf92eb8
-bl2
-
-# ╔═╡ f2c0bb90-b162-11ea-24a1-3f864a09e5ee
-@bind bw1 html"<input type='range' value='0'>"
-
-# ╔═╡ a4d4ac28-cfff-11ea-3f14-15d2928d2c88
-zeros((bw1, bw1))
-
-# ╔═╡ 56e6f440-b15e-11ea-1327-09932af5b5bd
-HTML("<div style='height: $(bw1)vh'></div>")
-
-# ╔═╡ 2296ac80-b163-11ea-3d00-ed366fa9ce3e
-@bind bw2 html"<input type='range' value='0'>"
-
-# ╔═╡ 20d72230-b163-11ea-39c2-69bf2c422d50
-HTML("<div style='height: $(bw2)vh'></div>")
-
-# ╔═╡ 55d116d6-cfff-11ea-25fc-056ce62c8bcd
-zeros((bw2, bw2))
-
-# ╔═╡ 76c98394-cfff-11ea-0b6c-25260a8a3bb9
-zeros((10,10));
-
-# ╔═╡ 52cb1264-d824-11ea-332a-55964f3d8b90
-begin
-	struct A end
-	struct B end
-	
-	function Base.show(io::IO, ::MIME"image/svg+xml", x::A)
-		write(io, read(download("https://raw.githubusercontent.com/fonsp/Pluto.jl/main/frontend/img/logo.svg")))
-	end
-	function Base.show(io::IO, ::MIME"image/jpg", x::B)
-		write(io, read(download("https://fonsp.com/img/doggoSmall.jpg?raw=true")))
-	end
-	nothing
-end
-
-# ╔═╡ 5d59acfe-d824-11ea-1d7b-07551a2b11d4
-A()
-
-# ╔═╡ 64d929aa-d824-11ea-2cc1-835fbe38be11
-B()
-
-# ╔═╡ 661c112e-d824-11ea-3612-4104449c409e
-[A(), B()]
-
-# ╔═╡ 42f0a872-b166-11ea-0c71-355d62f67fca
-ra = 1:100
-
-# ╔═╡ 794bc212-b166-11ea-0840-fddb29190841
-1:13
-
-# ╔═╡ 23f41dd2-b15c-11ea-17d2-45b3e83093ba
-Ref(Dict(:a => [1,md"![](https://upload.wikimedia.org/wikipedia/commons/thumb/1/1c/PDS_70.jpg/567px-PDS_70.jpg)", md"# Hello"], [3,4] => (:b, (x=3, y=2))))
-
-# ╔═╡ 4d452956-d682-11ea-3aeb-cd7d1b2f67dc
-s="12345678012345678012345678012345678012345678012345678012345678012345678012345678012345678012345678012345678056780123456780123456780123456780123456780123456780123456780123456780123456780120123456780\n\n\"\"\n\n5678012345678012
-
-7801234567801234567801234567 7801234567801234567801234567 7801234567801234567801234567 7801234567801234567801234567 7801234567801234567801234567
-
-👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧‍👦👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧👩‍👩‍👧❤❤❤✔
-
-Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."
-
-# ╔═╡ 4e320206-d682-11ea-3dfe-b77f6e96f33a
-Text(s)
-
 # ╔═╡ 7e2cc6c0-b15d-11ea-32b0-15394cdebd35
 function ask(kind, str::Markdown.MD)
 	HTML("<div class='test $(kind)'>" * sprint(show, MIME"text/html"(), str) * "</div>")
@@ -597,6 +658,48 @@ ask("visual", md"Assignment to `低调又牛逼的类型系统` must be visible"
 # ╔═╡ 21bd9950-b15d-11ea-2632-41b1c66563bd
 ask("visual", md"These three paragraphs must have equal spacing between them")
 
+# ╔═╡ 00000000-0000-0000-0000-000000000001
+PLUTO_PROJECT_TOML_CONTENTS = """
+[deps]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+"""
+
+# ╔═╡ 00000000-0000-0000-0000-000000000002
+PLUTO_MANIFEST_TOML_CONTENTS = """
+# This file is machine-generated - editing it directly is not advised
+
+julia_version = "1.7.0"
+manifest_format = "2.0"
+
+[[deps.Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+
+[[deps.InteractiveUtils]]
+deps = ["Markdown"]
+uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+
+[[deps.Logging]]
+uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
+
+[[deps.Markdown]]
+deps = ["Base64"]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+
+[[deps.Random]]
+deps = ["SHA", "Serialization"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[deps.SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+
+[[deps.Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[deps.Test]]
+deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
+uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+"""
+
 # ╔═╡ Cell order:
 # ╟─ce7f9d90-b163-11ea-0ff7-cf7378644741
 # ╠═878a4750-b15e-11ea-2584-8feba490699f
@@ -617,6 +720,8 @@ ask("visual", md"These three paragraphs must have equal spacing between them")
 # ╟─f4015940-b15f-11ea-0f3a-1714c79023c3
 # ╟─4980fc10-b163-11ea-081b-c1335699a8f6
 # ╟─d2c1d090-b162-11ea-0c17-2b234c098cf9
+# ╠═bc5bf64e-8b47-45ac-baf2-3cbb8e35d916
+# ╠═a28395ed-4004-4731-a0bd-be3398505a0e
 # ╟─d890a190-b162-11ea-31dd-8d603787e5c5
 # ╟─1b569b72-b167-11ea-1462-63674f7e13db
 # ╠═e141f910-b162-11ea-039b-3ba1414cbd07
@@ -713,3 +818,5 @@ ask("visual", md"These three paragraphs must have equal spacing between them")
 # ╟─1bb05fc0-b15d-11ea-3dae-7734f66a0c56
 # ╠═9ac925d0-b15d-11ea-2abd-7db360900be0
 # ╠═7e2cc6c0-b15d-11ea-32b0-15394cdebd35
+# ╟─00000000-0000-0000-0000-000000000001
+# ╟─00000000-0000-0000-0000-000000000002

From 848a279f9e92abe1e28f9086a64579a30a6f6893 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 00:28:29 +0100
Subject: [PATCH 027/821] Start registry update on server start

---
 src/webserver/WebServer.jl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 4a6e2a2551..49697596b0 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -2,6 +2,7 @@ import MsgPack
 import UUIDs: UUID
 import HTTP
 import Sockets
+import .PkgCompat
 
 include("./WebSocketFix.jl")
 
@@ -269,6 +270,11 @@ function run(session::ServerSession, pluto_router)
     if PLUTO_VERSION >= v"0.18.0" && frontend_directory() == "frontend"
         @info "It looks like you are developing the Pluto package, using the unbundled frontend..."
     end
+    
+    # Start this in the background, so that the first notebook launch (which will trigger registry update) will be faster
+    @asynclog withtoken(pkg_token) do
+        PkgCompat.update_registries(; force=false)
+    end
 
     shutdown_server[] = () -> @sync begin
         println("\n\nClosing Pluto... Restart Julia for a fresh session. \n\nHave a nice day! 🎈")

From a4fe8c316b4b8e2edad781b398aab310103b1bb0 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 00:36:40 +0100
Subject: [PATCH 028/821] recording UI tweaks

---
 frontend/components/Editor.js | 6 ++----
 frontend/editor.css           | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index fd28fa9642..e4e1a5751c 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1216,8 +1216,7 @@ patch: ${JSON.stringify(
                             }</div>
                         </nav>
                     </header>
-                    ${
-                        /*
+                    
                     <${RecordingUI} 
                         notebook_name=${notebook.shortpath}
                         recording_waiting_to_start=${this.state.recording_waiting_to_start}
@@ -1238,8 +1237,7 @@ patch: ${JSON.stringify(
                                 })
                             )}
                     />
-                    */ null
-                    }
+                    
                     <${BinderButton} binder_phase=${this.state.binder_phase} start_binder=${() =>
             start_binder({ setStatePromise: this.setStatePromise, connect: this.connect, launch_params: launch_params })} notebookfile=${
             launch_params.notebookfile == null ? null : new URL(launch_params.notebookfile, window.location.href).href
diff --git a/frontend/editor.css b/frontend/editor.css
index f172db894c..c3ed4cf7b8 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -917,7 +917,7 @@ main > preamble #saveall-container {
 }
 
 .overlay-button {
-    background: #ffffff;
+    background: var(--overlay-button-bg);
     padding: 5px 8px;
     border: 3px solid var(--overlay-button-border);
     border-radius: 12px;

From 6b76953be6eb7ad805aa47d3b8ea1911ff6626ad Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 00:47:12 +0100
Subject: [PATCH 029/821] Update Project.toml

---
 Project.toml         |   2 +-
 sample/JavaScript.jl |  44 +++++++++++++----
 sample/Plots.jl.jl   | 115 ++++++++++++++++++++++++-------------------
 sample/PlutoUI.jl.jl |  16 +++---
 4 files changed, 106 insertions(+), 71 deletions(-)

diff --git a/Project.toml b/Project.toml
index 099f5c55c9..188e75f862 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.17.5"
+version = "0.17.6"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
diff --git a/sample/JavaScript.jl b/sample/JavaScript.jl
index 343e240778..18513e4ff8 100644
--- a/sample/JavaScript.jl
+++ b/sample/JavaScript.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.17.3
+# v0.17.6
 
 using Markdown
 using InteractiveUtils
@@ -53,7 +53,7 @@ This document assumes that you have used HTML, CSS and JavaScript before in anot
 <style>
 
 	article.learning {
-		background: #fde6ea9c;
+		background: #f996a84f;
 		padding: 1em;
 		border-radius: 5px;
 	}
@@ -1045,7 +1045,7 @@ PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
 
 [compat]
 HypertextLiteral = "~0.9.3"
-PlutoUI = "~0.7.22"
+PlutoUI = "~0.7.30"
 """
 
 # ╔═╡ 00000000-0000-0000-0000-000000000002
@@ -1054,9 +1054,9 @@ PLUTO_MANIFEST_TOML_CONTENTS = """
 
 [[AbstractPlutoDingetjes]]
 deps = ["Pkg"]
-git-tree-sha1 = "abb72771fd8895a7ebd83d5632dc4b989b022b5b"
+git-tree-sha1 = "8eaf9f1b4921132a4cff3f36a1d9ba923b14a481"
 uuid = "6e696c72-6542-2067-7265-42206c756150"
-version = "1.1.2"
+version = "1.1.4"
 
 [[ArgTools]]
 uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
@@ -1067,6 +1067,12 @@ uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
 [[Base64]]
 uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
+[[ColorTypes]]
+deps = ["FixedPointNumbers", "Random"]
+git-tree-sha1 = "024fe24d83e4a5bf5fc80501a314ce0d1aa35597"
+uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
+version = "0.11.0"
+
 [[Dates]]
 deps = ["Printf"]
 uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
@@ -1075,6 +1081,12 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
 deps = ["ArgTools", "LibCURL", "NetworkOptions"]
 uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 
+[[FixedPointNumbers]]
+deps = ["Statistics"]
+git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc"
+uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
+version = "0.8.4"
+
 [[Hyperscript]]
 deps = ["Test"]
 git-tree-sha1 = "8d511d5b81240fc8e6802386302675bdf47737b9"
@@ -1121,6 +1133,10 @@ uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
 [[Libdl]]
 uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 
+[[LinearAlgebra]]
+deps = ["Libdl"]
+uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+
 [[Logging]]
 uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
 
@@ -1143,19 +1159,19 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
 [[Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "ae4bbcadb2906ccc085cf52ac286dc1377dceccc"
+git-tree-sha1 = "92f91ba9e5941fc781fecf5494ac1da87bdac775"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.1.2"
+version = "2.2.0"
 
 [[Pkg]]
 deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
 uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[PlutoUI]]
-deps = ["AbstractPlutoDingetjes", "Base64", "Dates", "Hyperscript", "HypertextLiteral", "IOCapture", "InteractiveUtils", "JSON", "Logging", "Markdown", "Random", "Reexport", "UUIDs"]
-git-tree-sha1 = "565564f615ba8c4e4f40f5d29784aa50a8f7bbaf"
+deps = ["AbstractPlutoDingetjes", "Base64", "ColorTypes", "Dates", "Hyperscript", "HypertextLiteral", "IOCapture", "InteractiveUtils", "JSON", "Logging", "Markdown", "Random", "Reexport", "UUIDs"]
+git-tree-sha1 = "5c0eb9099596090bb3215260ceca687b888a1575"
 uuid = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
-version = "0.7.22"
+version = "0.7.30"
 
 [[Printf]]
 deps = ["Unicode"]
@@ -1183,6 +1199,14 @@ uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 [[Sockets]]
 uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
 
+[[SparseArrays]]
+deps = ["LinearAlgebra", "Random"]
+uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[[Statistics]]
+deps = ["LinearAlgebra", "SparseArrays"]
+uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+
 [[TOML]]
 deps = ["Dates"]
 uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
diff --git a/sample/Plots.jl.jl b/sample/Plots.jl.jl
index 54fe6d3666..c35d282f56 100644
--- a/sample/Plots.jl.jl
+++ b/sample/Plots.jl.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.17.3
+# v0.17.6
 
 using Markdown
 using InteractiveUtils
@@ -215,7 +215,7 @@ PLUTO_PROJECT_TOML_CONTENTS = """
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 
 [compat]
-Plots = "~1.25.2"
+Plots = "~1.25.6"
 """
 
 # ╔═╡ 00000000-0000-0000-0000-000000000002
@@ -224,9 +224,9 @@ PLUTO_MANIFEST_TOML_CONTENTS = """
 
 [[Adapt]]
 deps = ["LinearAlgebra"]
-git-tree-sha1 = "84918055d15b3114ede17ac6a7182f68870c16f7"
+git-tree-sha1 = "af92965fb30777147966f58acb05da51c5616b5f"
 uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
-version = "3.3.1"
+version = "3.3.3"
 
 [[ArgTools]]
 uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
@@ -245,15 +245,15 @@ version = "1.0.8+0"
 
 [[Cairo_jll]]
 deps = ["Artifacts", "Bzip2_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"]
-git-tree-sha1 = "f2202b55d816427cd385a9a4f3ffb226bee80f99"
+git-tree-sha1 = "4b859a208b2397a7a623a03449e4636bdb17bcf2"
 uuid = "83423d85-b0ee-5818-9007-b63ccbeb887a"
-version = "1.16.1+0"
+version = "1.16.1+1"
 
 [[ChainRulesCore]]
 deps = ["Compat", "LinearAlgebra", "SparseArrays"]
-git-tree-sha1 = "4c26b4e9e91ca528ea212927326ece5918a04b47"
+git-tree-sha1 = "54fc4400de6e5c3e27be6047da2ef6ba355511f8"
 uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
-version = "1.11.2"
+version = "1.11.6"
 
 [[ChangesOfVariables]]
 deps = ["ChainRulesCore", "LinearAlgebra", "Test"]
@@ -263,9 +263,9 @@ version = "0.1.2"
 
 [[ColorSchemes]]
 deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random"]
-git-tree-sha1 = "a851fec56cb73cfdf43762999ec72eff5b86882a"
+git-tree-sha1 = "6b6f04f93710c71550ec7e16b650c1b9a612d0b6"
 uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
-version = "3.15.0"
+version = "3.16.0"
 
 [[ColorTypes]]
 deps = ["FixedPointNumbers", "Random"]
@@ -281,9 +281,9 @@ version = "0.12.8"
 
 [[Compat]]
 deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
-git-tree-sha1 = "dce3e3fea680869eaa0b774b2e8343e9ff442313"
+git-tree-sha1 = "44c37b4636bc54afac5c574d2d02b625349d6582"
 uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
-version = "3.40.0"
+version = "3.41.0"
 
 [[CompilerSupportLibraries_jll]]
 deps = ["Artifacts", "Libdl"]
@@ -394,16 +394,16 @@ uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89"
 version = "3.3.5+1"
 
 [[GR]]
-deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Printf", "Random", "Serialization", "Sockets", "Test", "UUIDs"]
-git-tree-sha1 = "30f2b340c2fff8410d89bfcdc9c0a6dd661ac5f7"
+deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Printf", "Random", "RelocatableFolders", "Serialization", "Sockets", "Test", "UUIDs"]
+git-tree-sha1 = "4a740db447aae0fbeb3ee730de1afbb14ac798a1"
 uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
-version = "0.62.1"
+version = "0.63.1"
 
 [[GR_jll]]
 deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Pkg", "Qt5Base_jll", "Zlib_jll", "libpng_jll"]
-git-tree-sha1 = "fd75fa3a2080109a2c0ec9864a6e14c60cca3866"
+git-tree-sha1 = "aa22e1ee9e722f1da183eb33370df4c1aeb6c2cd"
 uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
-version = "0.62.0+0"
+version = "0.63.1+0"
 
 [[GeometryBasics]]
 deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"]
@@ -419,9 +419,9 @@ version = "0.21.0+0"
 
 [[Glib_jll]]
 deps = ["Artifacts", "Gettext_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE_jll", "Pkg", "Zlib_jll"]
-git-tree-sha1 = "74ef6288d071f58033d54fd6708d4bc23a8b8972"
+git-tree-sha1 = "a32d672ac2c967f3deb8a81d828afc739c838a06"
 uuid = "7746bdde-850d-59dc-9ae8-88ece973131d"
-version = "2.68.3+1"
+version = "2.68.3+2"
 
 [[Graphite2_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -479,9 +479,9 @@ version = "1.0.0"
 
 [[JLLWrappers]]
 deps = ["Preferences"]
-git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e"
+git-tree-sha1 = "22df5b96feef82434b07327e2d3c770a9b21e023"
 uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
-version = "1.3.0"
+version = "1.4.0"
 
 [[JSON]]
 deps = ["Dates", "Mmap", "Parsers", "Unicode"]
@@ -591,9 +591,9 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [[LogExpFunctions]]
 deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"]
-git-tree-sha1 = "be9eef9f9d78cecb6f262f3c10da151a6c5ab827"
+git-tree-sha1 = "e5718a00af0ab9756305a0392832c8952c7426c1"
 uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
-version = "0.3.5"
+version = "0.3.6"
 
 [[Logging]]
 uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -636,24 +636,24 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
 
 [[NaNMath]]
-git-tree-sha1 = "bfe47e760d60b82b66b61d2d44128b62e3a369fb"
+git-tree-sha1 = "f755f36b19a5116bb580de457cda0c140153f283"
 uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
-version = "0.3.5"
+version = "0.3.6"
 
 [[NetworkOptions]]
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
 [[Ogg_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "7937eda4681660b4d6aeeecc2f7e1c81c8ee4e2f"
+git-tree-sha1 = "887579a3eb005446d514ab7aeac5d1d027658b8f"
 uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051"
-version = "1.3.5+0"
+version = "1.3.5+1"
 
 [[OpenSSL_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "15003dcb7d8db3c6c857fda14891a539a8f2705a"
+git-tree-sha1 = "648107615c15d4e09f7eca16307bc821c1f718d8"
 uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
-version = "1.1.10+0"
+version = "1.1.13+0"
 
 [[Opus_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -674,9 +674,9 @@ version = "8.44.0+0"
 
 [[Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "ae4bbcadb2906ccc085cf52ac286dc1377dceccc"
+git-tree-sha1 = "92f91ba9e5941fc781fecf5494ac1da87bdac775"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.1.2"
+version = "2.2.0"
 
 [[Pixman_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -696,21 +696,21 @@ version = "2.0.1"
 
 [[PlotUtils]]
 deps = ["ColorSchemes", "Colors", "Dates", "Printf", "Random", "Reexport", "Statistics"]
-git-tree-sha1 = "b084324b4af5a438cd63619fd006614b3b20b87b"
+git-tree-sha1 = "68604313ed59f0408313228ba09e79252e4b2da8"
 uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043"
-version = "1.0.15"
+version = "1.1.2"
 
 [[Plots]]
-deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun"]
-git-tree-sha1 = "65ebc27d8c00c84276f14aaf4ff63cbe12016c70"
+deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "Unzip"]
+git-tree-sha1 = "db7393a80d0e5bef70f2b518990835541917a544"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
-version = "1.25.2"
+version = "1.25.6"
 
 [[Preferences]]
 deps = ["TOML"]
-git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a"
+git-tree-sha1 = "2cf929d64681236a2e074ffafb8d568733d2e6af"
 uuid = "21216c6a-2e73-6563-6e65-726566657250"
-version = "1.2.2"
+version = "1.2.3"
 
 [[Printf]]
 deps = ["Unicode"]
@@ -737,20 +737,26 @@ version = "1.2.1"
 
 [[RecipesPipeline]]
 deps = ["Dates", "NaNMath", "PlotUtils", "RecipesBase"]
-git-tree-sha1 = "7ad0dfa8d03b7bcf8c597f59f5292801730c55b8"
+git-tree-sha1 = "37c1631cb3cc36a535105e6d5557864c82cd8c2b"
 uuid = "01d81517-befc-4cb6-b9ec-a95719d0359c"
-version = "0.4.1"
+version = "0.5.0"
 
 [[Reexport]]
 git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b"
 uuid = "189a3867-3050-52da-a836-e630ba90ab69"
 version = "1.2.2"
 
+[[RelocatableFolders]]
+deps = ["SHA", "Scratch"]
+git-tree-sha1 = "cdbd3b1338c72ce29d9584fdbe9e9b70eeb5adca"
+uuid = "05181044-ff0b-4ac5-8273-598c1e38db00"
+version = "0.1.3"
+
 [[Requires]]
 deps = ["UUIDs"]
-git-tree-sha1 = "4036a3bd08ac7e968e27c203d45f5fff15020621"
+git-tree-sha1 = "838a3a4188e2ded87a4f9f184b4b0d78a1e91cb7"
 uuid = "ae029012-a4dd-5104-9daa-d747884805df"
-version = "1.1.3"
+version = "1.3.0"
 
 [[SHA]]
 uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
@@ -789,30 +795,30 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [[StaticArrays]]
 deps = ["LinearAlgebra", "Random", "Statistics"]
-git-tree-sha1 = "3c76dde64d03699e074ac02eb2e8ba8254d428da"
+git-tree-sha1 = "2ae4fe21e97cd13efd857462c1869b73c9f61be3"
 uuid = "90137ffa-7385-5640-81b9-e52037218182"
-version = "1.2.13"
+version = "1.3.2"
 
 [[Statistics]]
 deps = ["LinearAlgebra", "SparseArrays"]
 uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [[StatsAPI]]
-git-tree-sha1 = "0f2aa8e32d511f758a2ce49208181f7733a0936a"
+git-tree-sha1 = "d88665adc9bcf45903013af0982e2fd05ae3d0a6"
 uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0"
-version = "1.1.0"
+version = "1.2.0"
 
 [[StatsBase]]
 deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
-git-tree-sha1 = "2bb0cb32026a66037360606510fca5984ccc6b75"
+git-tree-sha1 = "51383f2d367eb3b444c961d485c565e4c0cf4ba0"
 uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
-version = "0.33.13"
+version = "0.33.14"
 
 [[StructArrays]]
 deps = ["Adapt", "DataAPI", "StaticArrays", "Tables"]
-git-tree-sha1 = "2ce41e0d042c60ecd131e9fb7154a3bfadbf50d3"
+git-tree-sha1 = "d21f2c564b21a202f4677c0fba5b5ee431058544"
 uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
-version = "0.6.3"
+version = "0.6.4"
 
 [[TOML]]
 deps = ["Dates"]
@@ -826,9 +832,9 @@ version = "1.0.1"
 
 [[Tables]]
 deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"]
-git-tree-sha1 = "fed34d0e71b91734bf0a7e10eb1bb05296ddbcd0"
+git-tree-sha1 = "bb1064c9a84c52e277f1096cf41434b675cd368b"
 uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
-version = "1.6.0"
+version = "1.6.1"
 
 [[Tar]]
 deps = ["ArgTools", "SHA"]
@@ -856,6 +862,11 @@ git-tree-sha1 = "53915e50200959667e78a92a418594b428dffddf"
 uuid = "1cfade01-22cf-5700-b092-accc4b62d6e1"
 version = "0.4.1"
 
+[[Unzip]]
+git-tree-sha1 = "34db80951901073501137bdbc3d5a8e7bbd06670"
+uuid = "41fe7b60-77ed-43a1-b4f0-825fd5a5650d"
+version = "0.1.2"
+
 [[Wayland_jll]]
 deps = ["Artifacts", "Expat_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg", "XML2_jll"]
 git-tree-sha1 = "3e61f0b86f90dacb0bc0e73a0c5a83f6a8636e23"
diff --git a/sample/PlutoUI.jl.jl b/sample/PlutoUI.jl.jl
index 73ef79ec79..be3b1658a6 100644
--- a/sample/PlutoUI.jl.jl
+++ b/sample/PlutoUI.jl.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.17.3
+# v0.17.6
 
 using Markdown
 using InteractiveUtils
@@ -620,7 +620,7 @@ PLUTO_PROJECT_TOML_CONTENTS = """
 PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
 
 [compat]
-PlutoUI = "~0.7.24"
+PlutoUI = "~0.7.30"
 """
 
 # ╔═╡ 00000000-0000-0000-0000-000000000002
@@ -629,9 +629,9 @@ PLUTO_MANIFEST_TOML_CONTENTS = """
 
 [[AbstractPlutoDingetjes]]
 deps = ["Pkg"]
-git-tree-sha1 = "abb72771fd8895a7ebd83d5632dc4b989b022b5b"
+git-tree-sha1 = "8eaf9f1b4921132a4cff3f36a1d9ba923b14a481"
 uuid = "6e696c72-6542-2067-7265-42206c756150"
-version = "1.1.2"
+version = "1.1.4"
 
 [[ArgTools]]
 uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
@@ -734,9 +734,9 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
 [[Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "d7fa6237da8004be601e19bd6666083056649918"
+git-tree-sha1 = "92f91ba9e5941fc781fecf5494ac1da87bdac775"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.1.3"
+version = "2.2.0"
 
 [[Pkg]]
 deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
@@ -744,9 +744,9 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[PlutoUI]]
 deps = ["AbstractPlutoDingetjes", "Base64", "ColorTypes", "Dates", "Hyperscript", "HypertextLiteral", "IOCapture", "InteractiveUtils", "JSON", "Logging", "Markdown", "Random", "Reexport", "UUIDs"]
-git-tree-sha1 = "6c9fa3e4880242c666dafa4901a34d8e1cd1b243"
+git-tree-sha1 = "5c0eb9099596090bb3215260ceca687b888a1575"
 uuid = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
-version = "0.7.24"
+version = "0.7.30"
 
 [[Printf]]
 deps = ["Unicode"]

From 98a0a2aedf5e792aedfd88f18892d47becc6c51c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 01:59:21 +0100
Subject: [PATCH 030/821] binder fixes

---
 Project.toml              | 2 +-
 frontend/binder.css       | 5 ++++-
 frontend/common/Binder.js | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Project.toml b/Project.toml
index 188e75f862..6bf870218f 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.17.6"
+version = "0.17.7"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
diff --git a/frontend/binder.css b/frontend/binder.css
index fd68d3a771..3cb52336b1 100644
--- a/frontend/binder.css
+++ b/frontend/binder.css
@@ -140,10 +140,13 @@ body.wiggle_binder #binder_launch_help {
     border-radius: 8px;
     left: calc(50vw - var(--width) / 2);
     background-color: white;
+    color: black;
     box-shadow: 0px 0px 0px 100vmax #0000004a;
-
     font-family: "Lato", sans-serif;
 }
+#binder_help_text a {
+    color: black;
+}
 
 @media (max-width: 500px) {
     #binder_help_text {
diff --git a/frontend/common/Binder.js b/frontend/common/Binder.js
index e907a83815..b76a69e794 100644
--- a/frontend/common/Binder.js
+++ b/frontend/common/Binder.js
@@ -154,8 +154,8 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
         console.log("Connecting WebSocket")
 
         const connect_promise = connect(with_token(ws_address_from_base(binder_session_url) + "channels"))
-        await timeout_promise(connect_promise, 10_000).catch((e) => {
-            console.error("Failed to establish connection within 10 seconds. Navigating to the edit URL directly.", e)
+        await timeout_promise(connect_promise, 20_000).catch((e) => {
+            console.error("Failed to establish connection within 20 seconds. Navigating to the edit URL directly.", e)
             const edit_url = new URL("edit", binder_session_url)
             edit_url.searchParams.set("id", new_notebook_id)
             window.parent.location.href = with_token(edit_url)

From 2d2b3691e3ec20573587d51ac90a3f966b8eb10d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 02:31:59 +0100
Subject: [PATCH 031/821] Content-Length header for static assets

---
 src/webserver/Static.jl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index a42fd080af..92633759e0 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -44,9 +44,11 @@ function asset_response(path)
     end
     try
         @assert isfile(path)
-        response = HTTP.Response(200, read(path, String))
+        data = read(path)
+        response = HTTP.Response(200, data)
         m = mime_fromfilename(path)
         push!(response.headers, "Content-Type" => Base.istextmime(m) ? "$(m); charset=UTF-8" : string(m))
+        push!(response.headers, "Content-Length" => string(length(data)))
         push!(response.headers, "Access-Control-Allow-Origin" => "*")
         response
     catch e

From 3fa8ec49b4f836ae86a960adc0a809d4c1b0bec9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 14:39:35 +0100
Subject: [PATCH 032/821] Cache files from frontend-dist if they have a parcel
 hash (#1834)

---
 src/webserver/Static.jl | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index 92633759e0..edeea89d1a 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -8,7 +8,7 @@ function is_pluto_dev()
     if found_is_pluto_dev[] !== nothing
         return found_is_pluto_dev[]
     end
-    found_is_pluto_dev[] = try
+    found_is_pluto_dev[] = get(ENV, "JULIA_PLUTO_FORCE_BUNDLED", "nein") != "ja" && try
         deps = Pkg.dependencies()
 
         p_index = findfirst(p -> p.name == "Pluto", deps)
@@ -28,6 +28,11 @@ function frontend_directory(; allow_bundled::Bool=true)
     end
 end
 
+function should_cache(path::String)
+    dir, filename = splitdir(path)
+    endswith(dir, "frontend-dist") && occursin(r"\.[0-9a-f]{8}\.", filename)
+end
+
 # Serve everything from `/frontend`, and create HTTP endpoints to open notebooks.
 
 "Attempts to find the MIME pair corresponding to the extension of a filename. Defaults to `text/plain`."
@@ -38,7 +43,13 @@ function mime_fromfilename(filename)
     MIME(mimepairs[file_extension])
 end
 
-function asset_response(path)
+const day = let 
+    second = 1
+    hour = 60second
+    day = 24hour
+end
+
+function asset_response(path; cacheable::Bool=false)
     if !isfile(path) && !endswith(path, ".html")
         return asset_response(path * ".html")
     end
@@ -50,6 +61,8 @@ function asset_response(path)
         push!(response.headers, "Content-Type" => Base.istextmime(m) ? "$(m); charset=UTF-8" : string(m))
         push!(response.headers, "Content-Length" => string(length(data)))
         push!(response.headers, "Access-Control-Allow-Origin" => "*")
+        cacheable && push!(response.headers, "Cache-Control" => "public, max-age=$(30day), immutable")
+        
         response
     catch e
         HTTP.Response(404, "Not found!")
@@ -314,12 +327,11 @@ function http_router_for(session::ServerSession)
     
     function serve_asset(request::HTTP.Request)
         uri = HTTP.URI(request.target)
-        
         filepath = project_relative_path(frontend_directory(), relpath(HTTP.unescapeuri(uri.path), "/"))
-        asset_response(filepath)
+        asset_response(filepath; cacheable=should_cache(filepath))
     end
     HTTP.@register(router, "GET", "/*", serve_asset)
     HTTP.@register(router, "GET", "/favicon.ico", create_serve_onefile(project_relative_path(frontend_directory(allow_bundled=false), "img", "favicon.ico")))
 
     return router
-end
\ No newline at end of file
+end

From f10876cc689b7ad0d0835cb95412bd796500efda Mon Sep 17 00:00:00 2001
From: Zihua Wu <wuzihua@pku.edu.cn>
Date: Fri, 21 Jan 2022 21:58:53 +0800
Subject: [PATCH 033/821] wider line number gutter (fix #1826) (#1835)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/editor.css | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index c3ed4cf7b8..12bfbd368d 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2618,7 +2618,7 @@ pluto-input .cm-editor .cm-content {
 }
 
 .cm-editor .cm-gutter {
-    min-width: 29px;
+    min-width: 31px;
     min-height: 23px;
 }
 
@@ -2635,24 +2635,24 @@ pluto-cell.code_differs .cm-editor .cm-gutters {
 }
 
 .cm-editor .cm-lineNumbers .cm-gutterElement {
-    color: var(--cm-line-numbers-color);
+    color: transparent;
 }
 
 .cm-editor .cm-lineNumbers .cm-gutterElement::after {
     content: "⋅";
     font-size: 0.75rem;
-}
-
-.cm-editor .cm-lineNumbers .cm-gutterElement {
-    font-size: 0px;
+    color: var(--cm-line-numbers-color);
+    position: absolute;
+    right: 3px;
+    pointer-events: none;
 }
 
 .cm-editor .cm-lineNumbers .cm-gutterElement:hover {
-    font-size: 0.75rem;
+    color: var(--cm-line-numbers-color);
 }
 
 .cm-editor .cm-lineNumbers .cm-gutterElement:hover::after {
-    font-size: 0px;
+    color: transparent;
 }
 
 .cm-completionIcon-c_Number::before {

From a014642791f967de599f107983f2598ec6203a33 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 15:00:59 +0100
Subject: [PATCH 034/821] prefetch and prerender editor.html from index.html
 (#1838)

---
 frontend/index.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/index.html b/frontend/index.html
index f0b5871cfd..57192467e2 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -29,6 +29,9 @@
 
     <script src="index.js" type="module" defer></script>
     <script src="warn_old_browsers.js"></script>
+    <link rel="prefetch" as="stylesheet" type="text/html" href="editor.css">
+    <link rel="prefetch" as="script" type="text/javascript" href="editor.js">
+    <link rel="prerender" href="editor.html">
 </head>
 
 <body class="loading nosessions">

From 3c53b288ad304063e85be68edeffb1f7c8ace476 Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Fri, 21 Jan 2022 15:48:19 +0100
Subject: [PATCH 035/821] Render variable links not as `a`'s, fixes #1790

---
 frontend/components/CellInput/go_to_definition_plugin.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/components/CellInput/go_to_definition_plugin.js b/frontend/components/CellInput/go_to_definition_plugin.js
index 96cd0a42d6..60f4126086 100644
--- a/frontend/components/CellInput/go_to_definition_plugin.js
+++ b/frontend/components/CellInput/go_to_definition_plugin.js
@@ -807,7 +807,11 @@ let get_variable_marks = (state, { scopestate, used_variables }) => {
                     // .... Because now it will only show variables after it has run once
                     if (used_variables[text]) {
                         return Decoration.mark({
-                            tagName: "a",
+                            // TODO This used to be tagName: "a", but codemirror doesn't like that...
+                            // .... https://github.com/fonsp/Pluto.jl/issues/1790
+                            // .... Ideally we'd change it back to `a` (feels better), but functionally there is no difference..
+                            // .... When I ever happen to find a lot of time I can spend on this, I'll debug and change it back to `a`
+                            tagName: "pluto-variable-link",
                             attributes: {
                                 "title": `${ctrl_or_cmd_name}-Click to jump to the definition of ${text}.`,
                                 "data-pluto-variable": text,
@@ -830,7 +834,7 @@ let get_variable_marks = (state, { scopestate, used_variables }) => {
                 } else {
                     // Could be used to select the definition of a variable inside the current cell
                     return Decoration.mark({
-                        tagName: "a",
+                        tagName: "pluto-variable-link",
                         attributes: {
                             "title": `${ctrl_or_cmd_name}-Click to jump to the definition of ${text}.`,
                             "data-cell-variable": text,

From fa9e969f3b321a81d44096e92c5a2c3f8940e0d9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 15:55:06 +0100
Subject: [PATCH 036/821] yesssss found the bug

---
 src/webserver/Static.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index edeea89d1a..255b74b618 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -14,7 +14,7 @@ function is_pluto_dev()
         p_index = findfirst(p -> p.name == "Pluto", deps)
         p = deps[p_index]
 
-        return p.is_tracking_path
+        p.is_tracking_path
     catch
         false
     end

From dedc9787f1cfad739456714791d3c885ab3fe033 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 16:01:41 +0100
Subject: [PATCH 037/821] static file server tweaks

---
 frontend/editor.css        |  8 ++++----
 src/webserver/Static.jl    | 13 ++++++-------
 src/webserver/WebServer.jl |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 12bfbd368d..3143d79af2 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -12,14 +12,14 @@
 @import url("https://cdn.jsdelivr.net/npm/@fontsource/alegreya-sans@4.4.5/500-italic.css");
 @import url("https://cdn.jsdelivr.net/npm/@fontsource/alegreya-sans@4.4.5/700-italic.css");
 
-@import url("juliamono.css");
-@import url("vollkorn.css");
+@import url("./juliamono.css");
+@import url("./vollkorn.css");
 /* @import url("https://fonts.googleapis.com/css2?family=Lato&display=swap"); */
 @import url("https://cdn.jsdelivr.net/npm/@fontsource/lato@4.4.5/400.css");
 @import url("https://cdn.jsdelivr.net/npm/@fontsource/lato@4.4.5/400-italic.css");
 
-@import url("light_color.css");
-@import url("dark_color.css");
+@import url("./light_color.css");
+@import url("./dark_color.css");
 
 /* VARIABLES */
 
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index 255b74b618..5987b1b210 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -8,7 +8,7 @@ function is_pluto_dev()
     if found_is_pluto_dev[] !== nothing
         return found_is_pluto_dev[]
     end
-    found_is_pluto_dev[] = get(ENV, "JULIA_PLUTO_FORCE_BUNDLED", "nein") != "ja" && try
+    found_is_pluto_dev[] = try
         deps = Pkg.dependencies()
 
         p_index = findfirst(p -> p.name == "Pluto", deps)
@@ -21,7 +21,7 @@ function is_pluto_dev()
 end
 
 function frontend_directory(; allow_bundled::Bool=true)
-    if allow_bundled && isdir(project_relative_path("frontend-dist")) && !is_pluto_dev()
+    if allow_bundled && isdir(project_relative_path("frontend-dist")) && (get(ENV, "JULIA_PLUTO_FORCE_BUNDLED", "nein") == "ja" || !is_pluto_dev())
         "frontend-dist"
     else
         "frontend"
@@ -51,10 +51,9 @@ end
 
 function asset_response(path; cacheable::Bool=false)
     if !isfile(path) && !endswith(path, ".html")
-        return asset_response(path * ".html")
+        return asset_response(path * ".html"; cacheable)
     end
-    try
-        @assert isfile(path)
+    if isfile(path)
         data = read(path)
         response = HTTP.Response(200, data)
         m = mime_fromfilename(path)
@@ -62,9 +61,9 @@ function asset_response(path; cacheable::Bool=false)
         push!(response.headers, "Content-Length" => string(length(data)))
         push!(response.headers, "Access-Control-Allow-Origin" => "*")
         cacheable && push!(response.headers, "Cache-Control" => "public, max-age=$(30day), immutable")
-        
+        @info length(data)
         response
-    catch e
+    else
         HTTP.Response(404, "Not found!")
     end
 end
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 49697596b0..a19ec870c0 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -267,7 +267,7 @@ function run(session::ServerSession, pluto_router)
     println("Press Ctrl+C in this terminal to stop Pluto")
     println()
 
-    if PLUTO_VERSION >= v"0.18.0" && frontend_directory() == "frontend"
+    if PLUTO_VERSION >= v"0.17.6" && frontend_directory() == "frontend"
         @info "It looks like you are developing the Pluto package, using the unbundled frontend..."
     end
     

From f3e3a43ee5a0db2a28733b4691cfea141298726b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 16:37:38 +0100
Subject: [PATCH 038/821] refactor progress logs

---
 frontend/components/Logs.js | 17 ++++++++++-------
 frontend/dark_color.css     |  2 ++
 frontend/editor.css         | 28 ++++++++++++----------------
 frontend/light_color.css    |  2 ++
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
index 4666594e65..6a410c2007 100644
--- a/frontend/components/Logs.js
+++ b/frontend/components/Logs.js
@@ -82,10 +82,10 @@ const Progress = ({ progress }) => {
     const bar_ref = useRef(null)
 
     useLayoutEffect(() => {
-        bar_ref.current.style.width = `${progress * 100}%`
+        bar_ref.current.style.backgroundSize = `${progress * 100}%`
     }, [progress])
 
-    return html`<pluto-progress-bar ref=${bar_ref}></pluto-progress-bar>`
+    return html`<pluto-progress-bar ref=${bar_ref}>${Math.ceil(100 * progress)}%</pluto-progress-bar>`
 }
 
 const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${"adsf"} mime=${pair[1]} body=${pair[0]} persist_js_state=${false} />`
@@ -112,7 +112,6 @@ const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
 
         level = "Progress"
         y = 0
-        msg = [`${Math.ceil(100*progress)}%            `, "text/plain"]
     }
 
     useLayoutEffect(() => {
@@ -151,10 +150,14 @@ const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
           >
               <pluto-log-dot-sizer>
                   <pluto-log-dot class=${level}
-                      >${mimepair_output(msg)}${(!is_progress ? kwargs : []).map(
-                          ([k, v]) =>
-                              html` <pluto-log-dot-kwarg><pluto-key>${k}</pluto-key> <pluto-value>${mimepair_output(v)}</pluto-value></pluto-log-dot-kwarg> `
-                      )}${is_progress ? html`<${Progress} progress=${progress} />` : null}</pluto-log-dot
+                      >${!is_progress
+                          ? html`${mimepair_output(msg)}${kwargs.map(
+                                ([k, v]) =>
+                                    html`
+                                        <pluto-log-dot-kwarg><pluto-key>${k}</pluto-key> <pluto-value>${mimepair_output(v)}</pluto-value></pluto-log-dot-kwarg>
+                                    `
+                            )}`
+                          : html`<${Progress} progress=${progress} />`}</pluto-log-dot
                   >
               </pluto-log-dot-sizer>
           </pluto-log-dot-positioner>`
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index 8e79177b4c..2b686f0d37 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -65,6 +65,8 @@
 
         /* Logs */
         --pluto-logs-bg-color: hsl(240deg 10% 29%);
+        --pluto-logs-progress-fill: #5f7f5b;
+        --pluto-logs-progress-border: hsl(210deg 35% 72%);
 
         /*Top navbar styling*/
         --nav-h1-text-color: white;
diff --git a/frontend/editor.css b/frontend/editor.css
index 3143d79af2..42faba5254 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2308,20 +2308,13 @@ pluto-logs-container pluto-progress-bars pluto-progress:not(:first-child) {
 }
 
 pluto-logs-container pluto-progress-bar {
-    top: 3px;
-    position: absolute;
-    left: 2px;
-    height: calc(100% - 6px);
-    max-width: calc(100% - 4px);
-    width: 0;
-    border-radius: 5px;
-    transition: width cubic-bezier(0.14, 0.71, 0, 0.99) 2s, opacity linear 0.2s;
-    background-color: salmon;
-}
-
-pluto-logs-container pluto-log-dot.Progress pre {
-    z-index: 1;
-    color: white;
+    --c: var(--pluto-logs-progress-fill);
+    padding: 1px 3px;
+    background: linear-gradient(90deg, var(--c), var(--c));
+    background-repeat: no-repeat;
+    width: 100%;
+    transition: background-size cubic-bezier(0.14, 0.71, 0, 0.99) 2s, opacity linear 0.2s;
+    /* background-color: salmon; */
 }
 
 pluto-logs-container pluto-progress-bar.collapsed {
@@ -2404,8 +2397,11 @@ pluto-log-dot.Debug {
     border: 3px solid var(--jl-debug-accent-color);
 }
 pluto-log-dot.Progress {
-    background: pink;
-    border: 3px solid hsla(0, 100%, 80%, 1);
+    width: 100px;
+    background: #94949466;
+    border: 3px solid var(--pluto-logs-progress-border);
+    overflow: hidden;
+    padding: 0px;
 }
 
 pluto-log-dot jltree,
diff --git a/frontend/light_color.css b/frontend/light_color.css
index cbb83f3e1b..2a2ee9f318 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -68,6 +68,8 @@
 
         /* Logs */
         --pluto-logs-bg-color: #efeff3;
+        --pluto-logs-progress-fill: #ffffff;
+        --pluto-logs-progress-border: hsl(210deg 16% 74%);
 
         /*Top navbar styling*/
         --nav-h1-text-color: black;

From 583117c06a64fa391c2639cbb57d0be92c78ea73 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 16:42:24 +0100
Subject: [PATCH 039/821] wider logs

---
 frontend/editor.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 42faba5254..6711144743 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2361,8 +2361,9 @@ pluto-log-dot-positioner.inspecting ~ pluto-log-dot-positioner {
 
 pluto-log-dot-sizer {
     display: block;
-    width: 100px;
+    width: max-content;
     transform: translateZ(10px);
+    max-width: 600px;
     z-index: 300;
     pointer-events: none; /* part 1: because the hit box is larger than the action log dot */
 }

From 90d0804da3850b6111304eb9d8af5a67758ac336 Mon Sep 17 00:00:00 2001
From: Panagiotis Georgakopoulos <panagiotis.georgakopoulos@juliacomputing.com>
Date: Fri, 21 Jan 2022 19:00:48 +0200
Subject: [PATCH 040/821] Switch js-sha256 source to be a module without weird
 imports

---
 frontend/common/PlutoHash.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/common/PlutoHash.js b/frontend/common/PlutoHash.js
index 7c691388a8..46c3f41fb3 100644
--- a/frontend/common/PlutoHash.js
+++ b/frontend/common/PlutoHash.js
@@ -1,4 +1,4 @@
-import { sha256 } from "https://cdn.esm.sh/v62/js-sha256@0.9.0/es2021/js-sha256.js"
+import { sha256 } from "https://cdn.jsdelivr.net/gh/juliapluto/js-sha256@3d265a3b1e4e138422f90d483b1df1d1c3d0a2a7/src/sha256.mjs"
 
 export const base64_arraybuffer = async (/** @type {BufferSource} */ data) => {
     /** @type {string} */

From 2fc2a86785a02000c4614fef72f554473875a36c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 20:24:12 +0100
Subject: [PATCH 041/821] tagged the js-sha256 import <3

---
 frontend/common/PlutoHash.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/common/PlutoHash.js b/frontend/common/PlutoHash.js
index 46c3f41fb3..b64ebb6b55 100644
--- a/frontend/common/PlutoHash.js
+++ b/frontend/common/PlutoHash.js
@@ -1,4 +1,4 @@
-import { sha256 } from "https://cdn.jsdelivr.net/gh/juliapluto/js-sha256@3d265a3b1e4e138422f90d483b1df1d1c3d0a2a7/src/sha256.mjs"
+import { sha256 } from "https://cdn.jsdelivr.net/gh/JuliaPluto/js-sha256@v0.9.0-es6/src/sha256.mjs"
 
 export const base64_arraybuffer = async (/** @type {BufferSource} */ data) => {
     /** @type {string} */

From 69b2f36368b0673909143b172042cf0c6d6c43f2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 20:35:24 +0100
Subject: [PATCH 042/821] =?UTF-8?q?=F0=9F=8C=BC=20Fix=20#1836?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/imports/CodemirrorPlutoSetup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index 54d2203995..7cb23380bf 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -56,7 +56,7 @@ import {
     javascript,
     python,
     Text,
-} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.24.0/dist/index.es.min.js"
+} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.25.0/dist/index.es.min.js"
 
 export {
     EditorState,

From 0434e995d23cd3422a01104cc6ffb8ce395a87ee Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 20:43:02 +0100
Subject: [PATCH 043/821] remove console log

---
 src/webserver/Static.jl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index 5987b1b210..31685d2770 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -61,7 +61,6 @@ function asset_response(path; cacheable::Bool=false)
         push!(response.headers, "Content-Length" => string(length(data)))
         push!(response.headers, "Access-Control-Allow-Origin" => "*")
         cacheable && push!(response.headers, "Cache-Control" => "public, max-age=$(30day), immutable")
-        @info length(data)
         response
     else
         HTTP.Response(404, "Not found!")

From dd12b556fea9cfdef9de544c5cc319c2bb600c7f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 20:53:20 +0100
Subject: [PATCH 044/821] Update Bundle.yml

---
 .github/workflows/Bundle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Bundle.yml b/.github/workflows/Bundle.yml
index ef89e2bd0e..14f4735359 100644
--- a/.github/workflows/Bundle.yml
+++ b/.github/workflows/Bundle.yml
@@ -45,5 +45,5 @@ jobs:
             - name: Force push frontend-dist changes
               run: |
                   git add frontend-dist --force
-                  git commit -m "$GITHUB_WORKFLOW"
+                  git commit -m "$GITHUB_WORKFLOW" -m "Built from hash $GITHUB_SHA"
                   git push origin release --force

From dd2846011c37ced1e6f4d0b3f665bec992f0ceb3 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Jan 2022 21:02:23 +0100
Subject: [PATCH 045/821] =?UTF-8?q?=F0=9F=91=80=20important=20last=20minut?=
 =?UTF-8?q?e=20tweak?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/light_color.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/light_color.css b/frontend/light_color.css
index 2a2ee9f318..b28956de9b 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -162,7 +162,7 @@
         --cm-comment-color: #e96ba8;
         --cm-atom-color: #815ba4;
         --cm-number-color: #815ba4;
-        --cm-property-color: #48b685;
+        --cm-property-color: #b67a48;
         --cm-keyword-color: #ef6155;
         --cm-string-color: #da5616;
         --cm-var-color: #5668a4;
@@ -170,7 +170,7 @@
         --cm-var2-color: #37768a;
         --cm-builtin-color: #5e7ad3;
         --cm-function-color: #cc80ac;
-        --cm-type-color: hsl(170deg 32% 44%);
+        --cm-type-color: hsl(170deg 7% 56%);
         --cm-bracket-color: #41323f;
         --cm-tag-color: #ef6155;
         --cm-link-color: #815ba4;

From e33ecd134ca6d213194600e3777a102323e3f080 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 22 Jan 2022 00:45:16 +0100
Subject: [PATCH 046/821] =?UTF-8?q?=F0=9F=A7=B9=20css=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/CellInput.js | 10 ++---
 frontend/editor.css              | 70 ++++++++++++++------------------
 2 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 88b1f7d82b..95d858613b 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -636,22 +636,22 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, running_disabled, any_
         <span class="icon"></span>
         ${open
             ? html`<ul onMouseenter=${mouseenter}>
-                  <li onClick=${on_delete} title="Delete"><span class="delete_icon" />Delete cell</li>
+                  <li onClick=${on_delete} title="Delete"><span class="delete ctx_icon" />Delete cell</li>
                   <li
                       onClick=${toggle_running_disabled}
                       title=${running_disabled ? "Enable and run the cell" : "Disable this cell, and all cells that depend on it"}
                   >
-                      ${running_disabled ? html`<span class="enable_cell_icon" />` : html`<span class="disable_cell_icon" />`}
+                      ${running_disabled ? html`<span class="enable_cell ctx_icon" />` : html`<span class="disable_cell ctx_icon" />`}
                       ${running_disabled ? html`<b>Enable cell</b>` : html`Disable cell`}
                   </li>
                   ${any_logs
                       ? html`<li title="" onClick=${toggle_logs}>
                             ${show_logs
-                                ? html`<span class="hide_logs_icon" /><span>Hide logs</span>`
-                                : html`<span class="show_logs_icon" /><span>Show logs</span>`}
+                                ? html`<span class="hide_logs ctx_icon" /><span>Hide logs</span>`
+                                : html`<span class="show_logs ctx_icon" /><span>Show logs</span>`}
                         </li>`
                       : null}
-                  <li class="coming_soon" title=""><span class="bandage_icon" /><em>Coming soon…</em></li>
+                  <li class="coming_soon" title=""><span class="bandage ctx_icon" /><em>Coming soon…</em></li>
               </ul>`
             : html``}
     </button>`
diff --git a/frontend/editor.css b/frontend/editor.css
index 6711144743..af82a310ea 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1007,15 +1007,6 @@ pluto-output {
     background-color: var(--pluto-output-bg-color);
 }
 
-pluto-cell.depends_on_disabled_cells > pluto-output,
-pluto-cell.running_disabled > pluto-output {
-    opacity: 0.3;
-}
-
-pluto-cell.running_disabled > pluto-output {
-    background-color: var(--disabled-cell-bg-color);
-}
-
 .scroll_y {
     overflow-y: auto;
     max-height: 80vh;
@@ -1077,6 +1068,24 @@ pluto-display > div {
     display: none;
 }
 
+/* DISABLED CELLS */
+
+pluto-cell.depends_on_disabled_cells > pluto-output,
+pluto-cell.running_disabled > pluto-output,
+pluto-cell.depends_on_disabled_cells > pluto-trafficlight,
+pluto-cell.running_disabled > pluto-trafficlight,
+pluto-cell.depends_on_disabled_cells > pluto-input .cm-editor,
+pluto-cell.running_disabled > pluto-input .cm-editor,
+pluto-cell.depends_on_disabled_cells > pluto-logs-container,
+pluto-cell.running_disabled > pluto-logs-container {
+    opacity: 0.3;
+}
+
+pluto-cell.running_disabled > pluto-input .cm-editor,
+pluto-cell.running_disabled > pluto-output {
+    background-color: var(--disabled-cell-bg-color);
+}
+
 /* SELECTION */
 
 pluto-cell.selected {
@@ -1162,15 +1171,6 @@ pluto-cell.code_differs > pluto-input > .cm-editor {
     border-left: none;
 }
 
-pluto-cell.depends_on_disabled_cells > pluto-input .cm-editor,
-pluto-cell.running_disabled > pluto-input .cm-editor {
-    opacity: 0.3;
-}
-
-pluto-cell.running_disabled > pluto-input .cm-editor {
-    background-color: var(--disabled-cell-bg-color);
-}
-
 /* UI */
 
 .overlay-button button,
@@ -1385,11 +1385,6 @@ body:not(.___) pluto-cell.running.errored > pluto-trafficlight::after {
     background-size: 4px var(--patternHeight); /* 16 * sqrt(2) */
 }
 
-pluto-cell.depends_on_disabled_cells > pluto-trafficlight,
-pluto-cell.running_disabled > pluto-trafficlight {
-    opacity: 0.3;
-}
-
 /* Define --patternHeight for this keyframes animation to work! */
 @keyframes scrollbackground {
     0% {
@@ -1563,12 +1558,7 @@ pluto-input > button.input_context_menu ul {
     background-color: var(--input-context-menu-hover-bg-color);
 }
 
-.disable_cell_icon,
-.delete_icon,
-.enable_cell_icon,
-.bandage_icon,
-.show_logs_icon,
-.hide_logs_icon,
+.ctx_icon,
 .icon {
     --size: 17px;
     width: var(--size);
@@ -1578,33 +1568,33 @@ pluto-input > button.input_context_menu ul {
     background-position: center;
     margin-right: calc(var(--size) / 3);
 }
-.show_logs_icon {
+
+.ctx_icon {
+    filter: var(--image-filters);
+}
+.ctx_icon.show_logs {
     background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg);
 }
 
-.hide_logs_icon {
+.ctx_icon.hide_logs {
     background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg);
 }
 
-.bandage_icon {
-    filter: opacity(0.3);
+.ctx_icon.bandage {
+    filter: var(--image-filters) opacity(0.3);
     background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/bandage-outline.svg);
-    filter: var(--image-filters);
 }
-.enable_cell_icon {
+.ctx_icon.enable_cell {
     background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg);
-    filter: var(--image-filters);
 }
 
-.disable_cell_icon {
+.ctx_icon.disable_cell {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/ban-outline.svg");
     background-size: 15px;
     background-repeat: no-repeat;
-    filter: var(--image-filters);
 }
-.delete_icon {
+.ctx_icon.delete {
     background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-circle-outline.svg);
-    filter: var(--image-filters);
 }
 
 pluto-input > button.input_context_menu {

From 111960219770272ff8c1a700f1f894bf50348db9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 24 Jan 2022 21:41:35 +0100
Subject: [PATCH 047/821] Binder button dark mode color

---
 frontend/binder.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/binder.css b/frontend/binder.css
index 3cb52336b1..ca5995c0ba 100644
--- a/frontend/binder.css
+++ b/frontend/binder.css
@@ -113,13 +113,13 @@ body.wiggle_binder #binder_launch_help {
     box-shadow: none;
     cursor: pointer;
     background: unset;
-    background-color: white;
-    border: 3px solid #3f448c5e;
+    background-color: var(--overlay-button-bg);
+    border: 3px solid hsl(236deg 28% 50% / 70%);
     font-size: 14px;
     font-style: italic;
     font-family: "Roboto Mono";
     letter-spacing: -0.2px;
-    color: #0000009c;
+    color: var(--black);
     white-space: nowrap;
     padding: 8px 16px;
     border-radius: 30px;

From 35a60becce719b29c607e48dd038c06c41b586d2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Jan 2022 20:34:00 +0100
Subject: [PATCH 048/821] Update ErrorMessage.js

---
 frontend/components/ErrorMessage.js | 39 ++++++++++++++++-------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/frontend/components/ErrorMessage.js b/frontend/components/ErrorMessage.js
index 5a2d16d93a..e538134b7c 100644
--- a/frontend/components/ErrorMessage.js
+++ b/frontend/components/ErrorMessage.js
@@ -41,7 +41,7 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
     const rewriters = [
         {
             pattern: /syntax: extra token after end of expression/,
-            display: (x) => {
+            display: (/** @type{string} */ x) => {
                 const begin_hint = html`<a
                     href="#"
                     onClick=${(e) => {
@@ -86,11 +86,11 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
         },
         {
             pattern: /MethodError: no method matching .*\nClosest candidates are:/,
-            display: (x) => x.split("\n").map((line) => html`<p style="white-space: nowrap;">${line}</p>`),
+            display: (/** @type{string} */ x) => x.split("\n").map((line) => html`<p style="white-space: nowrap;">${line}</p>`),
         },
         {
             pattern: /Cyclic references among ([^\s]+)(, .*)* and ([^\s.]+).*/,
-            display: (x) => {
+            display: (/** @type{string} */ x) => {
                 const reg = x.match(/Cyclic references among ([^\s]+)(, .*)* and ([^\s.]+).*/)
                 const first = reg[1]
                 const last = reg[3]
@@ -103,24 +103,29 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
         },
         {
             pattern: /Multiple definitions for (.*)./,
-            display: (x) => {
-                const reg = x.match(/Multiple definitions for (.*)./)
-                const what = reg[1]
-                const onclick = (ev) => {
-                    const where = document.querySelector(`pluto-cell:not([id='${cell_id}']) span[id='${encodeURI(what)}']`)
-                    ev.preventDefault()
-                    where.scrollIntoView()
-                }
-
-                return html`<p>
-                    Multiple definitions for ${" "}
-                    <a href="#" onclick=${onclick}>${what}</a>
-                </p>`
+            display: (/** @type{string} */ x) => {
+                return x.split("\n").map((line) => {
+                    const match = /Multiple definitions for (.*)\./.exec(line)
+                    if (match) {
+                        const what = match[1]
+                        const onclick = (ev) => {
+                            const where = document.querySelector(`pluto-cell:not([id='${cell_id}']) span[id='${encodeURI(what)}']`)
+                            ev.preventDefault()
+                            where.scrollIntoView()
+                        }
+                        return html`<p>
+                            Multiple definitions for ${" "}
+                            <a href="#" onclick=${onclick}>${what}</a>.
+                        </p>`
+                    } else {
+                        return html`<p>${line}</p>`
+                    }
+                })
             },
         },
         {
             pattern: /.?/,
-            display: (x) => x.split("\n").map((line) => html`<p>${line}</p>`),
+            display: (/** @type{string} */ x) => x.split("\n").map((line) => html`<p>${line}</p>`),
         },
     ]
 

From b37832db9747020b4b67ab8f9da9f8b28595a22d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Jan 2022 21:04:37 +0100
Subject: [PATCH 049/821] Update ErrorMessage.js

---
 frontend/components/ErrorMessage.js | 66 +++++++++++++++++------------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/frontend/components/ErrorMessage.js b/frontend/components/ErrorMessage.js
index e538134b7c..a43170afa3 100644
--- a/frontend/components/ErrorMessage.js
+++ b/frontend/components/ErrorMessage.js
@@ -36,6 +36,8 @@ const Funccall = ({ frame }) => {
     }
 }
 
+const insert_commas_and_and = (/** @type {any[]} */ xs) => xs.flatMap((x, i) => (i === xs.length - 1 ? [x] : i === xs.length - 2 ? [x, " and "] : [x, ", "]))
+
 export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
     let pluto_actions = useContext(PlutoContext)
     const rewriters = [
@@ -89,39 +91,49 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
             display: (/** @type{string} */ x) => x.split("\n").map((line) => html`<p style="white-space: nowrap;">${line}</p>`),
         },
         {
-            pattern: /Cyclic references among ([^\s]+)(, .*)* and ([^\s.]+).*/,
-            display: (/** @type{string} */ x) => {
-                const reg = x.match(/Cyclic references among ([^\s]+)(, .*)* and ([^\s.]+).*/)
-                const first = reg[1]
-                const last = reg[3]
-                const mids = reg[2]?.split(", ").slice(1) || []
-                return html`<p>
-                    Cyclic references among <a href="#${encodeURI(first)}">${first}</a>,
-                    ${mids.map((varName) => html`<a href="#${encodeURI(varName)}">${varName}</a>`)} <a href="#${encodeURI(last)}">${last}</a>
-                </p>`
-            },
+            pattern: /Cyclic references among (.*)\./,
+            display: (/** @type{string} */ x) =>
+                x.split("\n").map((line) => {
+                    const match = line.match(/Cyclic references among (.*)\./)
+
+                    if (match) {
+                        let syms_string = match[1]
+                        let syms = syms_string.split(/, | and /)
+                        console.log(syms)
+
+                        let symbol_links = syms.map((what) => html`<a href="#${encodeURI(what)}">${what}</a>`)
+
+                        return html`<p>Cyclic references among${" "}${insert_commas_and_and(symbol_links)}.</p>`
+                    } else {
+                        return html`<p>${line}</p>`
+                    }
+                }),
         },
         {
-            pattern: /Multiple definitions for (.*)./,
-            display: (/** @type{string} */ x) => {
-                return x.split("\n").map((line) => {
-                    const match = /Multiple definitions for (.*)\./.exec(line)
+            pattern: /Multiple definitions for (.*)\./,
+            display: (/** @type{string} */ x) =>
+                x.split("\n").map((line) => {
+                    const match = line.match(/Multiple definitions for (.*)\./)
+
                     if (match) {
-                        const what = match[1]
-                        const onclick = (ev) => {
-                            const where = document.querySelector(`pluto-cell:not([id='${cell_id}']) span[id='${encodeURI(what)}']`)
-                            ev.preventDefault()
-                            where.scrollIntoView()
-                        }
-                        return html`<p>
-                            Multiple definitions for ${" "}
-                            <a href="#" onclick=${onclick}>${what}</a>.
-                        </p>`
+                        let syms_string = match[1]
+                        let syms = syms_string.split(/, | and /)
+                        console.log(syms)
+
+                        let symbol_links = syms.map((what) => {
+                            const onclick = (ev) => {
+                                const where = document.querySelector(`pluto-cell:not([id='${cell_id}']) span[id='${encodeURI(what)}']`)
+                                ev.preventDefault()
+                                where.scrollIntoView()
+                            }
+                            return html`<a href="#" onclick=${onclick}>${what}</a>`
+                        })
+
+                        return html`<p>Multiple definitions for${" "}${insert_commas_and_and(symbol_links)}.</p>`
                     } else {
                         return html`<p>${line}</p>`
                     }
-                })
-            },
+                }),
         },
         {
             pattern: /.?/,

From b474acac55bb7f71b5413d3b48fd7247c9fed212 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Jan 2022 21:27:47 +0100
Subject: [PATCH 050/821] =?UTF-8?q?=F0=9F=99=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/ErrorMessage.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/components/ErrorMessage.js b/frontend/components/ErrorMessage.js
index a43170afa3..1e88d3fd27 100644
--- a/frontend/components/ErrorMessage.js
+++ b/frontend/components/ErrorMessage.js
@@ -99,7 +99,6 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
                     if (match) {
                         let syms_string = match[1]
                         let syms = syms_string.split(/, | and /)
-                        console.log(syms)
 
                         let symbol_links = syms.map((what) => html`<a href="#${encodeURI(what)}">${what}</a>`)
 
@@ -118,7 +117,6 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
                     if (match) {
                         let syms_string = match[1]
                         let syms = syms_string.split(/, | and /)
-                        console.log(syms)
 
                         let symbol_links = syms.map((what) => {
                             const onclick = (ev) => {

From 8eb805311f31fd069478a9b84c9d95ef979d943e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Jan 2022 21:56:12 +0100
Subject: [PATCH 051/821] More TS definitions

---
 frontend/components/Cell.js                      |  1 +
 frontend/components/CellInput.js                 |  1 +
 .../CellInput/go_to_definition_plugin.js         |  3 +++
 frontend/components/CellInput/highlight_line.js  |  2 +-
 frontend/components/CellInput/mixedParsers.js    |  2 ++
 .../components/CellInput/pkg_bubble_plugin.js    |  5 ++++-
 frontend/components/Editor.js                    | 15 ++++++++++++++-
 frontend/components/PkgStatusMark.js             | 16 ++++++++++++++++
 8 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index fb593ad253..2acf8063e7 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -34,6 +34,7 @@ const useCellApi = (node_ref, published_object_keys, pluto_actions) => {
  *  cell_input: import("./Editor.js").CellInputData,
  *  cell_input_local: import("./Editor.js").CellInputData,
  *  cell_dependencies: import("./Editor.js").CellDependencyData
+ *  nbpkg: import("./Editor.js").NotebookPkgData,
  *  selected: boolean,
  *  selected_cells: Array<string>,
  *  force_hide_input: boolean,
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 95d858613b..bd773691f0 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -161,6 +161,7 @@ let line_and_ch_to_cm6_position = (/** @type {import("../imports/CodemirrorPluto
  *  remote_code: string,
  *  scroll_into_view_after_creation: boolean,
  *  cell_dependencies: import("./Editor.js").CellDependencyData,
+ *  nbpkg: import("./Editor.js").NotebookPkgData?,
  *  variables_in_all_notebook: { [variable_name: string]: string },
  *  [key: string]: any,
  * }} props
diff --git a/frontend/components/CellInput/go_to_definition_plugin.js b/frontend/components/CellInput/go_to_definition_plugin.js
index 60f4126086..e774b28076 100644
--- a/frontend/components/CellInput/go_to_definition_plugin.js
+++ b/frontend/components/CellInput/go_to_definition_plugin.js
@@ -851,6 +851,9 @@ let get_variable_marks = (state, { scopestate, used_variables }) => {
     )
 }
 
+/**
+ * @type {Facet<{ [variable_name: string]: string }>}
+ */
 export const UsedVariablesFacet = Facet.define({
     combine: (values) => values[0],
     compare: _.isEqual,
diff --git a/frontend/components/CellInput/highlight_line.js b/frontend/components/CellInput/highlight_line.js
index ea58961b58..cdf9082fc6 100644
--- a/frontend/components/CellInput/highlight_line.js
+++ b/frontend/components/CellInput/highlight_line.js
@@ -1,4 +1,4 @@
-import { Decoration, ViewPlugin, EditorView, Facet } from "../../imports/CodemirrorPlutoSetup.js"
+import { Decoration, ViewPlugin, EditorView, Facet, ViewUpdate } from "../../imports/CodemirrorPlutoSetup.js"
 
 const highlighted_line = Decoration.line({
     attributes: { class: "cm-highlighted-line" },
diff --git a/frontend/components/CellInput/mixedParsers.js b/frontend/components/CellInput/mixedParsers.js
index a5ea41eb5a..788be06c0e 100644
--- a/frontend/components/CellInput/mixedParsers.js
+++ b/frontend/components/CellInput/mixedParsers.js
@@ -1,3 +1,5 @@
+import _ from "../../imports/lodash.js"
+
 import {
     html,
     htmlLanguage,
diff --git a/frontend/components/CellInput/pkg_bubble_plugin.js b/frontend/components/CellInput/pkg_bubble_plugin.js
index 5f024dc545..973b2afba0 100644
--- a/frontend/components/CellInput/pkg_bubble_plugin.js
+++ b/frontend/components/CellInput/pkg_bubble_plugin.js
@@ -6,7 +6,7 @@ import { ReactWidget } from "./ReactWidget.js"
 
 /**
  * @typedef PkgstatusmarkWidgetProps
- * @type {{ nbpkg: any, pluto_actions: any, notebook_id: string }}
+ * @type {{ nbpkg: import("../Editor.js").NotebookPkgData, pluto_actions: any, notebook_id: string }}
  */
 
 // This list appears multiple times in our codebase. Be sure to match edits everywhere.
@@ -173,6 +173,9 @@ function pkg_decorations(view, { pluto_actions, notebook_id, nbpkg }) {
     return Decoration.set(widgets)
 }
 
+/**
+ * @type {Facet<import("../Editor.js").NotebookPkgData?>}
+ */
 export const NotebookpackagesFacet = Facet.define({
     combine: (values) => values[0],
     compare: _.isEqual,
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index e4e1a5751c..b85987409e 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -146,6 +146,19 @@ const first_true_key = (obj) => {
  * }}
  */
 
+/**
+ * @typedef NotebookPkgData
+ * @type {{
+ *  enabled: boolean,
+ *  restart_recommended_msg: string?,
+ *  restart_required_msg: string?,
+ *  installed_versions: { [pkg_name: string]: string },
+ *  terminal_outputs: { [pkg_name: string]: string },
+ *  busy_packages: string[],
+ *  instantiated: boolean,
+ * }}
+ */
+
 /**
  * @typedef NotebookData
  * @type {{
@@ -163,7 +176,7 @@ const first_true_key = (obj) => {
  *  cell_execution_order: Array<string>,
  *  published_objects: { [objectid: string]: any},
  *  bonds: { [name: string]: any },
- *  nbpkg: Object,
+ *  nbpkg: NotebookPkgData?,
  * }}
  */
 
diff --git a/frontend/components/PkgStatusMark.js b/frontend/components/PkgStatusMark.js
index d407df2e3b..c5cbc76376 100644
--- a/frontend/components/PkgStatusMark.js
+++ b/frontend/components/PkgStatusMark.js
@@ -15,6 +15,14 @@ const can_update = (installed, available) => {
     }
 }
 
+/**
+ * @param {{
+ *  package_name: string,
+ *  is_disable_pkg: boolean,
+ *  available_versions: string[],
+ *  nbpkg: import("./Editor.js").NotebookPkgData?,
+ * }} props
+ */
 export const package_status = ({ nbpkg, package_name, available_versions, is_disable_pkg }) => {
     let status = null
     let hint_raw = null
@@ -66,6 +74,14 @@ export const package_status = ({ nbpkg, package_name, available_versions, is_dis
     return { status, hint, hint_raw, available_versions, chosen_version, busy, offer_update }
 }
 
+/**
+ * @param {{
+ *  package_name: string,
+ *  pluto_actions: any,
+ *  notebook_id: string,
+ *  nbpkg: import("./Editor.js").NotebookPkgData?,
+ * }} props
+ */
 export const PkgStatusMark = ({ package_name, pluto_actions, notebook_id, nbpkg }) => {
     const [available_versions, set_available_versions] = useState(null)
 

From 4bc52fbf09587d7b55274f82fb730068f858088b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Jan 2022 21:56:39 +0100
Subject: [PATCH 052/821] Fix nbpkg instantiating display

---
 frontend/components/PkgPopup.js      | 2 +-
 frontend/components/PkgStatusMark.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/components/PkgPopup.js b/frontend/components/PkgPopup.js
index ea25cc6fdf..a1b297437a 100644
--- a/frontend/components/PkgPopup.js
+++ b/frontend/components/PkgPopup.js
@@ -79,7 +79,7 @@ export const PkgPopup = ({ notebook }) => {
 
     const [showterminal, set_showterminal] = useState(false)
 
-    const busy = recent_event != null && ((notebook.nbpkg?.busy_packages ?? []).includes(recent_event.package_name) || (notebook.nbpkg?.instantiating ?? false))
+    const busy = recent_event != null && ((notebook.nbpkg?.busy_packages ?? []).includes(recent_event.package_name) || !(notebook.nbpkg?.instantiated ?? true))
 
     const debounced_busy = useDebouncedTruth(busy, 2)
     useEffect(() => {
diff --git a/frontend/components/PkgStatusMark.js b/frontend/components/PkgStatusMark.js
index c5cbc76376..9bc8abdf08 100644
--- a/frontend/components/PkgStatusMark.js
+++ b/frontend/components/PkgStatusMark.js
@@ -29,7 +29,7 @@ export const package_status = ({ nbpkg, package_name, available_versions, is_dis
     let hint = null
     let offer_update = false
     const chosen_version = nbpkg?.installed_versions[package_name]
-    const busy = (nbpkg?.busy_packages ?? []).includes(package_name) || nbpkg?.instantiating
+    const busy = (nbpkg?.busy_packages ?? []).includes(package_name) || !(nbpkg?.instantiated ?? true)
 
     if (is_disable_pkg) {
         const f_name = package_name

From 3000d937cef1c701be4fff5be5c352acaccfaafc Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Jan 2022 21:57:29 +0100
Subject: [PATCH 053/821] types

---
 frontend/components/Cell.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 2acf8063e7..1adb104f38 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -34,7 +34,7 @@ const useCellApi = (node_ref, published_object_keys, pluto_actions) => {
  *  cell_input: import("./Editor.js").CellInputData,
  *  cell_input_local: import("./Editor.js").CellInputData,
  *  cell_dependencies: import("./Editor.js").CellDependencyData
- *  nbpkg: import("./Editor.js").NotebookPkgData,
+ *  nbpkg: import("./Editor.js").NotebookPkgData?,
  *  selected: boolean,
  *  selected_cells: Array<string>,
  *  force_hide_input: boolean,

From be89782d4ba16f788fad410004cd1df967b694ae Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Jan 2022 22:02:16 +0100
Subject: [PATCH 054/821] Rename `used_variables` to `global_definitions`

---
 frontend/components/CellInput.js              |  6 ++---
 .../CellInput/go_to_definition_plugin.js      | 24 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index bd773691f0..0fb856ace5 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -5,7 +5,7 @@ import _ from "../imports/lodash.js"
 import { utf8index_to_ut16index } from "../common/UnicodeTools.js"
 import { PlutoContext } from "../common/PlutoContext.js"
 import { get_selected_doc_from_state } from "./CellInput/LiveDocsFromCursor.js"
-import { go_to_definition_plugin, ScopeStateField, UsedVariablesFacet } from "./CellInput/go_to_definition_plugin.js"
+import { go_to_definition_plugin, ScopeStateField, GlobalDefinitionsFacet } from "./CellInput/go_to_definition_plugin.js"
 import { detect_deserializer } from "../common/Serialization.js"
 
 import {
@@ -201,7 +201,7 @@ export const CellInput = ({
     on_change_ref.current = on_change
 
     let nbpkg_compartment = useCompartment(newcm_ref, NotebookpackagesFacet.of(nbpkg))
-    let used_variables_compartment = useCompartment(newcm_ref, UsedVariablesFacet.of(variables_in_all_notebook))
+    let global_definitions_compartment = useCompartment(newcm_ref, GlobalDefinitionsFacet.of(variables_in_all_notebook))
     let highlighted_line_compartment = useCompartment(newcm_ref, HighlightLineFacet.of(cm_highlighted_line))
     let editable_compartment = useCompartment(newcm_ref, EditorState.readOnly.of(disable_input))
 
@@ -393,7 +393,7 @@ export const CellInput = ({
                     // Compartments coming from react state/props
                     nbpkg_compartment,
                     highlighted_line_compartment,
-                    used_variables_compartment,
+                    global_definitions_compartment,
                     editable_compartment,
 
                     // This is waaaay in front of the keys it is supposed to override,
diff --git a/frontend/components/CellInput/go_to_definition_plugin.js b/frontend/components/CellInput/go_to_definition_plugin.js
index e774b28076..13b7863253 100644
--- a/frontend/components/CellInput/go_to_definition_plugin.js
+++ b/frontend/components/CellInput/go_to_definition_plugin.js
@@ -796,7 +796,7 @@ let explore_variable_usage = (
     }
 }
 
-let get_variable_marks = (state, { scopestate, used_variables }) => {
+let get_variable_marks = (state, { scopestate, global_definitions }) => {
     return Decoration.set(
         Array.from(scopestate.usages)
             .map(({ definition, usage }) => {
@@ -805,7 +805,7 @@ let get_variable_marks = (state, { scopestate, used_variables }) => {
                 if (definition == null) {
                     // TODO variables_with_origin_cell should be notebook wide, not just in the current cell
                     // .... Because now it will only show variables after it has run once
-                    if (used_variables[text]) {
+                    if (global_definitions[text]) {
                         return Decoration.mark({
                             // TODO This used to be tagName: "a", but codemirror doesn't like that...
                             // .... https://github.com/fonsp/Pluto.jl/issues/1790
@@ -854,7 +854,7 @@ let get_variable_marks = (state, { scopestate, used_variables }) => {
 /**
  * @type {Facet<{ [variable_name: string]: string }>}
  */
-export const UsedVariablesFacet = Facet.define({
+export const GlobalDefinitionsFacet = Facet.define({
     combine: (values) => values[0],
     compare: _.isEqual,
 })
@@ -886,20 +886,20 @@ export const go_to_definition_plugin = ViewPlugin.fromClass(
          * @param {EditorView} view
          */
         constructor(view) {
-            let used_variables = view.state.facet(UsedVariablesFacet)
+            let global_definitions = view.state.facet(GlobalDefinitionsFacet)
             this.decorations = get_variable_marks(view.state, {
                 scopestate: view.state.field(ScopeStateField),
-                used_variables,
+                global_definitions,
             })
         }
 
         update(update) {
-            // My best take on getting this to update when UsedVariablesFacet does 🤷‍♀️
-            let used_variables = update.state.facet(UsedVariablesFacet)
-            if (update.docChanged || update.viewportChanged || used_variables !== update.startState.facet(UsedVariablesFacet)) {
+            // My best take on getting this to update when GlobalDefinitionsFacet does 🤷‍♀️
+            let global_definitions = update.state.facet(GlobalDefinitionsFacet)
+            if (update.docChanged || update.viewportChanged || global_definitions !== update.startState.facet(GlobalDefinitionsFacet)) {
                 this.decorations = get_variable_marks(update.state, {
                     scopestate: update.state.field(ScopeStateField),
-                    used_variables,
+                    global_definitions,
                 })
             }
         }
@@ -926,15 +926,15 @@ export const go_to_definition_plugin = ViewPlugin.fromClass(
                         // window.history.replaceState({ scrollTop: document.documentElement.scrollTop }, null)
                         // window.history.pushState({ scrollTo: scrollto_selector }, null)
 
-                        let used_variables = view.state.facet(UsedVariablesFacet)
+                        let global_definitions = view.state.facet(GlobalDefinitionsFacet)
 
                         // TODO Something fancy where we actually emit the identifier we are looking for,
                         // .... and the cell then selects exactly that definition (using lezer and cool stuff)
-                        if (used_variables[variable]) {
+                        if (global_definitions[variable]) {
                             window.dispatchEvent(
                                 new CustomEvent("cell_focus", {
                                     detail: {
-                                        cell_id: used_variables[variable],
+                                        cell_id: global_definitions[variable],
                                         line: 0, // 1-based to 0-based index
                                         definition_of: variable,
                                     },

From c1d23122845e7864ef3dfe15a8428366c98f95eb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Jan 2022 23:32:13 +0100
Subject: [PATCH 055/821] add broken test for #1856

---
 test/ExpressionExplorer.jl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index be36821c41..b58f56d8cd 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -376,6 +376,7 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(:(let global x, y, z; b = 5; x = 1; (y,z) = 3 end), [], [:x, :y, :z], [], [])
         @test testee(:(let global x, z; b = 5; x = 1; end), [], [:x], [], [])
         @test testee(:(let a = 1, b = 2; show(a + b) end), [], [], [:show, :+], [])
+        @test_broken testee(:(let a = 1; global a = 2; end), [], [:a], [], []; verbose=false)
 
         @test testee(:(begin local a, b = 1, 2 end), [], [], [], [])
         @test testee(:(begin local a = b = 1 end), [], [:b], [], [])

From 1f6be1e44dfde3543eba9182d0f92139c067d5f9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Jan 2022 23:40:55 +0100
Subject: [PATCH 056/821] Tests: make `let; global` expressions correct

---
 test/ExpressionExplorer.jl | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index b58f56d8cd..68ac5576b0 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -365,16 +365,16 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         ])
     end
     @testset "Scope modifiers" begin
-        @test testee(:(let global a, b = 1, 2 end), [], [:a, :b], [], [])
-        @test_broken testee(:(let global a = b = 1 end), [], [:a], [], []; verbose=false)
-        @test testee(:(let global k = 3 end), [], [:k], [], [])
-        @test_broken testee(:(let global k = r end), [], [:k], [], []; verbose=false)
-        @test testee(:(let global k = 3; k end), [], [:k], [], [])
-        @test testee(:(let global k += 3 end), [:k], [:k], [:+], [])
-        @test testee(:(let global k; k = 4 end), [], [:k], [], [])
-        @test testee(:(let global k; b = 5 end), [], [], [], [])
-        @test testee(:(let global x, y, z; b = 5; x = 1; (y,z) = 3 end), [], [:x, :y, :z], [], [])
-        @test testee(:(let global x, z; b = 5; x = 1; end), [], [:x], [], [])
+        @test testee(:(let; global a, b = 1, 2 end), [], [:a, :b], [], [])
+        @test_broken testee(:(let; global a = b = 1 end), [], [:a], [], []; verbose=false)
+        @test testee(:(let; global k = 3 end), [], [:k], [], [])
+        @test_broken testee(:(let; global k = r end), [], [:k], [], []; verbose=false)
+        @test testee(:(let; global k = 3; k end), [], [:k], [], [])
+        @test testee(:(let; global k += 3 end), [:k], [:k], [:+], [])
+        @test testee(:(let; global k; k = 4 end), [], [:k], [], [])
+        @test testee(:(let; global k; b = 5 end), [], [], [], [])
+        @test testee(:(let; global x, y, z; b = 5; x = 1; (y,z) = 3 end), [], [:x, :y, :z], [], [])
+        @test testee(:(let; global x, z; b = 5; x = 1; end), [], [:x], [], [])
         @test testee(:(let a = 1, b = 2; show(a + b) end), [], [], [:show, :+], [])
         @test_broken testee(:(let a = 1; global a = 2; end), [], [:a], [], []; verbose=false)
 
@@ -395,7 +395,7 @@ Some of these @test_broken lines are commented out to prevent printing to the te
             :f => ([], [:k], [], [])
         ])
         @test testee(:((begin x = 1 end, y)), [:y], [:x], [], [])
-        @test testee(:(x = let global a += 1 end), [:a], [:x, :a], [:+], [])
+        @test testee(:(x = let; global a += 1 end), [:a], [:x, :a], [:+], [])
     end
     @testset "`import` & `using`" begin
         @test testee(:(using Plots), [], [:Plots], [], [])

From 989231c9898bd832f326d970c2b3239e85a08401 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Fri, 28 Jan 2022 17:33:52 +0100
Subject: [PATCH 057/821] don't count logs messages multiple times for
 pluto-logs width (#1843)

---
 frontend/components/Logs.js | 41 +++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
index 6a410c2007..5f4a82545d 100644
--- a/frontend/components/Logs.js
+++ b/frontend/components/Logs.js
@@ -15,7 +15,27 @@ export const Logs = ({ logs, line_heights, set_cm_highlighted_line }) => {
     const container = useRef(null)
     const [from, setFrom] = useState(0)
     const [to, setTo] = useState(Math.round(1000 / GRID_WIDTH))
-    const logsWidth = logs.length * GRID_WIDTH
+    const progress_logs = logs.filter(is_progress_log)
+    const latest_progress_logs = progress_logs.reduce((progress_logs, log) => ({ ...progress_logs, [log.id]: log }), {})
+    const [_, grouped_progress_and_logs] = logs.reduce(
+        ([seen, final_logs], log) => {
+            const ipl = is_progress_log(log)
+            if (ipl && !(log.id in seen)) {
+                return [{ ...seen, [log.id]: true }, [...final_logs, latest_progress_logs[log.id]]]
+            } else if (!ipl) {
+                return [seen, [...final_logs, log]]
+            }
+            return [seen, final_logs]
+        },
+        [{}, []]
+    )
+    const logsWidth = grouped_progress_and_logs.length * GRID_WIDTH
+
+    const logsStyle = useMemo(
+        () => `grid-template-rows: ${line_heights.map((y) => y + "px").join(" ")} repeat(auto-fill, 15px); width: ${logsWidth}px;`,
+        [logsWidth, line_heights]
+    )
+
     useEffect(() => {
         if (!container.current) return
         const elem = container.current
@@ -33,30 +53,11 @@ export const Logs = ({ logs, line_heights, set_cm_highlighted_line }) => {
             document.removeEventListener("resize", l)
         }
     }, [container.current, logsWidth])
-    const logsStyle = useMemo(
-        () => `grid-template-rows: ${line_heights.map((y) => y + "px").join(" ")} repeat(auto-fill, 15px); width: ${logs.length * GRID_WIDTH}px;`,
-        [logs.length, line_heights]
-    )
     const is_hidden_input = line_heights[0] === 0
     if (logs.length === 0) {
         return null
     }
 
-    const progress_logs = logs.filter(is_progress_log)
-    const latest_progress_logs = progress_logs.reduce((progress_logs, log) => ({ ...progress_logs, [log.id]: log }), {})
-    const [_, grouped_progress_and_logs] = logs.reduce(
-        ([seen, final_logs], log) => {
-            const ipl = is_progress_log(log)
-            if (ipl && !(log.id in seen)) {
-                return [{ ...seen, [log.id]: true }, [...final_logs, latest_progress_logs[log.id]]]
-            } else if (!ipl) {
-                return [seen, [...final_logs, log]]
-            }
-            return [seen, final_logs]
-        },
-        [{}, []]
-    )
-
     return html`
         <pluto-logs-container ref=${container}>
             <pluto-logs style="${logsStyle}">

From c4a0f53a3f141ef76a0815f2273f4802d485e5cd Mon Sep 17 00:00:00 2001
From: Paul <paul@plutojl.org>
Date: Fri, 28 Jan 2022 17:37:11 +0100
Subject: [PATCH 058/821] enable progress logs from modules outside the
 notebook, fixes #1862

---
 frontend/components/Logs.js | 5 +++--
 src/runner/PlutoRunner.jl   | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
index 5f4a82545d..e9907b892b 100644
--- a/frontend/components/Logs.js
+++ b/frontend/components/Logs.js
@@ -6,9 +6,10 @@ import { SimpleOutputBody } from "./TreeView.js"
 // Defined in editor.css
 const GRID_WIDTH = 10
 const RESIZE_THROTTLE = 60
+const PROGRESS_LOG_LEVEL = "LogLevel(-1)"
 
 const is_progress_log = (log) => {
-    return log.kwargs.find((kwarg) => kwarg[0] === "progress") !== undefined
+    return log.level == PROGRESS_LOG_LEVEL && log.kwargs.find((kwarg) => kwarg[0] === "progress") !== undefined
 }
 
 export const Logs = ({ logs, line_heights, set_cm_highlighted_line }) => {
@@ -99,7 +100,7 @@ const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
     // }, [body])
     const [inspecting, set_inspecting] = useState(false)
 
-    const is_progress = is_progress_log({ kwargs })
+    const is_progress = is_progress_log({ level, kwargs })
     let progress = null
     if (is_progress) {
         progress = kwargs.find((p) => p[0] === "progress")[1][0]
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 337cad8eb5..e95a614584 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1983,7 +1983,11 @@ function Logging.shouldlog(::PlutoLogger, level, _module, _...)
     # Accept logs
     # - From the user's workspace module
     # - Info level and above for other modules
-    (_module isa Module && is_pluto_workspace(_module)) || convert(Logging.LogLevel, level) >= Logging.Info
+    # - LogLevel(-1) because that's what ProgressLogging.jl uses for its messages
+    level = convert(Logging.LogLevel, level)
+    (_module isa Module && is_pluto_workspace(_module)) ||
+        level >= Logging.Info ||
+        level == Logging.LogLevel(-1)
 end
 
 Logging.min_enabled_level(::PlutoLogger) = Logging.Debug

From 67f494cb2bf0a44dcd66c6bea05d108d75443f51 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Sun, 30 Jan 2022 22:55:42 +0100
Subject: [PATCH 059/821] Hide banner in CI (#1868)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 src/Pluto.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pluto.jl b/src/Pluto.jl
index c1a209276b..7f3078e37e 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -67,7 +67,7 @@ export reset_notebook_environment
 export update_notebook_environment
 export activate_notebook_environment
 
-if get(ENV, "JULIA_PLUTO_SHOW_BANNER", "1") !== "0"
+if get(ENV, "JULIA_PLUTO_SHOW_BANNER", "1") != "0" && get(ENV, "CI", "🍄") != "true"
 @info """\n
     Welcome to Pluto $(PLUTO_VERSION_STR) 🎈
     Start a notebook server using:

From 7c16080ecdeacf5499e45ed3d11b401a3ef8a397 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Sun, 30 Jan 2022 22:57:41 +0100
Subject: [PATCH 060/821] Use pkgdir instead of pathof (#1867)

---
 src/Pluto.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pluto.jl b/src/Pluto.jl
index 7f3078e37e..e603983197 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -9,7 +9,7 @@ Have a look at the FAQ:
 https://github.com/fonsp/Pluto.jl/wiki
 """
 module Pluto
-project_relative_path(xs...) = normpath(joinpath(dirname(dirname(pathof(Pluto))), xs...))
+project_relative_path(xs...) = normpath(joinpath(pkgdir(Pluto), xs...))
 
 import Pkg
 

From 0e4cc35bfcc388f8666cca3ea5e3a940e51b9314 Mon Sep 17 00:00:00 2001
From: Gurdit Singh Siyan <63354262+16bitmood@users.noreply.github.com>
Date: Mon, 31 Jan 2022 03:58:11 +0530
Subject: [PATCH 061/821] minor fix: Tables integration caused method
 ambiguation for Union{}[] (#1851)

---
 src/runner/PlutoRunner.jl | 1 +
 test/RichOutput.jl        | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index e95a614584..24f5b183d7 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1401,6 +1401,7 @@ const integrations = Integration[
             pluto_showable(::MIME"application/vnd.pluto.table+object", t::Type) = false
             pluto_showable(::MIME"application/vnd.pluto.table+object", t::AbstractVector{<:NamedTuple}) = false
             pluto_showable(::MIME"application/vnd.pluto.table+object", t::AbstractVector{<:Dict{Symbol,<:Any}}) = false
+            pluto_showable(::MIME"application/vnd.pluto.table+object", t::AbstractArray{Union{}, 1}) = false
 
         end,
     ),
diff --git a/test/RichOutput.jl b/test/RichOutput.jl
index 20a79050c6..f88822545b 100644
--- a/test/RichOutput.jl
+++ b/test/RichOutput.jl
@@ -224,6 +224,7 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
                     (a=16, b=16,)
                     (a=16, b=16,)
                 ]"""),
+                Cell("Union{}[]"),
             ])
         fakeclient.connected_notebook = notebook
 
@@ -242,6 +243,7 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
         @test notebook.cells[14].output.mime isa MIME"application/vnd.pluto.tree+object"
         @test notebook.cells[15].output.mime isa MIME"application/vnd.pluto.tree+object"
         @test notebook.cells[16].output.mime isa MIME"application/vnd.pluto.tree+object"
+        @test notebook.cells[17].output.mime isa MIME"application/vnd.pluto.tree+object"
         @test notebook.cells[2].output.body isa Dict
         @test notebook.cells[3].output.body isa Dict
         @test notebook.cells[4].output.body isa Dict
@@ -255,11 +257,14 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
         @test notebook.cells[14].output.body isa Dict
         @test notebook.cells[15].output.body isa Dict
         @test notebook.cells[16].output.body isa Dict
+        @test notebook.cells[17].output.body isa Dict
         @test occursin("String?", string(notebook.cells[13].output.body)) # Issue 1490.
 
         @test notebook.cells[10].output.mime isa MIME"text/plain"
         @test notebook.cells[10].errored == false
         
+        @test notebook.cells[17].errored == false  # Issue 1815
+
         # to see if we truncated correctly, we convert the output to string and check how big it is
         # because we don't want to test too specifically
         roughsize(x) = length(string(x))

From 223986533bc3b6a3d331211a0b5bed6b3f873bcb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 31 Jan 2022 00:18:04 +0100
Subject: [PATCH 062/821] PlutoRunner: only use vector viewer if
 `eltype(eachindex(x)) === Int`

Fix #806
---
 src/runner/PlutoRunner.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 24f5b183d7..46970f73f0 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1034,7 +1034,7 @@ pluto_showable(m::MIME, @nospecialize(x))::Bool = Base.invokelatest(showable, m,
 
 
 # We invent our own MIME _because we can_ but don't use it somewhere else because it might change :)
-pluto_showable(::MIME"application/vnd.pluto.tree+object", ::AbstractArray{<:Any,1}) = true
+pluto_showable(::MIME"application/vnd.pluto.tree+object", x::AbstractArray{<:Any,1}) = eltype(eachindex(x)) === Int
 pluto_showable(::MIME"application/vnd.pluto.tree+object", ::AbstractSet{<:Any}) = true
 pluto_showable(::MIME"application/vnd.pluto.tree+object", ::AbstractDict{<:Any,<:Any}) = true
 pluto_showable(::MIME"application/vnd.pluto.tree+object", ::Tuple) = true

From baad1b52fa0a6cae2e4955e08d2bf17ef938f04c Mon Sep 17 00:00:00 2001
From: Paul <paul@plutojl.org>
Date: Sun, 30 Jan 2022 20:46:06 +0100
Subject: [PATCH 063/821] allow .. as an identifier, fixes #1875

---
 src/analysis/ExpressionExplorer.jl |  2 +-
 test/React.jl                      | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index eddb6186c0..cb54f70a0a 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -271,7 +271,7 @@ end
 
 # this is stupid -- désolé
 function is_joined_funcname(joined::Symbol)
-    occursin('.', String(joined))
+    joined !== :.. #= .. is a valid identifier 😐 =# && occursin('.', String(joined))
 end
 
 assign_to_kw(e::Expr) = e.head == :(=) ? Expr(:kw, e.args...) : e
diff --git a/test/React.jl b/test/React.jl
index f7a1dcb6a6..42cf04cd1b 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -159,6 +159,16 @@ import Distributed
         end
     end
 
+    @testset ".. as an identifier" begin
+        notebook = Notebook(Cell.([
+           ".. = 1",
+           "..",
+        ]))
+        update_run!(🍭, notebook, notebook.cells)
+
+        @test all(noerror, notebook.cells)
+        @test notebook.cells[end].output.body == "1"
+    end
 
     # PlutoTest.jl is only working on Julia version >= 1.6
     VERSION >= v"1.6" && @testset "Test Firebasey" begin

From 3a0e7ec01cd1ad2c744747c75cfde3821079f268 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <t.h.huijzer@rug.nl>
Date: Tue, 1 Feb 2022 15:55:34 +0100
Subject: [PATCH 064/821] DOI in REAMDE for citation (#1864)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 README.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 80577ea210..3801e4fabd 100644
--- a/README.md
+++ b/README.md
@@ -147,9 +147,7 @@ Follow [these instructions](https://github.com/fonsp/Pluto.jl/blob/main/CONTRIBU
 
 ## License
 
-Pluto.jl is open source! Specifically, it is [MIT Licensed](https://github.com/fonsp/Pluto.jl/blob/main/LICENSE). The included sample notebooks have a more permissive license: the [Unlicense](https://github.com/fonsp/Pluto.jl/blob/main/sample/LICENSE). This means that you can use sample notebook code however you like - you do not need to credit us!
-
-Pluto.jl is built by gluing together open source software:
+Pluto.jl is open source! Specifically, it is [MIT Licensed](https://github.com/fonsp/Pluto.jl/blob/main/LICENSE). Pluto.jl is built by gluing together open source software:
 
 -   `Julia` - [license](https://github.com/JuliaLang/julia/blob/master/LICENSE.md)
 -   `CodeMirror` - [license](https://github.com/codemirror/codemirror.next/blob/master/LICENSE-MIT)
@@ -161,7 +159,13 @@ Pluto.jl is built by gluing together open source software:
 -   `developit/htm` - [license](https://github.com/developit/htm/blob/master/LICENSE)
 -   `MathJax` - [license](https://github.com/mathjax/MathJax-src/blob/master/LICENSE)
 
-Your notebook files are _yours_, you do not need to credit us. Have fun!
+If you want to reference Pluto.jl in scientific writing, you can use our DOI: [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5889169.svg)](https://doi.org/10.5281/zenodo.5889169)
+
+### Sample notebooks
+
+The included sample notebooks have a more permissive license: the [Unlicense](https://github.com/fonsp/Pluto.jl/blob/main/sample/LICENSE). This means that you can use sample notebook code however you like - you do not need to credit us! 
+
+Your notebook files are _yours_, you also do not need to credit us. Have fun!
 
 ## From the authors
 

From 30d87e44bfbe974c1d63eb03a905fa9004e0aeff Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Tue, 1 Feb 2022 15:56:18 +0100
Subject: [PATCH 065/821] fix is_stdlib() for nightly and enable nightly tests
 (#1874)

---
 src/packages/PkgCompat.jl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index 9d5d812385..ff79a30176 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -215,7 +215,15 @@ end
 
 # (⚠️ Internal API with fallback)
 _stdlibs() = try
-	values(Pkg.Types.stdlibs())
+	stdlibs = values(Pkg.Types.stdlibs())
+	T = eltype(stdlibs)
+	if T == String
+		stdlibs
+	elseif T <: Tuple{String,Any}
+		first.(stdlibs)
+	else
+		error()
+	end
 catch e
 	@warn "Pkg compat: failed to load standard libraries." exception=(e,catch_backtrace())
 

From a96d2ad9c7c64c4b952e82d8c80025a30edcca04 Mon Sep 17 00:00:00 2001
From: Panagiotis Georgakopoulos <panagiotis.georgakopoulos@juliacomputing.com>
Date: Tue, 1 Feb 2022 17:11:19 +0200
Subject: [PATCH 066/821] Upgrade CodemirrorPlutoSetup to 0.26.0

---
 frontend/imports/CodemirrorPlutoSetup.d.ts | 5 +++++
 frontend/imports/CodemirrorPlutoSetup.js   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/imports/CodemirrorPlutoSetup.d.ts b/frontend/imports/CodemirrorPlutoSetup.d.ts
index 0e8dbf47be..44c44660bd 100644
--- a/frontend/imports/CodemirrorPlutoSetup.d.ts
+++ b/frontend/imports/CodemirrorPlutoSetup.d.ts
@@ -4051,6 +4051,11 @@ declare const tags: {
     */
     definitionKeyword: Tag;
     /**
+    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) related to defining or
+    interfacing with modules.
+    */
+    moduleKeyword: Tag;
+    /**
     An operator.
     */
     operator: Tag;
diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index 7cb23380bf..056d25cc69 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -56,7 +56,7 @@ import {
     javascript,
     python,
     Text,
-} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.25.0/dist/index.es.min.js"
+} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.26.0/dist/index.es.min.js"
 
 export {
     EditorState,

From 2af3d5598971f3f51cffa8f2b7f9a2a8b7237e81 Mon Sep 17 00:00:00 2001
From: Connor Burns <ctrekker4@gmail.com>
Date: Tue, 1 Feb 2022 08:47:57 -0700
Subject: [PATCH 067/821] Server-side events as configuration (#1871)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 src/Configuration.jl     |  1 +
 src/notebook/Events.jl   | 33 ++++++++++++++++-----------------
 src/webserver/MsgPack.jl |  4 ++++
 src/webserver/Session.jl |  1 -
 test/Events.jl           |  3 ++-
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index 562fc8f602..10d9832dcd 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -62,6 +62,7 @@ The HTTP server options. See [`SecurityOptions`](@ref) for additional settings.
     notebook::Union{Nothing,String,Vector{<:String}} = nothing
     init_with_file_viewer::Bool = false
     simulated_lag::Real = 0.0
+    on_event::Function = function(a) #= @info "$(typeof(a))" =# end
 end
 
 """
diff --git a/src/notebook/Events.jl b/src/notebook/Events.jl
index a3590ad548..75bd16ffc3 100644
--- a/src/notebook/Events.jl
+++ b/src/notebook/Events.jl
@@ -9,37 +9,36 @@ the FileSaveEvent may be triggered whenever pluto wants to make sure the file is
 which may be more often than the file is actually changed. Deduplicate on your own if
 you care about this.
 
-To use that, we assume you are running Pluto through a julia script and
-opening it as 
-
-julia > pluto_server_session = Pluto.ServerSession(;
-    secret = secret,
-    options = pluto_server_options,
-)
-
 Define your function to handle the events using multiple dispatch:
 
 First assign a handler for all the types you will not use, using the supertype:
 
-julia >    function myfn(a::PlutoEvent)
-        nothing
-    end
+```julia-repl
+julia> function myfn(a::PlutoEvent)
+            nothing
+        end
+```
+
 
 And then create a special function for each event you want to handle specially
 
-julia >    function myfn(a::FileSaveEvent)
-        HTTP.post("https://my.service.com/count_saves")
-    end
+```julia-repl
+julia> function myfn(a::FileSaveEvent)
+            HTTP.post("https://my.service.com/count_saves")
+        end
+```
 
-Finally, assign the listener to your session
+Finally, pass the listener to Pluto's configurations with a keyword argument
 
-julia > pluto_server_session.event_listener = yourfunction
+```julia-repl
+julia> Pluto.run(; on_event = myfn)
+```
 """
 abstract type PlutoEvent end
 
 function try_event_call(session, event::PlutoEvent)
     return try
-        session.event_listener(event)
+        session.options.server.on_event(event)
     catch e
         @warn "Couldn't run event listener" event exception=(e, catch_backtrace())
         nothing
diff --git a/src/webserver/MsgPack.jl b/src/webserver/MsgPack.jl
index 1bbbad5cfb..7aa3bc35b1 100644
--- a/src/webserver/MsgPack.jl
+++ b/src/webserver/MsgPack.jl
@@ -31,6 +31,10 @@ MsgPack.msgpack_type(::Type{Configuration.CompilerOptions}) = MsgPack.StructType
 MsgPack.msgpack_type(::Type{Configuration.ServerOptions}) = MsgPack.StructType()
 MsgPack.msgpack_type(::Type{Configuration.SecurityOptions}) = MsgPack.StructType()
 
+# Don't try to send callback functions which can't be serialized (see ServerOptions.event_listener)
+MsgPack.msgpack_type(::Type{Function}) = MsgPack.NilType()
+MsgPack.to_msgpack(::MsgPack.NilType, ::Function) = nothing
+
 # We want typed integer arrays to arrive as JS typed integer arrays:
 const JSTypedIntSupport = [Int8, UInt8, Int16, UInt16, Int32, UInt32, Float32, Float64]
 JSTypedInt = Union{Int8,UInt8,Int16,UInt16,Int32,UInt32,Float32,Float64}
diff --git a/src/webserver/Session.jl b/src/webserver/Session.jl
index 3de8bb0268..013a92c615 100644
--- a/src/webserver/Session.jl
+++ b/src/webserver/Session.jl
@@ -47,7 +47,6 @@ Base.@kwdef mutable struct ServerSession
     secret::String = String(rand(('a':'z') ∪ ('A':'Z') ∪ ('0':'9'), 8))
     binder_token::Union{String,Nothing} = nothing
     options::Configuration.Options = Configuration.Options()
-    event_listener::Function = function(a::PlutoEvent) #= @info "$(typeof(a))" =# end
 end
 
 function save_notebook(session::ServerSession, notebook::Notebook)
diff --git a/test/Events.jl b/test/Events.jl
index 5727d387f0..bdd56dee0f 100644
--- a/test/Events.jl
+++ b/test/Events.jl
@@ -12,7 +12,8 @@ import UUIDs: UUID
         @info "this run!"
         push!(events, typeof(a))
     end
-    🍭 = ServerSession(; event_listener = test_listener)
+    🍭 = ServerSession()
+    🍭.options.server.on_event = test_listener
     🍭.options.evaluation.workspace_use_distributed = false
 
     fakeclient = ClientSession(:fake, nothing)

From 143cae813478b18499b01dfa99e394fbdaef2dec Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Tue, 1 Feb 2022 18:59:20 +0100
Subject: [PATCH 068/821] Awesome! Line wrapping! (#1876)

---
 frontend/components/CellInput.js              |   2 +-
 .../CellInput/awesome_line_wrapping.js        | 217 ++++++++++--------
 frontend/editor.css                           |  24 +-
 3 files changed, 143 insertions(+), 100 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 0fb856ace5..57b7409764 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -484,7 +484,7 @@ export const CellInput = ({
 
                     EditorView.lineWrapping,
                     // Disabled awesome_line_wrapping because it still fails in a lot of cases
-                    // awesome_line_wrapping,
+                    awesome_line_wrapping,
 
                     on_change_compartment,
                 ],
diff --git a/frontend/components/CellInput/awesome_line_wrapping.js b/frontend/components/CellInput/awesome_line_wrapping.js
index 4dce1f2b41..a2d41d3007 100644
--- a/frontend/components/CellInput/awesome_line_wrapping.js
+++ b/frontend/components/CellInput/awesome_line_wrapping.js
@@ -1,5 +1,7 @@
 import _ from "../../imports/lodash.js"
 import { StateEffect, StateField, EditorView, Decoration } from "../../imports/CodemirrorPlutoSetup.js"
+import { ReactWidget } from "./ReactWidget.js"
+import { html } from "../../imports/Preact.js"
 
 /**
  * Plugin that makes line wrapping in the editor respect the identation of the line.
@@ -28,25 +30,6 @@ const extra_cycle_character_width = StateField.define({
     },
 })
 
-// https://github.com/codemirror/view/blob/590690c71df9a3f25fd4d78edea5322f18114507/src/dom.ts#L223
-/** @type {Range} */
-let scratchRange
-export function textRange(node, from, to = from) {
-    let range = scratchRange || (scratchRange = document.createRange())
-    range.setEnd(node, to)
-    range.setStart(node, from)
-    console.log(`range:`, range.cloneContents())
-    console.log(`range:`, range.startOffset, range.endOffset)
-    console.log(`range:`, range)
-    return range
-}
-// https://github.com/codemirror/view/blob/590690c71df9a3f25fd4d78edea5322f18114507/src/dom.ts#L41
-export function clientRectsFor(dom) {
-    if (dom.nodeType == 3) return textRange(dom, 0, dom.nodeValue.length).getClientRects()
-    else if (dom.nodeType == 1) return dom.getClientRects()
-    else return []
-}
-
 let character_width_listener = EditorView.updateListener.of((viewupdate) => {
     let width = viewupdate.view.defaultCharacterWidth
     let { defaultCharacterWidth, measuredSpaceWidth } = viewupdate.view.state.field(extra_cycle_character_width, false)
@@ -76,66 +59,14 @@ let character_width_listener = EditorView.updateListener.of((viewupdate) => {
     }
 })
 
-let indent_decorations = StateField.define({
-    create() {
-        return Decoration.none
-    },
-    update(deco, tr) {
-        if (!tr.docChanged && deco !== Decoration.none) return deco
-
-        let decorations = []
-
-        for (let i of _.range(0, tr.state.doc.lines)) {
-            let line = tr.state.doc.line(i + 1)
-            if (line.length === 0) continue
-
-            let indented_chars = 0
-            for (let ch of line.text) {
-                if (ch === "\t") {
-                    indented_chars = indented_chars + 1
-                } else if (ch === " ") {
-                    indented_chars = indented_chars + 1
-                } else {
-                    break
-                }
-            }
-
-            const line_wrapping = Decoration.line({
-                attributes: {
-                    style: "display: flex",
-                },
-            })
-            decorations.push(line_wrapping.range(line.from, line.from))
-
-            if (indented_chars !== 0) {
-                const wrap_indentation = Decoration.mark({
-                    class: "indentation",
-                    attributes: {
-                        style: "flex-shrink: 0;",
-                    },
-                })
-                decorations.push(wrap_indentation.range(line.from, line.from + indented_chars))
-            }
-
-            if (line.from + indented_chars - line.to !== 0) {
-                const wrap_rest = Decoration.mark({
-                    class: "indentation-rest",
-                })
-                decorations.push(wrap_rest.range(line.from + indented_chars, line.to))
-            }
-        }
-        return Decoration.set(decorations, true)
-    },
-    provide: (f) => EditorView.decorations.from(f),
-})
-
-let ARBITRARY_INDENT_LINE_WRAP_LIMIT = 48
+let ARBITRARY_INDENT_LINE_WRAP_LIMIT = 12
 let line_wrapping_decorations = StateField.define({
     create() {
         return Decoration.none
     },
     update(deco, tr) {
-        let tabSize = tr.state.tabSize
+        // let tabSize = tr.state.tabSize
+        let tabSize = 4
         let previous = tr.startState.field(extra_cycle_character_width, false)
         let previous_space_width = previous.measuredSpaceWidth ?? previous.defaultCharacterWidth
         let { measuredSpaceWidth, defaultCharacterWidth } = tr.state.field(extra_cycle_character_width, false)
@@ -146,27 +77,57 @@ let line_wrapping_decorations = StateField.define({
 
         let decorations = []
 
-        console.log(`space_width:`, space_width)
-
         // TODO? Only apply to visible lines? Wouldn't that screw stuff up??
         // TODO? Don't create new decorations when a line hasn't changed?
         for (let i of _.range(0, tr.state.doc.lines)) {
             let line = tr.state.doc.line(i + 1)
             if (line.length === 0) continue
 
-            let indented_chars = 0
+            let indented_tabs = 0
             for (let ch of line.text) {
                 if (ch === "\t") {
-                    indented_chars = indented_chars + tabSize
-                } else if (ch === " ") {
-                    indented_chars = indented_chars + 1
+                    indented_tabs++
+                    // For now I ignore spaces... because they are weird... and stupid!
+                    // } else if (ch === " ") {
+                    //     indented_chars = indented_chars + 1
+                    //     indented_text_characters++
                 } else {
                     break
                 }
             }
 
+            const characters_to_count = Math.min(indented_tabs, ARBITRARY_INDENT_LINE_WRAP_LIMIT)
+            const offset = characters_to_count * tabSize * space_width
+
+            const linerwapper = Decoration.line({
+                attributes: {
+                    // style: rules.cssText,
+                    style: `--indented: ${offset}px;`,
+                    class: "awesome-wrapping-plugin-the-line",
+                },
+            })
+            // Need to push before the tabs one else codemirror gets madddd
+            decorations.push(linerwapper.range(line.from, line.from))
+
+            if (characters_to_count !== 0) {
+                decorations.push(
+                    Decoration.mark({
+                        class: "awesome-wrapping-plugin-the-tabs",
+                    }).range(line.from, line.from + characters_to_count)
+                )
+            }
+            if (indented_tabs > characters_to_count) {
+                for (let i of _.range(characters_to_count, indented_tabs)) {
+                    decorations.push(
+                        Decoration.replace({
+                            widget: new ReactWidget(html`<span style=${{ opacity: 0.2 }}>⇥ </span>`),
+                            block: false,
+                        }).range(line.from + i, line.from + i + 1)
+                    )
+                }
+            }
+
             // let tabs_in_front = Math.min(line.text.match(/^\t*/)[0].length) * tabSize
-            const offset = Math.min(indented_chars, ARBITRARY_INDENT_LINE_WRAP_LIMIT) * space_width
 
             // TODO? Cache the CSSStyleDeclaration?
             // This is used when we don't use a css class, but we do need a css class because
@@ -175,21 +136,95 @@ let line_wrapping_decorations = StateField.define({
             // rules.setProperty("--idented", `${offset}px`)
             // rules.setProperty("text-indent", "calc(-1 * var(--idented) - 1px)") // I have no idea why, but without the - 1px it behaves weirdly periodically
             // rules.setProperty("padding-left", "calc(var(--idented) + var(--cm-left-padding, 4px))")
+        }
+        return Decoration.set(decorations)
+    },
+    provide: (f) => EditorView.decorations.from(f),
+})
 
-            const linerwapper = Decoration.line({
-                attributes: {
-                    // style: rules.cssText,
-                    style: `--indented: ${offset}px;`,
-                    class: "awesome-wrapping-plugin-indent",
-                },
-            })
+// Add this back in
+// let dont_break_before_spaces_matcher = new MatchDecorator({
+//     regexp: /[^ \t]+[ \t]+/g,
+//     decoration: Decoration.mark({
+//         class: "indentation-so-dont-break",
+//     }),
+// })
 
-            decorations.push(linerwapper.range(line.from, line.from))
+let identation_so_dont_break_marker = Decoration.mark({
+    class: "indentation-so-dont-break",
+})
+
+let dont_break_before_spaces = StateField.define({
+    create() {
+        return Decoration.none
+    },
+    update(deco, tr) {
+        let decorations = []
+        let pos = 0
+        for (let line of tr.newDoc) {
+            for (let match of line.matchAll(/[^ \t]+([ \t]|$)+/g)) {
+                if (match.index === 0) continue // Sneaky negative lookbehind
+                decorations.push(identation_so_dont_break_marker.range(pos + match.index, pos + match.index + match[0].length))
+            }
         }
         return Decoration.set(decorations, true)
     },
     provide: (f) => EditorView.decorations.from(f),
 })
 
-// export let awesome_line_wrapping = [extra_cycle_character_width, character_width_listener, line_wrapping_decorations]
-export let awesome_line_wrapping = [indent_decorations]
+// let break_after_space_matcher = new MatchDecorator({
+//     regexp: /[ ](?=[^ \t])/g,
+//     decoration: Decoration.widget({
+//         widget: new ReactWidget(html` <wbr></wbr>`),
+//         block: false,
+//         side: 1,
+//     }),
+// })
+
+// let break_after_space = ViewPlugin.define(
+//     (view) => {
+//         return {
+//             decorations: break_after_space_matcher.createDeco(view),
+//             update(update) {
+//                 this.decorations = break_after_space_matcher.updateDeco(update, this.decorations)
+//             },
+//         }
+//     },
+//     {
+//         decorations: (v) => v.decorations,
+//     }
+// )
+
+// let dont_break_start_of_line_matcher = new MatchDecorator({
+//     regexp: /^[ \t]+[^ \t]/g,
+//     decoration: Decoration.mark({
+//         class: "Uhhh",
+//     }),
+// })
+
+// let dont_break_start_of_line = ViewPlugin.define(
+//     (view) => {
+//         return {
+//             decorations: dont_break_start_of_line_matcher.createDeco(view),
+//             update(update) {
+//                 this.decorations = dont_break_start_of_line_matcher.updateDeco(update, this.decorations)
+//             },
+//         }
+//     },
+//     {
+//         decorations: (v) => v.decorations,
+//     }
+// )
+
+// console.log(`awesome_line_wrapping:`, indent_decorations)
+export let awesome_line_wrapping = [
+    // dont_break_start_of_line,
+    extra_cycle_character_width,
+    character_width_listener,
+    line_wrapping_decorations,
+    // break_after_space,
+    // dont_break_before_spaces,
+]
+// export let awesome_line_wrapping = []
+// export let awesome_line_wrapping = indent_decorations
+// export let awesome_line_wrapping = [dont_break_before_spaces, break_after_space]
diff --git a/frontend/editor.css b/frontend/editor.css
index af82a310ea..04543f77c9 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2697,17 +2697,25 @@ pluto-input:focus-within .cm-editor .cm-matchingBracket {
 }
 
 /* Required for awesome-line-wrapping-plugin */
-.awesome-wrapping-plugin-indent {
-    /* Seems like tabs don't play too well with negative text-indent, and there seem to be some kind of cut-off point
-       before it even has any effect... Honestly need to look at this better because I can't figure it out yet */
-    --correction: 1px;
-    text-indent: calc(-1 * var(--indented, 0px) - var(--correction, 0px)) !important;
-    padding-left: calc(var(--indented, 0px) + var(--cm-left-padding, 4px)) + var(--correction, 0px) !important;
-}
-.awesome-wrapping-plugin-indent > * {
+.awesome-wrapping-plugin-the-line {
+    --correction: 0px;
+    margin-left: calc(var(--indented));
+    text-indent: calc(-1 * var(--indented));
+}
+.awesome-wrapping-plugin-the-line > * {
     /* text-indent apparently cascades... which I think is pretty stupid but this is the fix */
     text-indent: initial;
 }
+.awesome-wrapping-plugin-the-tabs {
+    /* So FOR SOME REASON text-ident is kinda buggy
+        but that gets fixed with inline-block...
+        But that brought some other problems...
+        But margin-left: -1px seems to also do the trick?? */
+    /* display: inline-block; */
+    white-space: pre;
+    vertical-align: top;
+    margin-left: -1px;
+}
 
 /* PLUTO HOOKS - special styling for cell that runs hook */
 /* New feature, new section in the css! */

From 51a88850c50f65db20cda4e64329c46c327f37e5 Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Tue, 1 Feb 2022 20:03:09 +0100
Subject: [PATCH 069/821] Pattern matching system for lezer code (and use it in
 scope traversal) (#1849)

---
 frontend/components/CellInput.js              |   29 +-
 .../CellInput/LiveDocsFromCursor.js           |    4 +-
 .../CellInput/debug_syntax_plugin.js          |   67 ++
 .../CellInput/go_to_definition_plugin.js      |  842 +------------
 .../components/CellInput/lezer_template.js    | 1050 ++++++++++++++++
 .../components/CellInput/pkg_bubble_plugin.js |  318 +++--
 .../CellInput/scopestate_statefield.js        | 1060 +++++++++++++++++
 .../components/CellInput/tests/.gitignore     |    1 +
 frontend/components/CellInput/tests/README.md |   14 +
 .../CellInput/tests/import_map.json           |    5 +
 .../CellInput/tests/scopestate.test.js        |  147 +++
 .../CellInput/tests/scopestate_helpers.js     |   69 ++
 frontend/editor.css                           |   20 +-
 frontend/imports/CodemirrorPlutoSetup.d.ts    |   21 +-
 frontend/imports/CodemirrorPlutoSetup.js      |    2 +
 sample/test_go_to_definition.jl               |  399 +++++++
 sample/test_pkg_bubble.jl                     |  190 ++-
 17 files changed, 3232 insertions(+), 1006 deletions(-)
 create mode 100644 frontend/components/CellInput/debug_syntax_plugin.js
 create mode 100644 frontend/components/CellInput/lezer_template.js
 create mode 100644 frontend/components/CellInput/scopestate_statefield.js
 create mode 100644 frontend/components/CellInput/tests/.gitignore
 create mode 100644 frontend/components/CellInput/tests/README.md
 create mode 100644 frontend/components/CellInput/tests/import_map.json
 create mode 100644 frontend/components/CellInput/tests/scopestate.test.js
 create mode 100644 frontend/components/CellInput/tests/scopestate_helpers.js
 create mode 100644 sample/test_go_to_definition.jl

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 57b7409764..8605ed0b67 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -5,7 +5,7 @@ import _ from "../imports/lodash.js"
 import { utf8index_to_ut16index } from "../common/UnicodeTools.js"
 import { PlutoContext } from "../common/PlutoContext.js"
 import { get_selected_doc_from_state } from "./CellInput/LiveDocsFromCursor.js"
-import { go_to_definition_plugin, ScopeStateField, GlobalDefinitionsFacet } from "./CellInput/go_to_definition_plugin.js"
+import { go_to_definition_plugin, GlobalDefinitionsFacet } from "./CellInput/go_to_definition_plugin.js"
 import { detect_deserializer } from "../common/Serialization.js"
 
 import {
@@ -55,6 +55,8 @@ import { pluto_paste_plugin } from "./CellInput/pluto_paste_plugin.js"
 import { bracketMatching } from "./CellInput/block_matcher_plugin.js"
 import { cl } from "../common/ClassTable.js"
 import { HighlightLineFacet, highlightLinePlugin } from "./CellInput/highlight_line.js"
+import { debug_syntax_plugin } from "./CellInput/debug_syntax_plugin.js"
+import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
 
 export const pluto_syntax_colors = HighlightStyle.define([
     /* The following three need a specific version of the julia parser, will add that later (still messing with it 😈) */
@@ -368,13 +370,14 @@ export const CellInput = ({
 
             if (update.docChanged || update.selectionSet) {
                 let state = update.state
-                DOCS_UPDATER_VERBOSE && console.groupCollapsed("Selection")
-                let result = get_selected_doc_from_state(state, DOCS_UPDATER_VERBOSE)
-                DOCS_UPDATER_VERBOSE && console.log("Result:", result)
-                DOCS_UPDATER_VERBOSE && console.groupEnd()
-
-                if (result != null) {
-                    on_update_doc_query(result)
+                DOCS_UPDATER_VERBOSE && console.groupCollapsed("Live docs updater")
+                try {
+                    let result = get_selected_doc_from_state(state, DOCS_UPDATER_VERBOSE)
+                    if (result != null) {
+                        on_update_doc_query(result)
+                    }
+                } finally {
+                    DOCS_UPDATER_VERBOSE && console.groupEnd()
                 }
             }
         })
@@ -487,6 +490,10 @@ export const CellInput = ({
                     awesome_line_wrapping,
 
                     on_change_compartment,
+
+                    // Enable this plugin if you want to see the lezer tree,
+                    // and possible lezer errors and maybe more debug info in the console:
+                    // debug_syntax_plugin,
                 ],
             }),
             parent: dom_node_ref.current,
@@ -586,7 +593,13 @@ export const CellInput = ({
 
             newcm_ref.current.focus()
             newcm_ref.current.dispatch({
+                scrollIntoView: true,
                 selection: new_selection,
+                effects: [
+                    EditorView.scrollIntoView(EditorSelection.range(new_selection.anchor, new_selection.head), {
+                        yMargin: 80,
+                    }),
+                ],
             })
         }
     }, [cm_forced_focus])
diff --git a/frontend/components/CellInput/LiveDocsFromCursor.js b/frontend/components/CellInput/LiveDocsFromCursor.js
index ea8036e4f1..341dec361f 100644
--- a/frontend/components/CellInput/LiveDocsFromCursor.js
+++ b/frontend/components/CellInput/LiveDocsFromCursor.js
@@ -1,5 +1,5 @@
 import { EditorState, syntaxTree } from "../../imports/CodemirrorPlutoSetup.js"
-import { ScopeStateField } from "./go_to_definition_plugin.js"
+import { ScopeStateField } from "./scopestate_statefield.js"
 
 let get_root_variable_from_expression = (cursor) => {
     if (cursor.name === "SubscriptExpression") {
@@ -285,7 +285,7 @@ export let get_selected_doc_from_state = (/** @type {EditorState} */ state, verb
                     }
 
                     // We have do find the current usage of the variable, and make sure it has no definition inside this cell
-                    let usage = Array.from(scopestate.usages).find((x) => x.usage.from === root_variable_node.from && x.usage.to === root_variable_node.to)
+                    let usage = scopestate.usages.find((x) => x.usage.from === root_variable_node.from && x.usage.to === root_variable_node.to)
                     // If we can't find the usage... we just assume it can be docs showed I guess
                     if (usage?.definition == null) {
                         return state.doc.sliceString(cursor.from, cursor.to)
diff --git a/frontend/components/CellInput/debug_syntax_plugin.js b/frontend/components/CellInput/debug_syntax_plugin.js
new file mode 100644
index 0000000000..51209cdb40
--- /dev/null
+++ b/frontend/components/CellInput/debug_syntax_plugin.js
@@ -0,0 +1,67 @@
+import { EditorView, syntaxTree, syntaxTreeAvailable } from "../../imports/CodemirrorPlutoSetup.js"
+import { iterate_with_cursor } from "./lezer_template.js"
+
+/**
+ * @param {any} doc
+ * @param {ReturnType<typeof syntaxTree>} tree
+ */
+let find_error_nodes = (doc, tree) => {
+    iterate_with_cursor({
+        tree: tree,
+        enter: (cursor) => {
+            if (cursor.type.isError) {
+                console.group(`Found error node in ${cursor.node.parent.name}`)
+                try {
+                    let text_before_cursor = doc.sliceString(cursor.from - 10, cursor.from)
+                    let text = doc.sliceString(cursor.from, cursor.to)
+                    let text_after_cursor = doc.sliceString(cursor.to, cursor.to + 10)
+
+                    if (text === "") {
+                        console.log(`${text_before_cursor}⚠${text_after_cursor}`)
+                        console.log(`${" ".repeat(text_before_cursor.length)}^$${" ".repeat(text_after_cursor.length)}`)
+                    } else {
+                        console.log(`${text_before_cursor}${text}${text_after_cursor}`)
+                        console.log(`${" ".repeat(text_before_cursor.length)}${"^".repeat(text.length)}$${" ".repeat(text_after_cursor.length)}`)
+                    }
+                } finally {
+                    console.groupEnd()
+                }
+                return false
+            }
+        },
+        leave: () => {},
+    })
+}
+
+export const debug_syntax_plugin = EditorView.updateListener.of((update) => {
+    if (update.docChanged || update.selectionSet || syntaxTree(update.state) !== syntaxTree(update.startState)) {
+        if (syntaxTreeAvailable(update.state)) {
+            let state = update.state
+            console.group("Selection")
+            try {
+                console.groupCollapsed("Lezer tree")
+                try {
+                    console.log(syntaxTree(state).toString())
+                } finally {
+                    console.groupEnd()
+                }
+                console.groupCollapsed("Document text")
+                try {
+                    console.log(update.state.doc.sliceString(0, update.state.doc.length))
+                } finally {
+                    console.groupEnd()
+                }
+                console.group("Lezer errors")
+                try {
+                    find_error_nodes(update.state.doc, syntaxTree(state))
+                } finally {
+                    console.groupEnd()
+                }
+            } finally {
+                console.groupEnd()
+            }
+        } else {
+            console.log("⚠️ Full syntax tree not available")
+        }
+    }
+})
diff --git a/frontend/components/CellInput/go_to_definition_plugin.js b/frontend/components/CellInput/go_to_definition_plugin.js
index 13b7863253..c5a32ad626 100644
--- a/frontend/components/CellInput/go_to_definition_plugin.js
+++ b/frontend/components/CellInput/go_to_definition_plugin.js
@@ -1,811 +1,23 @@
-import { syntaxTree, Facet, ViewPlugin, Decoration, StateField, EditorView, EditorSelection, EditorState } from "../../imports/CodemirrorPlutoSetup.js"
+import { Facet, ViewPlugin, Decoration, EditorView } from "../../imports/CodemirrorPlutoSetup.js"
 import { ctrl_or_cmd_name, has_ctrl_or_cmd_pressed } from "../../common/KeyboardShortcuts.js"
 import _ from "../../imports/lodash.js"
+import { ScopeStateField } from "./scopestate_statefield.js"
 
 /**
- * This function work bottom up: you give it an identifier, and it will look at it parents to figure out what it is...
- * Ideally we use the top-down approach for everything, like we do in `explore_variable_usage`.
+ * @param {any} state
+ * @param {{
+ *  scopestate: import("./scopestate_statefield.js").ScopeState,
+ *  global_definitions: { [key: string]: string }
+ * }} context
  */
-let node_is_variable_usage = (node) => {
-    let parent = node.parent
-
-    if (parent == null) return false
-    if (parent.name === "VariableDeclarator") return false
-    if (parent.name === "Symbol") return false
-
-    // If we are the first child of a FieldExpression, we are the usage
-    if (parent.name === "FieldExpression" || parent.name === "MacroFieldExpression") {
-        let firstchild = parent.firstChild
-        if (node.from === firstchild?.from && node.to === firstchild?.to) {
-            return true
-        } else {
-            return false
-        }
-    }
-
-    // Ignore left side of an assigment
-    // TODO Tuple assignment
-    if (parent.name === "AssignmentExpression") {
-        let firstchild = parent?.firstChild
-        if (node.from === firstchild?.from && node.to === firstchild?.to) {
-            return false
-        }
-    }
-
-    // If we are the name of a macro of function definition, we are not usage
-    if (parent.name === "MacroDefinition" || parent.name === "FunctionDefinition") {
-        let function_name = parent?.firstChild?.nextSibling
-        if (node.from === function_name?.from && node.to === function_name?.to) {
-            return false
-        }
-    }
-
-    if (parent.name === "ArgumentList") {
-        if (parent.parent.name === "MacroDefinition" || parent.parent.name === "FunctionDefinition") {
-            return false
-        }
-    }
-
-    if (parent.name === "Type") {
-        return true
-    }
-
-    if (parent.name === "TypedExpression") return node_is_variable_usage(parent)
-    if (parent.name === "NamedField") return node_is_variable_usage(parent)
-    if (parent.name === "BareTupleExpression") return node_is_variable_usage(parent)
-
-    return true
-}
-
-let empty_variables = []
-
-/**
- * @typedef Range
- * @property {number} from
- * @property {number} to
- *
- * @typedef ScopeState
- * @property {Set<{ usage: Range, definition: Range? }>} usages
- * @property {Map<String, Range>} definitions
- */
-
-/**
- * @param {ScopeState} a
- * @param {ScopeState} b
- * @returns {ScopeState}
- */
-let merge_scope_state = (a, b) => {
-    if (a === b) return a
-
-    let usages = new Set([...a.usages, ...b.usages])
-    let definitions = new Map(a.definitions)
-    for (let [key, value] of b.definitions) {
-        definitions.set(key, value)
-    }
-    return { usages, definitions }
-}
-
-/**
- * Clone scopestate
- * @param {ScopeState} scopestate
- * @returns {ScopeState}
- */
-let clone_scope_state = (scopestate) => {
-    let usages = new Set(scopestate.usages)
-    let definitions = new Map(scopestate.definitions)
-    return { usages, definitions }
-}
-
-/**
- * @param {import("../../imports/CodemirrorPlutoSetup.js").TreeCursor} cursor
- * @returns {Array<Range>}
- */
-let get_variables_from_assignment = (cursor) => {
-    if (cursor.name === "Definition") {
-        if (cursor.firstChild()) {
-            try {
-                return get_variables_from_assignment(cursor)
-            } finally {
-                cursor.parent()
-            }
-        }
-    }
-
-    if (cursor.name === "Identifier") {
-        return [{ to: cursor.to, from: cursor.from }]
-    }
-    // `function f(x...)` => ["x"]
-    // `x... = 10` => ["x"]
-    if (cursor.name === "SpreadExpression") {
-        if (cursor.firstChild()) {
-            try {
-                return get_variables_from_assignment(cursor)
-            } finally {
-                cursor.parent()
-            }
-        }
-    }
-    // `function f(x = 10)` => ["x"]
-    // First need to go into NamedArgument, then need to go into NamedField.
-    if (cursor.name === "NamedArgument" || cursor.name === "NamedField") {
-        if (cursor.firstChild()) {
-            try {
-                return get_variables_from_assignment(cursor)
-            } finally {
-                cursor.parent()
-            }
-        }
-    }
-    // `function f(x::Any)` => ["x"]
-    // `x::Any = 10` => ["x"]
-    if (cursor.name === "TypedExpression") {
-        if (cursor.firstChild()) {
-            try {
-                return get_variables_from_assignment(cursor)
-            } finally {
-                cursor.parent()
-            }
-        }
-    }
-    // `function f( (x,y) )` => ["x", "y"]
-    // `(x, y) = arr` => ["x", "y"]
-    // `x,y = arr` => ["x", "y"]
-    if (cursor.name === "TupleExpression" || cursor.name === "BareTupleExpression") {
-        let variables = []
-        if (cursor.firstChild()) {
-            do {
-                variables.push(...get_variables_from_assignment(cursor))
-            } while (cursor.nextSibling())
-            cursor.parent()
-        }
-        return variables
-    }
-    return []
-}
-
-let children = function* (cursor) {
-    if (cursor.firstChild()) {
-        try {
-            do {
-                yield cursor
-            } while (cursor.nextSibling())
-        } finally {
-            cursor.parent()
-        }
-    }
-}
-
-let all_children = function* (cursor) {
-    for (let child of children(cursor)) {
-        yield* all_children(child)
-    }
-}
-
-/**
- * @param {import("../../imports/CodemirrorPlutoSetup.js").TreeCursor} cursor
- */
-let go_through_quoted_expression_looking_for_interpolations = function* (cursor) {
-    if (cursor.name !== "QuoteExpression") throw new Error("Expected QuotedExpression")
-
-    for (let child of all_children(cursor)) {
-        // @ts-ignore
-        if (child.name === "InterpolationExpression") {
-            yield cursor
-        }
-    }
-}
-
-/**
- * @param {import("../../imports/CodemirrorPlutoSetup.js").TreeCursor} cursor
- * @param {any} doc
- * @param {ScopeState} scopestate
- * @returns {ScopeState}
- */
-let parse_definitions = function (cursor, doc, scopestate) {
-    if (cursor.name === "TypeArgumentList" && cursor.firstChild()) {
-        try {
-            do {
-                scopestate = parse_definitions(cursor, doc, scopestate)
-            } while (cursor.nextSibling())
-        } finally {
-            cursor.parent()
-        }
-        return scopestate
-    } else if (cursor.name === "TypedExpression" && cursor.node.getChildren("<:").length === 1 && cursor.firstChild()) {
-        // X <: Y
-        try {
-            // X
-            scopestate = parse_definitions(cursor, doc, scopestate)
-            cursor.nextSibling()
-            // <:
-            cursor.nextSibling()
-            // Y
-            scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
-            return scopestate
-        } finally {
-            cursor.parent()
-        }
-    } else if (cursor.name === "ParameterizedIdentifier" && cursor.firstChild()) {
-        // X{Y}
-        try {
-            // X
-            scopestate = parse_definitions(cursor, doc, scopestate)
-            cursor.nextSibling()
-            // Y
-            scopestate = parse_definitions(cursor, doc, scopestate)
-            return scopestate
-        } finally {
-            cursor.parent()
-        }
-    } else if (cursor.name === "Identifier") {
-        let name = doc.sliceString(cursor.from, cursor.to)
-        scopestate.definitions.set(name, {
-            from: cursor.from,
-            to: cursor.to,
-        })
-        return scopestate
-    } else {
-        // console.warn(`UNKNOWN NODE in parse_definition cursor.toString():`, cursor.toString())
-        return scopestate
-    }
-}
-
-/**
- * @param {import("../../imports/CodemirrorPlutoSetup.js").TreeCursor} cursor
- * @param {any} doc
- * @param {ScopeState} scopestate
- * @returns {ScopeState}
- */
-let explore_variable_usage = (
-    cursor,
-    doc,
-    scopestate = {
-        usages: new Set(),
-        definitions: new Map(),
-    },
-    verbose = false
-) => {
-    let start_node = null
-    if (verbose) {
-        verbose && console.group(`Explorer: ${cursor.toString()}`)
-        verbose && console.log("Full text:", doc.sliceString(cursor.from, cursor.to))
-        start_node = cursor.node
-    }
-    try {
-        if (cursor.name === "Symbol") {
-            // Nothing, ha!
-        } else if (cursor.name === "AbstractDefinition") {
-            // Also nothing!
-        } else if (cursor.name === "StructDefinition" && cursor.firstChild()) {
-            try {
-                // @ts-ignore
-                if (cursor.name === "mutable") cursor.nextSibling()
-                // @ts-ignore
-                if (cursor.name === "struct") cursor.nextSibling()
-
-                // We're at the identifier (possibly ParameterizedIdentifier)
-                // @ts-ignore
-                if (cursor.name === "Definition" && cursor.firstChild()) {
-                    try {
-                        scopestate = parse_definitions(cursor, doc, scopestate)
-                    } finally {
-                        cursor.parent()
-                    }
-                }
-
-                // We are now in the actual struct body
-                do {
-                    // @ts-ignore
-                    if (cursor.name === "Identifier") {
-                        // Nothing, this is just the name inside the struct blegh get it out of here
-                    }
-                    // @ts-ignore
-                    if (cursor.name === "TypedExpression") {
-                        // We're in X::Y, and Y is a reference
-                        scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor.node.lastChild.cursor, doc, scopestate))
-                    }
-                    // I'm not so sure about this
-                    // @ts-ignore
-                    if (cursor.name === "AssignmentExpression" && cursor.firstChild()) {
-                        try {
-                            if (cursor.name === "Identifier") {
-                                // Nothing, this is just the name inside the struct blegh get it out of here
-                            }
-                            if (cursor.name === "TypedExpression") {
-                                // We're in X::Y, and Y is a reference
-                                scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor.node.lastChild.cursor, doc, scopestate))
-                            }
-
-                            cursor.nextSibling()
-                            cursor.nextSibling()
-
-                            // We're in X::Y, and Y is a reference
-                            scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
-                        } finally {
-                            cursor.parent()
-                        }
-                    }
-                } while (cursor.nextSibling())
-            } finally {
-                cursor.parent()
-            }
-        } else if (cursor.name === "QuoteExpression") {
-            for (let interpolation_cursor of go_through_quoted_expression_looking_for_interpolations(cursor)) {
-                scopestate = merge_scope_state(scopestate, explore_variable_usage(interpolation_cursor, doc, scopestate))
-            }
-            verbose && console.log("Interpolating over")
-        } else if (cursor.name === "ModuleDefinition" && cursor.firstChild()) {
-            // Ugh..
-            try {
-                // First child is "module", next child is the name
-                cursor.nextSibling()
-                let name = doc.sliceString(cursor.from, cursor.to)
-                scopestate.definitions.set(name, {
-                    from: cursor.from,
-                    to: cursor.to,
-                })
-
-                // Next children are the body
-                // These have a new scope, not even escaping definitions
-                /** @type {ScopeState} */
-                let module_scopestate = {
-                    usages: new Set(),
-                    definitions: new Map(),
-                }
-                while (cursor.nextSibling()) {
-                    module_scopestate = merge_scope_state(module_scopestate, explore_variable_usage(cursor, doc, module_scopestate))
-                }
-                // We still merge the module scopestate with the global scopestate, but only the usages that don't escape.
-                // (Later we can have also shadowed definitions for the dimming of unused variables)
-                scopestate = merge_scope_state(scopestate, {
-                    usages: new Set(Array.from(module_scopestate.usages).filter((x) => x.definition != null)),
-                    definitions: new Map(),
-                })
-            } finally {
-                cursor.parent()
-            }
-        } else if (cursor.name === "CompoundExpression" && cursor.firstChild()) {
-            // begin ... end, go through all the children one by one and keep adding their definitions
-            try {
-                do {
-                    scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
-                } while (cursor.nextSibling())
-            } finally {
-                cursor.parent()
-            }
-        } else if (cursor.name === "ImportStatement" && cursor.firstChild()) {
-            try {
-                // let is_using = cursor.name === "using"
-                cursor.nextSibling()
-
-                // @ts-ignore
-                if (cursor.name === "Import" && cursor.firstChild()) {
-                    do {
-                        let node = cursor.node
-                        if (cursor.name === "Identifier") {
-                            // node = node 🤷‍♀️
-                        }
-                        if (cursor.name === "RenamedIdentifier") {
-                            node = node.lastChild
-                        }
-
-                        let name = doc.sliceString(node.from, node.to)
-                        scopestate.definitions.set(name, {
-                            from: cursor.from,
-                            to: cursor.to,
-                        })
-                    } while (cursor.nextSibling())
-                    cursor.parent()
-                }
-
-                // @ts-ignore
-                if (cursor.name === "SelectedImport") {
-                    // First child is the module we are importing from, so we skip to the next child
-                    for (let child of children(cursor)) {
-                        let node = cursor.node
-                        if (cursor.name === "Identifier") {
-                            // node = node 🤷‍♀️
-                        }
-                        if (cursor.name === "RenamedImport") {
-                            node = node.lastChild
-                        }
-                        let name = doc.sliceString(node.from, node.to)
-                        scopestate.definitions.set(name, {
-                            from: cursor.from,
-                            to: cursor.to,
-                        })
-                    }
-                }
-            } finally {
-                cursor.parent()
-            }
-        } else if (cursor.name === "ForStatement" && cursor.firstChild()) {
-            try {
-                let nested_scope = {
-                    usages: new Set(),
-                    definitions: new Map(scopestate.definitions),
-                }
-
-                // @ts-ignore
-                if (cursor.name === "for") {
-                    cursor.nextSibling()
-                }
-
-                // @ts-ignore
-                if (cursor.name === "ForBinding" && cursor.firstChild()) {
-                    try {
-                        for (let variable_node of get_variables_from_assignment(cursor)) {
-                            let name = doc.sliceString(variable_node.from, variable_node.to)
-                            nested_scope.definitions.set(name, {
-                                from: variable_node.from,
-                                to: variable_node.to,
-                            })
-                        }
-                        cursor.nextSibling()
-
-                        // @ts-ignore
-                        if (cursor.name === "in") {
-                            cursor.nextSibling()
-                        }
-
-                        // Right hand side of `for ... in ...`
-                        scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
-                    } finally {
-                        cursor.parent()
-                    }
-                }
-
-                cursor.nextSibling()
-
-                // Go through the expressions in the for body
-                do {
-                    nested_scope = merge_scope_state(nested_scope, explore_variable_usage(cursor, doc, nested_scope))
-                } while (cursor.nextSibling())
-
-                scopestate = {
-                    usages: new Set([...scopestate.usages, ...nested_scope.usages]),
-                    definitions: scopestate.definitions,
-                }
-            } finally {
-                cursor.parent()
-            }
-        } else if (cursor.name === "DoClause" && cursor.firstChild()) {
-            try {
-                let nested_scope = {
-                    usages: new Set(),
-                    definitions: new Map(scopestate.definitions),
-                }
-
-                do {
-                    // @ts-ignore
-                    if (cursor.name === "DoClauseArguments" && cursor.firstChild()) {
-                        // Don't ask me why, but currently `do (x, y)` is parsed as `DoClauseArguments(ArgumentList(x, y))`
-                        // while an actual argumentslist, `do x, y` is parsed as `DoClauseArguments(BareTupleExpression(x, y))`
-                        let did_go_on_level_deeper = cursor.name === "ArgumentList" && cursor.firstChild()
-                        try {
-                            for (let variable_node of get_variables_from_assignment(cursor)) {
-                                let name = doc.sliceString(variable_node.from, variable_node.to)
-                                nested_scope.definitions.set(name, {
-                                    from: variable_node.from,
-                                    to: variable_node.to,
-                                })
-                            }
-                        } finally {
-                            if (did_go_on_level_deeper) {
-                                cursor.parent()
-                            }
-                            cursor.parent()
-                        }
-                    } else {
-                        nested_scope = merge_scope_state(nested_scope, explore_variable_usage(cursor, doc, nested_scope))
-                    }
-                } while (cursor.nextSibling())
-
-                scopestate = {
-                    usages: new Set([...scopestate.usages, ...nested_scope.usages]),
-                    definitions: scopestate.definitions,
-                }
-            } finally {
-                cursor.parent()
-            }
-        } else if (cursor.name === "NamedField" && cursor.firstChild()) {
-            try {
-                // NamedField's in the wild indicate there is no assignment, just a property name
-                if (cursor.nextSibling()) {
-                    scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
-                }
-            } finally {
-                cursor.parent()
-            }
-        } else if (cursor.name === "FunctionDefinition" || cursor.name === "MacroDefinition") {
-            let full_node = cursor.node
-            if (cursor.firstChild()) {
-                // Two things
-                // 1. Add the function name to the current scope
-                // 2. Go through the function in a nested scope
-
-                try {
-                    // @ts-ignore
-                    // If we are at "function", skip it
-                    if (cursor.name === "function") {
-                        cursor.nextSibling()
-                    }
-                    let in_macro = false
-                    // @ts-ignore
-                    // If we are at "function", skip it
-                    if (cursor.name === "macro") {
-                        in_macro = true // So we add `@` to the name
-                        cursor.nextSibling()
-                    }
-                    // @ts-ignore
-                    // Function name, add to current scope
-                    if (cursor.name === "Definition" && cursor.firstChild()) {
-                        try {
-                            if (cursor.name === "Identifier") {
-                                let name = doc.sliceString(cursor.from, cursor.to)
-                                if (in_macro) {
-                                    name = `@${name}`
-                                }
-                                scopestate.definitions.set(name, { from: cursor.from, to: cursor.to })
-                                cursor.nextSibling()
-                            }
-                        } finally {
-                            cursor.parent()
-                        }
-                        cursor.nextSibling()
-                    }
-
-                    let nested_scope = {
-                        usages: new Set(),
-                        definitions: new Map(scopestate.definitions),
-                    }
-
-                    let type_parameters = full_node.getChild("TypeParameters")
-                    if (type_parameters) {
-                        nested_scope = parse_definitions(type_parameters.firstChild.cursor, doc, nested_scope)
-                    }
-
-                    // @ts-ignore
-                    // Cycle through arguments
-                    if (cursor.name === "ArgumentList" && cursor.firstChild()) {
-                        try {
-                            do {
-                                // @ts-ignore
-                                if (cursor.name === "NamedArgument" && cursor.firstChild()) {
-                                    try {
-                                        if (cursor.name === "NamedField" && cursor.firstChild()) {
-                                            try {
-                                                // First child is the name of the argument
-                                                if (cursor.name === "TypedExpression" && cursor.firstChild()) {
-                                                    try {
-                                                        do {
-                                                            // @ts-ignore
-                                                            if (cursor.name === "Type") {
-                                                                scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
-                                                            }
-                                                        } while (cursor.nextSibling())
-                                                    } finally {
-                                                        cursor.parent()
-                                                    }
-                                                }
-                                                for (let variable_node of get_variables_from_assignment(cursor)) {
-                                                    let name = doc.sliceString(variable_node.from, variable_node.to)
-                                                    nested_scope.definitions.set(name, {
-                                                        from: variable_node.from,
-                                                        to: variable_node.to,
-                                                    })
-                                                }
-
-                                                // Next sibling is the default value
-                                                if (cursor.nextSibling()) {
-                                                    scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
-                                                }
-                                            } finally {
-                                                cursor.parent()
-                                            }
-                                        }
-                                    } finally {
-                                        cursor.parent()
-                                    }
-                                }
-
-                                // @ts-ignore
-                                if (cursor.name === "TypedExpression" && cursor.firstChild()) {
-                                    try {
-                                        do {
-                                            // @ts-ignore
-                                            if (cursor.name === "Type") {
-                                                scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, nested_scope))
-                                            }
-                                        } while (cursor.nextSibling())
-                                    } finally {
-                                        cursor.parent()
-                                    }
-                                }
-
-                                for (let variable_node of get_variables_from_assignment(cursor)) {
-                                    let name = doc.sliceString(variable_node.from, variable_node.to)
-                                    nested_scope.definitions.set(name, {
-                                        from: variable_node.from,
-                                        to: variable_node.to,
-                                    })
-                                }
-                            } while (cursor.nextSibling())
-                        } finally {
-                            cursor.parent()
-                        }
-                    }
-
-                    cursor.nextSibling()
-
-                    do {
-                        nested_scope = merge_scope_state(nested_scope, explore_variable_usage(cursor, doc, nested_scope))
-                    } while (cursor.nextSibling())
-
-                    scopestate = {
-                        usages: new Set([...scopestate.usages, ...nested_scope.usages]),
-                        definitions: scopestate.definitions,
-                    }
-                } finally {
-                    cursor.parent()
-                }
-            }
-        } else if (cursor.name === "LetStatement" && cursor.firstChild()) {
-            try {
-                let nested_scope = {
-                    usages: new Set(),
-                    definitions: new Map(scopestate.definitions),
-                }
-                do {
-                    nested_scope = merge_scope_state(nested_scope, explore_variable_usage(cursor, doc, nested_scope))
-                } while (cursor.nextSibling())
-                scopestate = {
-                    usages: new Set([...scopestate.usages, ...nested_scope.usages]),
-                    definitions: scopestate.definitions,
-                }
-            } finally {
-                cursor.parent()
-            }
-        } else if (cursor.name === "VariableDeclaration" || cursor.name === "AssignmentExpression") {
-            if (cursor.firstChild()) {
-                try {
-                    for (let variable_node of get_variables_from_assignment(cursor)) {
-                        let name = doc.sliceString(variable_node.from, variable_node.to)
-                        scopestate.definitions.set(name, {
-                            from: variable_node.from,
-                            to: variable_node.to,
-                        })
-                    }
-                    // explore the right-hand side of the assignment
-                    if (cursor.nextSibling()) {
-                        scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
-                    }
-                } finally {
-                    cursor.parent()
-                }
-            }
-        } else if (cursor.name === "Identifier" || cursor.name === "MacroIdentifier") {
-            if (node_is_variable_usage(cursor.node)) {
-                let name = doc.sliceString(cursor.from, cursor.to)
-                if (scopestate.definitions.has(name)) {
-                    scopestate.usages.add({
-                        usage: {
-                            from: cursor.from,
-                            to: cursor.to,
-                        },
-                        definition: scopestate.definitions.get(name),
-                    })
-                } else {
-                    scopestate.usages.add({
-                        usage: {
-                            from: cursor.from,
-                            to: cursor.to,
-                        },
-                        definition: null,
-                    })
-                }
-            }
-        } else if (cursor.name === "ForClause" || cursor.name === "IfClause") {
-            // Nothing, this should be handled by ArrayComprehensionExpression
-        } else if (cursor.name === "ArrayComprehensionExpression" || cursor.name === "GeneratorExpression") {
-            let node = cursor.node
-            let for_binding = node.getChild("ForClause")?.getChild("ForBinding")
-            let binding = for_binding?.firstChild
-            let from = for_binding?.lastChild
-            let if_clause = node.getChild("IfClause")
-
-            // Because of the weird way this is parsed, we need `sort = true` in the Decorations.set below
-
-            if (binding != null || from != null) {
-                // Get usage for the generator
-                scopestate = merge_scope_state(scopestate, explore_variable_usage(from.cursor, doc, scopestate))
-
-                let nested_scope = {
-                    usages: new Set(),
-                    definitions: new Map(scopestate.definitions),
-                }
-
-                // Add definition from the binding
-                for (let variable_node of get_variables_from_assignment(binding.cursor)) {
-                    let name = doc.sliceString(variable_node.from, variable_node.to)
-                    nested_scope.definitions.set(name, {
-                        from: variable_node.from,
-                        to: variable_node.to,
-                    })
-                }
-
-                if (if_clause != null) {
-                    do {
-                        let if_clause_cursor = if_clause.cursor
-                        if_clause_cursor.lastChild()
-                        nested_scope = merge_scope_state(nested_scope, explore_variable_usage(if_clause_cursor, doc, nested_scope))
-                    } while (cursor.nextSibling())
-                }
-
-                if (cursor.firstChild()) {
-                    try {
-                        do {
-                            nested_scope = merge_scope_state(nested_scope, explore_variable_usage(cursor, doc, nested_scope))
-                        } while (cursor.nextSibling())
-                    } finally {
-                        cursor.parent()
-                    }
-                }
-
-                scopestate = {
-                    usages: new Set([...scopestate.usages, ...nested_scope.usages]),
-                    definitions: scopestate.definitions,
-                }
-            }
-
-            // cursor.nextSibling()
-            // // @ts-ignore
-            // if (cursor.name === "ForClause" && cursor.firstChild()) {
-            //     do {
-            //         if (cursor.name === "ForBinding" && cursor.firstChild()) {
-            //             local_variables.push(...get_variables_from_assignment(cursor))
-            //             cursor.parent()
-            //         }
-            //     } while (cursor.nextSibling())
-            //     cursor.parent()
-            // }
-        } else {
-            // In most cases we "just" go through all the children separately
-            if (cursor.firstChild()) {
-                try {
-                    do {
-                        scopestate = merge_scope_state(scopestate, explore_variable_usage(cursor, doc, scopestate))
-                    } while (cursor.nextSibling())
-                } finally {
-                    cursor.parent()
-                }
-            }
-        }
-
-        if (verbose) {
-            if (cursor.from !== start_node.from || cursor.to !== start_node.to) {
-                console.log(`start_node:`, start_node.toString(), doc.sliceString(start_node.from, start_node.to))
-                console.log(`cursor:`, cursor.toString(), doc.sliceString(cursor.from, cursor.to))
-                throw new Error("Cursor is at a different node at the end of explore_variable_usage :O")
-            }
-        }
-
-        return scopestate
-    } finally {
-        verbose && console.groupEnd()
-    }
-}
-
 let get_variable_marks = (state, { scopestate, global_definitions }) => {
     return Decoration.set(
-        Array.from(scopestate.usages)
-            .map(({ definition, usage }) => {
-                let text = state.doc.sliceString(usage.from, usage.to)
-
+        scopestate.usages
+            .map(({ definition, usage, name }) => {
                 if (definition == null) {
                     // TODO variables_with_origin_cell should be notebook wide, not just in the current cell
                     // .... Because now it will only show variables after it has run once
-                    if (global_definitions[text]) {
+                    if (global_definitions[name]) {
                         return Decoration.mark({
                             // TODO This used to be tagName: "a", but codemirror doesn't like that...
                             // .... https://github.com/fonsp/Pluto.jl/issues/1790
@@ -813,9 +25,9 @@ let get_variable_marks = (state, { scopestate, global_definitions }) => {
                             // .... When I ever happen to find a lot of time I can spend on this, I'll debug and change it back to `a`
                             tagName: "pluto-variable-link",
                             attributes: {
-                                "title": `${ctrl_or_cmd_name}-Click to jump to the definition of ${text}.`,
-                                "data-pluto-variable": text,
-                                "href": `#${text}`,
+                                "title": `${ctrl_or_cmd_name}-Click to jump to the definition of ${name}.`,
+                                "data-pluto-variable": name,
+                                "href": `#${name}`,
                             },
                         }).range(usage.from, usage.to)
                     } else {
@@ -836,8 +48,8 @@ let get_variable_marks = (state, { scopestate, global_definitions }) => {
                     return Decoration.mark({
                         tagName: "pluto-variable-link",
                         attributes: {
-                            "title": `${ctrl_or_cmd_name}-Click to jump to the definition of ${text}.`,
-                            "data-cell-variable": text,
+                            "title": `${ctrl_or_cmd_name}-Click to jump to the definition of ${name}.`,
+                            "data-cell-variable": name,
                             "data-cell-variable-from": `${definition.from}`,
                             "data-cell-variable-to": `${definition.to}`,
                             "href": `#`,
@@ -852,34 +64,13 @@ let get_variable_marks = (state, { scopestate, global_definitions }) => {
 }
 
 /**
- * @type {Facet<{ [variable_name: string]: string }>}
+ * @type {Facet<{ [variable_name: string]: string }, { [variable_name: string]: string }>}
  */
 export const GlobalDefinitionsFacet = Facet.define({
     combine: (values) => values[0],
     compare: _.isEqual,
 })
 
-/**
- * @type {StateField<ScopeState>}
- */
-export let ScopeStateField = StateField.define({
-    create(state) {
-        let cursor = syntaxTree(state).cursor()
-        let scopestate = explore_variable_usage(cursor, state.doc)
-        return scopestate
-    },
-
-    update(value, tr) {
-        if (tr.docChanged) {
-            let cursor = syntaxTree(tr.state).cursor()
-            let scopestate = explore_variable_usage(cursor, tr.state.doc)
-            return scopestate
-        } else {
-            return value
-        }
-    },
-})
-
 export const go_to_definition_plugin = ViewPlugin.fromClass(
     class {
         /**
@@ -951,6 +142,7 @@ export const go_to_definition_plugin = ViewPlugin.fromClass(
                         let variable_to = Number(cell_variable.getAttribute("data-cell-variable-to"))
 
                         view.dispatch({
+                            scrollIntoView: true,
                             selection: { anchor: variable_from, head: variable_to },
                         })
                         view.focus()
diff --git a/frontend/components/CellInput/lezer_template.js b/frontend/components/CellInput/lezer_template.js
new file mode 100644
index 0000000000..d977c6b00d
--- /dev/null
+++ b/frontend/components/CellInput/lezer_template.js
@@ -0,0 +1,1050 @@
+import { julia_andrey, NodeProp, syntaxTree, Text } from "../../imports/CodemirrorPlutoSetup.js"
+import lodash from "../../imports/lodash.js"
+
+// @ts-ignore
+import ManyKeysWeakMap from "https://esm.sh/many-keys-weakmap@1.0.0"
+
+/**
+ * @param {string} julia_code
+ * @returns {SyntaxNode}
+ */
+export let julia_to_ast = (julia_code) => {
+    return /** @type {any} */ (julia_andrey().language.parser.parse(julia_code).topNode.firstChild)
+}
+
+const TEMPLATE_CREATION_VERBOSE = false
+
+/**
+ * Settings this to `"VALIDITY"` will enable some (currently, one) slow validations.
+ * Might be useful to run set this to `"VALIDITY"` every so often to make sure there are no bugs.
+ * In production this should always to `"SPEED"`
+ *
+ * @type {"SPEED" | "VALIDITY"}
+ */
+const PERFORMANCE_MODE = /** @type {any} */ ("SPEED")
+
+const IS_IN_VALIDATION_MODE = PERFORMANCE_MODE === "VALIDITY"
+
+/**
+ * @template {Array} P
+ * @template {(...args: P) => any} T
+ * @param {T} fn
+ * @param {(...args: P) => any} cachekey_resolver
+ * @param {WeakMap} cache
+ * @returns {T}
+ */
+let memo = (fn, cachekey_resolver = /** @type {any} */ ((x) => x), cache = new Map()) => {
+    return /** @type {any} */ (
+        (/** @type {P} */ ...args) => {
+            let cachekey = cachekey_resolver(...args)
+            let result = cache.get(cachekey)
+            if (result != null) {
+                return result
+            } else {
+                let result = fn(...args)
+
+                if (result == undefined) {
+                    throw new Error("Memoized function returned undefined")
+                }
+                cache.set(cachekey, result)
+                return result
+            }
+        }
+    )
+}
+
+/**
+ * @template {(...args: any) => any} T
+ * @param {T} fn
+ * @param {(...x: Parameters<T>) => Array<any>} cachekey_resolver
+ * @returns {T}
+ */
+let weak_memo = (fn, cachekey_resolver = (...x) => x) => memo(fn, cachekey_resolver, new ManyKeysWeakMap())
+
+/**
+ * @template {(arg: any) => any} T
+ * @param {T} fn
+ * @returns {T}
+ */
+let weak_memo1 = (fn) => memo(fn, (x) => x, new WeakMap())
+
+// Good luck figuring anything out from these types 💕
+
+/**
+ * @typedef TreeCursor
+ * @type {import("../../imports/CodemirrorPlutoSetup.js").TreeCursor}
+ *
+ * @typedef SyntaxNode
+ * @type {TreeCursor["node"]}
+ */
+
+/**
+ * @typedef LezerOffsetNode
+ * @type {{
+ *  name: string,
+ *  from: number,
+ *  to: number,
+ *  node: SyntaxNode,
+ * }}
+ */
+
+/**
+ * @typedef TemplateGenerator
+ * @type {Generator<string, AstTemplate, LezerOffsetNode>}
+ */
+
+/**
+ * @typedef Substitution
+ * @type {() => TemplateGenerator}
+ */
+
+/**
+ * @typedef Templatable
+ * @type {JuliaCodeObject | Substitution}
+ */
+
+/**
+ * @typedef MatchResult
+ * @type {any}
+ */
+
+/**
+ * @typedef Matcher
+ * @type {{
+ *  match: (haystack_cursor: TreeCursor | SyntaxNode, verbose?: boolean) => void | { [key: string]: MatchResult }
+ * }}
+ */
+
+/** @param {TreeCursor} cursor */
+export let child_cursors = function* (cursor) {
+    if (cursor.firstChild()) {
+        try {
+            do {
+                yield cursor
+            } while (cursor.nextSibling())
+        } finally {
+            cursor.parent()
+        }
+    }
+}
+
+/** @param {SyntaxNode} node */
+export let child_nodes = function* (node) {
+    if (node.firstChild) {
+        let child = node.firstChild
+        do {
+            yield child
+        } while ((child = child.nextSibling))
+    }
+}
+
+/**
+ * @typedef AstTemplate
+ * @type {{
+ *  name?: string,
+ *  from?: number,
+ *  to?: number,
+ *  node: SyntaxNode,
+ *  children: Array<AstTemplate>,
+ * } | {
+ *  pattern: (
+ *      haystack: (TreeCursor | void),
+ *      matches: { [key: string]: any },
+ *      verbose?: boolean
+ *  ) => boolean,
+ * }}
+ */
+
+/**
+ * @param {TreeCursor | void} haystack_cursor
+ * @param {AstTemplate} template
+ * @param {{ [name: string]: any }} matches
+ * @param {boolean} verbose
+ */
+export let match_template = (haystack_cursor, template, matches, verbose = false) => {
+    if (verbose) {
+        console.group("Current haystack:", !haystack_cursor ? null : haystack_cursor.node.name)
+
+        console.groupCollapsed("Details")
+        try {
+            console.log(`template:`, template)
+            console.log(`haystack_cursor:`, !haystack_cursor ? null : haystack_cursor.node.toString())
+
+            if ("node" in template) {
+                console.log(`template.node:`, template.node)
+                console.log(`template.node.toString():`, template.node.toString())
+            } else if ("pattern" in template) {
+                console.log(`template.pattern:`, template.pattern)
+            }
+        } finally {
+            console.groupEnd()
+        }
+    }
+
+    try {
+        if ("pattern" in template) {
+            let pattern = template.pattern
+            if (typeof pattern !== "function") {
+                throw new Error(`Unknown pattern "${pattern}"`)
+            }
+
+            let matches_before_matching = {}
+            if (verbose) {
+                matches_before_matching = { ...matches }
+                console.groupCollapsed(`Matching against pattern: ${template.pattern.name}()`)
+            }
+
+            let did_match = null
+            try {
+                did_match = pattern(haystack_cursor, matches, verbose)
+            } finally {
+                if (verbose) {
+                    console.groupEnd()
+                }
+            }
+            if (verbose) {
+                if (did_match) {
+                    console.log(`✅ because the pattern was happy! All hail the pattern!`)
+                    if (!lodash.isEqual(matches, matches_before_matching)) {
+                        let new_matches = lodash.omit(matches, Object.keys(matches_before_matching))
+                        console.log(`   WE EVEN GOT NEW MATCHES SAY WHAAAAAAT:`, new_matches)
+                    }
+                } else {
+                    console.log(`❌ because... well, you should ask the pattern that!`)
+                }
+            }
+
+            return did_match
+        } else if ("node" in template) {
+            let { node, children } = template
+
+            verbose && console.log(`Matching against node: ${template.node.name}`)
+
+            if (!haystack_cursor) {
+                if (node.name === "end") {
+                    verbose && console.log(`✅ No node left to match, but it was the end anyway`)
+                    return true
+                }
+                verbose && console.log(`❌ because no cursor left to match against`)
+                return false
+            }
+
+            if (haystack_cursor.type.isError) {
+                // Not sure about this yet but ehhhh
+                verbose && console.log(`✅ because ⚠`)
+                return true
+            }
+
+            if (haystack_cursor.name !== node.name) {
+                verbose && console.log(`❌ because name mismatch "${haystack_cursor.name}" !== "${node.name}"`)
+                return false
+            }
+
+            if (haystack_cursor.firstChild()) {
+                try {
+                    let is_last_from_haystack = false
+                    for (let template_child of children) {
+                        if (is_last_from_haystack) {
+                            verbose && console.log(`Haystack is empty, but there are more children in template... lets see`)
+                            let child_does_match = match_template(null, template_child, matches, verbose)
+                            if (!child_does_match) {
+                                verbose && console.log(`❌ template child did not accept null for an answer`, template_child, haystack_cursor.toString())
+                                return false
+                            }
+                            verbose && console.log(`👌🏽 This template child was fine with null`)
+                            continue
+                        }
+
+                        // Skip comments
+                        // TODO This is, I think, one of the few julia-only things right now.....
+                        // .... Any sane way to factor this out?
+                        while (haystack_cursor.name === "Comment" || haystack_cursor.name === "BlockComment") {
+                            if (!haystack_cursor.nextSibling()) break
+                        }
+
+                        let child_does_match = match_template(haystack_cursor, template_child, matches, verbose)
+
+                        if (!child_does_match) {
+                            verbose && console.log(`❌ because a child mismatch`, template_child, haystack_cursor.toString())
+                            return false
+                        }
+
+                        // This is where we actually move the haystack_cursor (in sync with the `template.children`)
+                        // to give the nested match templates more freedom in move the cursor around between siblings.
+                        is_last_from_haystack = !haystack_cursor.nextSibling()
+                    }
+
+                    if (verbose && !is_last_from_haystack) {
+                        let spare_children = []
+                        do {
+                            spare_children.push(haystack_cursor.node)
+                        } while (haystack_cursor.nextSibling())
+                        for (let child of spare_children) {
+                            haystack_cursor.prevSibling()
+                        }
+
+                        // prettier-ignore
+                        console.warn("We did match all the children of the template, but there are more in the haystack... Might want to actually not match this?", spare_children, template)
+                    }
+
+                    verbose && console.log(`✅ because all children match`)
+                    return true
+                } finally {
+                    haystack_cursor.parent()
+                }
+            } else {
+                if (template.children.length !== 0) {
+                    verbose && console.log(`Haystack node is empty, but template has children... lets see`)
+
+                    for (let child of template.children) {
+                        if (!match_template(null, child, matches, verbose)) {
+                            verbose && console.log(`❌ because child template wasn't okay with having no children`, child)
+                            return false
+                        }
+                    }
+                    verbose && console.log(`✅ All template children we're fine with having no children to check on`)
+                    return true
+                } else {
+                    verbose && console.log(`✅ Template also has no children, yayyy`)
+                    return true
+                }
+            }
+        } else {
+            console.log(`template:`, template)
+            throw new Error("waaaah")
+        }
+    } finally {
+        if (verbose) {
+            console.groupEnd()
+        }
+    }
+}
+
+export class JuliaCodeObject {
+    /**
+     * @param {TemplateStringsArray} template
+     * @param {any[]} substitutions
+     * */
+    constructor(template, substitutions) {
+        let flattened_template = []
+        let flattened_substitutions = []
+
+        flattened_template.push(template[0])
+        for (let [string_part, substitution] of lodash.zip(template.slice(1), substitutions)) {
+            if (substitution instanceof JuliaCodeObject) {
+                flattened_template[flattened_template.length - 1] += substitution.template[0]
+                for (let [sub_string_part, sub_substitution] of lodash.zip(substitution.template.slice(1), substitution.substitutions)) {
+                    flattened_substitutions.push(sub_substitution)
+                    flattened_template.push(sub_string_part)
+                }
+                flattened_template[flattened_template.length - 1] += string_part
+            } else {
+                flattened_substitutions.push(substitution)
+                flattened_template.push(string_part)
+            }
+        }
+
+        this.template = flattened_template
+        this.substitutions = flattened_substitutions
+    }
+}
+
+/**
+ * @param {SyntaxNode} ast
+ * @param {Array<{ generator: TemplateGenerator, from: number, to: number, used?: boolean }>} substitutions
+ * @returns {AstTemplate}
+ */
+let substitutions_to_template = (ast, substitutions) => {
+    for (let substitution of substitutions) {
+        if (ast.from === substitution.from && ast.to === substitution.to) {
+            // Hacky and weird, but it is only for validation
+            substitution.used = true
+            let result = substitution.generator.next({
+                name: ast.name,
+                from: ast.from,
+                to: ast.to,
+                node: ast,
+            })
+
+            if (result.done) {
+                return result.value
+            } else {
+                throw new Error("Template generator not done providing ast node")
+            }
+        }
+    }
+
+    return {
+        name: ast.name,
+        from: ast.from,
+        to: ast.to,
+        children: Array.from(child_nodes(ast)).map((node) => substitutions_to_template(node, substitutions)),
+        node: ast,
+    }
+}
+
+/**
+ * @param {Templatable} julia_code_object
+ * @returns {TemplateGenerator}
+ */
+export let to_template = function* (julia_code_object) {
+    TEMPLATE_CREATION_VERBOSE && console.log(`to_template(`, julia_code_object, `)`)
+    if (julia_code_object instanceof JuliaCodeObject) {
+        let julia_code_to_parse = ""
+
+        let subsitions = []
+        for (let [string_part, substitution] of lodash.zip(julia_code_object.template, julia_code_object.substitutions)) {
+            julia_code_to_parse += string_part
+
+            if (substitution) {
+                let substitution_generator = to_template(substitution)
+
+                let substitution_code = intermediate_value(substitution_generator.next())
+
+                subsitions.push({
+                    from: julia_code_to_parse.length,
+                    to: julia_code_to_parse.length + substitution_code.length,
+                    generator: substitution_generator,
+                })
+                julia_code_to_parse += substitution_code
+            }
+        }
+
+        let template_node = yield julia_code_to_parse
+
+        let substitution_with_proper_position = subsitions.map((substitution) => {
+            return {
+                from: substitution.from + template_node.from,
+                to: substitution.to + template_node.from,
+                generator: substitution.generator,
+                used: false,
+            }
+        })
+
+        if (TEMPLATE_CREATION_VERBOSE) {
+            console.log(`julia_code_to_parse:`, julia_code_to_parse)
+            console.log(`template_node:`, template_node)
+            console.log(`subsitions:`, subsitions)
+            console.log(`substitution_with_proper_position:`, substitution_with_proper_position)
+        }
+
+        let result = substitutions_to_template(template_node.node, substitution_with_proper_position)
+        let unused_substitutions = substitution_with_proper_position
+            .filter((substitution) => !substitution.used)
+            .map((x) => {
+                return {
+                    text: julia_code_to_parse.slice(x.from, x.to),
+                    from: x.from,
+                    to: x.to,
+                }
+            })
+        if (unused_substitutions.length > 0) {
+            throw new Error(`Some substitutions not applied, this means it couldn't be matched to a AST position:`, unused_substitutions)
+        }
+        return result
+    } else if (typeof julia_code_object === "function") {
+        return yield* julia_code_object()
+    } else {
+        console.log(`julia_code_object:`, julia_code_object)
+        throw new Error("Unknown substition type")
+    }
+}
+
+/**
+ * @param {TemplateStringsArray} template
+ * @param {any[]} substitutions
+ * */
+export let jl_dynamic = weak_memo((template, ...substitutions) => {
+    return new JuliaCodeObject(template, substitutions)
+})
+
+/** @type {WeakMap<TemplateStringsArray, { input: Array<Templatable>, result: JuliaCodeObject }>} */
+let template_cache = new WeakMap()
+/**
+ * @param {TemplateStringsArray} template
+ * @param {Array<Templatable>} substitutions
+ */
+export let jl = (template, ...substitutions) => {
+    let cached = template_cache.get(template)
+    if (cached != null) {
+        let { input, result } = cached
+        if (IS_IN_VALIDATION_MODE) {
+            if (!lodash.isEqual(substitutions, input)) {
+                console.trace("Substitutions changed on `jl` template string.. change to `jl_dynamic` if you need this.")
+            }
+        }
+        return result
+    } else {
+        // Uncomment this if you want to check if the cache is working
+        // console.log("Creating template for", template, substitutions)
+        let result = new JuliaCodeObject(template, substitutions)
+        template_cache.set(template, {
+            input: substitutions,
+            result: result,
+        })
+        return result
+    }
+}
+
+/**
+ * Turns a ``` jl`` ``` (or substitution) into a template with a `.match(cursor)` method.
+ *
+ * @type {(code: Templatable) => Matcher}
+ */
+export let template = weak_memo1((julia_code_object) => {
+    let template_generator = to_template(julia_code_object)
+    let julia_to_parse = intermediate_value(template_generator.next())
+    let template_ast = julia_to_ast(julia_to_parse)
+
+    let template_description = return_value(
+        template_generator.next({
+            from: 0,
+            to: julia_to_parse.length,
+            name: template_ast.name,
+            node: /** @type {any} */ (template_ast),
+        })
+    )
+
+    return /** @type {Matcher} */ ({
+        /**
+         * @param {TreeCursor | SyntaxNode} haystack_cursor
+         * @param {boolean} verbose?
+         **/
+        template_description,
+        match(haystack_cursor, verbose = false) {
+            // Performance gain for not converting to `TreeCursor` possibly 🤷‍♀️
+            if ("node" in template_description && template_description.node.name !== haystack_cursor.name) return
+            if (haystack_cursor.type.isError) return null
+
+            if ("cursor" in haystack_cursor) haystack_cursor = haystack_cursor.cursor
+
+            let matches = /** @type {{ [key: string]: MatchResult }} */ ({})
+
+            verbose && console.groupCollapsed(`Starting a match at ${haystack_cursor.name}`)
+            try {
+                return match_template(haystack_cursor, template_description, matches, verbose) ? matches : null
+            } finally {
+                verbose && console.groupEnd()
+            }
+        },
+    })
+})
+
+export let as_string = weak_memo1((/** @type {JuliaCodeObject} */ julia_code_object) => {
+    let template_generator = to_template(julia_code_object)
+    let julia_to_parse = intermediate_value(template_generator.next())
+    // @ts-ignore
+    template_generator.return()
+    return julia_to_parse
+})
+
+export let as_node = weak_memo1((/** @type {JuliaCodeObject} */ julia_code_object) => {
+    return julia_to_ast(as_string(julia_code_object))
+})
+
+export let as_doc = weak_memo1((/** @type {JuliaCodeObject} */ julia_code_object) => {
+    return Text.of([as_string(julia_code_object)])
+})
+
+/**
+ * @template {(name: string, other_arg: Object) => any} T
+ * @param {T} func
+ * @returns {T}
+ **/
+let memo_first_argument_weakmemo_second = (func) => {
+    let fake_weakmap_no_arg = {}
+    let per_name_memo = memo((name) => {
+        return weak_memo1((arg) => {
+            if (arg === fake_weakmap_no_arg) return func(name)
+            return func(name, arg)
+        })
+    })
+
+    return /** @type {T} */ (
+        (name, arg = fake_weakmap_no_arg) => {
+            let sub_memo = per_name_memo(name)
+            return sub_memo(arg)
+        }
+    )
+}
+
+/** @type {Substitution} */
+function* any() {
+    yield "expression"
+    return {
+        pattern: function expression(cursor, matches, verbose = false) {
+            if (!cursor) {
+                verbose && console.log("❌ I want anything!! YOU GIVE ME NULL???")
+                return false
+            }
+            if (cursor.type.is("keyword")) {
+                verbose && console.log("❌ Keywords are not allowed!")
+                return false
+            }
+            return true
+        },
+    }
+}
+
+/**
+ * @param {TemplateGenerator} template_generator
+ * @return {TemplateGenerator}
+ * */
+function* narrow_template(template_generator) {
+    let ast = yield intermediate_value(template_generator.next())
+
+    if (ast.node.firstChild && ast.node.from === ast.node.firstChild.from && ast.node.to === ast.node.firstChild.to) {
+        console.log("Narrowing!!!!", ast.node, ast.node.firstChild)
+        return {
+            node: ast.node,
+            from: ast.from,
+            to: ast.to,
+            children: [
+                return_value(
+                    template_generator.next({
+                        ...ast,
+                        node: ast.node.firstChild,
+                    })
+                ),
+            ],
+        }
+    } else {
+        return return_value(template_generator.next(ast))
+    }
+}
+
+export const t = /** @type {const} */ ({
+    any: any,
+    /**
+     * Match no, one, or multiple! Like `*` in regex.
+     * It stores it's matches as `{ [name]: Array<{ node: SyntaxNode, matches: MatchResult }> }`
+     *
+     * If name isn't provided it will not store any of the matches.. useful if you really really don't care about something.
+     *
+     * @type {(name?: string, what?: Templatable) => Substitution}
+     */
+    many: memo_first_argument_weakmemo_second((name, of_what = any) => {
+        return function* many() {
+            let template_generator = to_template(of_what)
+            let ast = yield intermediate_value(template_generator.next())
+
+            // Ugly but it works
+            let narrowed_node = null
+            let sub_template = null
+            if (ast.node.firstChild && ast.node.from === ast.node.firstChild.from && ast.node.to === ast.node.firstChild.to) {
+                narrowed_node = ast.node
+                sub_template = return_value(
+                    template_generator.next({
+                        ...ast,
+                        node: ast.node.firstChild,
+                    })
+                )
+            } else {
+                sub_template = return_value(template_generator.next(ast))
+            }
+
+            // let sub_template = yield* narrow_template(to_template(of_what))
+
+            return {
+                narrowed_node,
+                sub_template,
+                pattern: function many(cursor, matches, verbose = false) {
+                    if (!cursor) {
+                        verbose && console.log("✅ Nothing to see here... I'm fine with that - many")
+                        return true
+                    }
+
+                    if (narrowed_node) {
+                        if (cursor.name !== narrowed_node.name) {
+                            verbose && console.log("❌ Tried to go in, but she wasn't my type - many")
+                            cursor.prevSibling()
+                            return true
+                        }
+                        cursor.firstChild()
+                    }
+
+                    try {
+                        let matches_nodes = []
+                        while (true) {
+                            let local_match = {}
+                            let did_match = match_template(cursor, sub_template, local_match, verbose)
+                            if (!did_match) {
+                                // Move back on child, as that is the child that DIDN'T match
+                                // And we want to give the next template a change to maybe match it
+                                cursor.prevSibling()
+                                break
+                            }
+                            matches_nodes.push({ node: cursor.node, match: local_match })
+
+                            if (!cursor.nextSibling()) break
+                        }
+
+                        if (name != null) {
+                            matches[name] = matches_nodes
+                        }
+                        return true
+                    } finally {
+                        if (narrowed_node) {
+                            cursor.parent()
+                        }
+                    }
+                },
+            }
+        }
+    }),
+
+    /**
+     * Match either a single node or none. Like `?` in regex.
+     * @type {(what: Templatable) => Substitution}
+     */
+    maybe: weak_memo1((what) => {
+        return function* maybe() {
+            let sub_template = yield* to_template(what)
+            return {
+                sub_template,
+                pattern: function maybe(cursor, matches, verbose = false) {
+                    if (!cursor) return true
+                    if (cursor.type.isError) return true
+
+                    let did_match = match_template(cursor, sub_template, matches, verbose)
+
+                    if (did_match === false) {
+                        // Roll back position because we didn't match
+                        cursor.prevSibling()
+                    }
+                    return true
+                },
+            }
+        }
+    }),
+
+    /**
+     * This is an escape hatch.
+     * Ideally I'd want to ask for multiple different templates to match, but I can't easily get that to work yet.
+     * So for now, you can ask templates to just match "Anything kinda like this",
+     * and then do further matching on the result manually.
+     *
+     * More technically, this says "match anything that will appear in my position in the AST".
+     * It does not care about the type. Don't use this recklessly!
+     *
+     * @type {(what: Templatable) => Substitution}
+     * */
+    anything_that_fits: weak_memo1((what) => {
+        return function* anything_that_fits() {
+            // We send the template code upwards, but we fully ignore the output
+            yield* to_template(what)
+            return {
+                pattern: function anything_that_fits(cursor, matches, verbose = false) {
+                    return true
+                },
+            }
+        }
+    }),
+    /**
+     * This is an escape hatch, like {@linkcode anything_that_fits},
+     * but it does also check for node type at least.
+     *
+     * @type {(what: Templatable) => Substitution}
+     * */
+    something_with_the_same_type_as: weak_memo1((what) => {
+        return function* something_with_the_same_type_as() {
+            let template_generator = to_template(what)
+            let julia_to_parse = intermediate_value(template_generator.next())
+
+            let ast = yield julia_to_parse
+
+            // @ts-ignore
+            template_generator.return()
+
+            return {
+                pattern: function something_with_the_same_type_as(cursor, matches, verbose = false) {
+                    return cursor && ast.name === cursor.name
+                },
+            }
+        }
+    }),
+
+    /**
+     * This "higher-order" template pattern is for adding their nodes to the matches.
+     * Without a pattern (e.g. `t.as("foo")`) it will default to `t.any`
+     *
+     * @type {(name: string, what?: Templatable) => Substitution}
+     */
+    as: memo_first_argument_weakmemo_second((name, what = any) => {
+        return function* as() {
+            let sub_template = yield* to_template(what)
+            return {
+                sub_template,
+                pattern: function as(cursor, matches, verbose = false) {
+                    let did_match = match_template(cursor, sub_template, matches, verbose)
+                    if (did_match === true) {
+                        matches[name] = cursor?.["node"]
+                    }
+                    return cursor && did_match
+                },
+            }
+        }
+    }),
+
+    /** @type {Substitution} */
+    Identifier: function* Identifier() {
+        yield "identifier"
+        return {
+            pattern: function Identifier(cursor, matches, verbose = false) {
+                return cursor && narrow_name(cursor) === "Identifier"
+            },
+        }
+    },
+    /** @type {Substitution} */
+    Number: function* Number() {
+        yield "69"
+        return {
+            pattern: function Number(cursor, matches, verbose = false) {
+                return cursor && narrow_name(cursor) === "Number"
+            },
+        }
+    },
+    /** @type {Substitution} */
+    String: function* String() {
+        yield `"A113"`
+        return {
+            pattern: function String(cursor, matches, verbose = false) {
+                return cursor && (narrow_name(cursor) === "StringWithoutInterpolation" || narrow_name(cursor) === "TripleStringWithoutInterpolation")
+            },
+        }
+    },
+})
+
+/**
+ * Basically exists for {@linkcode create_specific_template_maker}
+ *
+ * @type {(template: Templatable, meta_template: Matcher) => Matcher}
+ */
+export let take_little_piece_of_template = weak_memo((template, meta_template) => {
+    let template_generator = to_template(template)
+    let julia_to_parse = intermediate_value(template_generator.next())
+
+    // Parse the AST from the template, but we don't send it back to the template_generator yet!
+    let template_ast = julia_to_ast(julia_to_parse)
+
+    let match = null
+    // Match our created template code to the meta-template, which will yield us the part of the
+    // AST that falls inside the "content" in the meta-template.
+    if ((match = meta_template.match(template_ast))) {
+        let { content } = /** @type {{ content: SyntaxNode }} */ (match)
+
+        let possible_parents = []
+        while (content.firstChild && content.firstChild.from == content.from && content.firstChild.to == content.to) {
+            possible_parents.push(content.type)
+            content = content.firstChild
+        }
+
+        if (content == null) {
+            console.log(`match:`, match)
+            throw new Error("No content match?")
+        }
+
+        // Now we send just the `content` back to the template generator, which will happily accept it...
+        // (We do send the original from:to though, as these are the from:to's that are also in the template AST still)
+        let template_description = return_value(
+            template_generator.next({
+                name: content.name,
+                node: content,
+                // Need to provide the original from:to range
+                from: template_ast.from,
+                to: template_ast.to,
+            })
+        )
+
+        // And for some reason this works?
+        // Still feels like it shouldn't... it feels like I conjured some dark magic and I will be swiming in tartarus soon...
+
+        return {
+            possible_parents,
+            template_description,
+            /**
+             * @param {TreeCursor | SyntaxNode} haystack_cursor
+             * @param {boolean} verbose?
+             * */
+            match(haystack_cursor, verbose = false) {
+                if (haystack_cursor.type.isError) {
+                    verbose && console.log(`❌ Short circuiting because haystack(${haystack_cursor.name}) is an error`)
+                    return false
+                }
+                if ("cursor" in haystack_cursor) haystack_cursor = haystack_cursor.cursor
+
+                // Should possible parents be all-or-nothing?
+                // So either it matches all the possible parents, or it matches none?
+                let depth = 0
+                for (let possible_parent of possible_parents) {
+                    if (haystack_cursor.type === possible_parent) {
+                        let parent_from = haystack_cursor.from
+                        let parent_to = haystack_cursor.to
+                        // Going in
+                        if (haystack_cursor.firstChild()) {
+                            if (haystack_cursor.from === parent_from && haystack_cursor.to === parent_to) {
+                                verbose && console.log(`✅ Matched parent, going one level deeper (${possible_parent})`)
+                                depth++
+                            } else {
+                                haystack_cursor.parent()
+                                verbose &&
+                                    console.log(
+                                        `❌ Was matching possible parent (${possible_parent}), but it wasn't filling?! That's weird.... ${haystack_cursor.toString()}`
+                                    )
+                                for (let i = 0; i < depth; i++) {
+                                    haystack_cursor.parent()
+                                }
+                                return false
+                            }
+                        }
+                    } else {
+                        break
+                    }
+                }
+
+                // prettier-ignore
+                verbose && console.groupCollapsed(`Starting a specific at match haystack(${haystack_cursor.name}) vs. template(${"node" in template_description ? template_description.name : template_description.pattern.name})`)
+
+                try {
+                    let matches = {}
+                    return match_template(haystack_cursor, template_description, matches, verbose) ? matches : null
+                } finally {
+                    // ARE FOR LOOPS REALLY THE BEST I CAN DO HERE??
+                    for (let i = 0; i < depth; i++) {
+                        haystack_cursor.parent()
+                    }
+
+                    verbose && console.groupEnd()
+                }
+            },
+        }
+    } else {
+        console.log(`meta_template:`, meta_template)
+        console.log(`template:`, template)
+        throw new Error("Template passed into `take_little_piece_of_template` doesn't match meta_template")
+    }
+})
+
+/**
+ * Sometimes nodes are nested at the exact same position:
+ * `struct X end`, here `X` could be both a `Definition(Identifier)` or just the `Identifier`.
+ * This function will get you the deepest node, so in the above example, it would be `Identifier`.
+ * If the node has multiple children, or the child is offset, it will return the original node.
+ *
+ * @param {SyntaxNode} node
+ * @returns {SyntaxNode}
+ **/
+export let narrow = (node) => {
+    if (node.firstChild && node.firstChild.from === node.from && node.firstChild.to === node.to) {
+        return narrow(node.firstChild)
+    } else {
+        return node
+    }
+}
+
+/**
+ * Effecient, cursor-based, version of `narrow(node)`,
+ * for if all you care about is the name.
+ *
+ * Which will be most of the time..
+ *
+ * @param {TreeCursor} cursor
+ * @return {string}
+ */
+export let narrow_name = (cursor) => {
+    let from = cursor.from
+    let to = cursor.to
+    if (cursor.firstChild()) {
+        try {
+            if (cursor.from === from && cursor.to === to) {
+                return narrow_name(cursor)
+            }
+        } finally {
+            cursor.parent()
+        }
+    }
+    return cursor.name
+}
+
+/**
+ * This allows for selecting the unselectable!
+ * By default templates need to match the topnode of their AST, but sometimes we want to match something on a special position.
+ *
+ * ```create_specific_template_maker(x => jl_dynamic`import X: ${x}`)``` will match specifiers that could occur specifically on the `${x}` position.
+ *
+ * NOTE: Inside `create_specific_template_maker` you'll have to use `jl_dynamic` not going to explain why.
+ *
+ * @param {(subtemplate: Templatable) => Templatable} fn
+ */
+export let create_specific_template_maker = (fn) => {
+    return (argument) => {
+        let meta_template = template(fn(t.as("content", argument)))
+        return take_little_piece_of_template(fn(argument), meta_template)
+    }
+}
+
+/**
+ * Like Lezers `iterate`, but instead of `{ from, to, getNode() }`
+ * this will give `enter()` and `leave()` the `cursor` (which can be effeciently matches with lezer template)
+ *
+ * @param {{
+ *  tree: any,
+ *  enter: (cursor: import("../../imports/CodemirrorPlutoSetup.js").TreeCursor) => (void | boolean),
+ *  leave?: (cursor: import("../../imports/CodemirrorPlutoSetup.js").TreeCursor) => (void | boolean),
+ *  from?: number,
+ *  to?: number,
+ * }} options
+ */
+export function iterate_with_cursor({ tree, enter, leave, from = 0, to = tree.length }) {
+    let cursor = tree.cursor()
+    while (true) {
+        let mustLeave = false
+        if (cursor.from <= to && cursor.to >= from && (cursor.type.isAnonymous || enter(cursor) !== false)) {
+            if (cursor.firstChild()) continue
+            if (!cursor.type.isAnonymous) mustLeave = true
+        }
+        while (true) {
+            if (mustLeave && leave) leave(cursor)
+            mustLeave = cursor.type.isAnonymous
+            if (cursor.nextSibling()) break
+            if (!cursor.parent()) return
+            mustLeave = true
+        }
+    }
+}
+
+///////////////////////////////////
+// FULL ON UTILITY FUNCTIONS
+///////////////////////////////////
+
+/**
+ * Not sure why typescript doesn't infer the `Generator<T>` when I ask !iterater_result.done...
+ * Maybe it will bite me later 🤷‍♀️
+ *
+ * @template T
+ * @param {IteratorResult<T, unknown>} iterater_result
+ * @returns {T} iterater_result
+ */
+let intermediate_value = (iterater_result) => {
+    if (iterater_result.done) {
+        throw new Error("Expected `yield`-d value, but got `return`")
+    } else {
+        return /** @type {any} */ (iterater_result.value)
+    }
+}
+
+/**
+ * Not sure why typescript doesn't infer the `Generator<_, T>` when I ask !iterater_result.done...
+ * Maybe it will bite me later 🤷‍♀️
+ *
+ * @template T
+ * @param {IteratorResult<unknown, T>} iterater_result
+ * @returns {T} iterater_result
+ */
+let return_value = (iterater_result) => {
+    if (iterater_result.done) {
+        return /** @type {any} */ (iterater_result.value)
+    } else {
+        throw new Error("Expected `yield`-d value, but got `return`")
+    }
+}
diff --git a/frontend/components/CellInput/pkg_bubble_plugin.js b/frontend/components/CellInput/pkg_bubble_plugin.js
index 973b2afba0..57699013ce 100644
--- a/frontend/components/CellInput/pkg_bubble_plugin.js
+++ b/frontend/components/CellInput/pkg_bubble_plugin.js
@@ -3,6 +3,7 @@ import { EditorView, syntaxTree, Decoration, ViewUpdate, ViewPlugin, Facet } fro
 import { PkgStatusMark, PkgActivateMark } from "../PkgStatusMark.js"
 import { html } from "../../imports/Preact.js"
 import { ReactWidget } from "./ReactWidget.js"
+import { create_specific_template_maker, iterate_with_cursor, jl, jl_dynamic, narrow, t, template } from "./lezer_template.js"
 
 /**
  * @typedef PkgstatusmarkWidgetProps
@@ -22,155 +23,220 @@ export const pkg_disablers = [
     "@quickactivate",
 ]
 
-/**
- * @param {EditorView} view
- * @param {PkgstatusmarkWidgetProps} props
- */
-function pkg_decorations(view, { pluto_actions, notebook_id, nbpkg }) {
-    let widgets = []
-    let seen_packages = new Set()
-
-    const add_widget = (package_name, target) => {
-        if (package_name !== "Base" && package_name !== "Core" && !seen_packages.has(package_name)) {
-            seen_packages.add(package_name)
-            let deco = Decoration.widget({
-                widget: new ReactWidget(html`
-                    <${PkgStatusMark}
-                        key=${package_name}
-                        package_name=${package_name}
-                        pluto_actions=${pluto_actions}
-                        notebook_id=${notebook_id}
-                        nbpkg=${nbpkg}
-                    />
-                `),
-                side: 1,
-            })
-            widgets.push(deco.range(target))
-        }
-    }
-
-    for (let { from, to } of view.visibleRanges) {
-        let in_import = false
-        let in_selected_import = false
-        let is_inside_quote = false
+function find_import_statements({ doc, tree, from, to }) {
+    // This quotelevel stuff is waaaay overengineered and precise...
+    // but I love making stuff like this SO LET ME OKAY
+    let quotelevel = 0
+    let things_to_return = []
 
-        let is_inside_rename_import = false
-        let is_renamed_package_bubbled = false
+    iterate_with_cursor({
+        tree,
+        from,
+        to,
+        enter: (cursor) => {
+            // `quote ... end` or `:(...)`
+            if (cursor.name === "QuoteExpression" || cursor.name === "QuoteStatement") {
+                quotelevel++
+            }
+            // `$(...)` when inside quote
+            if (cursor.name === "InterpolationExpression") {
+                quotelevel--
+            }
+            if (quotelevel !== 0) return
 
-        let is_inside_scoped_identifier = false
+            // Check for Pkg.activate() and friends
+            if (cursor.name === "CallExpression" || cursor.name === "MacroExpression") {
+                let node = cursor.node
+                let callee = node.firstChild
+                let callee_name = doc.sliceString(callee.from, callee.to)
 
-        syntaxTree(view.state).iterate({
-            from,
-            to,
-            enter: (type, from, to, getNode) => {
-                // `quote ... end` or `:(...)`
-                if (type.name === "QuoteExpression" || type.name === "QuoteStatement") {
-                    is_inside_quote = true
+                if (pkg_disablers.includes(callee_name)) {
+                    things_to_return.push({
+                        type: "package_disabler",
+                        name: callee_name,
+                        from: cursor.to,
+                        to: cursor.to,
+                    })
                 }
-                // `$(...)` when inside quote
-                if (type.name === "InterpolationExpression") {
-                    is_inside_quote = false
-                }
-                if (is_inside_quote) return
 
-                // Check for Pkg.activate() and friends
-                if (type.name === "CallExpression" || type.name === "MacroExpression") {
-                    let node = getNode()
-                    let callee = node.firstChild
-                    let callee_name = view.state.sliceDoc(callee.from, callee.to)
+                return
+            }
 
-                    if (pkg_disablers.includes(callee_name)) {
-                        let deco = Decoration.widget({
-                            widget: new ReactWidget(html` <${PkgActivateMark} package_name=${callee_name} /> `),
-                            side: 1,
-                        })
-                        widgets.push(deco.range(to))
-                    }
+            let import_specifier_template = create_specific_template_maker((x) => jl_dynamic`import A, ${x}`)
+            // Because the templates can't really do recursive stuff, we need JavaScript™️!
+            let unwrap_scoped_import = (specifier) => {
+                let match = null
+                if ((match = import_specifier_template(jl`${t.as("package")}.${t.any}`).match(specifier))) {
+                    return unwrap_scoped_import(match.package)
+                } else if ((match = import_specifier_template(jl`.${t.maybe(t.any)}`).match(specifier))) {
+                    // Still trash!
+                    return null
+                } else if ((match = import_specifier_template(jl`${t.Identifier}`).match(specifier))) {
+                    return specifier
+                } else {
+                    console.warn("Unknown nested import specifier: " + specifier.toString())
                 }
+            }
 
-                if (type.name === "ImportStatement") {
-                    in_import = true
-                }
-                if (type.name === "SelectedImport") {
-                    in_selected_import = true
-                }
-                if (type.name === "RenamedIdentifier") {
-                    is_inside_rename_import = true
-                }
-                // Don't show a buble next to the name `B` in `import A as B`
-                if (is_inside_rename_import && is_renamed_package_bubbled) {
-                    return
+            let match = null
+            if (
+                // These templates might look funky... and they are!
+                // But they are necessary to force the matching to match as specific as possible.
+                // With just `import ${t.many("specifiers")}` it will match `import A, B, C`, but
+                //    it will do so by giving back [`A, B, C`] as one big specifier!
+                (match = template(jl`import ${t.as("specifier")}: ${t.many()}`).match(cursor)) ??
+                (match = template(jl`import ${t.as("specifier")}, ${t.many("specifiers")}`).match(cursor)) ??
+                (match = template(jl`using ${t.as("specifier")}: ${t.many()}`).match(cursor)) ??
+                (match = template(jl`using ${t.as("specifier")}, ${t.many("specifiers")}`).match(cursor))
+            ) {
+                let { specifier, specifiers = [] } = match
+
+                if (specifier) {
+                    specifiers = [{ node: specifier }, ...specifiers]
                 }
 
-                // `import .X` or `import ..X` or `import Flux.Zygote`
-                // handled when leaving the ScopedIdentifier
-                if (in_import && type.name === "ScopedIdentifier") {
-                    is_inside_scoped_identifier = true
+                for (let { node: specifier } of specifiers) {
+                    specifier = narrow(specifier)
 
-                    if (is_inside_rename_import && !is_renamed_package_bubbled) {
-                        is_renamed_package_bubbled = true
+                    let match = null
+                    if ((match = import_specifier_template(jl`${t.as("package")} as ${t.maybe(t.any)}`).match(specifier))) {
+                        let node = unwrap_scoped_import(match.package)
+                        if (node) {
+                            things_to_return.push({
+                                type: "package",
+                                name: doc.sliceString(node.from, node.to),
+                                from: node.to,
+                                to: node.to,
+                            })
+                        }
+                    } else if ((match = import_specifier_template(jl`${t.as("package")}.${t.any}`).match(specifier))) {
+                        let node = unwrap_scoped_import(match.package)
+                        if (node) {
+                            things_to_return.push({
+                                type: "package",
+                                name: doc.sliceString(node.from, node.to),
+                                from: node.to,
+                                to: node.to,
+                            })
+                        }
+                    } else if ((match = import_specifier_template(jl`.${t.as("scoped")}`).match(specifier))) {
+                        // Trash!
+                    } else if ((match = import_specifier_template(jl`${t.as("package")}`).match(specifier))) {
+                        let node = unwrap_scoped_import(match.package)
+                        if (node) {
+                            things_to_return.push({
+                                type: "package",
+                                name: doc.sliceString(node.from, node.to),
+                                from: node.to,
+                                to: node.to,
+                            })
+                        }
+                    } else {
+                        console.warn("Unknown import specifier: " + specifier.toString())
                     }
-
-                    return
                 }
 
-                if (in_import && type.name === "Identifier" && !is_inside_scoped_identifier) {
-                    if (is_inside_rename_import && !is_renamed_package_bubbled) {
-                        is_renamed_package_bubbled = true
+                match = null
+                if ((match = template(jl`using ${t.as("specifier")}, ${t.many("specifiers")}`).match(cursor))) {
+                    let { specifier } = match
+                    if (specifier) {
+                        if (doc.sliceString(specifier.to, specifier.to + 1) === "\n" || doc.sliceString(specifier.to, specifier.to + 1) === "") {
+                            things_to_return.push({
+                                type: "implicit_using",
+                                name: doc.sliceString(specifier.from, specifier.to),
+                                from: specifier.to,
+                                to: specifier.to,
+                            })
+                        }
                     }
+                }
+
+                return false
+            } else if (cursor.name === "ImportStatement") {
+                throw new Error("What")
+            }
+        },
+        leave: (cursor) => {
+            if (cursor.name === "QuoteExpression" || cursor.name === "QuoteStatement") {
+                quotelevel--
+            }
+            if (cursor.name === "InterpolationExpression") {
+                quotelevel++
+            }
+        },
+    })
 
-                    let package_name = view.state.doc.sliceString(from, to)
-                    // console.warn(type)
-                    // console.warn("Found", package_name)
-                    add_widget(package_name, to)
+    return things_to_return
+}
 
-                    if (in_selected_import) {
-                        in_import = false
-                    }
-                }
-            },
-            leave: (type, from, to, getNode) => {
-                if (type.name === "QuoteExpression" || type.name === "QuoteStatement") {
-                    is_inside_quote = false
-                }
-                if (type.name === "InterpolationExpression") {
-                    is_inside_quote = true
-                }
-                if (type.name === "RenamedIdentifier") {
-                    is_inside_rename_import = false
-                    is_renamed_package_bubbled = false
-                }
-                if (is_inside_quote) return
+/**
+ * @param {EditorView} view
+ * @param {PkgstatusmarkWidgetProps} props
+ */
+function pkg_decorations(view, { pluto_actions, notebook_id, nbpkg }) {
+    let seen_packages = new Set()
 
-                // console.log("Leave", type.name)
-                if (type.name === "ImportStatement") {
-                    in_import = false
-                }
-                if (type.name === "SelectedImport") {
-                    in_selected_import = false
-                }
-                if (type.name === "ScopedIdentifier") {
-                    let node = getNode()
-                    if (node.parent.name === "Import" || node.parent.name === "SelectedImport") {
-                        is_inside_scoped_identifier = false
-                        let package_name = view.state.doc.sliceString(from, to)
-
-                        if (package_name.startsWith(".")) {
-                            return
-                        }
+    let widgets = view.visibleRanges
+        .flatMap(({ from, to }) => {
+            let things_to_mark = find_import_statements({
+                doc: view.state.doc,
+                tree: syntaxTree(view.state),
+                from: from,
+                to: to,
+            })
 
-                        package_name = package_name.split(".")[0]
-                        add_widget(package_name, to)
+            return things_to_mark.map((thing) => {
+                if (thing.type === "package") {
+                    let { name: package_name } = thing
+                    if (package_name !== "Base" && package_name !== "Core" && !seen_packages.has(package_name)) {
+                        seen_packages.add(package_name)
 
-                        if (in_selected_import) {
-                            in_import = false
-                        }
+                        let deco = Decoration.widget({
+                            widget: new ReactWidget(html`
+                                <${PkgStatusMark}
+                                    key=${package_name}
+                                    package_name=${package_name}
+                                    pluto_actions=${pluto_actions}
+                                    notebook_id=${notebook_id}
+                                    nbpkg=${nbpkg}
+                                />
+                            `),
+                            side: 1,
+                        })
+                        return deco.range(thing.to)
+                    }
+                } else if (thing.type === "package_disabler") {
+                    let deco = Decoration.widget({
+                        widget: new ReactWidget(html` <${PkgActivateMark} package_name=${thing.name} /> `),
+                        side: 1,
+                    })
+                    return deco.range(thing.to)
+                } else if (thing.type === "implicit_using") {
+                    if (thing.name === "HypertextLiteral") {
+                        let deco = Decoration.widget({
+                            widget: new ReactWidget(html`<span style=${{ position: "relative" }}>
+                                <div
+                                    style=${{
+                                        position: `absolute`,
+                                        display: `inline`,
+                                        left: 0,
+                                        whiteSpace: `nowrap`,
+                                        opacity: 0.3,
+                                        pointerEvents: `none`,
+                                    }}
+                                >
+                                    : @htl, @htl_str
+                                </div>
+                            </span>`),
+                            side: 1,
+                        })
+                        return deco.range(thing.to)
                     }
                 }
-            },
+            })
         })
-    }
-    return Decoration.set(widgets)
+        .filter((x) => x != null)
+    return Decoration.set(widgets, true)
 }
 
 /**
diff --git a/frontend/components/CellInput/scopestate_statefield.js b/frontend/components/CellInput/scopestate_statefield.js
new file mode 100644
index 0000000000..6fe6a0f2a2
--- /dev/null
+++ b/frontend/components/CellInput/scopestate_statefield.js
@@ -0,0 +1,1060 @@
+import { syntaxTree, StateField } from "../../imports/CodemirrorPlutoSetup.js"
+import _ from "../../imports/lodash.js"
+import { child_cursors, child_nodes, create_specific_template_maker, jl, jl_dynamic, narrow, t, template } from "./lezer_template.js"
+
+/**
+ * @typedef TreeCursor
+ * @type {import("../../imports/CodemirrorPlutoSetup.js").TreeCursor}
+ */
+
+/**
+ * @typedef SyntaxNode
+ * @type {TreeCursor["node"]}
+ */
+
+/**
+ * @typedef Range
+ * @property {number} from
+ * @property {number} to
+ *
+ * @typedef ScopeState
+ * @property {Array<{
+ *  usage: Range,
+ *  definition: Range | null,
+ *  name: string,
+ * }>} usages
+ * @property {Map<String, Range>} definitions
+ */
+
+/**
+ * @param {ScopeState} a
+ * @param {ScopeState} b
+ * @returns {ScopeState}
+ */
+let merge_scope_state = (a, b) => {
+    if (a === b) return a
+
+    let usages = [...a.usages, ...b.usages]
+    let definitions = new Map(a.definitions)
+    for (let [key, value] of b.definitions) {
+        definitions.set(key, value)
+    }
+    return { usages, definitions }
+}
+
+/** @param {TreeCursor} cursor */
+let search_for_interpolations = function* (cursor) {
+    for (let child of child_cursors(cursor)) {
+        if (child.name === "InterpolationExpression") {
+            yield cursor
+        } else if (child.name === "QuoteExpression" || child.name === "QuoteStatement") {
+            for (let child_child of search_for_interpolations(child)) {
+                yield* search_for_interpolations(child_child)
+            }
+        } else {
+            yield* search_for_interpolations(child)
+        }
+    }
+}
+/** @param {TreeCursor} cursor */
+let go_through_quoted_expression_looking_for_interpolations = function* (cursor) {
+    if (cursor.name !== "QuoteExpression" && cursor.name !== "QuoteStatement") throw new Error("Expected QuotedExpression or QuoteStatement")
+    yield* search_for_interpolations(cursor)
+}
+
+/**
+ * So this was a late addition, and it creates a bit crazy syntax...
+ * but I love it for that syntax! It really makes the patterns pop out,
+ * which it really needs, because the patterns are the most important part of this code..
+ * @param {(subsitution: import("./lezer_template.js").Templatable) => import("./lezer_template.js").Matcher} template_fn
+ */
+let make_beautiful_matcher = (template_fn) => {
+    return function match(cursor, verbose = false) {
+        if (cursor == null) {
+            /** @type {(...args: Parameters<jl>) => any} */
+            return (x, ...args) => {
+                return template_fn(jl(x, ...args))
+            }
+        }
+
+        /** @type {(...args: Parameters<jl>) => any} */
+        return function jl_and_match(x, ...args) {
+            return template_fn(jl(x, ...args)).match(cursor, verbose)
+        }
+    }
+}
+
+/**
+ * @param {Parameters<create_specific_template_maker>[0]} template_creator
+ */
+let make_beautiful_specific_matcher = (template_creator) => {
+    let template_fn = create_specific_template_maker(template_creator)
+    return function match(cursor, verbose = false) {
+        if (cursor == null) {
+            /** @type {(...args: Parameters<jl>) => any} */
+            return (x, ...args) => {
+                return template_fn(jl(x, ...args))
+            }
+        }
+
+        /** @type {(...args: Parameters<jl>) => any} */
+        return function jl_and_match(x, ...args) {
+            return template_fn(jl(x, ...args)).match(cursor, verbose)
+        }
+    }
+}
+
+let match_for_binding = make_beautiful_specific_matcher((x) => jl_dynamic`[i for i in i ${x}]`)
+let match_assignee = make_beautiful_specific_matcher((x) => jl_dynamic`${x} = nothing`)
+let match_function_definition_argument = make_beautiful_specific_matcher((x) => jl_dynamic`function f(${x}) end`)
+let match_function_call_argument = make_beautiful_specific_matcher((x) => jl_dynamic`f(${x})`)
+let match_function_call_named_argument = make_beautiful_specific_matcher((x) => jl_dynamic`f(; ${x})`)
+
+/**
+ * @param {TreeCursor | SyntaxNode} cursor
+ * @param {any} doc
+ * @param {ScopeState} scopestate
+ * @param {boolean?} verbose
+ * @returns {ScopeState}
+ */
+let explorer_function_definition_argument = (cursor, doc, scopestate, verbose = false) => {
+    let match = null
+
+    if ((match = match_function_call_argument(cursor)`; ${t.many("named_args")}`)) {
+        // "Parameters", the `y, z` in `function f(x; y, z) end`
+        let { named_args } = match
+        for (let { node: named_arg } of named_args) {
+            scopestate = explorer_function_definition_argument(named_arg, doc, scopestate, verbose)
+        }
+        return scopestate
+    } else if ((match = match_function_definition_argument(cursor)`${t.Identifier}`)) {
+        return scopestate_add_definition(scopestate, doc, cursor)
+    } else if ((match = match_function_definition_argument(cursor)`${t.as("subject")}...`)) {
+        // `function f(x...)` => ["x"]
+        return explore_pattern(match.subject, doc, scopestate, verbose)
+    } else if ((match = match_function_definition_argument(cursor)`${t.as("name")} = ${t.as("value")}`)) {
+        // `function f(x = 10)` => ["x"]
+        let { name, value } = match
+        scopestate = explore_pattern(name, doc, scopestate, verbose)
+        scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+        return scopestate
+    } else if (
+        (match = match_function_definition_argument(cursor)`${t.as("name")}::${t.as("type")}`) ??
+        (match = match_function_definition_argument(cursor)`${t.as("name")}:`) ??
+        // (match = match_function_definition_argument(cursor)`${t.as("name")}::`) ??
+        (match = match_function_definition_argument(cursor)`::${t.as("type")}`)
+    ) {
+        let { name, type } = match
+        if (name) scopestate = explore_pattern(name, doc, scopestate, verbose)
+        if (type) scopestate = explore_variable_usage(type.cursor, doc, scopestate, verbose)
+        return scopestate
+    } else {
+        verbose && console.warn("UNKNOWN FUNCTION DEFINITION ARGUMENT:", cursor.toString())
+        return scopestate
+    }
+}
+
+/**
+ * @param {TreeCursor | SyntaxNode} node
+ * @param {any} doc
+ * @param {ScopeState} scopestate
+ * @param {boolean?} verbose
+ * @returns {ScopeState}
+ */
+let explore_pattern = (node, doc, scopestate, verbose = false) => {
+    let match = null
+
+    if ((match = match_assignee(node)`${t.Identifier}`)) {
+        return scopestate_add_definition(scopestate, doc, node)
+    } else if ((match = match_assignee(node)`${t.as("object")}::${t.as("type")}`)) {
+        let { object, type } = match
+        scopestate = explore_variable_usage(type.cursor, doc, scopestate, verbose)
+        scopestate = scopestate_add_definition(scopestate, doc, object)
+        return scopestate
+    } else if ((match = match_assignee(node)`${t.as("subject")}...`)) {
+        // `x... = [1,2,3]` => ["x"]
+        return explore_pattern(match.subject, doc, scopestate, verbose)
+    } else if ((match = match_function_definition_argument(node)`${t.as("name")} = ${t.as("value")}`)) {
+        let { name, value } = match
+        scopestate = explore_pattern(name, doc, scopestate, verbose)
+        scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+        return scopestate
+    } else if ((match = match_assignee(node)`${t.as("first")}, ${t.many("rest")}`) ?? (match = match_assignee(node)`(${t.as("first")}, ${t.many("rest")})`)) {
+        // console.warn("Tuple assignment... but the bad one")
+        for (let { node: name } of [{ node: match.first }, ...(match.rest ?? [])]) {
+            scopestate = explore_pattern(name.cursor, doc, scopestate, verbose)
+        }
+        return scopestate
+    } else if ((match = match_julia(node)`${t.as("prefix")}${t.as("string", t.String)}`)) {
+        // This one is also a bit enigmatic, but `t.String` renders in the template as `"..."`,
+        // so the template with match things that look like `prefix"..."`
+        let { prefix, string } = match
+        let prefix_string = doc.sliceString(prefix.from, prefix.to)
+
+        if (prefix_string === "var") {
+            let name = doc.sliceString(string.from + 1, string.to - 1)
+            if (name.length !== 0) {
+                scopestate.definitions.set(name, {
+                    from: node.from,
+                    to: node.to,
+                })
+            }
+        } else {
+            scopestate = explore_variable_usage("cursor" in node ? node.cursor : node, doc, scopestate, verbose)
+        }
+        return scopestate
+    } else if ((match = match_assignee(node)`${t.as("object")}[${t.as("property")}]`)) {
+        let { object, property } = match
+        scopestate = explore_variable_usage(object.cursor, doc, scopestate, verbose)
+        if (property) scopestate = explore_variable_usage(property.cursor, doc, scopestate, verbose)
+        return scopestate
+    } else if ((match = match_assignee(node)`${t.as("object")}.${t.as("property")}`)) {
+        let { object, property } = match
+        scopestate = explore_variable_usage(object.cursor, doc, scopestate, verbose)
+        return scopestate
+    } else {
+        verbose && console.warn("UNKNOWN PATTERN:", node.toString(), doc.sliceString(node.from, node.to))
+        return scopestate
+    }
+}
+
+/**
+ * Explores the definition part of a struct or such.
+ * Takes care of defining that actual name, defining type parameters,
+ * and using all the types used.
+ *
+ * It returns an inner and an outer scope state.
+ * The inner scope state is for code "inside" the struct, which has access to the implicitly created types.
+ * Outer scope is only the actual defined name, so will always exist of just one definition and no usages.
+ * This distinction is so the created types don't escape outside the struct.
+ * Usages all go in the inner scope.
+ *
+ * @param {TreeCursor} cursor
+ * @param {any} doc
+ * @param {ScopeState} scopestate
+ * @param {boolean} [verbose]
+ * @returns {{ inner: ScopeState, outer: ScopeState }}
+ */
+let explore_definition = function (cursor, doc, scopestate, verbose = false) {
+    let match = null
+
+    if (cursor.name === "Definition" && cursor.firstChild()) {
+        try {
+            return explore_definition(cursor, doc, scopestate)
+        } finally {
+            cursor.parent()
+        }
+    } else if (cursor.name === "Identifier") {
+        return {
+            inner: scopestate_add_definition(scopestate, doc, cursor),
+            outer: scopestate_add_definition(fresh_scope(), doc, cursor),
+        }
+    } else if ((match = match_julia(cursor)`${t.as("subject")}{ ${t.many("parameters")} }`)) {
+        // A{B}
+        let { subject, parameters } = match
+        let outer = fresh_scope()
+        if (subject) {
+            let subject_explored = explore_definition(subject.cursor, doc, scopestate)
+            outer = subject_explored.outer
+            scopestate = subject_explored.inner
+        }
+        for (let { node: parameter } of parameters) {
+            // Yes, when there is a type parameter in the definition itself (so not after `::`),
+            // it implies a new type parameter being implicitly instanciated.
+            let { inner: parameter_inner } = explore_definition(parameter.cursor, doc, scopestate)
+            scopestate = parameter_inner
+        }
+        return { inner: scopestate, outer: outer }
+    } else if ((match = match_julia(cursor)`${t.as("subject")} <: ${t.maybe(t.as("type"))}`)) {
+        let { subject, type } = match
+        let outer = fresh_scope()
+        if (subject) ({ outer, inner: scopestate } = explore_definition(subject.cursor, doc, scopestate))
+        if (type) scopestate = explore_variable_usage(type.cursor, doc, scopestate)
+        return { inner: scopestate, outer: outer }
+    } else {
+        verbose && console.warn(`Unknown thing in definition: "${doc.sliceString(cursor.from, cursor.to)}", "${cursor.toString()}"`)
+        return { inner: scopestate, outer: fresh_scope() }
+    }
+}
+
+let match_julia = make_beautiful_matcher(template)
+
+/**
+ * @param {TreeCursor} cursor
+ * @param {any} doc
+ * @param {ScopeState} scopestate
+ * @param {boolean} [verbose]
+ * @returns {ScopeState}
+ */
+let explore_macro_identifier = (cursor, doc, scopestate, verbose = false) => {
+    let match = null
+
+    let match_macro_identifier = make_beautiful_specific_matcher((x) => jl_dynamic`${x} x y z`)
+
+    if ((match = match_macro_identifier(cursor)`${t.as("macro", jl`@${t.any}`)}`)) {
+        let { macro } = match
+        let name = doc.sliceString(macro.from, macro.to)
+        scopestate.usages.push({
+            usage: macro,
+            definition: scopestate.definitions.get(name),
+            name: name,
+        })
+        return scopestate
+    } else if ((match = match_macro_identifier(cursor)`${t.as("object")}.@${t.as("macro")}`)) {
+        let { object } = match
+        let name = doc.sliceString(object.from, object.to)
+        scopestate.usages.push({
+            usage: object,
+            definition: scopestate.definitions.get(name),
+            name: name,
+        })
+        return scopestate
+    } else if ((match = match_macro_identifier(cursor)`@${t.as("object")}.${t.as("macro")}`)) {
+        let { object } = match
+        let name = doc.sliceString(object.from, object.to)
+        scopestate.usages.push({
+            usage: object,
+            definition: scopestate.definitions.get(name),
+            name: name,
+        })
+        return scopestate
+    } else {
+        verbose && console.warn("Mwep mweeeep", cursor.toString())
+    }
+}
+
+/**
+ * @returns {ScopeState}
+ */
+let fresh_scope = () => {
+    return {
+        usages: [],
+        definitions: new Map(),
+    }
+}
+
+/**
+ * Currently this clones a scope state, except for the usages.
+ * The reason is skips the usages is a premature optimisation.
+ * We don't need them in the inner scope, but we just as well could leave them on
+ * (as they won't do any harm either way)
+ *
+ * @param {ScopeState} scopestate
+ * @returns {ScopeState}
+ */
+let lower_scope = (scopestate) => {
+    return {
+        usages: [],
+        definitions: new Map(scopestate.definitions),
+    }
+}
+
+/**
+ * For use in combination with `lower_scope`.
+ * This will take an inner scope and merge only the usages into the outer scope.
+ * So we see the usages of the inner scope, but the definitions don't exist in the outer scope.
+ *
+ * @param {ScopeState} nested_scope
+ * @param {ScopeState} scopestate
+ * @returns {ScopeState}
+ */
+let raise_scope = (nested_scope, scopestate) => {
+    return {
+        usages: [...scopestate.usages, ...nested_scope.usages],
+        definitions: scopestate.definitions,
+    }
+}
+
+/**
+ * @param {ScopeState} scopestate
+ * @param {any} doc
+ * @param {SyntaxNode | TreeCursor} node
+ */
+let scopestate_add_definition = (scopestate, doc, node) => {
+    scopestate.definitions.set(doc.sliceString(node.from, node.to), {
+        from: node.from,
+        to: node.to,
+    })
+    return scopestate
+}
+
+/**
+ * @param {TreeCursor} cursor
+ * @param {any} doc
+ * @param {ScopeState} scopestate
+ * @returns {ScopeState}
+ */
+export let explore_variable_usage = (
+    cursor,
+    doc,
+    scopestate = {
+        usages: [],
+        definitions: new Map(),
+    },
+    verbose = false
+) => {
+    if ("cursor" in cursor) {
+        // console.trace("`explore_variable_usage()` called with a SyntaxNode, not a TreeCursor")
+        cursor = cursor["cursor"]
+    }
+
+    let start_node = null
+    if (verbose) {
+        console.group(`Explorer: ${cursor.name}`)
+
+        console.groupCollapsed("Details")
+        try {
+            console.log(`Full tree: ${cursor.toString()}`)
+            console.log("Full text:", doc.sliceString(cursor.from, cursor.to))
+            console.log(`scopestate:`, scopestate)
+        } finally {
+            console.groupEnd()
+        }
+        start_node = cursor.node
+    }
+    try {
+        let match = null
+
+        // Doing these checks in front seems to speed things up a bit.
+        if (
+            cursor.type.is("keyword") ||
+            cursor.name === "SourceFile" ||
+            cursor.name === "BooleanLiteral" ||
+            cursor.name === "Character" ||
+            cursor.name === "String" ||
+            cursor.name === "Number" ||
+            cursor.name === "Comment" ||
+            cursor.name === "BinaryExpression" ||
+            cursor.name === "Operator" ||
+            cursor.name === "MacroArgumentList" ||
+            cursor.name === "ReturnStatement" ||
+            cursor.name === "BareTupleExpression" ||
+            cursor.name === "ParenthesizedExpression" ||
+            cursor.name === "Type" ||
+            cursor.name === "InterpolationExpression" ||
+            cursor.name === "SpreadExpression" ||
+            cursor.name === "CompoundExpression" ||
+            cursor.name === "ParameterizedIdentifier" ||
+            cursor.name === "TypeArgumentList" ||
+            cursor.name === "TernaryExpression" ||
+            cursor.name === "Coefficient" ||
+            cursor.name === "TripleString" ||
+            cursor.name === "RangeExpression" ||
+            cursor.name === "SubscriptExpression" ||
+            cursor.name === "UnaryExpression" ||
+            cursor.name === "ConstStatement" ||
+            cursor.name === "GlobalStatement" ||
+            cursor.name === "ContinueStatement" ||
+            cursor.name === "MatrixExpression" ||
+            cursor.name === "MatrixRow" ||
+            cursor.name === "ArrayExpression"
+        ) {
+            for (let subcursor of child_cursors(cursor)) {
+                scopestate = explore_variable_usage(subcursor, doc, scopestate, verbose)
+            }
+            return scopestate
+        }
+
+        if (cursor.name === "Identifier" || cursor.name === "MacroIdentifier") {
+            let name = doc.sliceString(cursor.from, cursor.to)
+            scopestate.usages.push({
+                name: name,
+                usage: {
+                    from: cursor.from,
+                    to: cursor.to,
+                },
+                definition: scopestate.definitions.get(name),
+            })
+            return scopestate
+        } else if ((match = match_julia(cursor)`:${t.any}`)) {
+            // Nothing, ha!
+            return scopestate
+        } else if ((match = match_julia(cursor)`${t.Number}`)) {
+            // Nothing, ha!
+            return scopestate
+        } else if ((match = match_julia(cursor)`${t.String}`)) {
+            // Nothing, ha!
+            return scopestate
+        } else if ((match = match_julia(cursor)`${t.as("object")}.${t.as("property")}`)) {
+            let { object, property } = match
+            if (object) scopestate = explore_variable_usage(object.cursor, doc, scopestate, verbose)
+            return scopestate
+        } else if ((match = match_julia(cursor)`${t.as("assignee")} = ${t.maybe(t.as("value"))}`)) {
+            let { assignee, value } = match
+            if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+            if (assignee) scopestate = explore_pattern(assignee.cursor, doc, scopestate, verbose)
+            return scopestate
+        } else if (
+            (match = match_julia(cursor)`
+                ${t.as("macro", t.anything_that_fits(jl`@macro`))}(${t.many("args")}) ${t.maybe(jl`do ${t.maybe(t.many("do_args"))}
+                    ${t.many("do_expressions")}
+                end`)}}
+            `)
+        ) {
+            let { macro, args = [], do_args, do_expressions } = match
+            if (macro) explore_macro_identifier(macro.cursor, doc, scopestate, verbose)
+
+            for (let { node: arg } of args) {
+                if ((match = match_function_call_argument(arg)`${t.as("name")} = ${t.as("value")}`)) {
+                    let { name, value } = match
+                    if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+                } else {
+                    scopestate = explore_variable_usage(arg.cursor, doc, scopestate, verbose)
+                }
+            }
+
+            if (do_args && do_expressions) {
+                // Cheating because lezer-julia isn't up to this task yet
+                // TODO julia-lezer is up to the task now!!
+                let inner_scope = lower_scope(scopestate)
+
+                // Don't ask me why, but currently `do (x, y)` is parsed as `DoClauseArguments(ArgumentList(x, y))`
+                // while an actual argumentslist, `do x, y` is parsed as `DoClauseArguments(BareTupleExpression(x, y))`
+                let do_args_actually = do_args.firstChild
+                if (do_args_actually.name === "Identifier") {
+                    inner_scope = scopestate_add_definition(inner_scope, doc, do_args_actually)
+                } else if (do_args_actually.name === "ArgumentList") {
+                    for (let child of child_nodes(do_args_actually)) {
+                        inner_scope = explorer_function_definition_argument(child, doc, inner_scope)
+                    }
+                } else if (do_args_actually.name === "BareTupleExpression") {
+                    for (let child of child_nodes(do_args_actually)) {
+                        inner_scope = explorer_function_definition_argument(child, doc, inner_scope)
+                    }
+                } else {
+                    verbose && console.warn("Unrecognized do args", do_args_actually.toString())
+                }
+
+                for (let { node: expression } of do_expressions) {
+                    inner_scope = explore_variable_usage(expression.cursor, doc, inner_scope, verbose)
+                }
+                return raise_scope(inner_scope, scopestate)
+            }
+
+            return scopestate
+        } else if ((match = match_julia(cursor)`${t.as("macro", t.anything_that_fits(jl`@macro`))} ${t.many("args")}`)) {
+            let { macro, args = [] } = match
+            if (macro) explore_macro_identifier(macro.cursor, doc, scopestate, verbose)
+
+            for (let { node: arg } of args) {
+                scopestate = explore_variable_usage(arg.cursor, doc, scopestate, verbose)
+            }
+            return scopestate
+        } else if (
+            (match = match_julia(cursor)`
+                struct ${t.as("defined_as")}
+                    ${t.many("expressions")}
+                end
+            `) ??
+            (match = match_julia(cursor)`
+                mutable struct ${t.as("defined_as")}
+                    ${t.many("expressions")}
+                end
+            `)
+        ) {
+            let { defined_as, expressions = [] } = match
+            defined_as = narrow(defined_as)
+
+            let inner_scope = lower_scope(scopestate)
+            let outer_scope = fresh_scope()
+
+            if (defined_as) ({ inner: inner_scope, outer: outer_scope } = explore_definition(defined_as.cursor, doc, inner_scope))
+
+            // Struct body
+            for (let { node: expression } of expressions) {
+                if (cursor.name === "Identifier") {
+                    // Nothing, this is just the name inside the struct blegh get it out of here
+                } else if ((match = match_julia(expression)`${t.as("subject")}::${t.as("type")}`)) {
+                    // We're in X::Y, and Y is a reference
+                    let { subject, type } = match
+                    inner_scope = explore_variable_usage(type.cursor, doc, inner_scope, verbose)
+                } else if ((match = match_julia(expression)`${t.as("assignee")} = ${t.as("value")}`)) {
+                    let { assignee, value } = match
+
+                    // Yeah... we do the same `a::G` check again
+                    if ((match = match_julia(assignee)`${t.as("subject")}::${t.as("type")}`)) {
+                        let { subject, type } = match
+                        inner_scope = explore_variable_usage(type.cursor, doc, inner_scope, verbose)
+                    }
+                    inner_scope = explore_variable_usage(value.cursor, doc, inner_scope, verbose)
+                }
+            }
+
+            scopestate = raise_scope(inner_scope, scopestate)
+            scopestate = merge_scope_state(scopestate, outer_scope)
+            return scopestate
+        } else if ((match = match_julia(cursor)`abstract type ${t.as("name")} end`)) {
+            let { name } = match
+            if (name) {
+                let { outer } = explore_definition(name.cursor, doc, scopestate)
+                scopestate = merge_scope_state(scopestate, outer)
+            }
+            return scopestate
+        } else if ((match = match_julia(cursor)`quote ${t.many("body")} end`) ?? (match = match_julia(cursor)`:(${t.many("body")})`)) {
+            // We don't use the match because I made `go_through_quoted_expression_looking_for_interpolations`
+            // to take a cursor at the quoted expression itself
+            for (let interpolation_cursor of go_through_quoted_expression_looking_for_interpolations(cursor)) {
+                scopestate = explore_variable_usage(interpolation_cursor, doc, scopestate, verbose)
+            }
+            return scopestate
+        } else if (
+            (match = match_julia(cursor)`
+                module ${t.as("name")}
+                    ${t.many("expressions")}
+                end
+            `)
+        ) {
+            let { name, expressions = [] } = match
+
+            if (name) scopestate = scopestate_add_definition(scopestate, doc, name)
+
+            let module_scope = fresh_scope()
+            for (let { node: expression } of expressions) {
+                module_scope = explore_variable_usage(expression.cursor, doc, module_scope)
+            }
+            // We still merge the module scopestate with the global scopestate, but only the usages that don't escape.
+            // (Later we can have also shadowed definitions for the dimming of unused variables)
+            scopestate = merge_scope_state(scopestate, {
+                usages: Array.from(module_scope.usages).filter((x) => x.definition != null),
+                definitions: new Map(),
+            })
+
+            for (let { node: expression } of expressions) {
+                scopestate = explore_variable_usage(expression.cursor, doc, scopestate)
+            }
+            return scopestate
+        } else if ((match = match_julia(cursor)`${t.as("prefix")}${t.as("string", t.String)}`)) {
+            // This one is also a bit enigmatic, but `t.String` renders in the template as `"..."`,
+            // so the template with match things that look like `prefix"..."`
+            let { prefix, string } = match
+            let prefix_string = doc.sliceString(prefix.from, prefix.to)
+
+            if (prefix_string === "var") {
+                let name = doc.sliceString(string.from + 1, string.to - 1)
+                if (name.length !== 0) {
+                    scopestate.usages.push({
+                        name: name,
+                        usage: {
+                            from: cursor.from,
+                            to: cursor.to,
+                        },
+                        definition: scopestate.definitions.get(name) ?? null,
+                    })
+                }
+                return scopestate
+            } else {
+                let name = `@${prefix_string}_str`
+                scopestate.usages.push({
+                    name: name,
+                    usage: {
+                        from: prefix.from,
+                        to: prefix.to,
+                    },
+                    definition: scopestate.definitions.get(name) ?? null,
+                })
+            }
+            return scopestate
+        } else if ((match = match_julia(cursor)`${t.Number}${t.as("unit")}`)) {
+            // This isn't that useful, just wanted to test (and show off) the template
+            return explore_variable_usage(match.unit.cursor, doc, scopestate, verbose)
+        } else if (
+            (match = match_julia(cursor)`import ${t.any}: ${t.many("specifiers")}`) ??
+            (match = match_julia(cursor)`using ${t.any}: ${t.many("specifiers")}`)
+        ) {
+            let { specifiers = [] } = match
+            let match_selected_import_specifier = make_beautiful_specific_matcher((x) => jl_dynamic`import X: ${x}`)
+
+            for (let { node: specifier } of specifiers) {
+                if ((match = match_selected_import_specifier(specifier)`${t.as("name")} as ${t.as("alias")}`)) {
+                    let { alias } = match
+                    scopestate = scopestate_add_definition(scopestate, doc, alias)
+                } else if ((match = match_selected_import_specifier(specifier)`${t.as("name", t.Identifier)}`)) {
+                    let { name } = match
+                    scopestate = scopestate_add_definition(scopestate, doc, name)
+                } else {
+                    verbose && console.warn("Hmmmm, I don't know what to do with this selected import specifier:", specifier)
+                }
+            }
+            return scopestate
+        } else if ((match = match_julia(cursor)`import ${t.many("specifiers")}`)) {
+            let { specifiers = [] } = match
+
+            let match_import_specifier = make_beautiful_specific_matcher((x) => jl_dynamic`import ${x}`)
+
+            for (let { node: specifier } of specifiers) {
+                if ((match = match_import_specifier(specifier)`${t.any} as ${t.as("alias")}`)) {
+                    let { alias } = match
+                    scopestate = scopestate_add_definition(scopestate, doc, alias)
+                } else if ((match = match_import_specifier(specifier)`${t.as("package")}.${t.as("name", t.Identifier)}`)) {
+                    scopestate = scopestate_add_definition(scopestate, doc, match.name)
+                } else if ((match = match_import_specifier(specifier)`.${t.as("scoped")}`)) {
+                    let scopedmatch = null
+                    while ((scopedmatch = match_import_specifier(match.scoped)`.${t.as("scoped")}`)) {
+                        match = scopedmatch
+                    }
+                    scopestate = scopestate_add_definition(scopestate, doc, match.scoped)
+                } else if ((match = match_import_specifier(specifier)`${t.as("name", t.Identifier)}`)) {
+                    scopestate = scopestate_add_definition(scopestate, doc, match.name)
+                } else {
+                    verbose && console.warn("Hmmm, I don't know what to do with this import specifier:", specifier)
+                }
+            }
+            return scopestate
+        } else if ((match = match_julia(cursor)`using ${t.many()}`)) {
+            // Can't care less
+            return scopestate
+        } else if (
+            (match = match_julia(cursor)`
+                for ${t.many("bindings", t.something_with_the_same_type_as(jl`x in y`))};
+                    ${t.many("expressions")}
+                end
+            `)
+        ) {
+            let for_loop_binding_template = create_specific_template_maker((arg) => jl_dynamic`for ${arg}; x end`)
+            let for_loop_binding_match_julia =
+                (cursor) =>
+                (...args) => {
+                    // @ts-ignore
+                    return for_loop_binding_template(jl(...args)).match(cursor)
+                }
+
+            let { bindings, expressions } = match
+            let inner_scope = lower_scope(scopestate)
+
+            for (let { node: binding } of bindings) {
+                let match = null
+                if (
+                    (match = for_loop_binding_match_julia(binding)`${t.as("name")} in ${t.as("range")}`) ??
+                    (match = for_loop_binding_match_julia(binding)`${t.as("name")} ∈ ${t.as("range")}`) ??
+                    (match = for_loop_binding_match_julia(binding)`${t.as("name")} = ${t.as("range")}`)
+                ) {
+                    let { name, range } = match
+                    if (range) inner_scope = explore_variable_usage(range.cursor, doc, inner_scope, verbose)
+                    if (name) inner_scope = explore_pattern(name, doc, inner_scope)
+                } else {
+                    verbose && console.warn("Unrecognized for loop binding", binding.toString())
+                }
+            }
+
+            for (let { node: expression } of expressions) {
+                inner_scope = explore_variable_usage(expression.cursor, doc, inner_scope, verbose)
+            }
+
+            return raise_scope(inner_scope, scopestate)
+        } else if (
+            (match = match_julia(cursor)`
+                ${t.as("callee")}(${t.many("args")}) ${t.maybe(jl`do ${t.maybe(t.many("do_args"))}
+                    ${t.many("do_expressions")}
+                end`)}
+            `) ??
+            (match = match_julia(cursor)`
+                ${t.as("callee")}.(${t.many("args")})
+            `)
+        ) {
+            let { callee, args = [], do_args = [], do_expressions = [] } = match
+
+            scopestate = explore_variable_usage(callee.cursor, doc, scopestate, verbose)
+
+            for (let { node: arg } of args) {
+                let match = null
+                if ((match = match_function_call_argument(arg)`; ${t.many("named_args")}`)) {
+                    // "Parameters", the part in `f(x; y, z)` after the `;`
+                    let { named_args } = match
+                    for (let { node: named_arg } of named_args) {
+                        let match = null
+                        if ((match = match_function_call_named_argument(named_arg)`${t.as("name")} = ${t.as("value")}`)) {
+                            let { name, value } = match
+                            scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+                        } else {
+                            scopestate = explore_variable_usage(named_arg.cursor, doc, scopestate, verbose)
+                        }
+                    }
+                } else if ((match = match_function_call_argument(arg)`${t.as("name")} = ${t.as("value")}`)) {
+                    let { name, value } = match
+                    if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+                } else if ((match = match_function_call_argument(arg)`${t.as("result")} ${t.many("clauses", t.anything_that_fits(jl`for x = y`))}`)) {
+                    let { result, clauses } = match
+                    let nested_scope = lower_scope(scopestate)
+                    // Because of the `t.anything_that_fits`, we can now match different `for x ? y`'s and `if x`s manually.
+                    // There might be a way to express this in the template, but this keeps templates a lot simpler yet powerful.
+                    for (let { node: for_binding } of clauses) {
+                        let match = null
+                        if (
+                            (match = match_for_binding(for_binding)`for ${t.as("variable")} = ${t.maybe(t.as("value"))}`) ??
+                            (match = match_for_binding(for_binding)`for ${t.as("variable")} in ${t.maybe(t.as("value"))}`) ??
+                            (match = match_for_binding(for_binding)`for ${t.as("variable")} ∈ ${t.maybe(t.as("value"))}`) ??
+                            (match = match_for_binding(for_binding)`for ${t.as("variable")}`)
+                        ) {
+                            let { variable, value } = match
+
+                            if (value) nested_scope = explore_variable_usage(value.cursor, doc, nested_scope, verbose)
+                            if (variable) nested_scope = explore_pattern(variable, doc, nested_scope)
+                        } else if ((match = match_for_binding(for_binding)`if ${t.maybe(t.as("if"))}`)) {
+                            let { if: node } = match
+                            if (node) nested_scope = explore_variable_usage(node.cursor, doc, nested_scope, verbose)
+                        } else {
+                            verbose && console.log("Hmmm, can't parse for binding", for_binding)
+                        }
+                    }
+
+                    nested_scope = explore_variable_usage(result.cursor, doc, nested_scope, verbose)
+
+                    return raise_scope(nested_scope, scopestate)
+                } else {
+                    scopestate = explore_variable_usage(arg.cursor, doc, scopestate, verbose)
+                }
+            }
+
+            let inner_scope = lower_scope(scopestate)
+
+            for (let { node: arg } of do_args) {
+                inner_scope = explorer_function_definition_argument(arg, doc, inner_scope)
+            }
+            for (let { node: expression } of do_expressions) {
+                inner_scope = explore_variable_usage(expression.cursor, doc, inner_scope, verbose)
+            }
+            return raise_scope(inner_scope, scopestate)
+        } else if ((match = match_julia(cursor)`(${t.many("tuple_elements")},)`)) {
+            // TODO.. maybe? `(x, g = y)` is a "ParenthesizedExpression", but lezer parses it as a tuple...
+            // For now I fix it here hackily by checking if there is only NamedFields
+
+            let { tuple_elements = [] } = match
+
+            let match_tuple_element = make_beautiful_specific_matcher((arg) => jl_dynamic`(${arg},)`)
+
+            let is_named_field = tuple_elements.map(({ node }) => match_tuple_element(cursor)`${t.Identifier} = ${t.any}` != null)
+
+            if (is_named_field.every((x) => x === true) || is_named_field.every((x) => x === false)) {
+                // Valid tuple, either named or unnamed
+                for (let { node: element } of tuple_elements) {
+                    let match = null
+                    if ((match = match_tuple_element(cursor)`${t.as("name")} = ${t.as("value")}`)) {
+                        let { name, value } = match
+                        if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+                    } else {
+                        scopestate = explore_variable_usage(element.cursor, doc, scopestate, verbose)
+                    }
+                }
+            } else {
+                // Sneaky! Actually an expression list 😏
+                for (let { node: element } of tuple_elements) {
+                    let match = null
+                    if ((match = match_tuple_element(cursor)`${t.as("name")} = ${t.as("value")}`)) {
+                        // 🚨 actually an assignment 🚨
+                        let { name, value } = match
+                        if (name) scopestate = scopestate_add_definition(scopestate, doc, name)
+                        if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+                    } else {
+                        scopestate = explore_variable_usage(element.cursor, doc, scopestate, verbose)
+                    }
+                }
+            }
+            return scopestate
+        } else if (
+            (match = match_julia(cursor)`(${t.many("args")}) -> ${t.many("body")}`) ??
+            (match = match_julia(cursor)`${t.as("arg")} -> ${t.many("body")}`) ??
+            (match = match_julia(cursor)`${t.as("name")}(${t.many("args")})::${t.as("return_type")} = ${t.many("body")}`) ??
+            (match = match_julia(cursor)`${t.as("name")}(${t.many("args")}) = ${t.many("body")}`) ??
+            (match = match_julia(cursor)`${t.as("name")}(${t.many("args")}) = ${t.many("body", t.anything_that_fits(jl`x, y`))}`) ??
+            (match = match_julia(cursor)`
+                function ${t.as("name")}(${t.many("args")})::${t.as("return_type")} where ${t.as("type_param")}
+                    ${t.many("body")}
+                end
+            `) ??
+            (match = match_julia(cursor)`
+                function ${t.as("name")}(${t.many("args")}) where ${t.as("type_param")}
+                    ${t.many("body")}
+                end
+            `) ??
+            (match = match_julia(cursor)`
+                function ${t.as("name")}(${t.many("args")})::${t.as("return_type")}
+                    ${t.many("body")}
+                end
+            `) ??
+            (match = match_julia(cursor)`
+                function ${t.as("name")}(${t.many("args")})
+                    ${t.many("body")}
+                end
+            `) ??
+            (match = match_julia(cursor)`
+                function ${t.as("name", t.Identifier)} end
+            `) ??
+            // Putting macro definitions here too because they are very similar
+            (match = match_julia(cursor)`macro ${t.as("macro_name")} end`) ??
+            (match = match_julia(cursor)`
+                macro ${t.as("macro_name")}(${t.many("args")})
+                    ${t.many("body")}
+                end
+            `)
+        ) {
+            let { name, macro_name, arg, args = [], return_type, type_param, body = [] } = match
+
+            if (arg) {
+                args.push({ node: arg })
+            }
+
+            if (name) {
+                scopestate = scopestate_add_definition(scopestate, doc, name)
+            } else if (macro_name) {
+                scopestate.definitions.set(`@${doc.sliceString(macro_name.from, macro_name.to)}`, {
+                    from: macro_name.from,
+                    to: macro_name.to,
+                })
+            }
+
+            let inner_scope = lower_scope(scopestate)
+            if (type_param) {
+                let match_where_types = make_beautiful_specific_matcher((x) => jl_dynamic`function X() where ${x} end`)
+                let match_where_type = make_beautiful_specific_matcher((x) => jl_dynamic`function X() where {${x}} end`)
+
+                let type_params = [{ node: type_param }]
+                let multiple_types_match = match_where_types(type_param)`{${t.many("type_params")}}`
+                if (multiple_types_match) {
+                    type_params = multiple_types_match.type_params
+                }
+
+                for (let { node: type_param } of type_params) {
+                    let match = null
+                    if ((match = match_where_type(type_param)`${t.as("defined", t.Identifier)} <: ${t.as("parent_type")}`)) {
+                        let { defined, parent_type } = match
+                        inner_scope = explore_variable_usage(parent_type, doc, inner_scope, verbose)
+                        inner_scope = scopestate_add_definition(inner_scope, doc, defined)
+                    } else if ((match = match_where_type(type_param)`${t.as("defined", t.Identifier)}`)) {
+                        let { defined } = match
+                        inner_scope = scopestate_add_definition(inner_scope, doc, defined)
+                    } else {
+                        verbose && console.warn(`Can't handle type param:`, type_param)
+                    }
+                }
+            }
+
+            if (return_type) {
+                inner_scope = explore_variable_usage(narrow(return_type).cursor, doc, inner_scope, verbose)
+            }
+            for (let { node: arg } of args) {
+                inner_scope = explorer_function_definition_argument(arg.cursor, doc, inner_scope, verbose)
+            }
+            for (let { node: expression } of body) {
+                inner_scope = explore_variable_usage(expression.cursor, doc, inner_scope, verbose)
+            }
+            return raise_scope(inner_scope, scopestate)
+        } else if (
+            (match = match_julia(cursor)`
+                let ${t.many("assignments", jl`${t.as("assignee")} = ${t.as("value")}`)}
+                    ${t.many("body", t.any)}
+                end
+            `)
+        ) {
+            let { assignments = [], body = [] } = match
+            let innerscope = lower_scope(scopestate)
+            for (let {
+                match: { assignee, value },
+            } of assignments) {
+                // Explorer lefthandside in inner scope
+                if (assignee) innerscope = explore_pattern(assignee, doc, innerscope)
+                // Explorer righthandside in the outer scope
+                if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+            }
+            // Explorer body in innerscope
+            for (let { node: line } of body) {
+                innerscope = explore_variable_usage(line.cursor, doc, innerscope, verbose)
+            }
+            return raise_scope(innerscope, scopestate)
+        } else if (
+            // A bit hard to see from the template, but these are array (and generator) comprehensions
+            // e.g. [x for x in y]
+            (match = match_julia(cursor)`[
+                ${t.as("result")}
+                ${t.many("clauses", t.anything_that_fits(jl`for x = y`))}
+            ]`) ??
+            // Are there syntax differences between Array or Generator expressions?
+            // For now I treat them the same...
+            // (Also this is one line because lezer doesn't parse multiline generator expressions yet)
+            (match = match_julia(cursor)`(
+                ${t.as("result")}
+                ${t.many("clauses", t.anything_that_fits(jl`for x = y`))}
+            )`)
+        ) {
+            let { result, clauses } = match
+
+            let nested_scope = lower_scope(scopestate)
+
+            // Because of the `t.anything_that_fits`, we can now match different `for x ? y`'s and `if x`s manually.
+            // There might be a way to express this in the template, but this keeps templates a lot simpler yet powerful.
+            for (let { node: for_binding } of clauses) {
+                let match = null
+                if (
+                    (match = match_for_binding(for_binding)`for ${t.as("variable")} = ${t.maybe(t.as("value"))}`) ??
+                    (match = match_for_binding(for_binding)`for ${t.as("variable")} in ${t.maybe(t.as("value"))}`) ??
+                    (match = match_for_binding(for_binding)`for ${t.as("variable")} ∈ ${t.maybe(t.as("value"))}`) ??
+                    (match = match_for_binding(for_binding)`for ${t.as("variable")}`)
+                ) {
+                    let { variable, value } = match
+
+                    if (value) nested_scope = explore_variable_usage(value.cursor, doc, nested_scope, verbose)
+                    if (variable) nested_scope = explore_pattern(variable, doc, nested_scope)
+                } else if ((match = match_for_binding(for_binding)`if ${t.maybe(t.as("if"))}`)) {
+                    let { if: node } = match
+                    if (node) nested_scope = explore_variable_usage(node.cursor, doc, nested_scope, verbose)
+                } else {
+                    verbose && console.warn("Hmmm, can't parse for binding", for_binding)
+                }
+            }
+
+            nested_scope = explore_variable_usage(result.cursor, doc, nested_scope, verbose)
+
+            return raise_scope(nested_scope, scopestate)
+        } else {
+            if (verbose) {
+                console.groupCollapsed(`Cycling through all children of`, cursor.name)
+                console.log(`text:`, doc.sliceString(cursor.from, cursor.to))
+                console.groupEnd()
+            }
+
+            // In most cases we "just" go through all the children separately
+            for (let subcursor of child_cursors(cursor)) {
+                scopestate = explore_variable_usage(subcursor, doc, scopestate, verbose)
+            }
+            return scopestate
+        }
+    } finally {
+        verbose && console.groupEnd()
+    }
+}
+
+/**
+ * @type {StateField<ScopeState>}
+ */
+export let ScopeStateField = StateField.define({
+    create(state) {
+        try {
+            let cursor = syntaxTree(state).cursor()
+            let scopestate = explore_variable_usage(cursor, state.doc, undefined)
+            return scopestate
+        } catch (error) {
+            console.error("Something went wrong while parsing variables...", error)
+            return {
+                usages: [],
+                definitions: new Map(),
+            }
+        }
+    },
+
+    update(value, tr) {
+        try {
+            if (syntaxTree(tr.state) != syntaxTree(tr.startState)) {
+                let cursor = syntaxTree(tr.state).cursor()
+                let scopestate = explore_variable_usage(cursor, tr.state.doc, undefined)
+                return scopestate
+            } else {
+                return value
+            }
+        } catch (error) {
+            console.error("Something went wrong while parsing variables...", error)
+            return {
+                usages: [],
+                definitions: new Map(),
+            }
+        }
+    },
+})
diff --git a/frontend/components/CellInput/tests/.gitignore b/frontend/components/CellInput/tests/.gitignore
new file mode 100644
index 0000000000..ed9f9cc128
--- /dev/null
+++ b/frontend/components/CellInput/tests/.gitignore
@@ -0,0 +1 @@
+coverage
\ No newline at end of file
diff --git a/frontend/components/CellInput/tests/README.md b/frontend/components/CellInput/tests/README.md
new file mode 100644
index 0000000000..c8dd93eef5
--- /dev/null
+++ b/frontend/components/CellInput/tests/README.md
@@ -0,0 +1,14 @@
+# Deno unit tests
+
+Unit tests for the scopestate explorer (and maybe later more who knows)
+
+```shell
+deno test --import-map=./import_map.json --allow-env
+```
+
+You can also do coverage, which looks fun but not sure how to interpret it:
+
+```shell
+deno test --import-map=./import_map.json --allow-env --coverage=coverage
+deno coverage coverage --include=../scopestate_statefield.js
+```
\ No newline at end of file
diff --git a/frontend/components/CellInput/tests/import_map.json b/frontend/components/CellInput/tests/import_map.json
new file mode 100644
index 0000000000..57a87cf9b4
--- /dev/null
+++ b/frontend/components/CellInput/tests/import_map.json
@@ -0,0 +1,5 @@
+{
+  "imports": {
+     "../../../imports/lodash.js": "https://deno.land/x/lodash@4.17.15-es/lodash.js"
+  }
+}
diff --git a/frontend/components/CellInput/tests/scopestate.test.js b/frontend/components/CellInput/tests/scopestate.test.js
new file mode 100644
index 0000000000..96072cb61b
--- /dev/null
+++ b/frontend/components/CellInput/tests/scopestate.test.js
@@ -0,0 +1,147 @@
+import { jl } from "../lezer_template.js"
+import { test_implicit } from "./scopestate_helpers.js"
+// @ts-ignore
+import chalk from "https://deno.land/x/chalk_deno@v4.1.1-deno/source/index.js"
+
+let broken = (fn) => {
+    try {
+        console.log()
+        fn()
+        console.log(chalk.green("BROKEN TEST PASSED???"))
+    } catch (error) {
+        console.log(chalk.blue("Broken test failed as expected"))
+    }
+}
+
+Deno.test("Function call", () => {
+    test_implicit(jl`global_call(global_argument1, global_argument2...)`)
+})
+
+Deno.test("Simple definition", () => {
+    test_implicit(jl`defined = 10`)
+})
+
+Deno.test("Tuple destructuring", () => {
+    test_implicit(jl`(defined_1, defined_2, defined_3...) = global_call()`)
+})
+
+// Need to fix this later
+Deno.test("BROKEN Named destructuring", () => {
+    broken(() => {
+        test_implicit(jl`(; irrelevant_1=defined_1, irrelevant_2=defined_2) = global_call()`)
+    })
+})
+
+Deno.test("Array comprehension", () => {
+    test_implicit(jl`(local_x + global_const for local_x in global_xs)`)
+    test_implicit(jl`(
+      local_x + local_y + global_const
+      for local_x in global_xs
+      for local_y in [local_x, local_x * 2]
+    )`)
+    test_implicit(jl`(local_x for local_x in global_xs if local_x > global_const)`)
+})
+
+Deno.test("BROKEN Array comprehension with comma but VERY WEIRD", () => {
+    // So... `for x in xs, y in ys` does resolve the `_ in _`'s from right to left...
+    // Except..... it then specifically "unbinds" the defined variables.....
+    // So in this case, even though `irrelevant` might be globally defined,
+    // this will ALWAYS say `irrelevant is not defined`, because it is "overshadowed" by the `for irrelevant in global_ys`.
+    broken(() => {
+        test_implicit(jl`(local_x + global_const for local_x in irrelevant, for irrelevant in global_ys)`)
+    })
+})
+
+Deno.test("BROKEN Array comprehension with comma", () => {
+    broken(() => {
+        test_implicit(jl`(local_x for global_array in global_array_array, for local_x in global_array)`)
+    })
+})
+
+Deno.test("Function definition", () => {
+    test_implicit(jl`
+        function defined_function(local_argument1, local_argument2...; local_argument3, local_argument4...)
+            local_argument1, local_argument2, local_argument3, local_argument4
+            global_var1, global_var2
+        end
+    `)
+})
+
+Deno.test("Function definition", () => {
+    test_implicit(jl`
+        function defined_function(local_argument1 = global_default)
+            local_argument1
+        end
+    `)
+})
+
+Deno.test("Function definition where", () => {
+    test_implicit(jl`
+        function defined_function(local_argument1) where {local_type}
+            local_argument1, local_type
+        end
+    `)
+})
+
+Deno.test("Function definition returntype", () => {
+    test_implicit(jl`begin
+        function defined_function(local_argument1)::global_type
+            local_argument1
+        end
+    end`)
+})
+
+Deno.test("Function expression", () => {
+    test_implicit(jl`defined_fn = (local_argument1, local_argument2) -> (local_argument1, local_argument2, global_var1, global_var2)`)
+})
+
+Deno.test("Let block", () => {
+    test_implicit(jl`defined_outside = let local_let = global_let
+        local_inside = local_let
+        local_inside * global_inside
+    end`)
+})
+
+Deno.test("Imports", () => {
+    test_implicit(jl`import defined_module`)
+    test_implicit(jl`import X: defined_specific1, defined_specific2`)
+    test_implicit(jl`import X: defined_specific3, irrelevant as defined_alias`)
+    test_implicit(jl`import X.defined_specific4`)
+    test_implicit(jl`import X.irrelevant as defined_alias2`)
+})
+
+Deno.test("Typed struct", () => {
+    test_implicit(jl`begin
+        struct defined_struct{local_type} <: global_type{local_type, global_type2}
+            g
+            y::global_type3
+            z = global_var
+            x::local_type = global_var2
+        end
+  end`)
+})
+
+Deno.test("Quotes", () => {
+    test_implicit(jl`quote
+        irrelevant_1 = irrelevant_2
+        irrelevant_3 = $(global_var)
+    end`)
+})
+
+Deno.test("Nested Quotes", () => {
+    test_implicit(jl`quote
+            :($irrelevant)
+            :($$global_var)
+        end
+    end`)
+})
+
+Deno.test("Macros", () => {
+    test_implicit(jl`global_used.@irrelevant`)
+    test_implicit(jl`@global_but_not_macro.irrelevant`)
+    test_implicit(jl`@macro_global`)
+})
+
+Deno.test("Lonely bare tuple", () => {
+    test_implicit(jl`defined, = (global_var,)`)
+})
diff --git a/frontend/components/CellInput/tests/scopestate_helpers.js b/frontend/components/CellInput/tests/scopestate_helpers.js
new file mode 100644
index 0000000000..2cccbfc3e1
--- /dev/null
+++ b/frontend/components/CellInput/tests/scopestate_helpers.js
@@ -0,0 +1,69 @@
+import { assertEquals as untyped_assertEquals } from "https://deno.land/std@0.123.0/testing/asserts.ts"
+import { jl, as_node, as_doc, JuliaCodeObject, as_string } from "../lezer_template.js"
+import { explore_variable_usage } from "../scopestate_statefield.js"
+
+/**
+ * @template T
+ * @param {T} a
+ * @param {T} b
+ **/
+export let assertEquals = (a, b) => untyped_assertEquals(a, b)
+
+/**
+ * @param {import("../scopestate_statefield.js").ScopeState} scopestate
+ */
+let simplify_scopestate = (scopestate) => {
+    let { definitions, usages } = scopestate
+    return {
+        defined: new Set(Array.from(definitions.keys())),
+        local_used: new Set(usages.filter((x) => x.definition != null).map((x) => x.name)),
+        global_used: new Set(usages.filter((x) => x.definition == null).map((x) => x.name)),
+    }
+}
+
+/**
+ * @param {import("../lezer_template.js").JuliaCodeObject} input
+ * @param {{
+ *  defined?: Array<string>,
+ *  local_used?: Array<string>,
+ *  global_used?: Array<string>,
+ * }} expected
+ */
+export let test_scopestate = (input, expected) => {
+    let scopestate = {
+        defined: [],
+        local_used: [],
+        global_used: [],
+    }
+    assertEquals(simplify_scopestate(explore_variable_usage(as_node(input).cursor, as_doc(input))), {
+        defined: new Set(expected.defined),
+        local_used: new Set(expected.local_used),
+        global_used: new Set(expected.global_used),
+    })
+}
+
+/**
+ * @param {JuliaCodeObject} code
+ */
+export function test_implicit(code) {
+    let expected_scopestate = { defined: [], local_used: [], global_used: [] }
+
+    for (let variable of as_string(code).matchAll(/(macro_)?(global|local|defined)(_[a-z0-9_]+)?/g)) {
+        let [variable_name, is_macro, usage_type] = variable
+
+        if (is_macro != null) {
+            variable_name = `@${variable_name}`
+        }
+
+        let index = variable.index
+        if (usage_type === "global") {
+            expected_scopestate.global_used.push(variable_name)
+        } else if (usage_type === "local") {
+            expected_scopestate.local_used.push(variable_name)
+        } else if (usage_type === "defined") {
+            expected_scopestate.defined.push(variable_name)
+        }
+    }
+
+    return test_scopestate(code, expected_scopestate)
+}
diff --git a/frontend/editor.css b/frontend/editor.css
index 04543f77c9..ef3d334d38 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2559,7 +2559,9 @@ body.ctrl_down [data-cell-variable] {
 }
 body.ctrl_down [data-pluto-variable]:hover,
 body.ctrl_down [data-pluto-variable]:hover * {
-    color: #af5bc3 !important;
+    /* This basically `color: #af5bc3`, but it works for emoji too!! */
+    color: transparent !important;
+    text-shadow: 0 0 #af5bc3;
 }
 
 /* Variable that is declared in the same cell */
@@ -2568,7 +2570,9 @@ body.ctrl_down [data-pluto-variable]:hover * {
     text-decoration: none;
 }
 body.ctrl_down [data-cell-variable]:hover * {
-    color: #af5bc3 !important;
+    /* This basically `color: #af5bc3`, but it works for emoji too!! */
+    color: transparent !important;
+    text-shadow: 0 0 #af5bc3;
 }
 
 .cm-tooltip.cm-tooltip-autocomplete {
@@ -2675,6 +2679,18 @@ pluto-output > assignee {
     background: unset;
 }
 
+.cm-selectionMatch {
+    background: none !important;
+    text-shadow: 0 0 8px rgba(0, 0, 0, 0.5);
+}
+
+@media (prefers-color-scheme: dark) {
+    .cm-selectionMatch {
+        background: none !important;
+        text-shadow: 0 0 8px rgba(255, 255, 255, 0.5);
+    }
+}
+
 .cm-editor .cm-matchingBracket,
 .cm-editor .cm-nonmatchingBracket {
     background-color: unset;
diff --git a/frontend/imports/CodemirrorPlutoSetup.d.ts b/frontend/imports/CodemirrorPlutoSetup.d.ts
index 44c44660bd..973582b992 100644
--- a/frontend/imports/CodemirrorPlutoSetup.d.ts
+++ b/frontend/imports/CodemirrorPlutoSetup.d.ts
@@ -2593,7 +2593,7 @@ declare class EditorView {
     (`view.contentDOM.getBoundingClientRect().top`) to limit layout
     queries.
     
-    *Deprecated: use `blockAtHeight` instead.*
+    *Deprecated: use `elementAtHeight` instead.*
     */
     blockAtHeight(height: number, docTop?: number): BlockInfo;
     /**
@@ -2947,6 +2947,13 @@ declare class EditorView {
         dark?: boolean;
     }): Extension;
     /**
+    This facet records whether a dark theme is active. The extension
+    returned by [`theme`](https://codemirror.net/6/docs/ref/#view.EditorView^theme) automatically
+    includes an instance of this when the `dark` option is set to
+    true.
+    */
+    static darkTheme: Facet<boolean, boolean>;
+    /**
     Create an extension that adds styles to the base theme. Like
     with [`theme`](https://codemirror.net/6/docs/ref/#view.EditorView^theme), use `&` to indicate the
     place of the editor wrapper element when directly targeting
@@ -3269,6 +3276,16 @@ or the empty tree if there is no language available.
 */
 declare function syntaxTree(state: EditorState): Tree;
 /**
+Queries whether there is a full syntax tree available up to the
+given document position. If there isn't, the background parse
+process _might_ still be working and update the tree further, but
+there is no guarantee of that—the parser will [stop
+working](https://codemirror.net/6/docs/ref/#language.syntaxParserStopped) when it has spent a
+certain amount of time or has moved beyond the visible viewport.
+Always returns false if no language has been enabled.
+*/
+declare function syntaxTreeAvailable(state: EditorState, upto?: number): boolean;
+/**
 This class bundles a [language object](https://codemirror.net/6/docs/ref/#language.Language) with an
 optional set of supporting extensions. Language packages are
 encouraged to export a function that optionally takes a
@@ -5171,4 +5188,4 @@ Create an instance of the collaborative editing plugin.
 */
 declare function collab(config?: CollabConfig): Extension;
 
-export { Annotation, Compartment, Decoration, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, StreamLanguage, Text, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, commentKeymap, completionKeymap, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, julia$1 as julia_legacy, keymap, lineNumbers, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, rectangularSelection, searchKeymap, sql, syntaxTree, tags };
+export { Annotation, Compartment, Decoration, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, StreamLanguage, Text, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, commentKeymap, completionKeymap, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, julia$1 as julia_legacy, keymap, lineNumbers, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, rectangularSelection, searchKeymap, sql, syntaxTree, syntaxTreeAvailable, tags };
diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index 056d25cc69..b17c4ed4f6 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -30,6 +30,7 @@ import {
     foldKeymap,
     commentKeymap,
     syntaxTree,
+    syntaxTreeAvailable,
     Decoration,
     ViewUpdate,
     ViewPlugin,
@@ -90,6 +91,7 @@ export {
     foldKeymap,
     commentKeymap,
     syntaxTree,
+    syntaxTreeAvailable,
     Decoration,
     ViewUpdate,
     ViewPlugin,
diff --git a/sample/test_go_to_definition.jl b/sample/test_go_to_definition.jl
new file mode 100644
index 0000000000..7ddfdea7ea
--- /dev/null
+++ b/sample/test_go_to_definition.jl
@@ -0,0 +1,399 @@
+### A Pluto.jl notebook ###
+# v0.17.5
+
+using Markdown
+using InteractiveUtils
+
+# ╔═╡ a3865853-58ad-4e27-bfbf-7223760ca026
+md"""
+# Methodical testing for the go-to-definition plugin
+
+### FAQ
+**Q:** Wait.. isn't it better to have this as javascript tests, so we can actually automate them and be sure that nothing breaks instead of relying on our flimsy human eyeballs?
+
+**A:** Yes
+"""
+
+# ╔═╡ c93bd0ce-dffe-4416-a007-79116ab1f1cb
+macro >(expr)
+	nothing
+end
+
+# ╔═╡ 91bd5444-154e-48f1-bd51-fbdcfc5cfc14
+macro +(expr)
+	return esc(expr)
+end
+
+# ╔═╡ cf229fd1-5bdc-4a44-8272-5ecc872a2fbd
+md"""
+### Reading guide for ["Definitions"](#Definitions)
+
+Every section here consists of a couple of definitions, followed by a cell that references all of these. The test is pressing every reference and making sure it selects the right part in the definition cell.
+"""
+
+# ╔═╡ 8d559967-84da-45c9-9e05-ce1adc36804c
+md"""
+### Reading guide for ["Usages"](#Usages)
+
+There are some "predefined" variables: `x`, `y` and `z`; `@z`, `@z_str`; `X`, `Y` and `Z`. These are then used to make sure they get underlined. I decided that the `z`-s and `y`-s are intended to reference outside of the cell. If there is a way to override the variable locally in the cell or an identifier that isn't a reference,  use `x` for that. There should be **no underlined `x`'s**.
+"""
+
+# ╔═╡ 52620cb5-7d42-4d40-a3ae-6d9d29448014
+md"## Definitions"
+
+# ╔═╡ 7527a5b8-7eeb-4ec7-abbe-34ed68415ce1
+md"---"
+
+# ╔═╡ 0cdf94d0-dd1a-4a4a-b6c2-d2d290cd3224
+import Example
+
+# ╔═╡ 2d145800-c22f-4bbe-a6f3-bca8bb79d513
+import Example as ExampleAlias
+
+# ╔═╡ df05dcd2-fb6b-4907-ad80-6d231d6b6ce5
+import Example: hello, domath as domath_alias
+
+# ╔═╡ f22e3e28-6cda-4dbd-bc30-d2f7c2411e91
+import Example: hello as hello_alias
+
+# ╔═╡ 8948913b-9917-46c2-a91a-14386d269502
+import Example.domath
+
+# ╔═╡ e152285a-9265-4a13-bf0d-cfc0ba418595
+import Example.domath as another_domath_alias
+
+# ╔═╡ 90682238-2769-4f20-afcf-56ced93242ba
+Example; ExampleAlias; hello; domath;
+
+# ╔═╡ e30de56d-5985-42e7-abde-1ec90c7484c9
+hello_alias; domath_alias; another_domath_alias; # Pluto doesn't recognize aliases?
+
+# ╔═╡ 3be4e4b7-02f8-4f4c-bcab-2d796f38a93f
+md"---"
+
+# ╔═╡ 1d2f2927-49d0-404e-a324-4ab4f677d89a
+abstract type _abstract_type1 end
+
+# ╔═╡ 654566d0-9b46-49dd-a8ac-4d3f5708cba5
+abstract type _abstract_type2{T} end
+
+# ╔═╡ 8e823381-7b06-44b1-99e0-565083bc2434
+_abstract_type1; _abstract_type2;
+
+# ╔═╡ 709300fe-3b3d-471f-8fc1-608b904d18ed
+md"---"
+
+# ╔═╡ 4f996030-0ff2-4ea2-aa48-ac92765072c8
+struct _struct1 end;
+
+# ╔═╡ 670eb47b-225f-4626-9276-4cae08d90843
+struct _struct2 x end;
+
+# ╔═╡ 5afc38cb-ae2b-495e-93f9-a7ca85773ca9
+struct _struct4{T} <: _abstract_type2{T} end
+
+# ╔═╡ 327e846b-3edc-406a-936f-799475a7b3de
+md"---"
+
+# ╔═╡ 955ae894-24a1-4f8a-999d-3e8d809e0eba
+(_tuple1,) = (:x,);
+
+# ╔═╡ 09a24659-6646-40bb-8e7c-0d340d2b45da
+(_tuple2, _tuple3, _tuple4...) = (:x1, :x2, :x3, :x4);
+
+# ╔═╡ a85d6a78-b212-46b0-bacc-ad880911f2cb
+_tuple1; _tuple2; _tuple3; _tuple4;
+
+# ╔═╡ cb226d6d-f294-42b0-a40e-cb07e58fa776
+md"---"
+
+# ╔═╡ 554ad95c-2edd-4ef9-b532-0ec7cf08243c
+_baretuple1, = (:x,);
+
+# ╔═╡ d6e27295-77eb-4a84-98be-ea338a85f455
+_baretuple2, _baretuple3... = (:x1, :x2, :x3);
+
+# ╔═╡ 06948715-85e7-4609-94b1-bb91123d928c
+_baretuple1; _baretuple2; _baretuple3;
+
+# ╔═╡ 22032cef-5889-48d8-8709-bb7eeac89638
+md"""
+For both `_tuple4` and `_baretuple3`: JS side has these covered (shown by example below), but Pluto doesn't recognize it (thus it not working outside cells)
+"""
+
+# ╔═╡ 31713a89-8656-4cf9-aee0-ac24c3430c0a
+let
+	(_tuple2, _tuple3, _tuple4...) = (:x1, :x2, :x3, :x4);
+	_baretuple2, _baretuple3... = (:x1, :x2, :x3);
+
+	_baretuple3; _tuple4; # cmd+click me!
+end;
+
+# ╔═╡ 0a8e5b66-daaa-4f32-8dd8-1e8b9ec35465
+md"---"
+
+# ╔═╡ 4e3b5537-59b7-4d87-ae54-f1153c092ffa
+const _const = :const;
+
+# ╔═╡ 5d2d43f0-5a17-407a-a9ee-a041010e5579
+global _global = :global;
+
+# ╔═╡ e14b69ca-f325-440c-acb1-c33de71e75a2
+_const; _global;
+
+# ╔═╡ f9737a60-9909-445c-8382-4dd00aa267ba
+md"## Usages"
+
+# ╔═╡ a0f62011-92f2-44ad-b420-27217bcbd89c
+md"### Predefined"
+
+# ╔═╡ 90a81bc8-cce9-49bd-a3c4-126c74a515d3
+x = "Hi, I'm x";
+
+# ╔═╡ ad3ab162-2139-45b4-8877-18285f1c2fa8
+y = "Hi, x";
+
+# ╔═╡ 18e25073-6ea7-4287-975d-84c05743930e
+z = "I was expecting a joke";
+
+# ╔═╡ b7bd9512-a119-46e5-a6df-58b04e04bda0
+_function3() = (x, z);
+
+# ╔═╡ 1c530e0e-770c-44b5-a13e-e5b905e3d84c
+_function6(x) = x, z;
+
+# ╔═╡ a6eec43c-dc37-4113-a7e5-fafde8bdbd39
+@Base.kwdef struct _struct3
+	x::Int = z
+end;
+
+# ╔═╡ 0135431d-4b3f-4513-9982-937cc0b60837
+_struct1; _struct2; _struct3; _struct4;
+
+# ╔═╡ 669cf7b9-b1cc-4f01-8dc3-b9a156f9de63
+macro z end;
+
+# ╔═╡ 20804f0f-ca92-463d-afb7-604aeb6057f7
+macro z_str end;
+
+# ╔═╡ 7781bce5-2dd8-4d06-8bfd-7589bea619dc
+abstract type X end
+
+# ╔═╡ f9236dd2-4fd7-4d86-8dcb-cbc011da8b03
+abstract type Y end
+
+# ╔═╡ 4a9d7bb3-9ca7-4af9-b7e1-e730fbc1c570
+abstract type Z end
+
+# ╔═╡ 5d9701eb-46a3-483a-9b51-0e376031ae34
+function _function1()::Z end;
+
+# ╔═╡ 24716c18-5a36-4b12-9ed5-43069c81f15b
+function _function2(x...)::Z
+	x, z
+end;
+
+# ╔═╡ 5365c683-75b7-4f29-8cbe-810167409686
+_function4(x::Z) = begin x end;
+
+# ╔═╡ a85475ce-44ee-4b87-99b6-10b8b31d99fa
+_function4(::Z) = (10, z, "hi");
+
+# ╔═╡ b2c9c60f-c107-4cbb-bc7e-3018117e9ecb
+_function5(x)::Z = (x, z);
+
+# ╔═╡ 3f3440dc-4449-4a9f-b019-f2b5a3fc97b9
+_function1; _function2; _function3; _function4; _function5; _function6;
+
+# ╔═╡ e5b3cb7a-bf0d-479e-a533-d5699abe6f2a
+md"### Cases"
+
+# ╔═╡ 94c6fccc-ae3a-40bb-bf3f-a11f6d9244e2
+@> sum(x for x in [1,2,3])
+
+# ╔═╡ 18ea6b86-9ed5-4a75-852e-13cbb7f4d8da
+@> function f(x=z)::z 
+	x, z
+end
+
+# ╔═╡ d8de87c9-e516-4f5f-978a-4c53071c5656
+@> function f(x=z; y)::z 
+	x, y, z
+end
+
+# ╔═╡ 6bc106ce-ebba-4487-859e-9701ebeda022
+md"---"
+
+# ╔═╡ c283d772-e007-447a-aa88-a01d75d48e2e
+@> z.@x
+
+# ╔═╡ fa2aaff3-9b8a-4cdc-919d-2de38f54018b
+@> @z.x
+
+# ╔═╡ da330714-5130-470b-bd2a-6343c932f808
+@> @z
+
+# ╔═╡ 196a17eb-1ded-40be-a00b-b5e4d7fa1070
+md"---"
+
+# ╔═╡ 3e773c63-a8b7-4ad8-9dbb-74d519054f0f
+@> struct x
+	x1
+	x2::z
+	x3::z = z
+	x4 = z
+end
+
+# ╔═╡ eac662c8-369e-4bf3-9aec-5f9c46fc4f77
+@> x::z = z
+
+# ╔═╡ 1d7c5c41-f5c8-40b3-b0b1-7da19572bef2
+@> :(1 + $(z...) + 1)
+
+# ╔═╡ 7521b3c9-a1bd-4786-aa19-44fd1db90149
+@> (x, y...) = z
+
+# ╔═╡ 4eb71552-16da-42bb-a9dc-f18e1b3e7190
+@> z.@macro x = z
+
+# ╔═╡ 3f009423-6a36-41c2-ad74-de596a8519c1
+@> begin
+	struct x end
+	struct x{y} end
+	struct x <: z end
+	struct x <: z{x,z} end
+	struct x{y} <: z{x,y,z} end
+
+	x, y, z
+end
+
+# ╔═╡ fba1aebf-c00a-4750-89d3-a1b6e27c07a4
+@> var"x" = 10;
+
+# ╔═╡ 0b34c665-9c93-40ab-9965-d0ae36a2190d
+@> var"x";
+
+# ╔═╡ 29f7c36e-9b4d-4a91-83b3-162f1cd9e00c
+@> (x=z) -> (x, z)
+
+# ╔═╡ a478a0e0-51ba-4261-ac9d-5b3333b5a8bf
+@> f(z)
+
+# ╔═╡ 8ea3cd9e-c831-4140-977c-cc6cee5367b9
+@> f(x=z)
+
+# ╔═╡ 499392fa-4c50-4d0b-b584-098355e9af48
+md"---"
+
+# ╔═╡ 5749eb9d-f18f-4a91-8bb1-17d1c680d397
+@> quote $(z) end
+
+# ╔═╡ 259004c3-770f-4fe2-9c84-4c6f5d5c879c
+@> quote quote $(x) end end
+
+# ╔═╡ 91f8bfee-102a-437d-8c40-d7c694f0a384
+@> quote quote $$(z) end end
+
+# ╔═╡ 00000000-0000-0000-0000-000000000001
+PLUTO_PROJECT_TOML_CONTENTS = """
+[deps]
+Example = "7876af07-990d-54b4-ab0e-23690620f79a"
+
+[compat]
+Example = "~0.5.3"
+"""
+
+# ╔═╡ 00000000-0000-0000-0000-000000000002
+PLUTO_MANIFEST_TOML_CONTENTS = """
+# This file is machine-generated - editing it directly is not advised
+
+[[Example]]
+git-tree-sha1 = "46e44e869b4d90b96bd8ed1fdcf32244fddfb6cc"
+uuid = "7876af07-990d-54b4-ab0e-23690620f79a"
+version = "0.5.3"
+"""
+
+# ╔═╡ Cell order:
+# ╟─a3865853-58ad-4e27-bfbf-7223760ca026
+# ╟─c93bd0ce-dffe-4416-a007-79116ab1f1cb
+# ╟─91bd5444-154e-48f1-bd51-fbdcfc5cfc14
+# ╟─cf229fd1-5bdc-4a44-8272-5ecc872a2fbd
+# ╟─8d559967-84da-45c9-9e05-ce1adc36804c
+# ╟─52620cb5-7d42-4d40-a3ae-6d9d29448014
+# ╠═5d9701eb-46a3-483a-9b51-0e376031ae34
+# ╠═24716c18-5a36-4b12-9ed5-43069c81f15b
+# ╠═b7bd9512-a119-46e5-a6df-58b04e04bda0
+# ╠═5365c683-75b7-4f29-8cbe-810167409686
+# ╠═a85475ce-44ee-4b87-99b6-10b8b31d99fa
+# ╠═b2c9c60f-c107-4cbb-bc7e-3018117e9ecb
+# ╠═1c530e0e-770c-44b5-a13e-e5b905e3d84c
+# ╠═3f3440dc-4449-4a9f-b019-f2b5a3fc97b9
+# ╟─7527a5b8-7eeb-4ec7-abbe-34ed68415ce1
+# ╠═0cdf94d0-dd1a-4a4a-b6c2-d2d290cd3224
+# ╠═2d145800-c22f-4bbe-a6f3-bca8bb79d513
+# ╠═df05dcd2-fb6b-4907-ad80-6d231d6b6ce5
+# ╠═f22e3e28-6cda-4dbd-bc30-d2f7c2411e91
+# ╠═8948913b-9917-46c2-a91a-14386d269502
+# ╠═e152285a-9265-4a13-bf0d-cfc0ba418595
+# ╠═90682238-2769-4f20-afcf-56ced93242ba
+# ╠═e30de56d-5985-42e7-abde-1ec90c7484c9
+# ╟─3be4e4b7-02f8-4f4c-bcab-2d796f38a93f
+# ╠═1d2f2927-49d0-404e-a324-4ab4f677d89a
+# ╠═654566d0-9b46-49dd-a8ac-4d3f5708cba5
+# ╠═8e823381-7b06-44b1-99e0-565083bc2434
+# ╟─709300fe-3b3d-471f-8fc1-608b904d18ed
+# ╠═4f996030-0ff2-4ea2-aa48-ac92765072c8
+# ╠═670eb47b-225f-4626-9276-4cae08d90843
+# ╠═a6eec43c-dc37-4113-a7e5-fafde8bdbd39
+# ╠═5afc38cb-ae2b-495e-93f9-a7ca85773ca9
+# ╠═0135431d-4b3f-4513-9982-937cc0b60837
+# ╟─327e846b-3edc-406a-936f-799475a7b3de
+# ╠═955ae894-24a1-4f8a-999d-3e8d809e0eba
+# ╠═09a24659-6646-40bb-8e7c-0d340d2b45da
+# ╠═a85d6a78-b212-46b0-bacc-ad880911f2cb
+# ╟─cb226d6d-f294-42b0-a40e-cb07e58fa776
+# ╠═554ad95c-2edd-4ef9-b532-0ec7cf08243c
+# ╠═d6e27295-77eb-4a84-98be-ea338a85f455
+# ╠═06948715-85e7-4609-94b1-bb91123d928c
+# ╟─22032cef-5889-48d8-8709-bb7eeac89638
+# ╠═31713a89-8656-4cf9-aee0-ac24c3430c0a
+# ╟─0a8e5b66-daaa-4f32-8dd8-1e8b9ec35465
+# ╠═4e3b5537-59b7-4d87-ae54-f1153c092ffa
+# ╠═5d2d43f0-5a17-407a-a9ee-a041010e5579
+# ╠═e14b69ca-f325-440c-acb1-c33de71e75a2
+# ╟─f9737a60-9909-445c-8382-4dd00aa267ba
+# ╟─a0f62011-92f2-44ad-b420-27217bcbd89c
+# ╠═90a81bc8-cce9-49bd-a3c4-126c74a515d3
+# ╠═ad3ab162-2139-45b4-8877-18285f1c2fa8
+# ╠═18e25073-6ea7-4287-975d-84c05743930e
+# ╠═669cf7b9-b1cc-4f01-8dc3-b9a156f9de63
+# ╠═20804f0f-ca92-463d-afb7-604aeb6057f7
+# ╠═7781bce5-2dd8-4d06-8bfd-7589bea619dc
+# ╠═f9236dd2-4fd7-4d86-8dcb-cbc011da8b03
+# ╠═4a9d7bb3-9ca7-4af9-b7e1-e730fbc1c570
+# ╟─e5b3cb7a-bf0d-479e-a533-d5699abe6f2a
+# ╠═94c6fccc-ae3a-40bb-bf3f-a11f6d9244e2
+# ╠═18ea6b86-9ed5-4a75-852e-13cbb7f4d8da
+# ╠═d8de87c9-e516-4f5f-978a-4c53071c5656
+# ╟─6bc106ce-ebba-4487-859e-9701ebeda022
+# ╠═c283d772-e007-447a-aa88-a01d75d48e2e
+# ╠═fa2aaff3-9b8a-4cdc-919d-2de38f54018b
+# ╠═da330714-5130-470b-bd2a-6343c932f808
+# ╟─196a17eb-1ded-40be-a00b-b5e4d7fa1070
+# ╠═3e773c63-a8b7-4ad8-9dbb-74d519054f0f
+# ╠═eac662c8-369e-4bf3-9aec-5f9c46fc4f77
+# ╠═1d7c5c41-f5c8-40b3-b0b1-7da19572bef2
+# ╠═7521b3c9-a1bd-4786-aa19-44fd1db90149
+# ╠═4eb71552-16da-42bb-a9dc-f18e1b3e7190
+# ╠═3f009423-6a36-41c2-ad74-de596a8519c1
+# ╠═fba1aebf-c00a-4750-89d3-a1b6e27c07a4
+# ╠═0b34c665-9c93-40ab-9965-d0ae36a2190d
+# ╠═29f7c36e-9b4d-4a91-83b3-162f1cd9e00c
+# ╠═a478a0e0-51ba-4261-ac9d-5b3333b5a8bf
+# ╠═8ea3cd9e-c831-4140-977c-cc6cee5367b9
+# ╟─499392fa-4c50-4d0b-b584-098355e9af48
+# ╠═5749eb9d-f18f-4a91-8bb1-17d1c680d397
+# ╠═259004c3-770f-4fe2-9c84-4c6f5d5c879c
+# ╠═91f8bfee-102a-437d-8c40-d7c694f0a384
+# ╟─00000000-0000-0000-0000-000000000001
+# ╟─00000000-0000-0000-0000-000000000002
\ No newline at end of file
diff --git a/sample/test_pkg_bubble.jl b/sample/test_pkg_bubble.jl
index 54406dd1d6..a180521550 100644
--- a/sample/test_pkg_bubble.jl
+++ b/sample/test_pkg_bubble.jl
@@ -1,57 +1,165 @@
 ### A Pluto.jl notebook ###
-# v0.16.4
+# v0.17.5
 
 using Markdown
 using InteractiveUtils
 
-# ╔═╡ f7dfc33e-6ff8-44d6-a88e-bea5834a9d27
-import A1
-using A2
+# ╔═╡ f16ef748-7c86-11ec-10a5-830de8dd2a2e
+md"""
+# Package Managment AST tests
 
-# ╔═╡ 360ee541-cbc4-4df6-bdc5-ea23fe08abdd
-import A1, B1, .C1, D1.E1
-using A2, B2, .C2, D2.E2
+- `Random` or `Downloads` indicates the name should be parsed as package name
+- Single letter names are for everything that shouldn't be parsed
+- Random `Base` thrown in to make sure it is not parsed
+"""
 
-# ╔═╡ 8a4eff2d-5dbc-4056-a81b-da0618503467
-import A1: b1, c1
-using A2: b2, c2
+# ╔═╡ e99b72b2-8939-430c-b8b3-25155559e7dc
+macro >(expr) end
 
-# ╔═╡ 393a7816-0fa0-4f74-8fe7-c8d8d8c7e868
-import A1.B1: b1, c1
-using A2.B2: b2, c2
+# ╔═╡ e7f324d7-e4b0-498a-a8a2-f94f52a9453d
+@> using Random
 
-# ╔═╡ c1b5da89-c9a3-439c-8bee-2a8690265796
-import .A1
-using .A2
+# ╔═╡ fb917588-1499-433b-aeba-e6833346c968
+@> using Random: a as x
 
-# ╔═╡ daf52b3f-513c-45de-a232-bda50e45b326
-import .A1: x1
-using .A2: x2
+# ╔═╡ d4f1ec8b-7597-45bf-9cea-4770802d516b
+@> using Random.A.B
 
-# ╔═╡ 6a90ece9-e7ad-404e-a3b0-4d484821f461
-import ..A1
-using ..A2
+# ╔═╡ a68c8859-d7dd-4e8d-9996-f81216b84355
+@> using Random.B.C: X
 
-# ╔═╡ 4206dd87-a9e9-4f2c-865f-bec68d199b55
-import A1.B1
-using A2.B2
+# ╔═╡ 589ee4e7-8fec-424a-82f7-cf0a700bf20a
+@> using .A.B.C: X
 
-# ╔═╡ eb7ba436-d23b-4e97-af92-81271fa76989
-import A1.B1.C1
-using A2.B2.C2
+# ╔═╡ 5e9f4f30-39f5-4c1d-b94d-4d937d37c47f
+@> using Random.B.C, Downloads.K
 
-# ╔═╡ 4f1d3da9-370c-42c2-9d17-a3caffca638d
-import A1.B1.C1.D1
-using A2.B2.C2.D2
+# ╔═╡ 55449e27-c8db-4593-bc3b-0011179c6b20
+@> import Random
+
+# ╔═╡ 91b12b1c-1590-421e-8904-6b728bbf004d
+@> import Base
+
+# ╔═╡ 9d42b339-f64d-4ce8-b765-0ebd060dec55
+@> import Random: a, b
+
+# ╔═╡ d555a75d-eed6-4cb8-82a0-53f84ceb982a
+@> import Random: A as Z
+
+# ╔═╡ db8041c4-645c-4af9-8d33-aa4dfd45ea5f
+@> import Random as X, Downloads as Y, .A
+
+# ╔═╡ 42a5bed8-c761-4e9d-907d-25d49157647b
+@> import Random, Base, .A as X
+
+# ╔═╡ 7c4496e7-5b21-4748-9877-bff4a7ae5752
+@> import .A: X, Y
+
+# ╔═╡ 04faa311-541d-44c7-a189-e390c5cbdef9
+@> import .A
+
+# ╔═╡ 3490d653-47da-4cea-939e-076ad38558d7
+@> import .A as X, ..A as Y
+
+# ╔═╡ 1fc087ca-70b3-43d2-8793-70131227329f
+@> import ..A
+
+# ╔═╡ 7150f6b7-aa4f-44bf-a751-9c34c4a1c981
+md"---"
+
+# ╔═╡ b371f04d-0a89-4aa9-a03a-7c903270fd20
+md"---"
+
+# ╔═╡ 3749489b-49d3-4187-a2f6-1dddc0e97f92
+@> import Random as 
+
+# ╔═╡ ed56bd75-8d7d-45ec-a3f9-c440141f7633
+@> import NotExisting
+
+# ╔═╡ 00000000-0000-0000-0000-000000000001
+PLUTO_PROJECT_TOML_CONTENTS = """
+[deps]
+Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+"""
+
+# ╔═╡ 00000000-0000-0000-0000-000000000002
+PLUTO_MANIFEST_TOML_CONTENTS = """
+# This file is machine-generated - editing it directly is not advised
+
+[[ArgTools]]
+uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
+
+[[Artifacts]]
+uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+
+[[Downloads]]
+deps = ["ArgTools", "LibCURL", "NetworkOptions"]
+uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
+
+[[LibCURL]]
+deps = ["LibCURL_jll", "MozillaCACerts_jll"]
+uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
+
+[[LibCURL_jll]]
+deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
+uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
+
+[[LibSSH2_jll]]
+deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
+uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
+
+[[Libdl]]
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
+[[MbedTLS_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
+
+[[MozillaCACerts_jll]]
+uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
+
+[[NetworkOptions]]
+uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
+
+[[Random]]
+deps = ["Serialization"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[Zlib_jll]]
+deps = ["Libdl"]
+uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
+
+[[nghttp2_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
+"""
 
 # ╔═╡ Cell order:
-# ╠═f7dfc33e-6ff8-44d6-a88e-bea5834a9d27
-# ╠═360ee541-cbc4-4df6-bdc5-ea23fe08abdd
-# ╠═8a4eff2d-5dbc-4056-a81b-da0618503467
-# ╠═393a7816-0fa0-4f74-8fe7-c8d8d8c7e868
-# ╠═c1b5da89-c9a3-439c-8bee-2a8690265796
-# ╠═daf52b3f-513c-45de-a232-bda50e45b326
-# ╠═6a90ece9-e7ad-404e-a3b0-4d484821f461
-# ╠═4206dd87-a9e9-4f2c-865f-bec68d199b55
-# ╠═eb7ba436-d23b-4e97-af92-81271fa76989
-# ╠═4f1d3da9-370c-42c2-9d17-a3caffca638d
+# ╟─f16ef748-7c86-11ec-10a5-830de8dd2a2e
+# ╟─e99b72b2-8939-430c-b8b3-25155559e7dc
+# ╠═55449e27-c8db-4593-bc3b-0011179c6b20
+# ╠═9d42b339-f64d-4ce8-b765-0ebd060dec55
+# ╠═d555a75d-eed6-4cb8-82a0-53f84ceb982a
+# ╠═db8041c4-645c-4af9-8d33-aa4dfd45ea5f
+# ╠═42a5bed8-c761-4e9d-907d-25d49157647b
+# ╠═7c4496e7-5b21-4748-9877-bff4a7ae5752
+# ╠═04faa311-541d-44c7-a189-e390c5cbdef9
+# ╠═3490d653-47da-4cea-939e-076ad38558d7
+# ╠═1fc087ca-70b3-43d2-8793-70131227329f
+# ╟─7150f6b7-aa4f-44bf-a751-9c34c4a1c981
+# ╠═e7f324d7-e4b0-498a-a8a2-f94f52a9453d
+# ╠═fb917588-1499-433b-aeba-e6833346c968
+# ╠═d4f1ec8b-7597-45bf-9cea-4770802d516b
+# ╠═a68c8859-d7dd-4e8d-9996-f81216b84355
+# ╠═589ee4e7-8fec-424a-82f7-cf0a700bf20a
+# ╠═5e9f4f30-39f5-4c1d-b94d-4d937d37c47f
+# ╟─b371f04d-0a89-4aa9-a03a-7c903270fd20
+# ╠═3749489b-49d3-4187-a2f6-1dddc0e97f92
+# ╠═ed56bd75-8d7d-45ec-a3f9-c440141f7633
+# ╠═91b12b1c-1590-421e-8904-6b728bbf004d
+# ╟─00000000-0000-0000-0000-000000000001
+# ╟─00000000-0000-0000-0000-000000000002
\ No newline at end of file

From 615b944cdcd07a7ffc3ddc7f64c5c5a9cf869189 Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Wed, 2 Feb 2022 00:27:37 +0100
Subject: [PATCH 070/821] Fix bundling of esm.sh dependency

---
 frontend/components/CellInput/lezer_template.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/CellInput/lezer_template.js b/frontend/components/CellInput/lezer_template.js
index d977c6b00d..7d4a1614b3 100644
--- a/frontend/components/CellInput/lezer_template.js
+++ b/frontend/components/CellInput/lezer_template.js
@@ -2,7 +2,7 @@ import { julia_andrey, NodeProp, syntaxTree, Text } from "../../imports/Codemirr
 import lodash from "../../imports/lodash.js"
 
 // @ts-ignore
-import ManyKeysWeakMap from "https://esm.sh/many-keys-weakmap@1.0.0"
+import ManyKeysWeakMap from "https://cdn.esm.sh/v64/many-keys-weakmap@1.0.0/es2021/many-keys-weakmap.js"
 
 /**
  * @param {string} julia_code

From 2d7e783ee0401b7b87c9348b5f9f06491c478b8f Mon Sep 17 00:00:00 2001
From: Michael Hatherly <michaelhatherly@gmail.com>
Date: Tue, 1 Feb 2022 23:57:37 +0000
Subject: [PATCH 071/821] Fix #1852, relocatable changes for sysimage usage.
 (#1853)

Uses `RelocatableFolders` to store all files that may be accessed
at runtime rather than baking in their file paths, which won't
point to valid file paths once a system image is created containing
`Pluto` and then moved to a different machine/system.

Co-authored-by: Michiel Dral <m.c.dral@gmail.com>
---
 Project.toml                       |  2 ++
 src/Pluto.jl                       | 20 ++++++++++++++++++--
 src/evaluation/WorkspaceManager.jl |  6 +++---
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Project.toml b/Project.toml
index 6bf870218f..bcf4394c2d 100644
--- a/Project.toml
+++ b/Project.toml
@@ -18,6 +18,7 @@ Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 MsgPack = "99f44e22-a591-53d1-9472-aa23ef4bd671"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
@@ -27,6 +28,7 @@ Configurations = "0.15, 0.16, 0.17"
 FuzzyCompletions = "0.3,0.4"
 HTTP = "^0.9.1"
 MsgPack = "1.1"
+RelocatableFolders = "0.1"
 Tables = "1"
 julia = "^1.5"
 
diff --git a/src/Pluto.jl b/src/Pluto.jl
index e603983197..e6c3ff3bb5 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -9,12 +9,28 @@ Have a look at the FAQ:
 https://github.com/fonsp/Pluto.jl/wiki
 """
 module Pluto
-project_relative_path(xs...) = normpath(joinpath(pkgdir(Pluto), xs...))
+
+import RelocatableFolders: @path
+const ROOT_DIR = normpath(joinpath(@__DIR__, ".."))
+const FRONTEND_DIR = @path(joinpath(ROOT_DIR, "frontend"))
+const FRONTEND_DIST_DIR = let dir = joinpath(ROOT_DIR, "frontend-dist")
+    isdir(dir) ? @path(dir) : FRONTEND_DIR
+end
+const frontend_dist_exists = FRONTEND_DIR !== FRONTEND_DIST_DIR
+const SAMPLE_DIR = @path(joinpath(ROOT_DIR, "sample"))
+const RUNNER_DIR = @path(joinpath(ROOT_DIR, "src", "runner"))
+function project_relative_path(root, xs...)
+    root == joinpath("src", "runner") ? joinpath(RUNNER_DIR, xs...) :
+    root == "frontend-dist" && frontend_dist_exists ? joinpath(FRONTEND_DIST_DIR, xs...) :
+    root == "frontend" ? joinpath(FRONTEND_DIR, xs...) :
+    root == "sample" ? joinpath(SAMPLE_DIR, xs...) :
+        normpath(joinpath(pkgdir(Pluto), root, xs...))
+end
 
 import Pkg
 
 include_dependency("../Project.toml")
-const PLUTO_VERSION = VersionNumber(Pkg.TOML.parsefile(project_relative_path("Project.toml"))["version"])
+const PLUTO_VERSION = VersionNumber(Pkg.TOML.parsefile(joinpath(ROOT_DIR, "Project.toml"))["version"])
 const PLUTO_VERSION_STR = 'v' * string(PLUTO_VERSION)
 const JULIA_VERSION_STR = 'v' * string(VERSION)
 
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index fc57e0ca2f..62f2b3b0c9 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -22,9 +22,9 @@ Base.@kwdef mutable struct Workspace
 end
 
 "These expressions get evaluated whenever a new `Workspace` process is created."
-const process_preamble = quote
+process_preamble() = quote
     ccall(:jl_exit_on_sigint, Cvoid, (Cint,), 0)
-    include($(project_relative_path("src", "runner", "Loader.jl")))
+    include($(project_relative_path(joinpath("src", "runner"), "Loader.jl")))
     ENV["GKSwstype"] = "nul"
     ENV["JULIA_REVISE_WORKER_ONLY"] = "1"
 end
@@ -217,7 +217,7 @@ function create_workspaceprocess(;compiler_options=CompilerOptions())::Integer
         $(Distributed_expr).addprocs(1; exeflags=$(_convert_to_flags(compiler_options))) |> first
     end)
 
-    Distributed.remotecall_eval(Main, [pid], process_preamble)
+    Distributed.remotecall_eval(Main, [pid], process_preamble())
 
     # so that we NEVER break the workspace with an interrupt 🤕
     @async Distributed.remotecall_eval(Main, [pid],

From 918ebbb179a5449c1332c7bf16ad2951afe81e41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Wed, 2 Feb 2022 13:35:45 +0200
Subject: [PATCH 072/821] Re-enable parseMixed (#1855)

---
 frontend/components/CellInput.js              | 299 ++++++++++++++----
 .../CellInput/comment_mixed_parsers.js        | 171 ++++++++++
 frontend/components/CellInput/mixedParsers.js |  76 +++--
 frontend/dark_color.css                       |  11 +
 frontend/light_color.css                      |   9 +
 5 files changed, 480 insertions(+), 86 deletions(-)
 create mode 100644 frontend/components/CellInput/comment_mixed_parsers.js

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 8605ed0b67..b286692577 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -34,7 +34,6 @@ import {
     closeBracketsKeymap,
     searchKeymap,
     foldKeymap,
-    commentKeymap,
     syntaxTree,
     Decoration,
     ViewUpdate,
@@ -44,6 +43,10 @@ import {
     StateField,
     StateEffect,
     autocomplete,
+    htmlLanguage,
+    markdownLanguage,
+    javascriptLanguage,
+    pythonLanguage,
 } from "../imports/CodemirrorPlutoSetup.js"
 
 import { markdown, html as htmlLang, javascript, sqlLang, python, julia_andrey } from "./CellInput/mixedParsers.js"
@@ -55,77 +58,232 @@ import { pluto_paste_plugin } from "./CellInput/pluto_paste_plugin.js"
 import { bracketMatching } from "./CellInput/block_matcher_plugin.js"
 import { cl } from "../common/ClassTable.js"
 import { HighlightLineFacet, highlightLinePlugin } from "./CellInput/highlight_line.js"
+import { commentKeymap } from "./CellInput/comment_mixed_parsers.js"
 import { debug_syntax_plugin } from "./CellInput/debug_syntax_plugin.js"
 import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
 
-export const pluto_syntax_colors = HighlightStyle.define([
-    /* The following three need a specific version of the julia parser, will add that later (still messing with it 😈) */
-    // Symbol
-    // { tag: tags.controlKeyword, color: "var(--cm-keyword-color)", fontWeight: 700 },
-
-    { tag: tags.propertyName, color: "var(--cm-property-color)" },
-    { tag: tags.unit, color: "var(--cm-tag-color)" },
-    { tag: tags.literal, color: "var(--cm-builtin-color)", fontWeight: 700 },
-    { tag: tags.macroName, color: "var(--cm-macro-color)", fontWeight: 700 },
-
-    // `nothing` I guess... Any others?
+export const pluto_syntax_colors = HighlightStyle.define(
+    [
+        /* The following three need a specific version of the julia parser, will add that later (still messing with it 😈) */
+        // Symbol
+        // { tag: tags.controlKeyword, color: "var(--cm-keyword-color)", fontWeight: 700 },
+
+        { tag: tags.propertyName, color: "var(--cm-property-color)" },
+        { tag: tags.unit, color: "var(--cm-tag-color)" },
+        { tag: tags.literal, color: "var(--cm-builtin-color)", fontWeight: 700 },
+        { tag: tags.macroName, color: "var(--cm-macro-color)", fontWeight: 700 },
+
+        // `nothing` I guess... Any others?
+        {
+            tag: tags.standard(tags.variableName),
+            color: "var(--cm-builtin-color)",
+            fontWeight: 700,
+        },
+
+        { tag: tags.bool, color: "var(--cm-builtin-color)", fontWeight: 700 },
+
+        { tag: tags.keyword, color: "var(--cm-keyword-color)" },
+        { tag: tags.comment, color: "var(--cm-comment-color)", fontStyle: "italic" },
+        { tag: tags.atom, color: "var(--cm-atom-color)" },
+        { tag: tags.number, color: "var(--cm-number-color)" },
+        // { tag: tags.property, color: "#48b685" },
+        // { tag: tags.attribute, color: "#48b685" },
+        { tag: tags.keyword, color: "var(--cm-keyword-color)" },
+        { tag: tags.string, color: "var(--cm-string-color)" },
+        { tag: tags.variableName, color: "var(--cm-var-color)", fontWeight: 700 },
+        // { tag: tags.variable2, color: "#06b6ef" },
+        { tag: tags.typeName, color: "var(--cm-type-color)", fontStyle: "italic" },
+        { tag: tags.typeOperator, color: "var(--cm-type-color)", fontStyle: "italic" },
+        { tag: tags.bracket, color: "var(--cm-bracket-color)" },
+        { tag: tags.brace, color: "var(--cm-bracket-color)" },
+        { tag: tags.tagName, color: "var(--cm-tag-color)" },
+        { tag: tags.link, color: "var(--cm-link-color)" },
+        {
+            tag: tags.invalid,
+            color: "var(--cm-error-color)",
+            background: "var(--cm-error-bg-color)",
+        },
+    ],
+    {
+        all: { color: `var(--cm-editor-text-color)` },
+        scope: julia_andrey().language.topNode,
+    }
+)
+
+export const pluto_syntax_colors_javascript = HighlightStyle.define(
+    [
+        // SAME AS JULIA:
+        { tag: tags.propertyName, color: "var(--cm-property-color)" },
+        { tag: tags.unit, color: "var(--cm-tag-color)" },
+        { tag: tags.literal, color: "var(--cm-builtin-color)", fontWeight: 700 },
+        { tag: tags.macroName, color: "var(--cm-macro-color)", fontWeight: 700 },
+
+        // `nothing` I guess... Any others?
+        {
+            tag: tags.standard(tags.variableName),
+            color: "var(--cm-builtin-color)",
+            fontWeight: 700,
+        },
+
+        { tag: tags.bool, color: "var(--cm-builtin-color)", fontWeight: 700 },
+
+        { tag: tags.keyword, color: "var(--cm-keyword-color)" },
+        { tag: tags.atom, color: "var(--cm-atom-color)" },
+        { tag: tags.number, color: "var(--cm-number-color)" },
+        // { tag: tags.property, color: "#48b685" },
+        // { tag: tags.attribute, color: "#48b685" },
+        { tag: tags.keyword, color: "var(--cm-keyword-color)" },
+        { tag: tags.string, color: "var(--cm-string-color)" },
+        { tag: tags.variableName, color: "var(--cm-var-color)", fontWeight: 700 },
+        // { tag: tags.variable2, color: "#06b6ef" },
+        { tag: tags.typeName, color: "var(--cm-type-color)", fontStyle: "italic" },
+        { tag: tags.typeOperator, color: "var(--cm-type-color)", fontStyle: "italic" },
+        { tag: tags.bracket, color: "var(--cm-bracket-color)" },
+        { tag: tags.brace, color: "var(--cm-bracket-color)" },
+        { tag: tags.tagName, color: "var(--cm-tag-color)" },
+        { tag: tags.link, color: "var(--cm-link-color)" },
+        {
+            tag: tags.invalid,
+            color: "var(--cm-error-color)",
+            background: "var(--cm-error-bg-color)",
+        },
+
+        // JAVASCRIPT SPECIFIC
+        { tag: tags.comment, color: "var(--cm-comment-color)", fontStyle: "italic", filter: "none" },
+    ],
+    {
+        scope: javascriptLanguage.topNode,
+        all: {
+            color: `var(--cm-editor-text-color)`,
+            filter: `contrast(0.5)`,
+        },
+    }
+)
+
+export const pluto_syntax_colors_python = HighlightStyle.define(
+    [
+        // SAME AS JULIA:
+        { tag: tags.propertyName, color: "var(--cm-property-color)" },
+        { tag: tags.unit, color: "var(--cm-tag-color)" },
+        { tag: tags.literal, color: "var(--cm-builtin-color)", fontWeight: 700 },
+        { tag: tags.macroName, color: "var(--cm-macro-color)", fontWeight: 700 },
+
+        // `nothing` I guess... Any others?
+        {
+            tag: tags.standard(tags.variableName),
+            color: "var(--cm-builtin-color)",
+            fontWeight: 700,
+        },
+
+        { tag: tags.bool, color: "var(--cm-builtin-color)", fontWeight: 700 },
+
+        { tag: tags.keyword, color: "var(--cm-keyword-color)" },
+        { tag: tags.comment, color: "var(--cm-comment-color)", fontStyle: "italic" },
+        { tag: tags.atom, color: "var(--cm-atom-color)" },
+        { tag: tags.number, color: "var(--cm-number-color)" },
+        // { tag: tags.property, color: "#48b685" },
+        // { tag: tags.attribute, color: "#48b685" },
+        { tag: tags.keyword, color: "var(--cm-keyword-color)" },
+        { tag: tags.string, color: "var(--cm-string-color)" },
+        { tag: tags.variableName, color: "var(--cm-var-color)", fontWeight: 700 },
+        // { tag: tags.variable2, color: "#06b6ef" },
+        { tag: tags.typeName, color: "var(--cm-type-color)", fontStyle: "italic" },
+        { tag: tags.typeOperator, color: "var(--cm-type-color)", fontStyle: "italic" },
+        { tag: tags.bracket, color: "var(--cm-bracket-color)" },
+        { tag: tags.brace, color: "var(--cm-bracket-color)" },
+        { tag: tags.tagName, color: "var(--cm-tag-color)" },
+        { tag: tags.link, color: "var(--cm-link-color)" },
+        {
+            tag: tags.invalid,
+            color: "var(--cm-error-color)",
+            background: "var(--cm-error-bg-color)",
+        },
+
+        // PYTHON SPECIFIC
+    ],
     {
-        tag: tags.standard(tags.variableName),
-        color: "var(--cm-builtin-color)",
-        fontWeight: 700,
-    },
-
-    { tag: tags.bool, color: "var(--cm-builtin-color)", fontWeight: 700 },
-
-    { tag: tags.keyword, color: "var(--cm-keyword-color)" },
-    { tag: tags.comment, color: "var(--cm-comment-color)", fontStyle: "italic" },
-    { tag: tags.atom, color: "var(--cm-atom-color)" },
-    { tag: tags.number, color: "var(--cm-number-color)" },
-    // { tag: tags.property, color: "#48b685" },
-    // { tag: tags.attribute, color: "#48b685" },
-    { tag: tags.keyword, color: "var(--cm-keyword-color)" },
-    { tag: tags.string, color: "var(--cm-string-color)" },
-    { tag: tags.variableName, color: "var(--cm-var-color)", fontWeight: 700 },
-    // { tag: tags.variable2, color: "#06b6ef" },
-    { tag: tags.typeName, color: "var(--cm-type-color)", fontStyle: "italic" },
-    { tag: tags.typeOperator, color: "var(--cm-type-color)", fontStyle: "italic" },
-    { tag: tags.bracket, color: "var(--cm-bracket-color)" },
-    { tag: tags.brace, color: "var(--cm-bracket-color)" },
-    { tag: tags.tagName, color: "var(--cm-tag-color)" },
-    { tag: tags.link, color: "var(--cm-link-color)" },
+        scope: pythonLanguage.topNode,
+        all: {
+            color: "var(--cm-editor-text-color)",
+            filter: `contrast(0.5)`,
+        },
+    }
+)
+
+export const pluto_syntax_colors_css = HighlightStyle.define(
+    [
+        { tag: tags.propertyName, color: "var(--cm-css-accent-color)", fontWeight: 700 },
+        { tag: tags.variableName, color: "var(--cm-css-accent-color)", fontWeight: 700 },
+        { tag: tags.definitionOperator, color: "var(--cm-css-color)" },
+        { tag: tags.keyword, color: "var(--cm-css-color)" },
+        { tag: tags.modifier, color: "var(--cm-css-accent-color)" },
+        { tag: tags.punctuation, opacity: 0.5 },
+        { tag: tags.literal, color: "var(--cm-css-color)" },
+        // { tag: tags.unit, color: "var(--cm-css-accent-color)" },
+        { tag: tags.tagName, color: "var(--cm-css-color)", fontWeight: 700 },
+        { tag: tags.className, color: "var(--cm-css-why-doesnt-codemirror-highlight-all-the-text-aaa)" },
+        { tag: tags.constant(tags.className), color: "var(--cm-css-why-doesnt-codemirror-highlight-all-the-text-aaa)" },
+
+        // Comment from julia
+        { tag: tags.comment, color: "var(--cm-comment-color)", fontStyle: "italic" },
+    ],
+    {
+        // scope: CSS,
+        // But the css-lang packaged isn't in codemirror pluto setup and I can't be arsed now.
+        all: { color: "var(--cm-css-color)" },
+    }
+)
+
+export const pluto_syntax_colors_html = HighlightStyle.define(
+    [
+        { tag: tags.tagName, color: "var(--cm-html-accent-color)", fontWeight: 600 },
+        { tag: tags.attributeName, color: "var(--cm-html-accent-color)", fontWeight: 600 },
+        { tag: tags.attributeValue, color: "var(--cm-html-accent-color)" },
+        { tag: tags.angleBracket, color: "var(--cm-html-accent-color)", fontWeight: 600 },
+        { tag: tags.content, color: "var(--cm-html-color)", fontWeight: 400 },
+        { tag: tags.documentMeta, color: "var(--cm-html-accent-color)" },
+        { tag: tags.comment, color: "var(--cm-comment-color)", fontStyle: "italic" },
+    ],
     {
-        tag: tags.invalid,
-        color: "var(--cm-error-color)",
-        background: "var(--cm-error-bg-color)",
-    },
-    // ...Object.keys(tags).map((x) => ({ tag: x, color: x })),
-
-    // Markdown
-    { tag: tags.heading, color: "#081e87", fontWeight: 500 },
-    { tag: tags.heading1, color: "#081e87", fontWeight: 500, fontSize: "1.5em" },
-    { tag: tags.heading2, color: "#081e87", fontWeight: 500, fontSize: "1.4em" },
-    { tag: tags.heading3, color: "#081e87", fontWeight: 500, fontSize: "1.25em" },
-    { tag: tags.heading4, color: "#081e87", fontWeight: 500, fontSize: "1.1em" },
-    { tag: tags.heading5, color: "#081e87", fontWeight: 500, fontSize: "1em" },
+        scope: htmlLanguage.topNode,
+        all: {
+            color: "var(--cm-html-color)",
+        },
+    }
+)
+
+// https://github.com/codemirror/lang-markdown/blob/main/src/markdown.ts
+export const pluto_syntax_colors_markdown = HighlightStyle.define(
+    [
+        { tag: tags.content, color: "var(--cm-md-color)" },
+        { tag: tags.quote, color: "var(--cm-md-color)" },
+        { tag: tags.link, textDecoration: "underline" },
+        { tag: tags.url, color: "var(--cm-md-color)", textDecoration: "none" },
+        { tag: tags.emphasis, fontStyle: "italic" },
+        { tag: tags.strong, fontWeight: "bolder" },
+
+        { tag: tags.heading, color: "var(--cm-md-color)", fontWeight: 700 },
+        {
+            tag: tags.comment,
+            color: "var(--cm-comment-color)",
+            fontStyle: "italic",
+        },
+        {
+            // These are all the things you won't see in the result:
+            // `-` bullet points, the `#` for headers, the `>` with quoteblocks.
+            tag: tags.processingInstruction,
+            color: "var(--cm-md-accent-color) !important",
+            opacity: "0.5",
+        },
+        { tag: tags.monospace, color: "var(--cm-md-accent-color)" },
+    ],
     {
-        tag: tags.heading6,
-        color: "#081e87",
-        fontWeight: "bold",
-        fontSize: "0.8em",
-    },
-    { tag: tags.url, color: "#48b685", textDecoration: "underline" },
-    { tag: tags.quote, color: "#444", fontStyle: "italic" },
-    { tag: tags.literal, color: "#232227", fontWeight: 700 },
-    // HTML
-    { tag: tags.tagName, color: "#01654f", fontWeight: 600 },
-    { tag: tags.attributeName, color: "#01654f", fontWeight: 400 },
-    { tag: tags.attributeValue, color: "#01654f", fontWeight: 600 },
-    { tag: tags.angleBracket, color: "#01654f", fontWeight: 600 },
-    { tag: tags.content, color: "#232227", fontWeight: 400 },
-    { tag: tags.documentMeta, color: "#232227", fontStyle: "italic" },
-    // CSS
-    { tag: tags.className, color: "grey", fontWeight: "bold" },
-])
+        scope: markdownLanguage.topNode,
+        all: {
+            color: "var(--cm-md-color)",
+        },
+    }
+)
 
 const getValue6 = (/** @type {EditorView} */ cm) => cm.state.doc.toString()
 const setValue6 = (/** @type {EditorView} */ cm, value) =>
@@ -409,6 +567,11 @@ export const CellInput = ({
                     pkgBubblePlugin({ pluto_actions, notebook_id }),
                     ScopeStateField,
                     pluto_syntax_colors,
+                    pluto_syntax_colors_html,
+                    pluto_syntax_colors_markdown,
+                    pluto_syntax_colors_javascript,
+                    pluto_syntax_colors_python,
+                    pluto_syntax_colors_css,
                     lineNumbers(),
                     highlightSpecialChars(),
                     history(),
@@ -456,7 +619,9 @@ export const CellInput = ({
                     EditorState.tabSize.of(4),
                     indentUnit.of("\t"),
                     julia_andrey(),
-                    markdown(),
+                    markdown({
+                        defaultCodeLanguage: julia_andrey(),
+                    }),
                     htmlLang(), //Provides tag closing!,
                     javascript(),
                     python(),
diff --git a/frontend/components/CellInput/comment_mixed_parsers.js b/frontend/components/CellInput/comment_mixed_parsers.js
new file mode 100644
index 0000000000..9f2684c2a5
--- /dev/null
+++ b/frontend/components/CellInput/comment_mixed_parsers.js
@@ -0,0 +1,171 @@
+// This is "just" https://github.com/codemirror/comment/blob/da336b8660dedab23e06ced2b430f2ac56ef202d/src/comment.ts
+// (@codemirror/comment)
+// But with a change that helps mixed parser environments:
+// If the comment-style (`#`, `//`, `/* */`, etc) at the begin and end of the selection is the same,
+// we don't use the comment-style per line, but use the begin/end style for every line.
+
+import { EditorSelection, EditorState } from "../../imports/CodemirrorPlutoSetup.js"
+
+/// Comment or uncomment the current selection. Will use line comments
+/// if available, otherwise falling back to block comments.
+export const toggleComment = (target) => {
+    let config = getConfig(target.state)
+    return config.line ? toggleLineComment(target) : config.block ? toggleBlockComment(target) : false
+}
+function command(f, option) {
+    return ({ state, dispatch }) => {
+        if (state.readOnly) return false
+        let tr = f(option, state.selection.ranges, state)
+        if (!tr) return false
+        dispatch(state.update(tr))
+        return true
+    }
+}
+/// Comment or uncomment the current selection using line comments.
+/// The line comment syntax is taken from the
+/// [`commentTokens`](#comment.CommentTokens) [language
+/// data](#state.EditorState.languageDataAt).
+export const toggleLineComment = command(changeLineComment, 0 /* Toggle */)
+/// Comment the current selection using line comments.
+export const lineComment = command(changeLineComment, 1 /* Comment */)
+/// Uncomment the current selection using line comments.
+export const lineUncomment = command(changeLineComment, 2 /* Uncomment */)
+/// Comment or uncomment the current selection using block comments.
+/// The block comment syntax is taken from the
+/// [`commentTokens`](#comment.CommentTokens) [language
+/// data](#state.EditorState.languageDataAt).
+export const toggleBlockComment = command(changeBlockComment, 0 /* Toggle */)
+/// Comment the current selection using block comments.
+export const blockComment = command(changeBlockComment, 1 /* Comment */)
+/// Uncomment the current selection using block comments.
+export const blockUncomment = command(changeBlockComment, 2 /* Uncomment */)
+/// Default key bindings for this package.
+///
+///  - Ctrl-/ (Cmd-/ on macOS): [`toggleComment`](#comment.toggleComment).
+///  - Shift-Alt-a: [`toggleBlockComment`](#comment.toggleBlockComment).
+export const commentKeymap = [
+    { key: "Mod-/", run: toggleComment },
+    { key: "Alt-A", run: toggleBlockComment },
+]
+/**
+ * @param {EditorState} state
+ */
+function getConfig(state, pos = state.selection.main.head) {
+    let data = state.languageDataAt("commentTokens", pos)
+    return data.length ? data[0] : {}
+}
+const SearchMargin = 50
+/// Determines if the given range is block-commented in the given
+/// state.
+function findBlockComment(state, { open, close }, from, to) {
+    let textBefore = state.sliceDoc(from - SearchMargin, from)
+    let textAfter = state.sliceDoc(to, to + SearchMargin)
+    let spaceBefore = /\s*$/.exec(textBefore)[0].length,
+        spaceAfter = /^\s*/.exec(textAfter)[0].length
+    let beforeOff = textBefore.length - spaceBefore
+    if (textBefore.slice(beforeOff - open.length, beforeOff) == open && textAfter.slice(spaceAfter, spaceAfter + close.length) == close) {
+        return { open: { pos: from - spaceBefore, margin: spaceBefore && 1 }, close: { pos: to + spaceAfter, margin: spaceAfter && 1 } }
+    }
+    let startText, endText
+    if (to - from <= 2 * SearchMargin) {
+        startText = endText = state.sliceDoc(from, to)
+    } else {
+        startText = state.sliceDoc(from, from + SearchMargin)
+        endText = state.sliceDoc(to - SearchMargin, to)
+    }
+    let startSpace = /^\s*/.exec(startText)[0].length,
+        endSpace = /\s*$/.exec(endText)[0].length
+    let endOff = endText.length - endSpace - close.length
+    if (startText.slice(startSpace, startSpace + open.length) == open && endText.slice(endOff, endOff + close.length) == close) {
+        return {
+            open: { pos: from + startSpace + open.length, margin: /\s/.test(startText.charAt(startSpace + open.length)) ? 1 : 0 },
+            close: { pos: to - endSpace - close.length, margin: /\s/.test(endText.charAt(endOff - 1)) ? 1 : 0 },
+        }
+    }
+    return null
+}
+// Performs toggle, comment and uncomment of block comments in
+// languages that support them.
+function changeBlockComment(option, ranges, state) {
+    let tokens = ranges.map((r) => getConfig(state, r.from).block)
+    if (!tokens.every((c) => c)) return null
+    let comments = ranges.map((r, i) => findBlockComment(state, tokens[i], r.from, r.to))
+    if (option != 2 /* Uncomment */ && !comments.every((c) => c)) {
+        let index = 0
+        return state.changeByRange((range) => {
+            let { open, close } = tokens[index++]
+            if (comments[index]) return { range }
+            let shift = open.length + 1
+            return {
+                changes: [
+                    { from: range.from, insert: open + " " },
+                    { from: range.to, insert: " " + close },
+                ],
+                range: EditorSelection.range(range.anchor + shift, range.head + shift),
+            }
+        })
+    } else if (option != 1 /* Comment */ && comments.some((c) => c)) {
+        let changes = []
+        for (let i = 0, comment; i < comments.length; i++)
+            if ((comment = comments[i])) {
+                let token = tokens[i],
+                    { open, close } = comment
+                changes.push(
+                    { from: open.pos - token.open.length, to: open.pos + open.margin },
+                    { from: close.pos - close.margin, to: close.pos + token.close.length }
+                )
+            }
+        return { changes }
+    }
+    return null
+}
+// Performs toggle, comment and uncomment of line comments.
+function changeLineComment(option, ranges, state) {
+    let lines = []
+    let prevLine = -1
+    for (let { from, to } of ranges) {
+        // DRAL EDIIIIIITS
+        // If the comment tokens at the begin and end are the same,
+        // I assume we want these for the whole range!
+        let comment_token_from = getConfig(state, from).line
+        let comment_token_to = getConfig(state, to).line
+        let overwrite_token = comment_token_from === comment_token_to ? comment_token_from : null
+
+        let startI = lines.length,
+            minIndent = 1e9
+        for (let pos = from; pos <= to; ) {
+            let line = state.doc.lineAt(pos)
+            if (line.from > prevLine && (from == to || to > line.from)) {
+                prevLine = line.from
+                // DRAL EDIIIIIIIITS
+                let token = overwrite_token ?? getConfig(state, pos).line
+                if (!token) continue
+                let indent = /^\s*/.exec(line.text)[0].length
+                let empty = indent == line.length
+                let comment = line.text.slice(indent, indent + token.length) == token ? indent : -1
+                if (indent < line.text.length && indent < minIndent) minIndent = indent
+                lines.push({ line, comment, token, indent, empty, single: false })
+            }
+            pos = line.to + 1
+        }
+        if (minIndent < 1e9) for (let i = startI; i < lines.length; i++) if (lines[i].indent < lines[i].line.text.length) lines[i].indent = minIndent
+        if (lines.length == startI + 1) lines[startI].single = true
+    }
+    if (option != 2 /* Uncomment */ && lines.some((l) => l.comment < 0 && (!l.empty || l.single))) {
+        let changes = []
+        for (let { line, token, indent, empty, single } of lines) if (single || !empty) changes.push({ from: line.from + indent, insert: token + " " })
+        let changeSet = state.changes(changes)
+        return { changes: changeSet, selection: state.selection.map(changeSet, 1) }
+    } else if (option != 1 /* Comment */ && lines.some((l) => l.comment >= 0)) {
+        let changes = []
+        for (let { line, comment, token } of lines)
+            if (comment >= 0) {
+                let from = line.from + comment,
+                    to = from + token.length
+                if (line.text[to - line.from] == " ") to++
+                changes.push({ from, to })
+            }
+        return { changes }
+    }
+    return null
+}
diff --git a/frontend/components/CellInput/mixedParsers.js b/frontend/components/CellInput/mixedParsers.js
index 788be06c0e..aab8abba04 100644
--- a/frontend/components/CellInput/mixedParsers.js
+++ b/frontend/components/CellInput/mixedParsers.js
@@ -17,15 +17,41 @@ import {
 } from "../../imports/CodemirrorPlutoSetup.js"
 
 const htmlParser = htmlLanguage.parser
-const mdParser = markdownLanguage.parser
 const mdParserExt = markdownLanguage.parser.configure(parseCode({ htmlParser }))
 const postgresParser = PostgreSQL.language.parser
 const sqlLang = sql({ dialect: PostgreSQL })
 const pythonParser = pythonLanguage.parser
 
-const MD_SIMPLE_TAGS = ["md", "mermaid"].flatMap((x) => [x, `@${x}`])
-const MD_EXTENDED_TAGS = ["cm", "markdown", "mdx", "mdl", "markdownliteral"].flatMap((x) => [x, `@${x}`])
+/**
+ * Markdown tags list; we create both `md""` and `@md("")` instances.
+ */
+const MD_TAGS = ["md", "mermaid", "cm", "markdown", "mdx", "mdl", "markdownliteral"].flatMap((x) => [x, `@${x}`])
 
+/**
+ * Julia strings are do not represent the exact code that is going to run
+ * for example the following julia string:
+ *
+ * ```julia
+ * """
+ * const test = "five"
+ * const five = \${test}
+ * """
+ * ```
+ *
+ * is going to be executed as javascript, after escaping the \$ to $
+ *
+ * ```javascript
+ * """
+ * const test = "five"
+ * const five = ${test}
+ * """
+ * ```
+ *
+ * The overlays already remove the string interpolation parts of the julia string.
+ * This hack additionally removes the `\` from the overlay for common interpolations, so the underlaying parser
+ * will get the javascript version of the string, and not the julia version of the string (which is invalid js)
+ *
+ */
 const overlayHack = (overlay, input) => {
     return overlay.flatMap(({ from, to }) => {
         const text = input.read(from, to)
@@ -47,11 +73,23 @@ const overlayHack = (overlay, input) => {
     })
 }
 
+const STRING_NODE_NAMES = new Set([
+    "TripleString",
+    "String",
+    "CommandString",
+    "TripleStringWithoutInterpolation",
+    "StringWithoutInterpolation",
+    "CommandStringWithoutInterpolation",
+])
+
 const juliaWrapper = parseMixed((node, input) => {
-    if (!["TripleString", "String", "CommandString"].includes(node.type.name)) {
+    if (!STRING_NODE_NAMES.has(node.type.name)) {
         return null
     }
-    const offset = node.name === "TripleString" ? 3 : 1
+
+    let is_tripple_string = node.name === "TripleString" || node.name === "TripleStringWithoutInterpolation"
+
+    const offset = is_tripple_string ? 3 : 1
     const defaultOverlay = [{ from: node.from + offset, to: Math.min(node.to - offset, input.length) }]
 
     if (defaultOverlay[0].from >= defaultOverlay[0].to) {
@@ -69,19 +107,13 @@ const juliaWrapper = parseMixed((node, input) => {
     let parser,
         overlay = []
 
-    if (tag === "@htl") {
+    if (tag === "@htl" || tag === "html") {
         parser = htmlParser
-    } else if (tag === "html") {
-        parser = htmlParser
-        overlay = defaultOverlay
-    } else if (MD_SIMPLE_TAGS.includes(tag)) {
-        parser = mdParser
-        overlay = defaultOverlay
-    } else if (MD_EXTENDED_TAGS.includes(tag)) {
+    } else if (MD_TAGS.includes(tag)) {
         parser = mdParserExt
-    } else if (tag === "@javascript") {
+    } else if (tag === "@javascript" || tag === "@js" || tag === "js" || tag === "javascript") {
         parser = javascriptLanguage.parser
-    } else if (tag === "py" || tag === "pyr" || tag === "python") {
+    } else if (tag === "py" || tag === "pyr" || tag === "python" || tag === "@python") {
         parser = pythonParser
     } else if (tag === "sql") {
         parser = postgresParser
@@ -94,6 +126,7 @@ const juliaWrapper = parseMixed((node, input) => {
         overlay.push({ from, to: child.from })
         from = child.to
     }
+
     // If overlay is not the default and we haven't found anything (=interpolation) inside, use the default
     if (overlay.length === 0 || node.node.firstChild === null) {
         overlay = defaultOverlay
@@ -116,17 +149,22 @@ const juliaWrapper = parseMixed((node, input) => {
 
     // If javascript or markdown or htl, we want to unescape some characters
     // Until the parser is smarter, we remove the selection from the syntax highlighting overlay.
-    if (["@htl", "@javascript", ...MD_EXTENDED_TAGS].includes(tag)) {
+    if (["@htl", "@javascript", ...MD_TAGS].includes(tag)) {
         overlay = overlayHack(overlay, input)
     }
+
+    // No overlays for markdown yet
+    if ([...MD_TAGS].includes(tag)) {
+        return { parser, overlay: defaultOverlay }
+    }
+
     return { parser, overlay }
 })
 
 const julia_andrey = (config) => {
     const julia = julia_andrey_original(config)
-    /* We need to revert this due to https://github.com/fonsp/Pluto.jl/issues/1800 - fix is WIP
-        julia.language.parser = julia.language.parser.configure({ wrap: juliaWrapper })
-    */
+    // @ts-ignore
+    julia.language.parser = julia.language.parser.configure({ wrap: juliaWrapper })
     return julia
 }
 
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index 2b686f0d37..c995ce31f4 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -186,6 +186,17 @@
 
         /* docs binding */
         --docs-binding-bg: #323431;
+
+        /* Nesed languages in codemirror! */
+        --cm-html-color: #00ab85;
+        --cm-html-accent-color: #00e7b4;
+        --cm-css-color: #ebd073;
+        --cm-css-accent-color: #fffed2;
+        /* This is basically --cm-css-accent-color, but because the CSS plugin shows some characters in plain white,
+            this is made also a liiiitle lighter so it doesn't stand out too much against the white prefix */
+        --cm-css-why-doesnt-codemirror-highlight-all-the-text-aaa: #ffffea;
+        --cm-md-color: #a2c9d5;
+        --cm-md-accent-color: #00a9d1;
     }
     body:not(.disable_ui):not(.more-specificity) {
         /* background by SVGBackgrounds.com */
diff --git a/frontend/light_color.css b/frontend/light_color.css
index b28956de9b..42244c8ad3 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -187,5 +187,14 @@
         --index-text-color: hsl(0, 0, 60);
         --index-clickable-text-color: hsl(0, 0, 30);
         --docs-binding-bg: #8383830a;
+
+        /* HTML in codemirror! */
+        --cm-html-color: #48b685;
+        --cm-html-accent-color: #00ab85;
+        --cm-css-color: #876800;
+        --cm-css-accent-color: #696200;
+        --cm-css-why-doesnt-codemirror-highlight-all-the-text-aaa: #3b3700;
+        --cm-md-color: #005a9b;
+        --cm-md-accent-color: #00a9d1;
     }
 }

From a166aec5b6767400f703811980bfc30a6f32a0c1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 2 Feb 2022 20:03:21 +0100
Subject: [PATCH 073/821] whitespace

---
 src/webserver/WebServer.jl | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index a19ec870c0..4db0a42261 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -125,14 +125,16 @@ function run(session::ServerSession, pluto_router)
     open_notebook!(session, notebook_at_startup)
 
     host = session.options.server.host
-    port = session.options.server.port
-
     hostIP = parse(Sockets.IPAddr, host)
-    if port === nothing
+    favourite_port = session.options.server.port
+    
+    local port, serversocket
+    if favourite_port === nothing
         port, serversocket = Sockets.listenany(hostIP, UInt16(1234))
     else
+        port = UInt16(favourite_port)
         try
-            serversocket = Sockets.listen(hostIP, UInt16(port))
+            serversocket = Sockets.listen(hostIP, port)
         catch e
             @error "Port with number $port is already in use. Use Pluto.run() to automatically select an available port."
             return
@@ -141,7 +143,7 @@ function run(session::ServerSession, pluto_router)
 
     shutdown_server = Ref{Function}(() -> ())
 
-    servertask = @async HTTP.serve(hostIP, UInt16(port), stream=true, server=serversocket) do http::HTTP.Stream
+    servertask = @async HTTP.serve(hostIP, port, stream=true, server=serversocket) do http::HTTP.Stream
         # messy messy code so that we can use the websocket on the same port as the HTTP server
         if HTTP.WebSockets.is_upgrade(http.message)
             secret_required = let

From 7e153ff8090c7277b25e90f7eb7d36cd05378c12 Mon Sep 17 00:00:00 2001
From: Connor Burns <ctrekker4@gmail.com>
Date: Wed, 2 Feb 2022 12:04:08 -0700
Subject: [PATCH 074/821] Server start event (#1882)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 src/notebook/Events.jl     |  7 +++++++
 src/webserver/WebServer.jl | 13 +++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/notebook/Events.jl b/src/notebook/Events.jl
index 75bd16ffc3..26df8e1f95 100644
--- a/src/notebook/Events.jl
+++ b/src/notebook/Events.jl
@@ -45,6 +45,13 @@ function try_event_call(session, event::PlutoEvent)
     end
 end
 
+
+# Triggered when the web server gets started
+struct ServerStartEvent <: PlutoEvent
+    address::String
+    port::UInt16
+end
+
 # Triggered when a notebook is saved
 struct FileSaveEvent <: PlutoEvent
     notebook::Notebook
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 4db0a42261..05c30982a7 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -253,14 +253,12 @@ function run(session::ServerSession, pluto_router)
     catch
         false
     end
+    # Wait for the server to start up before opening the browser. We have a 5 second grace period for allowing the connection, and then 10 seconds for the server to write data.
+    WorkspaceManager.poll(server_running, 5.0, 1.0)
     
     address = pretty_address(session, hostIP, port)
     println()
-    if session.options.server.launch_browser && (
-        # Wait for the server to start up before opening the browser. We have a 5 second grace period for allowing the connection, and then 10 seconds for the server to write data.
-        WorkspaceManager.poll(server_running, 5.0, 1.0) && 
-        open_in_default_browser(address)
-    )
+    if session.options.server.launch_browser && open_in_default_browser(address)
         println("Opening $address in your default browser... ~ have fun!")
     else
         println("Go to $address in your browser to start writing ~ have fun!")
@@ -268,11 +266,14 @@ function run(session::ServerSession, pluto_router)
     println()
     println("Press Ctrl+C in this terminal to stop Pluto")
     println()
+    
+    # Trigger ServerStartEvent with server details
+    try_event_call(session, ServerStartEvent(address, port))
 
     if PLUTO_VERSION >= v"0.17.6" && frontend_directory() == "frontend"
         @info "It looks like you are developing the Pluto package, using the unbundled frontend..."
     end
-    
+
     # Start this in the background, so that the first notebook launch (which will trigger registry update) will be faster
     @asynclog withtoken(pkg_token) do
         PkgCompat.update_registries(; force=false)

From d3bc5ec22c612da3df02026dd981a53223b129f3 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Wed, 2 Feb 2022 21:14:49 +0100
Subject: [PATCH 075/821] respect maxlog keyword for logs, fixes #1858 (#1877)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 src/evaluation/WorkspaceManager.jl | 20 +++++++++++++++++---
 src/runner/PlutoRunner.jl          |  2 +-
 test/Logging.jl                    | 30 ++++++++++++++++++++++++++++++
 test/runtests.jl                   |  2 ++
 4 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 test/Logging.jl

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 62f2b3b0c9..a606823c88 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -137,11 +137,11 @@ function start_relaying_logs((session, notebook)::SN, log_channel::Distributed.R
 
             fn = next_log["file"]
             match = findfirst("#==#", fn)
-            
+
             # We always show the log at the currently running cell, which is given by
-            running_cell_id = UUID(next_log["cell_id"])
+            running_cell_id = next_log["cell_id"]::UUID
             running_cell = notebook.cells_dict[running_cell_id]
-            
+
             # Some logs originate from outside of the running code, through function calls. Some code here to deal with that:
             begin
                 source_cell_id = if match !== nothing
@@ -163,6 +163,20 @@ function start_relaying_logs((session, notebook)::SN, log_channel::Distributed.R
                 end
             end
 
+            maybe_max_log = findfirst(((key, _),) -> key == "maxlog", next_log["kwargs"])
+            if maybe_max_log !== nothing
+                n_logs = count(log -> log["id"] == next_log["id"], running_cell.logs)
+                try
+                    max_log = parse(Int, next_log["kwargs"][maybe_max_log][2] |> first)
+
+                    # Don't show message with id more than max_log times
+                    if max_log isa Int && n_logs >= max_log
+                        return
+                    end
+                catch
+                end
+            end
+
             push!(running_cell.logs, next_log)
             Pluto.@asynclog update_throttled()
         catch e
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 46970f73f0..20f1653f8c 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -2005,7 +2005,7 @@ function Logging.handle_message(::PlutoLogger, level, msg, _module, group, id, f
             "file" => file,
             "cell_id" => currently_running_cell_id[],
             "line" => line,
-            "kwargs" => Any[(string(k), format_output_default(v)) for (k, v) in kwargs],
+            "kwargs" => Tuple{String,Any}[(string(k), format_output_default(v)) for (k, v) in kwargs],
             )
         )
         
diff --git a/test/Logging.jl b/test/Logging.jl
new file mode 100644
index 0000000000..eb0930cc7f
--- /dev/null
+++ b/test/Logging.jl
@@ -0,0 +1,30 @@
+using Test
+import UUIDs
+import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, ClientSession, update_run!
+using Pluto.WorkspaceManager: poll
+
+@testset "Logging" begin
+    🍭 = ServerSession()
+    🍭.options.evaluation.workspace_use_distributed = true
+
+    fakeclient = ClientSession(:fake, nothing)
+    🍭.connected_clients[fakeclient.id] = fakeclient
+
+    @testset "Logging respects maxlog" begin
+        notebook = Notebook(Cell.([
+            """
+            for i in 1:10
+                @info "logging" i maxlog=2
+            end
+            """,
+        ]))
+
+        update_run!(🍭, notebook, notebook.cells)
+        @test notebook.cells[begin] |> noerror
+
+        @test poll(5, 1/60) do
+            length(notebook.cells[begin].logs) == 2
+        end
+        WorkspaceManager.unmake_workspace((🍭, notebook))
+    end
+end
diff --git a/test/runtests.jl b/test/runtests.jl
index 554de40c76..ba9ea13bff 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -18,6 +18,8 @@ include("./Dynamic.jl")
 verify_no_running_processes()
 include("./MacroAnalysis.jl")
 verify_no_running_processes()
+include("./Logging.jl")
+verify_no_running_processes()
 include("./webserver.jl")
 verify_no_running_processes()
 include("./Notebook.jl")

From 17049278ef915ff24fcb78dfd314c4dfe57e1cc5 Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Wed, 2 Feb 2022 22:02:40 +0100
Subject: [PATCH 076/821] Make document currentscript work (#1765)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/CellOutput.js | 76 ++++++++++++++++++++++++-------
 1 file changed, 59 insertions(+), 17 deletions(-)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 5b49ac2daf..b8d4b40ec1 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -223,6 +223,42 @@ let execute_dynamic_function = async ({ environment, code }) => {
     return result
 }
 
+/**
+ * Runs the code `fn` with `document.currentScript` being set to a new script_element thats
+ * is placed on the page where `script_element` was.
+ *
+ * Why? So we can run the javascript code with extra cool Pluto variables and return value,
+ * but still have a script at the same position as `document.currentScript`.
+ * This way you can do `document.currentScript.insertBefore()` and have it work!
+ *
+ * This will remove the passed in `script_element` from the DOM!
+ *
+ * @param {HTMLOrSVGScriptElement} script_element
+ * @param {() => any} fn
+ */
+let execute_inside_script_tag_that_replaces = async (script_element, fn) => {
+    // Mimick as much as possible from the original script (only attributes but sure)
+    let new_script_tag = document.createElement("script")
+    for (let attr of script_element.attributes) {
+        new_script_tag.attributes.setNamedItem(attr.cloneNode(true))
+    }
+
+    // @ts-ignore
+    // I use this long variable name to pass the function and result to and from the script we created
+    window.____FUNCTION_TO_RUN_INSIDE_SCRIPT = { function_to_run: fn, result: null }
+    new_script_tag.textContent = `{
+        window.____FUNCTION_TO_RUN_INSIDE_SCRIPT.result = window.____FUNCTION_TO_RUN_INSIDE_SCRIPT.function_to_run()
+    }`
+    // Put the script in the DOM, this will run the script
+    script_element.parentNode.replaceChild(new_script_tag, script_element)
+    // @ts-ignore - Get the result back
+    let result = await window.____FUNCTION_TO_RUN_INSIDE_SCRIPT.result
+    // @ts-ignore - Reset the global variable "just in case"
+    window.____FUNCTION_TO_RUN_INSIDE_SCRIPT = { function_to_run: fn, result: null }
+
+    return { node: new_script_tag, result: result }
+}
+
 const is_displayable = (result) => result instanceof Element && result.nodeType === Node.ELEMENT_NODE
 
 /**
@@ -284,16 +320,19 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
                     }
 
                     const cell = root_node.closest("pluto-cell")
-                    let result = await execute_dynamic_function({
-                        environment: {
-                            this: script_id ? old_result : window,
-                            currentScript: node,
-                            invalidation: invalidation,
-                            getPublishedObject: (id) => cell.getPublishedObject(id),
-                            ...observablehq_for_cells,
-                        },
-                        code: node.innerText,
+                    let { node: new_node, result } = await execute_inside_script_tag_that_replaces(node, async () => {
+                        return await execute_dynamic_function({
+                            environment: {
+                                this: script_id ? old_result : window,
+                                currentScript: document.currentScript,
+                                invalidation: invalidation,
+                                getPublishedObject: (id) => cell.getPublishedObject(id),
+                                ...observablehq_for_cells,
+                            },
+                            code: node.innerText,
+                        })
                     })
+
                     // Save result for next run
                     if (script_id != null) {
                         results_map.set(script_id, result)
@@ -304,7 +343,7 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
                             old_result.remove()
                         }
                         if (is_displayable(result)) {
-                            node.parentElement.insertBefore(result, node)
+                            new_node.parentElement.insertBefore(result, new_node)
                         }
                     }
                 }
@@ -321,14 +360,17 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
 
 let run = (f) => f()
 
-/** @param {HTMLTemplateElement} template */
+/**
+ * Support declarative shadowroot 😼
+ * https://web.dev/declarative-shadow-dom/
+ * The polyfill they mention on the page is nice and all, but we need more.
+ * For one, we need the polyfill anyway as we're adding html using innerHTML (just like we need to run the scripts ourselves)
+ * Also, we want to run the scripts inside the shadow roots, ideally in the same order that a browser would.
+ * And we want nested shadowroots, which their polyfill doesn't provide (and I hope the spec does)
+ *
+ * @param {HTMLTemplateElement} template
+ */
 let declarative_shadow_dom_polyfill = (template) => {
-    // Support declarative shadowroot 😼
-    // https://web.dev/declarative-shadow-dom/
-    // The polyfill they mention on the page is nice and all, but we need more.
-    // For one, we need the polyfill anyway as we're adding html using innerHTML (just like we need to run the scripts ourselves)
-    // Also, we want to run the scripts inside the shadow roots, ideally in the same order that a browser would.
-    // And we want nested shadowroots, which their polyfill doesn't provide (and I hope the spec does)
     try {
         const mode = template.getAttribute("shadowroot")
         // @ts-ignore

From 897e152ca4ba97fa7dee86627774ed5780248966 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 3 Feb 2022 12:27:05 +0100
Subject: [PATCH 077/821] Julia 1.6 minimum (#1885)

---
 .github/workflows/FrontendTest.yml    |  2 +-
 .github/workflows/LaunchTest.yml      |  2 +-
 .github/workflows/Test.yml            |  2 +-
 Project.toml                          |  2 +-
 README.md                             |  2 +-
 src/Configuration.jl                  |  4 +--
 src/packages/PkgCompat.jl             | 40 ++++++++++++---------------
 src/runner/Loader.jl                  | 13 +++------
 test/Configuration.jl                 | 18 +++++-------
 test/ExpressionExplorer.jl            |  4 +--
 test/React.jl                         |  2 +-
 test/RichOutput.jl                    |  6 ++--
 test/WorkspaceManager.jl              |  2 +-
 test/packages/old_artifacts_import.jl |  2 +-
 test/packages/simple_import.jl        |  2 +-
 15 files changed, 42 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/FrontendTest.yml b/.github/workflows/FrontendTest.yml
index 6f72114274..a8033b8d03 100644
--- a/.github/workflows/FrontendTest.yml
+++ b/.github/workflows/FrontendTest.yml
@@ -27,7 +27,7 @@ jobs:
             # Makes thes `julia` command available
             - uses: julia-actions/setup-julia@v1
               with:
-                  version: "1.5"
+                  version: "1.6"
 
             - name: Install Pluto.jl packages
               run: |
diff --git a/.github/workflows/LaunchTest.yml b/.github/workflows/LaunchTest.yml
index c7538be8b2..814357ef33 100644
--- a/.github/workflows/LaunchTest.yml
+++ b/.github/workflows/LaunchTest.yml
@@ -13,7 +13,7 @@ jobs:
         strategy:
             matrix:
                 # We test quite a lot of versions because we do some OS and version specific things unfortunately
-                julia-version: ["1.0", "1.5", "1.7"]
+                julia-version: ["1.6", "1.7"]
                 os: [windows-latest, ubuntu-latest]
 
         steps:
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index eaa6a1ff72..8bd5540875 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -29,7 +29,7 @@ jobs:
         strategy:
             matrix:
                 # We test quite a lot of versions because we do some OS and version specific things unfortunately
-                julia-version: ["1.5", "1.6", "1.7"] #, "nightly"]
+                julia-version: ["1.6", "1.7"] #, "nightly"]
                 os: [ubuntu-latest, macOS-latest, windows-latest]
 
         steps:
diff --git a/Project.toml b/Project.toml
index bcf4394c2d..b7d5afb27b 100644
--- a/Project.toml
+++ b/Project.toml
@@ -30,7 +30,7 @@ HTTP = "^0.9.1"
 MsgPack = "1.1"
 RelocatableFolders = "0.1"
 Tables = "1"
-julia = "^1.5"
+julia = "^1.6"
 
 [extras]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
diff --git a/README.md b/README.md
index 3801e4fabd..dce18495ea 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ _([video](https://www.youtube.com/watch?v=rpB6zQNsbQU)) Grant Sanderson ([3Blue1
 
 For one tasty notebook 🥞 you will need:
 
-- [**Julia** v1.5 or above](https://julialang.org/downloads/#current_stable_release)
+- [**Julia** v1.6 or above](https://julialang.org/downloads/#current_stable_release)
 - **Linux**, **MacOS** or **Windows**, _Linux and MacOS will work best_
 - Mozilla **Firefox** or Google **Chrome**
 
diff --git a/src/Configuration.jl b/src/Configuration.jl
index 10d9832dcd..d55ffbfba7 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -200,9 +200,7 @@ function _convert_to_flags(options::CompilerOptions)::Vector{String}
         flagname = string("--", replace(String(name), "_" => "-"))
         value = getfield(options, name)
         if value !== nothing
-            if !(VERSION <= v"1.5.0-" && name === :threads)
-                push!(option_list, string(flagname, "=", value))
-            end
+            push!(option_list, string(flagname, "=", value))
         end
     end
 
diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index ff79a30176..8223586a8b 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -340,32 +340,28 @@ package_exists(package_name::AbstractString)::Bool =
 
 # 🐸 "Public API", but using PkgContext
 function dependencies(ctx)
-	# Pkg.dependencies(ctx) should also work on 1.5, but there is some weird bug (run the tests without this patch). This is probably some Pkg bug that got fixed.
-	@static if VERSION < v"1.6.0-a"
-		ctx.env.manifest
-	else
-		try
-			# ctx.env.manifest
-			@static if hasmethod(Pkg.dependencies, (PkgContext,))
-				Pkg.dependencies(ctx)
-			else
-				Pkg.dependencies(ctx.env)
-			end
-		catch e
-			if !occursin(r"expected.*exist.*manifest", sprint(showerror, e))
-				@error """
-				Pkg error: you might need to use
-
-				Pluto.reset_notebook_environment(notebook_path)
+	try
+		# ctx.env.manifest
+		@static if hasmethod(Pkg.dependencies, (PkgContext,))
+			Pkg.dependencies(ctx)
+		else
+			Pkg.dependencies(ctx.env)
+		end
+	catch e
+		if !occursin(r"expected.*exist.*manifest", sprint(showerror, e))
+			@error """
+			Pkg error: you might need to use
 
-				to reset this notebook's environment.
+			Pluto.reset_notebook_environment(notebook_path)
 
-				Before doing so, consider sending your notebook file to https://github.com/fonsp/Pluto.jl/issues together with the following info:
-				""" Pluto.PLUTO_VERSION VERSION exception=(e,catch_backtrace())
-			end
+			to reset this notebook's environment.
 
-			Dict()
+			Before doing so, consider sending your notebook file to https://github.com/fonsp/Pluto.jl/issues together with the following info:
+			""" Pluto.PLUTO_VERSION VERSION exception=(e,catch_backtrace())
 		end
+
+		Dict()
+	
 	end
 end
 
diff --git a/src/runner/Loader.jl b/src/runner/Loader.jl
index d1933e7367..bb1f5c5a0b 100644
--- a/src/runner/Loader.jl
+++ b/src/runner/Loader.jl
@@ -27,15 +27,10 @@ catch
 end
 try
     # we don't suppress IO for this one because it can take very long, and that would be a frustrating experience without IO
-    if VERSION >= v"1.6.0-a"
-        # precompilation switched off because of https://github.com/fonsp/Pluto.jl/issues/875
-        Pkg.instantiate(pkg_ctx; update_registry=false, allow_autoprecomp=false) 
-    elseif VERSION >= v"1.3.0"
-        # registry update is not required here and may save some time for startup
-        Pkg.instantiate(pkg_ctx; update_registry=false)
-    else
-        Pkg.instantiate(pkg_ctx)
-    end
+    
+    # precompilation switched off because of https://github.com/fonsp/Pluto.jl/issues/875
+    Pkg.instantiate(pkg_ctx; update_registry=false, allow_autoprecomp=false) 
+
 catch e
     @error "Failed to instantiate notebook boot environment" exception=(e, catch_backtrace())
 end
diff --git a/test/Configuration.jl b/test/Configuration.jl
index 720427fbfe..82cf21de94 100644
--- a/test/Configuration.jl
+++ b/test/Configuration.jl
@@ -27,19 +27,15 @@ end
 end
 
 @testset "flag conversion" begin
-    if VERSION > v"1.5.0-"
-        @test _convert_to_flags(Configuration.CompilerOptions(threads="123")) ==
-            ["--startup-file=no", "--history-file=no", "--threads=123"]
+    @test _convert_to_flags(Configuration.CompilerOptions(threads="123")) ==
+        ["--startup-file=no", "--history-file=no", "--threads=123"]
 
-        @test _convert_to_flags(Configuration.CompilerOptions(threads=123)) ==
-            ["--startup-file=no", "--history-file=no", "--threads=123"]
+    @test _convert_to_flags(Configuration.CompilerOptions(threads=123)) ==
+        ["--startup-file=no", "--history-file=no", "--threads=123"]
+
+    @test _convert_to_flags(Configuration.CompilerOptions()) ⊇
+        ["--startup-file=no", "--history-file=no"]
 
-        @test _convert_to_flags(Configuration.CompilerOptions()) ⊇
-            ["--startup-file=no", "--history-file=no"]
-    else
-        @test _convert_to_flags(Configuration.CompilerOptions()) ==
-            ["--startup-file=no", "--history-file=no"]
-    end
     @test _convert_to_flags(Configuration.CompilerOptions(compile="min")) ⊇
     ["--compile=min", "--startup-file=no", "--history-file=no"]
 end
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index 68ac5576b0..1abc6797eb 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -621,8 +621,6 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test ExpressionExplorer.external_package_names(:(using Plots, Something.Else, .LocalModule)) == Set([:Plots, :Something])
         @test ExpressionExplorer.external_package_names(:(import Plots.A: b, c)) == Set([:Plots])
 
-        if VERSION >= v"1.6.0"
-            @test ExpressionExplorer.external_package_names(Meta.parse("import Foo as Bar, Baz.Naz as Jazz")) == Set([:Foo, :Baz])
-        end
+        @test ExpressionExplorer.external_package_names(Meta.parse("import Foo as Bar, Baz.Naz as Jazz")) == Set([:Foo, :Baz])
     end
 end
diff --git a/test/React.jl b/test/React.jl
index 42cf04cd1b..3069b89f13 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -171,7 +171,7 @@ import Distributed
     end
 
     # PlutoTest.jl is only working on Julia version >= 1.6
-    VERSION >= v"1.6" && @testset "Test Firebasey" begin
+    @testset "Test Firebasey" begin
         🍭.options.evaluation.workspace_use_distributed = true
 
         file = tempname()
diff --git a/test/RichOutput.jl b/test/RichOutput.jl
index f88822545b..2bfc98e8bc 100644
--- a/test/RichOutput.jl
+++ b/test/RichOutput.jl
@@ -152,10 +152,8 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
             s = string(notebook.cells[2].output.body)
             @test occursin("OffsetArray", s)
             @test occursin("21", s)
-            if VERSION >= v"1.3"
-                # once in the prefix, once as index
-                @test count("22", s) >= 2
-            end
+            # once in the prefix, once as index
+            @test count("22", s) >= 2
             
             WorkspaceManager.unmake_workspace((🍭, notebook))
             🍭.options.evaluation.workspace_use_distributed = false
diff --git a/test/WorkspaceManager.jl b/test/WorkspaceManager.jl
index c56954fc79..f90987d6a5 100644
--- a/test/WorkspaceManager.jl
+++ b/test/WorkspaceManager.jl
@@ -64,7 +64,7 @@ import Distributed
         WorkspaceManager.unmake_workspace((🍭, notebook))
     end
 
-    Sys.iswindows() || (VERSION < v"1.6.0-a") || @testset "Pluto inside Pluto" begin
+    Sys.iswindows() || @testset "Pluto inside Pluto" begin
 
         client = ClientSession(:fakeA, nothing)
         🍭 = ServerSession()
diff --git a/test/packages/old_artifacts_import.jl b/test/packages/old_artifacts_import.jl
index 0d8a613d9b..993ce61b2a 100644
--- a/test/packages/old_artifacts_import.jl
+++ b/test/packages/old_artifacts_import.jl
@@ -7,7 +7,7 @@ using InteractiveUtils
 # ╔═╡ c581d17a-c965-11eb-1607-bbeb44933d25
 # This file imports an outdated version of PlutoPkgTestA: 0.2.1 (which is stored in the embedded Manifest file) and Artifacts, which is now a standard library (as of Julia 1.6), but it used to be a registered package (https://github.com/JuliaPackaging/Artifacts.jl). This notebook was generated on Julia 1.5, so the Manifest will be very very confusing for Julia 1.6 and up.
 
-# It is generated on Julia 1.5 (our oldest supported Julia version, Manifest.toml is not backwards-compatible):
+# It is generated on Julia 1.5 (our oldest supported Julia version (at the time of writing), Manifest.toml is not backwards-compatible):
 
 # 1. add our test registry: 
 #   pkg> registry add https://github.com/JuliaPluto/PlutoPkgTestRegistry
diff --git a/test/packages/simple_import.jl b/test/packages/simple_import.jl
index c741ae26a3..65893283da 100644
--- a/test/packages/simple_import.jl
+++ b/test/packages/simple_import.jl
@@ -7,7 +7,7 @@ using InteractiveUtils
 # ╔═╡ c581d17a-c965-11eb-1607-bbeb44933d25
 # This file imports an outdated version of PlutoPkgTestA: 0.2.2 (which is stored in the embedded Manifest file).
 
-# It is generated on Julia 1.5 (our oldest supported Julia version, Manifest.toml is not backwards-compatible):
+# It is generated on Julia 1.5 (our oldest supported Julia version (at the time of writing), Manifest.toml is not backwards-compatible):
 
 # 1. add our test registry: 
 #   pkg> registry add https://github.com/JuliaPluto/PlutoPkgTestRegistry

From d8bf85935778f0a831ddd7058ad2519639bfc772 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 3 Feb 2022 17:06:07 +0100
Subject: [PATCH 078/821] tweak pending_local_updates logic

---
 frontend/components/Editor.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index b85987409e..3b4d2a86c1 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -35,7 +35,7 @@ import { RecordingPlaybackUI, RecordingUI } from "./RecordingUI.js"
 
 const default_path = "..."
 const DEBUG_DIFFING = false
-let pending_local_updates = 0
+
 // from our friends at https://stackoverflow.com/a/2117523
 // i checked it and it generates Julia-legal UUIDs and that's all we need -SNOF
 const uuidv4 = () =>
@@ -262,8 +262,6 @@ export class Editor extends Component {
             last_created_cell: null,
             selected_cells: [],
 
-            update_is_ongoing: false,
-
             is_recording: false,
             recording_waiting_to_start: false,
         }
@@ -779,15 +777,20 @@ patch: ${JSON.stringify(
         }, 1000 * 5)
 
         // Not completely happy with this yet, but it will do for now - DRAL
+        /** Patches that are being delayed until all cells have finished running. */
         this.bonds_changes_to_apply_when_done = []
+        /** Number of local updates that have not yet been applied to the server's state. */
+        this.pending_local_updates = 0
         this.js_init_set = new Set()
+        /** Is the notebook ready to execute code right now? (i.e. are no cells queued or running?) */
         this.notebook_is_idle = () => {
             return !(
-                this.state.update_is_ongoing ||
+                this.pending_local_updates > 0 ||
                 // a cell is running:
                 Object.values(this.state.notebook.cell_results).some((cell) => cell.running || cell.queued) ||
                 // a cell is initializing JS:
-                !_.isEmpty(this.js_init_set)
+                !_.isEmpty(this.js_init_set) ||
+                !this.is_process_ready()
             )
         }
         this.is_process_ready = () =>
@@ -832,8 +835,7 @@ patch: ${JSON.stringify(
                         throw new Error("This sounds like it is editing an array...")
                     }
                 }
-                pending_local_updates++
-                this.setState({ update_is_ongoing: pending_local_updates > 0 })
+                this.pending_local_updates++
                 this.on_patches_hook(changes)
                 try {
                     await Promise.all([
@@ -850,8 +852,7 @@ patch: ${JSON.stringify(
                         }),
                     ])
                 } finally {
-                    pending_local_updates--
-                    this.setState({ update_is_ongoing: pending_local_updates > 0 })
+                    this.pending_local_updates--
                 }
             })
             last_update_notebook_task = new_task.catch(console.error)
@@ -1085,7 +1086,7 @@ patch: ${JSON.stringify(
 
         // this class is used to tell our frontend tests that the updates are done
         //@ts-ignore
-        document.body._update_is_ongoing = pending_local_updates > 0
+        document.body._update_is_ongoing = this.pending_local_updates > 0
 
         if (this.notebook_is_idle() && this.bonds_changes_to_apply_when_done.length !== 0) {
             // `bonds_changes_to_apply_when_done:`, this.bonds_changes_to_apply_when_done

From f094e02fe76b670a504a90320c4081c13632fc81 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 4 Feb 2022 14:38:45 +0100
Subject: [PATCH 079/821] Fix `Ptr{Nothing}` in MsgPack error, continuing #1879

---
 src/runner/PlutoRunner.jl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 20f1653f8c..ae33b2081f 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1995,16 +1995,17 @@ Logging.min_enabled_level(::PlutoLogger) = Logging.Debug
 Logging.catch_exceptions(::PlutoLogger) = false
 function Logging.handle_message(::PlutoLogger, level, msg, _module, group, id, file, line; kwargs...)
     # println("receiving msg from ", _module, " ", group, " ", id, " ", msg, " ", level, " ", line, " ", file)
+    # println("with types: ", "_module: ", typeof(_module), ", ", "msg: ", typeof(msg), ", ", "group: ", typeof(group), ", ", "id: ", typeof(id), ", ", "file: ", typeof(file), ", ", "line: ", typeof(line), ", ", "kwargs: ", typeof(kwargs)) # thanks Copilot
 
     try
         put!(log_channel, Dict{String,Any}(
             "level" => string(level),
             "msg" => format_output_default(msg isa String ? Text(msg) : msg),
-            "group" => group,
-            "id" => id,
-            "file" => file,
+            "group" => string(group),
+            "id" => string(id),
+            "file" => string(file),
             "cell_id" => currently_running_cell_id[],
-            "line" => line,
+            "line" => line isa Union{Int32,Int64} ? line : nothing,
             "kwargs" => Tuple{String,Any}[(string(k), format_output_default(v)) for (k, v) in kwargs],
             )
         )

From c047235ef50edae66095864449e88d8e9216da2e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 4 Feb 2022 19:07:27 +0100
Subject: [PATCH 080/821] tweak: reset state after failure: really show alert

---
 frontend/components/Editor.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 3b4d2a86c1..f0b218a08d 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -653,11 +653,10 @@ patch: ${JSON.stringify(
                     case "notebook_diff":
                         if (message?.response?.from_reset) {
                             console.log("Trying to reset state after failure")
-                            try {
-                                apply_notebook_patches(message.patches, initial_notebook())
-                            } catch (exception) {
+                            apply_notebook_patches(message.patches, initial_notebook()).catch((e) => {
                                 alert("Oopsie!! please refresh your browser and everything will be alright!")
-                            }
+                                throw e
+                            })
                         } else if (message.patches.length !== 0) {
                             apply_notebook_patches(message.patches)
                         }

From ac34d3dfadb995396ad38ba4f602441611f88473 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 4 Feb 2022 22:03:08 +0100
Subject: [PATCH 081/821] running user scripts: try finally (mostly whitespace)

---
 frontend/components/CellOutput.js | 73 ++++++++++++++++---------------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index b8d4b40ec1..c28432ba92 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -433,46 +433,49 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
         const new_scripts = [...scripts_in_shadowroots, ...Array.from(container.current.querySelectorAll("script"))]
 
         run(async () => {
-            js_init_set?.add(container.current)
-            previous_results_map.current = await execute_scripttags({
-                root_node: container.current,
-                script_nodes: new_scripts,
-                invalidation: invalidation,
-                previous_results_map: persist_js_state ? previous_results_map.current : new Map(),
-            })
-
-            if (pluto_actions != null) {
-                set_bound_elements_to_their_value(container.current, pluto_bonds)
-                let remove_bonds_listener = add_bonds_listener(container.current, pluto_actions.set_bond, pluto_bonds)
-                invalidation.then(remove_bonds_listener)
-            }
+            try {
+                js_init_set?.add(container.current)
+                previous_results_map.current = await execute_scripttags({
+                    root_node: container.current,
+                    script_nodes: new_scripts,
+                    invalidation: invalidation,
+                    previous_results_map: persist_js_state ? previous_results_map.current : new Map(),
+                })
 
-            // Convert LaTeX to svg
-            // @ts-ignore
-            if (window.MathJax?.typeset != undefined) {
-                try {
-                    // @ts-ignore
-                    window.MathJax.typeset(container.current.querySelectorAll(".tex"))
-                } catch (err) {
-                    console.info("Failed to typeset TeX:")
-                    console.info(err)
+                if (pluto_actions != null) {
+                    set_bound_elements_to_their_value(container.current, pluto_bonds)
+                    let remove_bonds_listener = add_bonds_listener(container.current, pluto_actions.set_bond, pluto_bonds)
+                    invalidation.then(remove_bonds_listener)
                 }
-            }
 
-            // Apply syntax highlighting
-            try {
-                container.current.querySelectorAll("code").forEach((code_element) => {
-                    code_element.classList.forEach((className) => {
-                        if (className.startsWith("language-")) {
-                            let language = className.substr(9)
+                // Convert LaTeX to svg
+                // @ts-ignore
+                if (window.MathJax?.typeset != undefined) {
+                    try {
+                        // @ts-ignore
+                        window.MathJax.typeset(container.current.querySelectorAll(".tex"))
+                    } catch (err) {
+                        console.info("Failed to typeset TeX:")
+                        console.info(err)
+                    }
+                }
 
-                            // Remove "language-"
-                            highlight(code_element, language)
-                        }
+                // Apply syntax highlighting
+                try {
+                    container.current.querySelectorAll("code").forEach((code_element) => {
+                        code_element.classList.forEach((className) => {
+                            if (className.startsWith("language-")) {
+                                let language = className.substr(9)
+
+                                // Remove "language-"
+                                highlight(code_element, language)
+                            }
+                        })
                     })
-                })
-            } catch (err) {}
-            js_init_set?.delete(container.current)
+                } catch (err) {}
+            } finally {
+                js_init_set?.delete(container.current)
+            }
         })
 
         return () => {

From 5780c9242c973374844410fadbfa7bc1dfb28abf Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 4 Feb 2022 22:09:37 +0100
Subject: [PATCH 082/821] Don't run bonds if the process died

---
 src/evaluation/RunBonds.jl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/evaluation/RunBonds.jl b/src/evaluation/RunBonds.jl
index 30647b516d..9e6aad6790 100644
--- a/src/evaluation/RunBonds.jl
+++ b/src/evaluation/RunBonds.jl
@@ -18,13 +18,13 @@ function set_bond_values_reactive(; session::ServerSession, notebook::Notebook,
         # Check if the variable does not already have that value.
         # because if the initial value is already set, then we don't want to run dependent cells again.
         eq_tester = :(try !ismissing($bound_sym) && ($bound_sym == Main.PlutoRunner.transform_bond_value($(QuoteNode(bound_sym)), $(new_value))) === true catch; false end) # not just a === comparison because JS might send back the same value but with a different type (Float64 becomes Int64 in JS when it's an integer. The `=== true` check handles cases like `[missing] == [123]`, which returns `missing`, not `true` or `false`.)
-        if is_first_value && WorkspaceManager.eval_fetch_in_workspace((session, notebook), eq_tester)
+        if is_first_value && will_run_code(notebook) && WorkspaceManager.eval_fetch_in_workspace((session, notebook), eq_tester)
             return false
         end
         return true
     end .|> first
 
-    if isempty(to_set)
+    if isempty(to_set) || !will_run_code(notebook)
         return TopologicalOrder(notebook.topology, Cell[], Dict{Cell, ReactivityError}())
     end
 

From a99d736ab76ffb8745026a605880394d6690129e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 4 Feb 2022 22:32:34 +0100
Subject: [PATCH 083/821] Send queued bond changes when last script finishes
 (#1898)

---
 frontend/common/PlutoContext.js | 17 +++++++++++++++++
 frontend/components/Editor.js   | 26 ++++++++++++++++----------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/frontend/common/PlutoContext.js b/frontend/common/PlutoContext.js
index 4580a858fc..2cb2eb66ba 100644
--- a/frontend/common/PlutoContext.js
+++ b/frontend/common/PlutoContext.js
@@ -3,3 +3,20 @@ import { createContext } from "../imports/Preact.js"
 export let PlutoContext = createContext()
 export let PlutoBondsContext = createContext(/** @type {{ [key: string]: { value: any } }} */ (null))
 export let PlutoJSInitializingContext = createContext()
+
+// Create a class like the built-in `Set` class, but with a callback that is fired when the set becomes empty.
+export class SetWithEmptyCallback extends Set {
+    constructor(callback) {
+        super()
+        this.callback = callback
+    }
+
+    delete(value) {
+        let result = super.delete(value)
+        if (result && this.size === 0) {
+            this.callback()
+        }
+        return result
+    }
+}
+// THANKS COPILOT ❤️
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index f0b218a08d..6c23d0130b 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -21,7 +21,7 @@ import { PkgPopup } from "./PkgPopup.js"
 import { slice_utf8, length_utf8 } from "../common/UnicodeTools.js"
 import { has_ctrl_or_cmd_pressed, ctrl_or_cmd_name, is_mac_keyboard, in_textarea_or_input } from "../common/KeyboardShortcuts.js"
 import { handle_log } from "../common/Logging.js"
-import { PlutoContext, PlutoBondsContext, PlutoJSInitializingContext } from "../common/PlutoContext.js"
+import { PlutoContext, PlutoBondsContext, PlutoJSInitializingContext, SetWithEmptyCallback } from "../common/PlutoContext.js"
 import { unpack } from "../common/MsgPack.js"
 import { PkgTerminalView } from "./PkgTerminalView.js"
 import { start_binder, BinderPhase, count_stat } from "../common/Binder.js"
@@ -778,9 +778,22 @@ patch: ${JSON.stringify(
         // Not completely happy with this yet, but it will do for now - DRAL
         /** Patches that are being delayed until all cells have finished running. */
         this.bonds_changes_to_apply_when_done = []
+        this.send_queued_bond_changes = () => {
+            if (this.notebook_is_idle() && this.bonds_changes_to_apply_when_done.length !== 0) {
+                // console.log("Applying queued bond changes!", this.bonds_changes_to_apply_when_done)
+                let bonds_patches = this.bonds_changes_to_apply_when_done
+                this.bonds_changes_to_apply_when_done = []
+                this.update_notebook((notebook) => {
+                    applyPatches(notebook, bonds_patches)
+                })
+            }
+        }
         /** Number of local updates that have not yet been applied to the server's state. */
         this.pending_local_updates = 0
-        this.js_init_set = new Set()
+        this.js_init_set = new SetWithEmptyCallback(() => {
+            // console.info("All scripts finished!")
+            this.send_queued_bond_changes()
+        })
         /** Is the notebook ready to execute code right now? (i.e. are no cells queued or running?) */
         this.notebook_is_idle = () => {
             return !(
@@ -1087,14 +1100,7 @@ patch: ${JSON.stringify(
         //@ts-ignore
         document.body._update_is_ongoing = this.pending_local_updates > 0
 
-        if (this.notebook_is_idle() && this.bonds_changes_to_apply_when_done.length !== 0) {
-            // `bonds_changes_to_apply_when_done:`, this.bonds_changes_to_apply_when_done
-            let bonds_patches = this.bonds_changes_to_apply_when_done
-            this.bonds_changes_to_apply_when_done = []
-            this.update_notebook((notebook) => {
-                applyPatches(notebook, bonds_patches)
-            })
-        }
+        this.send_queued_bond_changes()
 
         if (old_state.binder_phase !== this.state.binder_phase && this.state.binder_phase != null) {
             const phase = Object.entries(BinderPhase).find(([k, v]) => v == this.state.binder_phase)[0]

From 8639a17e3d330675a7469c92ba57c321ecbd4f02 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 4 Feb 2022 23:55:27 +0100
Subject: [PATCH 084/821] whitespace

---
 frontend/common/Bond.js           | 3 ++-
 frontend/components/CellOutput.js | 1 +
 frontend/components/Editor.js     | 4 ++--
 tsconfig.json                     | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/common/Bond.js b/frontend/common/Bond.js
index 22df007c66..3a7f594526 100644
--- a/frontend/common/Bond.js
+++ b/frontend/common/Bond.js
@@ -155,7 +155,8 @@ export const add_bonds_listener = (node, on_bond_change, known_values) => {
 
         // see the docs on Generators.input from observablehq/stdlib
         let skippped_first = false
-        for (let val of input_generator(bond_node.firstElementChild)) {
+        const bound_element_node = bond_node.firstElementChild
+        for (let val of input_generator(bound_element_node)) {
             if (node_is_invalidated) break
 
             if (skippped_first === false) {
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index c28432ba92..029dd4e4f4 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -240,6 +240,7 @@ let execute_inside_script_tag_that_replaces = async (script_element, fn) => {
     // Mimick as much as possible from the original script (only attributes but sure)
     let new_script_tag = document.createElement("script")
     for (let attr of script_element.attributes) {
+        //@ts-ignore because of https://github.com/microsoft/TypeScript-DOM-lib-generator/issues/1260
         new_script_tag.attributes.setNamedItem(attr.cloneNode(true))
     }
 
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 6c23d0130b..a6e56ae78f 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -852,10 +852,10 @@ patch: ${JSON.stringify(
                 try {
                     await Promise.all([
                         this.client.send("update_notebook", { updates: changes }, { notebook_id: this.state.notebook.notebook_id }, false).then((response) => {
-                            if (response.message.response.update_went_well === "👎") {
+                            if (response.message?.response?.update_went_well === "👎") {
                                 // We only throw an error for functions that are waiting for this
                                 // Notebook state will already have the changes reversed
-                                throw new Error(`Pluto update_notebook error: ${response.message.response.why_not})`)
+                                throw new Error(`Pluto update_notebook error: (from Julia: ${response.message.response.why_not})`)
                             }
                         }),
                         this.setStatePromise({
diff --git a/tsconfig.json b/tsconfig.json
index 325a962efa..3810a2de99 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,7 @@
     "compilerOptions": {
         "target": "ES2021",
         "module": "ES2020",
-        "lib": ["ES2021", "DOM", "WebWorker"],
+        "lib": ["ES2021", "DOM", "WebWorker", "DOM.Iterable"],
         "allowJs": true,
         "checkJs": true,
         "noEmit": true,

From e2f955e04c0f1abdcb2aa049c5d0a487f61cd1f9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 5 Feb 2022 00:22:21 +0100
Subject: [PATCH 085/821] =?UTF-8?q?Disable=20source=20maps=20as=20temporar?=
 =?UTF-8?q?y=20patch=20=F0=9F=A9=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend-bundler/package-lock.json | 7 ++++++-
 frontend-bundler/package.json      | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index 691ca8b386..05385627c0 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -3462,7 +3462,8 @@
                 "esprima": "^4.0.1",
                 "estraverse": "^4.2.0",
                 "esutils": "^2.0.2",
-                "optionator": "^0.8.1"
+                "optionator": "^0.8.1",
+                "source-map": "~0.6.1"
             },
             "bin": {
                 "escodegen": "bin/escodegen.js",
@@ -4778,6 +4779,7 @@
             "hasInstallScript": true,
             "dependencies": {
                 "mkdirp": "^1.0.4",
+                "msgpackr": "^1.3.7",
                 "nan": "^2.14.2",
                 "node-gyp-build": "^4.2.3",
                 "ordered-binary": "^1.0.0",
@@ -5071,6 +5073,9 @@
             "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.4.5.tgz",
             "integrity": "sha512-AFmAehFqidJaSAWig6cp+8MZU3r7rtL1sgBxzXR9YICfG8vGRemCcVoqPG81CqRHdxP/VX/DyM85wltqPseXNw==",
             "optional": true,
+            "dependencies": {
+                "msgpackr-extract": "^1.0.14"
+            },
             "optionalDependencies": {
                 "msgpackr-extract": "^1.0.14"
             }
diff --git a/frontend-bundler/package.json b/frontend-bundler/package.json
index f981415a7c..0b5a3fbe21 100644
--- a/frontend-bundler/package.json
+++ b/frontend-bundler/package.json
@@ -7,7 +7,7 @@
     "description": "",
     "scripts": {
         "start": "cd ../frontend && parcel --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html sample.html",
-        "build": "cd ../frontend && parcel build --public-url . --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html sample.html",
+        "build": "cd ../frontend && parcel build --no-source-maps --public-url . --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html sample.html",
         "test": "echo \"Error: no test specified\" && exit 1"
     },
     "author": "",

From e73c11a3bc005e6598bf195382b0ae105ae08fcf Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 5 Feb 2022 00:29:01 +0100
Subject: [PATCH 086/821] New heuristic to skip intermediate bond values
 (#1892)

---
 frontend/components/Editor.js | 59 +++++++++++++++++++++++++++++------
 src/evaluation/RunBonds.jl    |  9 +++++-
 src/webserver/Dynamic.jl      |  3 +-
 3 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index a6e56ae78f..d9376cbd71 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -651,15 +651,36 @@ patch: ${JSON.stringify(
                 const message = update.message
                 switch (update.type) {
                     case "notebook_diff":
+                        let apply_promise = Promise.resolve()
                         if (message?.response?.from_reset) {
                             console.log("Trying to reset state after failure")
-                            apply_notebook_patches(message.patches, initial_notebook()).catch((e) => {
+                            apply_promise = apply_notebook_patches(message.patches, initial_notebook()).catch((e) => {
                                 alert("Oopsie!! please refresh your browser and everything will be alright!")
                                 throw e
                             })
                         } else if (message.patches.length !== 0) {
-                            apply_notebook_patches(message.patches)
+                            apply_promise = apply_notebook_patches(message.patches)
                         }
+
+                        const set_waiting = () => {
+                            let from_update = message?.response?.update_went_well != null
+                            let is_just_acknowledgement = from_update && message.patches.length === 0
+                            // console.log("Received patches!", message.patches, message.response, is_just_acknowledgement)
+
+                            if (!is_just_acknowledgement) {
+                                this.waiting_for_bond_to_trigger_execution = false
+                            }
+                        }
+                        apply_promise
+                            .then(set_waiting)
+                            .catch((e) => {
+                                set_waiting()
+                                throw e
+                            })
+                            .then(() => {
+                                this.send_queued_bond_changes()
+                            })
+
                         break
                     default:
                         console.error("Received unknown update type!", update)
@@ -788,6 +809,8 @@ patch: ${JSON.stringify(
                 })
             }
         }
+        /** Whether we just set a bond value which will trigger a cell to run, but we are still waiting for the server to process the bond value (and run the cell). See https://github.com/fonsp/Pluto.jl/issues/1891 for more info. */
+        this.waiting_for_bond_to_trigger_execution = false
         /** Number of local updates that have not yet been applied to the server's state. */
         this.pending_local_updates = 0
         this.js_init_set = new SetWithEmptyCallback(() => {
@@ -797,6 +820,7 @@ patch: ${JSON.stringify(
         /** Is the notebook ready to execute code right now? (i.e. are no cells queued or running?) */
         this.notebook_is_idle = () => {
             return !(
+                this.waiting_for_bond_to_trigger_execution ||
                 this.pending_local_updates > 0 ||
                 // a cell is running:
                 Object.values(this.state.notebook.cell_results).some((cell) => cell.running || cell.queued) ||
@@ -808,6 +832,15 @@ patch: ${JSON.stringify(
         this.is_process_ready = () =>
             this.state.notebook.process_status === ProcessStatus.starting || this.state.notebook.process_status === ProcessStatus.ready
 
+        let bond_will_trigger_evaluation = (/** @type {string|PropertyKey} */ sym) =>
+            Object.entries(this.state.notebook.cell_dependencies).some(([cell_id, deps]) => {
+                // if the other cell depends on the variable `sym`...
+                if (deps.upstream_cells_map.hasOwnProperty(sym)) {
+                    // and the cell is not disabled
+                    return !(this.state.notebook.cell_inputs[cell_id]?.running_disabled ?? true)
+                }
+            })
+
         let last_update_notebook_task = Promise.resolve()
         /** @param {(notebook: NotebookData) => void} mutate_fn */
         let update_notebook = (mutate_fn) => {
@@ -821,13 +854,13 @@ patch: ${JSON.stringify(
                     mutate_fn(notebook)
                 })
 
-                // If "notebook is not idle" I seperate and store the bonds updates,
+                // If "notebook is not idle" we seperate and store the bonds updates,
                 // to send when the notebook is idle. This delays the updating of the bond for performance,
                 // but when the server can discard bond updates itself (now it executes them one by one, even if there is a newer update ready)
                 // this will no longer be necessary
-                // console.log(`this.notebook_is_idle():`, this.notebook_is_idle())
-                if (!this.notebook_is_idle()) {
-                    let changes_involving_bonds = changes.filter((x) => x.path[0] === "bonds")
+                let is_idle = this.notebook_is_idle()
+                let changes_involving_bonds = changes.filter((x) => x.path[0] === "bonds")
+                if (!is_idle) {
                     this.bonds_changes_to_apply_when_done = [...this.bonds_changes_to_apply_when_done, ...changes_involving_bonds]
                     changes = changes.filter((x) => x.path[0] !== "bonds")
                 }
@@ -838,18 +871,24 @@ patch: ${JSON.stringify(
                         console.log(`Changes to send to server from "${previous_function_name}":`, changes)
                     } catch (error) {}
                 }
-                if (changes.length === 0) {
-                    return
-                }
-
                 for (let change of changes) {
                     if (change.path.some((x) => typeof x === "number")) {
                         throw new Error("This sounds like it is editing an array...")
                     }
                 }
+
+                if (changes.length === 0) {
+                    return
+                }
+                if (is_idle) {
+                    this.waiting_for_bond_to_trigger_execution ||= changes_involving_bonds.some(
+                        (x) => x.path.length >= 1 && bond_will_trigger_evaluation(x.path[1])
+                    )
+                }
                 this.pending_local_updates++
                 this.on_patches_hook(changes)
                 try {
+                    // console.log("Sending changes to server:", changes)
                     await Promise.all([
                         this.client.send("update_notebook", { updates: changes }, { notebook_id: this.state.notebook.notebook_id }, false).then((response) => {
                             if (response.message?.response?.update_went_well === "👎") {
diff --git a/src/evaluation/RunBonds.jl b/src/evaluation/RunBonds.jl
index 9e6aad6790..293dbac18a 100644
--- a/src/evaluation/RunBonds.jl
+++ b/src/evaluation/RunBonds.jl
@@ -1,4 +1,10 @@
-function set_bond_values_reactive(; session::ServerSession, notebook::Notebook, bound_sym_names::AbstractVector{Symbol}, is_first_values::AbstractVector{Bool}=[true for x in bound_sym_names], kwargs...)::Union{Task,TopologicalOrder}
+function set_bond_values_reactive(; 
+    session::ServerSession, notebook::Notebook, 
+    bound_sym_names::AbstractVector{Symbol}, 
+    is_first_values::AbstractVector{Bool}=[true for x in bound_sym_names], 
+    initiator=nothing,
+    kwargs...
+)::Union{Task,TopologicalOrder}
     # filter out the bonds that don't need to be set
     to_set = filter(zip(bound_sym_names, is_first_values) |> collect) do (bound_sym, is_first_value)
         new_value = notebook.bonds[bound_sym].value
@@ -25,6 +31,7 @@ function set_bond_values_reactive(; session::ServerSession, notebook::Notebook,
     end .|> first
 
     if isempty(to_set) || !will_run_code(notebook)
+        send_notebook_changes!(ClientRequest(; session, notebook, initiator))
         return TopologicalOrder(notebook.topology, Cell[], Dict{Cell, ReactivityError}())
     end
 
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index a351100b27..fc2aa2786c 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -327,10 +327,11 @@ responses[:update_notebook] = function response_update_notebook(🙋::ClientRequ
                 bound_sym_names=bound_sym_names,
                 is_first_values=is_first_values,
                 run_async=true,
+                initiator=🙋.initiator,
             )
         end
     
-        send_notebook_changes!(🙋; commentary=Dict(:update_went_well => :👍))    
+        send_notebook_changes!(🙋; commentary=Dict(:update_went_well => :👍))
     catch ex
         @error "Update notebook failed"  🙋.body["updates"] exception=(ex, stacktrace(catch_backtrace()))
         response = Dict(

From 248fce24a0a4de797c9de6c1ef87fedd71ebd09d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 5 Feb 2022 01:06:11 +0100
Subject: [PATCH 087/821] prevent some error logs

---
 frontend/common/Bond.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/common/Bond.js b/frontend/common/Bond.js
index 3a7f594526..626ca85d39 100644
--- a/frontend/common/Bond.js
+++ b/frontend/common/Bond.js
@@ -78,6 +78,9 @@ function input_generator(input) {
  * @param {any} new_value
  */
 const set_input_value = (input, new_value) => {
+    if (input instanceof HTMLInputElement && input.type === "file") {
+        return
+    }
     if (new_value == null) {
         //@ts-ignore
         input.value = new_value

From 2545b919eb5a9d62a4aef19827642188a41bf7a9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 5 Feb 2022 01:06:49 +0100
Subject: [PATCH 088/821] update sample notebooks

---
 sample/JavaScript.jl | 12 ++++++------
 sample/Plots.jl.jl   | 40 ++++++++++++++++++++--------------------
 sample/PlutoUI.jl.jl | 12 ++++++------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/sample/JavaScript.jl b/sample/JavaScript.jl
index 18513e4ff8..11eca9dd05 100644
--- a/sample/JavaScript.jl
+++ b/sample/JavaScript.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.17.6
+# v0.17.7
 
 using Markdown
 using InteractiveUtils
@@ -1045,7 +1045,7 @@ PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
 
 [compat]
 HypertextLiteral = "~0.9.3"
-PlutoUI = "~0.7.30"
+PlutoUI = "~0.7.34"
 """
 
 # ╔═╡ 00000000-0000-0000-0000-000000000002
@@ -1159,9 +1159,9 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
 [[Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "92f91ba9e5941fc781fecf5494ac1da87bdac775"
+git-tree-sha1 = "0b5cfbb704034b5b4c1869e36634438a047df065"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.2.0"
+version = "2.2.1"
 
 [[Pkg]]
 deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
@@ -1169,9 +1169,9 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[PlutoUI]]
 deps = ["AbstractPlutoDingetjes", "Base64", "ColorTypes", "Dates", "Hyperscript", "HypertextLiteral", "IOCapture", "InteractiveUtils", "JSON", "Logging", "Markdown", "Random", "Reexport", "UUIDs"]
-git-tree-sha1 = "5c0eb9099596090bb3215260ceca687b888a1575"
+git-tree-sha1 = "8979e9802b4ac3d58c503a20f2824ad67f9074dd"
 uuid = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
-version = "0.7.30"
+version = "0.7.34"
 
 [[Printf]]
 deps = ["Unicode"]
diff --git a/sample/Plots.jl.jl b/sample/Plots.jl.jl
index c35d282f56..313197612d 100644
--- a/sample/Plots.jl.jl
+++ b/sample/Plots.jl.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.17.6
+# v0.17.7
 
 using Markdown
 using InteractiveUtils
@@ -215,7 +215,7 @@ PLUTO_PROJECT_TOML_CONTENTS = """
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 
 [compat]
-Plots = "~1.25.6"
+Plots = "~1.25.7"
 """
 
 # ╔═╡ 00000000-0000-0000-0000-000000000002
@@ -251,9 +251,9 @@ version = "1.16.1+1"
 
 [[ChainRulesCore]]
 deps = ["Compat", "LinearAlgebra", "SparseArrays"]
-git-tree-sha1 = "54fc4400de6e5c3e27be6047da2ef6ba355511f8"
+git-tree-sha1 = "f9982ef575e19b0e5c7a98c6e75ee496c0f73a93"
 uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
-version = "1.11.6"
+version = "1.12.0"
 
 [[ChangesOfVariables]]
 deps = ["ChainRulesCore", "LinearAlgebra", "Test"]
@@ -389,9 +389,9 @@ version = "1.0.10+0"
 
 [[GLFW_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Pkg", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll"]
-git-tree-sha1 = "0c603255764a1fa0b61752d2bec14cfbd18f7fe8"
+git-tree-sha1 = "51d2dfe8e590fbd74e7a842cf6d13d8a2f45dc01"
 uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89"
-version = "3.3.5+1"
+version = "3.3.6+0"
 
 [[GR]]
 deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Printf", "Random", "RelocatableFolders", "Serialization", "Sockets", "Test", "UUIDs"]
@@ -479,9 +479,9 @@ version = "1.0.0"
 
 [[JLLWrappers]]
 deps = ["Preferences"]
-git-tree-sha1 = "22df5b96feef82434b07327e2d3c770a9b21e023"
+git-tree-sha1 = "abc9885a7ca2052a736a600f7fa66209f96506e1"
 uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
-version = "1.4.0"
+version = "1.4.1"
 
 [[JSON]]
 deps = ["Dates", "Mmap", "Parsers", "Unicode"]
@@ -636,9 +636,9 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
 
 [[NaNMath]]
-git-tree-sha1 = "f755f36b19a5116bb580de457cda0c140153f283"
+git-tree-sha1 = "b086b7ea07f8e38cf122f5016af580881ac914fe"
 uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
-version = "0.3.6"
+version = "0.3.7"
 
 [[NetworkOptions]]
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
@@ -674,9 +674,9 @@ version = "8.44.0+0"
 
 [[Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "92f91ba9e5941fc781fecf5494ac1da87bdac775"
+git-tree-sha1 = "0b5cfbb704034b5b4c1869e36634438a047df065"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.2.0"
+version = "2.2.1"
 
 [[Pixman_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -696,15 +696,15 @@ version = "2.0.1"
 
 [[PlotUtils]]
 deps = ["ColorSchemes", "Colors", "Dates", "Printf", "Random", "Reexport", "Statistics"]
-git-tree-sha1 = "68604313ed59f0408313228ba09e79252e4b2da8"
+git-tree-sha1 = "6f1b25e8ea06279b5689263cc538f51331d7ca17"
 uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043"
-version = "1.1.2"
+version = "1.1.3"
 
 [[Plots]]
 deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "Unzip"]
-git-tree-sha1 = "db7393a80d0e5bef70f2b518990835541917a544"
+git-tree-sha1 = "7e4920a7d4323b8ffc3db184580598450bde8a8e"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
-version = "1.25.6"
+version = "1.25.7"
 
 [[Preferences]]
 deps = ["TOML"]
@@ -795,9 +795,9 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [[StaticArrays]]
 deps = ["LinearAlgebra", "Random", "Statistics"]
-git-tree-sha1 = "2ae4fe21e97cd13efd857462c1869b73c9f61be3"
+git-tree-sha1 = "a635a9333989a094bddc9f940c04c549cd66afcf"
 uuid = "90137ffa-7385-5640-81b9-e52037218182"
-version = "1.3.2"
+version = "1.3.4"
 
 [[Statistics]]
 deps = ["LinearAlgebra", "SparseArrays"]
@@ -1047,9 +1047,9 @@ version = "1.6.38+0"
 
 [[libvorbis_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"]
-git-tree-sha1 = "c45f4e40e7aafe9d086379e5578947ec8b95a8fb"
+git-tree-sha1 = "b910cb81ef3fe6e78bf6acee440bda86fd6ae00c"
 uuid = "f27f6e37-5d2b-51aa-960f-b287f2bc3b7a"
-version = "1.3.7+0"
+version = "1.3.7+1"
 
 [[nghttp2_jll]]
 deps = ["Artifacts", "Libdl"]
diff --git a/sample/PlutoUI.jl.jl b/sample/PlutoUI.jl.jl
index be3b1658a6..9369358d87 100644
--- a/sample/PlutoUI.jl.jl
+++ b/sample/PlutoUI.jl.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.17.6
+# v0.17.7
 
 using Markdown
 using InteractiveUtils
@@ -620,7 +620,7 @@ PLUTO_PROJECT_TOML_CONTENTS = """
 PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
 
 [compat]
-PlutoUI = "~0.7.30"
+PlutoUI = "~0.7.34"
 """
 
 # ╔═╡ 00000000-0000-0000-0000-000000000002
@@ -734,9 +734,9 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
 [[Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "92f91ba9e5941fc781fecf5494ac1da87bdac775"
+git-tree-sha1 = "0b5cfbb704034b5b4c1869e36634438a047df065"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.2.0"
+version = "2.2.1"
 
 [[Pkg]]
 deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
@@ -744,9 +744,9 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[PlutoUI]]
 deps = ["AbstractPlutoDingetjes", "Base64", "ColorTypes", "Dates", "Hyperscript", "HypertextLiteral", "IOCapture", "InteractiveUtils", "JSON", "Logging", "Markdown", "Random", "Reexport", "UUIDs"]
-git-tree-sha1 = "5c0eb9099596090bb3215260ceca687b888a1575"
+git-tree-sha1 = "8979e9802b4ac3d58c503a20f2824ad67f9074dd"
 uuid = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
-version = "0.7.30"
+version = "0.7.34"
 
 [[Printf]]
 deps = ["Unicode"]

From aebd1258cc5e7c0cfe1341cba1f0c1c49de8ad2f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 5 Feb 2022 01:07:12 +0100
Subject: [PATCH 089/821] =?UTF-8?q?=F0=9F=A7=B9=20remove=20manual=20syntax?=
 =?UTF-8?q?=20highlighting=20from=20JS=20sample=20notebook?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sample/JavaScript.jl | 302 +++++--------------------------------------
 1 file changed, 34 insertions(+), 268 deletions(-)

diff --git a/sample/JavaScript.jl b/sample/JavaScript.jl
index 11eca9dd05..0ee47f5ab9 100644
--- a/sample/JavaScript.jl
+++ b/sample/JavaScript.jl
@@ -325,12 +325,12 @@ ClickCounter(text="Click") = @htl("""
 <script>
 
 	// Select elements relative to `currentScript`
-	var span = currentScript.parentElement
-	var button = span.querySelector("button")
+	const span = currentScript.parentElement
+	const button = span.querySelector("button")
 
 	// we wrapped the button in a `span` to hide its default behaviour from Pluto
 
-	var count = 0
+	let count = 0
 
 	button.addEventListener("click", (e) => {
 		count += 1
@@ -427,9 +427,9 @@ Let's look at the "wrapper span strategy" again.
 	<button id="second">Julians!</button>
 	
 	<script>
-		var wrapper_span = currentScript.parentElement
+		const wrapper_span = currentScript.parentElement
 		// we can now use querySelector to select anything we want
-		var first_button = wrapper_span.querySelector("button#first")
+		const first_button = wrapper_span.querySelector("button#first")
 
 		console.log(first_button)
 	</script>
@@ -445,7 +445,7 @@ md"""
 In the example above, it would have been easier to just select the button directly, using:
 ```javascript
 // ⛔ do no use:
-var first_button = document.body.querySelector("button#first")
+const first_button = document.body.querySelector("button#first")
 ```
 
 However, this becomes a problem when **combining using the widget multiple times in the same notebook**, since all selectors will point to the first instance. 
@@ -459,27 +459,29 @@ md"""
 
 To use external javascript dependencies, you can load them from a CDN, such as:
 - [jsdelivr.com](https://www.jsdelivr.com/)
-- [skypack.dev](https://www.skypack.dev/)
+- [esm.sh](https://esm.sh)
 
 Just like when writing a browser app, there are two ways to import JS dependencies: a `<script>` tag, and the more modern ES6 import.
 
 ### Loading method 1: ES6 imports
 
-We recommend that you use an [**ES6 import**](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules) if the library supports it.
+We recommend that you use an [**ES6 import**](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules) if the library supports it. (If it does not, you might be able to still get it using [esm.sh](https://esm.sh) or [skypack.dev](https://www.skypack.dev)!)
 
 
 ##### Awkward note about syntax
 
 Normally, you can import libraries inside JS using the import syntax:
 ```javascript
-import confetti from 'https://cdn.skypack.dev/canvas-confetti'
+// ⛔ do no use:
+import confetti from "https://esm.sh/canvas-confetti@1.4.0"
 import { html, render, useEffect } from "https://cdn.jsdelivr.net/npm/htm@3.0.4/preact/standalone.mjs"
 ```
 
 In Pluto, this is [currently not yet supported](https://github.com/fonsp/Pluto.jl/issues/992), and you need to use a different syntax as workaround:
 ```javascript
-const { default: confetti } = await import("https://cdn.skypack.dev/canvas-confetti@1")
-const { html, render, useEffect } = await import( "https://cdn.jsdelivr.net/npm/htm@3.0.4/preact/standalone.mjs")
+// ✔ use:
+const { default: confetti } = await import("https://esm.sh/canvas-confetti@1.4.0")
+const { html, render, useEffect } = await import("https://cdn.jsdelivr.net/npm/htm@3.0.4/preact/standalone.mjs")
 ```
 """
 
@@ -497,6 +499,22 @@ md"""
 will work as expected. The execution of other script tags within the same cell is delayed until a `src` script finished loading, and Pluto will make sure that every source file is only loaded once.
 """
 
+# ╔═╡ 80511436-e41f-4913-8a30-d9e113cfaf71
+md"""
+### Pinning versions
+
+When using a CDN almost **never** want to use an unpinned import. Always version your CDN imports!
+```js
+// ⛔ do no use:
+"https://esm.sh/canvas-confetti"
+"https://cdn.jsdelivr.net/npm/htm/preact/standalone.mjs"
+
+// ✔ use:
+"https://esm.sh/canvas-confetti@1.4.0"
+"https://cdn.jsdelivr.net/npm/htm@3.0.4/preact/standalone.mjs"
+```
+"""
+
 # ╔═╡ 8388a833-d535-4cbd-a27b-de323cea60e8
 md"""
 # Advanced
@@ -529,6 +547,9 @@ md"""
 (Though using `HypertextLiteral.jl` would make more sense for this purpose.)
 """
 
+# ╔═╡ fc8984c8-4668-418a-b258-a1718809470c
+
+
 # ╔═╡ 846354c8-ba3b-4be7-926c-d3c9cc9add5f
 films = [
 	(title="Frances Ha", director="Noah Baumbach", year=2012),
@@ -745,255 +766,6 @@ details(x, summary="Show more") = @htl("""
 	</details>
 	""")
 
-# ╔═╡ 93abe0dc-f041-475f-9ef7-d8ee4408414b
-details(md"""
-	```htmlmixed
-	
-	<article class="learning">
-		<h4>
-			Learning HTML and CSS
-		</h4>
-		<p>
-			It is easy to learn HTML and CSS because they are not 'programming languages' like Julia and JavaScript, they are <em>markup languages</em>: there are no loops, functions or arrays, you only <em>declare</em> how your document is structured (HTML) and what that structure looks like on a 2D color display (CSS).
-		</p>
-		<p>
-			As an example, this is what this cell looks like, written in HTML and CSS:
-		</p>
-	</article>
-
-
-	<style>
-
-		article.learning {
-			background: #fde6ea4c;
-			padding: 1em;
-			border-radius: 5px;
-		}
-
-		article.learning h4::before {
-			content: "☝️";
-		}
-
-		article.learning p::first-letter {
-			font-size: 1.5em;
-			font-family: cursive;
-		}
-
-	</style>
-	```
-	""", "Show with syntax highlighting")
-
-# ╔═╡ d12b98df-8c3f-4620-ba3c-2f3dadac521b
-details(md"""
-	```htmlmixed
-	<script>
-
-	// interpolate the data 🐸
-	const data = $(simple_data)
-
-	const span = document.createElement("span")
-	span.innerText = data.msg.repeat(data.times)
-	
-	return span
-	</script>
-	```
-	""", "Show with syntax highlighting")
-
-# ╔═╡ 94561cb1-2325-49b6-8b22-943923fdd91b
-details(md"""
-	```htmlmixed
-	<script src="https://cdn.jsdelivr.net/npm/d3@6.2.0/dist/d3.min.js"></script>
-
-	<script>
-
-	// interpolate the data 🐸
-	const data = $(my_data)
-
-	const svg = DOM.svg(600,200)
-	const s = d3.select(svg)
-
-	s.selectAll("text")
-		.data(data)
-		.join("text")
-		.attr("x", d => d.coordinate[0])
-		.attr("y", d => d.coordinate[1])
-		.style("fill", "red")
-		.text(d => d.name)
-
-	return svg
-	</script>
-	```
-	""", "Show with syntax highlighting")
-
-# ╔═╡ b0c246ed-b871-461b-9541-280e49b49136
-details(md"""
-```htmlmixed
-<div>
-<button>$(text)</button>
-
-<script>
-
-	// Select elements relative to `currentScript`
-	var div = currentScript.parentElement
-	var button = div.querySelector("button")
-
-	// we wrapped the button in a `div` to hide its default behaviour from Pluto
-
-	var count = 0
-
-	button.addEventListener("click", (e) => {
-		count += 1
-
-		// we dispatch the input event on the div, not the button, because 
-		// Pluto's `@bind` mechanism listens for events on the **first element** in the
-		// HTML output. In our case, that's the div.
-
-		div.value = count
-		div.dispatchEvent(new CustomEvent("input"))
-		e.preventDefault()
-	})
-
-	// Set the initial value
-	div.value = count
-
-</script>
-</div>
-```
-""", "Show with syntax highlighting")
-
-# ╔═╡ d121e085-c69b-490f-b315-c11a9abd57a6
-details(md"""
-	```htmlmixed
-	<script>
-	
-	let data = $(films)
-	
-	// html`...` is from https://github.com/observablehq/stdlib
-	// note the escaped dollar signs:
-	let Film = ({title, director, year}) => html`
-		<li class="film">
-			<b>\${title}</b> by <em>\${director}</em> (\${year})
-		</li>
-	`
-	
-	// the returned HTML node is rendered
-	return html`
-		<ul>
-			\${data.map(Film)}
-		</ul>
-	`
-	
-	</script>
-	```
-	""", "Show with syntax highlighting")
-
-# ╔═╡ d4bdc4fe-2af8-402f-950f-2afaf77c62de
-details(md"""
-	```htmlmixed
-	<script id="something">
-	
-	console.log("'this' is currently:", this)
-
-	if(this == null) {
-		return html`<blockquote>I am running for the first time!</blockqoute>`
-	} else {
-		return html`<blockquote><b>I was triggered by reactivity!</b></blockqoute>`
-	}
-
-
-	</script>
-	```
-	""", "Show with syntax highlighting")
-
-# ╔═╡ e910982c-8508-4729-a75d-8b5b847918b6
-details(md"""
-```htmlmixed
-<script src="https://cdn.jsdelivr.net/npm/d3@6.2.0/dist/d3.min.js"></script>
-
-<script id="hello">
-
-const positions = $(dot_positions)
-
-const svg = this == null ? DOM.svg(600,200) : this
-const s = this == null ? d3.select(svg) : this.s
-
-s.selectAll("circle")
-	.data(positions)
-	.join("circle")
-	.transition()
-	.duration(300)
-	.attr("cx", d => d)
-	.attr("cy", 100)
-	.attr("r", 10)
-	.attr("fill", "gray")
-
-
-const output = svg
-output.s = s
-return output
-</script>
-```
-""", "Show with syntax highlighting")
-
-# ╔═╡ 05d28aa2-9622-4e62-ab39-ca4c7dde6eb4
-details(md"""
-	```htmlmixed
-	<script type="module" id="asdf">
-		//await new Promise(r => setTimeout(r, 1000))
-
-		const { html, render, Component, useEffect, useLayoutEffect, useState, useRef, useMemo, createContext, useContext, } = await import( "https://cdn.jsdelivr.net/npm/htm@3.0.4/preact/standalone.mjs")
-
-		const node = this ?? document.createElement("div")
-
-		const new_state = $(state)
-
-		if(this == null){
-
-			// PREACT APP STARTS HERE
-
-			const Item = ({value}) => {
-				const [loading, set_loading] = useState(true)
-
-				useEffect(() => {
-					set_loading(true)
-
-					const handle = setTimeout(() => {
-						set_loading(false)
-					}, 1000)
-
-					return () => clearTimeout(handle)
-				}, [value])
-
-				return html`<li>\${loading ? 
-					html`<em>Loading...</em>` : 
-					value
-				}</li>`
-			}
-
-			const App = () => {
-
-				const [state, set_state] = useState(new_state)
-				node.set_app_state = set_state
-
-				return html`<h5>Hello world!</h5>
-					<ul>\${
-					state.x.map((x,i) => html`<\${Item} value=\${x} key=\${i}/>`)
-				}</ul>`;
-			}
-
-			// PREACT APP ENDS HERE
-
-			render(html`<\${App}/>`, node);
-
-		} else {
-
-			node.set_app_state(new_state)
-		}
-		return node
-	</script>
-	```
-	""", "Show with syntax highlighting")
-
 # ╔═╡ cc318a19-316f-4fd9-8436-fb1d42f888a3
 demo_img = let
 	url = "https://user-images.githubusercontent.com/6933510/116753174-fa40ab80-aa06-11eb-94d7-88f4171970b2.jpeg"
@@ -1244,7 +1016,6 @@ uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
 # ╠═571613a1-6b4b-496d-9a68-aac3f6a83a4b
 # ╟─168e13f7-2ff2-4207-be56-e57755041d36
 # ╠═28ae1424-67dc-4b76-a172-1185cc76cb59
-# ╟─93abe0dc-f041-475f-9ef7-d8ee4408414b
 # ╟─ea39c63f-7466-4015-a66c-08bd9c716343
 # ╟─8b082f9a-073e-4112-9422-4087850fc89e
 # ╟─d70a3a02-ef3a-450f-bf5a-4a0d7f6262e2
@@ -1270,17 +1041,14 @@ uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
 # ╟─7afbf8ef-e91c-45b9-bf22-24201cbb4828
 # ╠═b226da72-9512-4d14-8582-2f7787c25028
 # ╠═a6fd1f7b-a8fc-420d-a8bb-9f549842ad3e
-# ╟─d12b98df-8c3f-4620-ba3c-2f3dadac521b
 # ╟─965f3660-6ec4-4a86-a2a2-c167dbe9315f
 # ╠═01ce31a9-6856-4ee7-8bce-7ce635167457
 # ╠═00d97588-d591-4dad-9f7d-223c237deefd
 # ╠═21f57310-9ceb-423c-a9ce-5beb1060a5a3
-# ╟─94561cb1-2325-49b6-8b22-943923fdd91b
 # ╟─7d9d6c28-131a-4b2a-84f8-5c085f387e85
 # ╟─0866afc2-fd42-42b7-a572-9d824cf8b83b
 # ╟─75e1a973-7ef0-4ac5-b3e2-5edb63577927
 # ╠═e8d8a60e-489b-467a-b49c-1fa844807751
-# ╟─b0c246ed-b871-461b-9541-280e49b49136
 # ╠═9346d8e2-9ba0-4475-a21f-11bdd018bc60
 # ╠═7822fdb7-bee6-40cc-a089-56bb32d77fe6
 # ╟─701de4b8-42d3-46a3-a399-d7761dccd83d
@@ -1291,28 +1059,26 @@ uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
 # ╟─f18b98f7-1e0f-4273-896f-8a667d15605b
 # ╟─d83d57e2-4787-4b8d-8669-64ed73d79e73
 # ╟─077c95cf-2a1b-459f-830e-c29c11a2c5cc
+# ╟─80511436-e41f-4913-8a30-d9e113cfaf71
 # ╟─8388a833-d535-4cbd-a27b-de323cea60e8
 # ╟─4cf27df3-6a69-402e-a71c-26538b2a52e7
 # ╟─5721ad33-a51a-4a91-adb2-0915ea0efa13
 # ╠═c857bb4b-4cf4-426e-b340-592cf7700434
-# ╟─d121e085-c69b-490f-b315-c11a9abd57a6
+# ╟─fc8984c8-4668-418a-b258-a1718809470c
 # ╠═846354c8-ba3b-4be7-926c-d3c9cc9add5f
 # ╟─a33c7d7a-8071-448e-abd6-4e38b5444a3a
 # ╠═91f3dab8-5521-44a0-9890-8d988a994076
 # ╠═dcaae662-4a4f-4dd3-8763-89ea9eab7d43
-# ╟─d4bdc4fe-2af8-402f-950f-2afaf77c62de
 # ╟─e77cfefc-429d-49db-8135-f4604f6a9f0b
 # ╠═2d5689f5-1d63-4b8b-a103-da35933ad26e
 # ╠═6dd221d1-7fd8-446e-aced-950512ea34bc
 # ╠═0a9d6e2d-3a41-4cd5-9a4e-a9b76ed89fa9
 # ╟─0962d456-1a76-4b0d-85ff-c9e7dc66621d
 # ╠═bf9b36e8-14c5-477b-a54b-35ba8e415c77
-# ╟─e910982c-8508-4729-a75d-8b5b847918b6
 # ╟─781adedc-2da7-4394-b323-e508d614afae
 # ╟─de789ad1-8197-48ae-81b2-a21ec2340ae0
 # ╠═85483b28-341e-4ed6-bb1e-66c33613725e
 # ╠═9e37c18c-3ebb-443a-9663-bb4064391d6e
-# ╟─05d28aa2-9622-4e62-ab39-ca4c7dde6eb4
 # ╠═3266f9e6-42ad-4103-8db3-b87d2c315290
 # ╟─ebec177c-4c33-45a4-bdbd-f16944631aff
 # ╟─da7091f5-8ba2-498b-aa8d-bbf3b4505b81

From cb0a11e3d3a575340de3a8a40bcbbd73ee5200bd Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 5 Feb 2022 01:07:57 +0100
Subject: [PATCH 090/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index b7d5afb27b..a3e6f0ed1f 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.17.7"
+version = "0.17.8"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 098155978c61b8e2be60949f4820513049f3d76e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 5 Feb 2022 01:39:01 +0100
Subject: [PATCH 091/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index a3e6f0ed1f..916ed19f26 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.17.8"
+version = "0.18.0"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 8ea6eabfb499bebd6551f36ea5c30afc926fe388 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 5 Feb 2022 01:51:55 +0100
Subject: [PATCH 092/821] More loading progress in terminal

---
 src/webserver/WebServer.jl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 05c30982a7..d20c57d45a 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -115,7 +115,13 @@ function run(session::ServerSession)
     Base.invokelatest(run, session, pluto_router)
 end
 
+const is_first_run = Ref(true)
+
 function run(session::ServerSession, pluto_router)
+    if is_first_run[]
+        is_first_run[] = false
+        @info "Loading..."
+    end
     
     if VERSION < v"1.6.2"
         @info "Pluto is running on an old version of Julia ($(VERSION)) that is no longer supported. Visit https://julialang.org/downloads/ for more information about upgrading Julia."
@@ -277,6 +283,7 @@ function run(session::ServerSession, pluto_router)
     # Start this in the background, so that the first notebook launch (which will trigger registry update) will be faster
     @asynclog withtoken(pkg_token) do
         PkgCompat.update_registries(; force=false)
+        println("    Updating registry done ✓")
     end
 
     shutdown_server[] = () -> @sync begin

From 10747db7ed512c6b3a9881c5cdb2a4daadea766d Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Thu, 10 Feb 2022 20:58:59 +0100
Subject: [PATCH 093/821] make `GlobalRef` aliases local to the cell (#1904)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* make `GlobalRef` aliases local to the cell

Otherwise, they "leak" inside the workspace and are set to `nothing` in
the next reactive run. This means that if you use a hook defined in the
same notebook, even Base functions can become `nothing` 👻.

* one func
---
 src/runner/PlutoRunner.jl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index ae33b2081f..fc6dfb3e23 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -144,6 +144,7 @@ function globalref_to_workspaceref(expr)
         # Create new lines to assign to the replaced names of the global refs.
         # This way the expression explorer doesn't care (it just sees references to variables outside of the workspace), 
         # and the variables don't get overwriten by local assigments to the same name (because we have special names). 
+        (mutable_ref_list .|> ref -> :(local $(ref[2])))...,
         map(mutable_ref_list) do ref
             # I can just do Expr(:isdefined, ref[1]) here, but it feels better to macroexpand,
             #   because it's more obvious what's going on, and when they ever change the ast, we're safe :D

From ae1ec105c12b2229dd5efa0d6320e17e63fc26ef Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 11 Feb 2022 22:03:30 +0100
Subject: [PATCH 094/821] whitespace

---
 src/runner/PlutoRunner.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index fc6dfb3e23..2e0204b714 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1304,7 +1304,7 @@ end
 # This is similar to how Requires.jl works, except we don't use a callback, we just check every time.
 const integrations = Integration[
     Integration(
-        id = Base.PkgId(Base.UUID(reinterpret(Int128, codeunits("Paul Berg Berlin")) |> first), "AbstractPlutoDingetjes"),
+        id = Base.PkgId(Base.UUID(reinterpret(UInt128, codeunits("Paul Berg Berlin")) |> first), "AbstractPlutoDingetjes"),
         code = quote
             @assert v"1.0.0" <= AbstractPlutoDingetjes.MY_VERSION < v"2.0.0"
             initial_value_getter_ref[] = AbstractPlutoDingetjes.Bonds.initial_value

From dac1912e5ad05f2d14bbf75d863b46353cde30fb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 11 Feb 2022 22:04:08 +0100
Subject: [PATCH 095/821] tweak: use Response.ok for better errors

---
 frontend/common/SliderServerClient.js | 8 ++++++--
 frontend/components/RecordingUI.js    | 5 +++--
 frontend/components/Welcome.js        | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frontend/common/SliderServerClient.js b/frontend/common/SliderServerClient.js
index cf0c86fb93..c25084ee29 100644
--- a/frontend/common/SliderServerClient.js
+++ b/frontend/common/SliderServerClient.js
@@ -4,6 +4,8 @@ import { pack, unpack } from "./MsgPack.js"
 import immer from "../imports/immer.js"
 import _ from "../imports/lodash.js"
 
+const assert_response_ok = (/** @type {Response} */ r) => (r.ok ? r : Promise.reject(r))
+
 const actions_to_keep = ["get_published_object"]
 
 export const nothing_actions = ({ actions }) =>
@@ -20,6 +22,7 @@ export const nothing_actions = ({ actions }) =>
 
 export const slider_server_actions = ({ setStatePromise, launch_params, actions, get_original_state, get_current_state, apply_notebook_patches }) => {
     const notebookfile_hash = fetch(launch_params.notebookfile)
+        .then(assert_response_ok)
         .then((r) => r.arrayBuffer())
         .then(hash_arraybuffer)
 
@@ -27,6 +30,7 @@ export const slider_server_actions = ({ setStatePromise, launch_params, actions,
 
     const bond_connections = notebookfile_hash
         .then((hash) => fetch(trailingslash(launch_params.slider_server_url) + "bondconnections/" + encodeURIComponent(hash)))
+        .then(assert_response_ok)
         .then((r) => r.arrayBuffer())
         .then((b) => unpack(new Uint8Array(b)))
 
@@ -65,11 +69,11 @@ export const slider_server_actions = ({ setStatePromise, launch_params, actions,
                 const response = use_get
                     ? await fetch(url + encodeURIComponent(await base64_arraybuffer(packed)), {
                           method: "GET",
-                      })
+                      }).then(assert_response_ok)
                     : await fetch(url, {
                           method: "POST",
                           body: packed,
-                      })
+                      }).then(assert_response_ok)
 
                 unpacked = unpack(new Uint8Array(await response.arrayBuffer()))
                 const { patches, ids_of_cells_that_ran } = unpacked
diff --git a/frontend/components/RecordingUI.js b/frontend/components/RecordingUI.js
index 3cd0b035c2..846dd41b13 100644
--- a/frontend/components/RecordingUI.js
+++ b/frontend/components/RecordingUI.js
@@ -6,6 +6,7 @@ import immer from "../imports/immer.js"
 import { base64_arraybuffer, blob_url_to_data_url } from "../common/PlutoHash.js"
 import { pack, unpack } from "../common/MsgPack.js"
 
+const assert_response_ok = (/** @type {Response} */ r) => (r.ok ? r : Promise.reject(r))
 let run = (x) => x()
 
 export const RecordingUI = ({ notebook_name, is_recording, recording_waiting_to_start, set_recording_states, patch_listeners, export_url }) => {
@@ -53,7 +54,7 @@ export const RecordingUI = ({ notebook_name, is_recording, recording_waiting_to_
             }
         }
 
-        let initial_html = await (await fetch(export_url("notebookexport"))).text()
+        let initial_html = await (await fetch(export_url("notebookexport")).then(assert_response_ok)).text()
 
         initial_html = initial_html.replaceAll(
             "https://cdn.jsdelivr.net/gh/fonsp/Pluto.jl@0.17.3/frontend/",
@@ -205,7 +206,7 @@ export const RecordingPlaybackUI = ({ recording_url, audio_src, initializing, ap
         () =>
             Promise.resolve().then(async () => {
                 if (recording_url) {
-                    return unpack(new Uint8Array(await (await fetch(recording_url)).arrayBuffer()))
+                    return unpack(new Uint8Array(await (await fetch(recording_url).then(assert_response_ok)).arrayBuffer()))
                 } else {
                     return null
                 }
diff --git a/frontend/components/Welcome.js b/frontend/components/Welcome.js
index c58ac800a1..b29660cdd2 100644
--- a/frontend/components/Welcome.js
+++ b/frontend/components/Welcome.js
@@ -65,7 +65,7 @@ export const process_path_or_url = async (path_or_url) => {
             const gist = await (
                 await fetch(`https://api.github.com/gists/${gist_id}`, {
                     headers: { Accept: "application/vnd.github.v3+json" },
-                })
+                }).then((r) => (r.ok ? r : Promise.reject(r)))
             ).json()
             console.log(gist)
             const files = Object.values(gist.files)

From 8d735ded933c968195cee9acf686f7803aec848b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 11 Feb 2022 22:17:06 +0100
Subject: [PATCH 096/821] asdf

---
 frontend/binder.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/binder.css b/frontend/binder.css
index ca5995c0ba..ef11506ec3 100644
--- a/frontend/binder.css
+++ b/frontend/binder.css
@@ -79,10 +79,10 @@ binder-spinner {
 body.wiggle_binder button#launch_binder,
 body.wiggle_binder #binder_launch_help {
     /* position: fixed; */
-    animation: wiggle 0.3s ease-in-out 0s 1;
+    animation: wiggle-binder-button 0.3s ease-in-out 0s 1;
 }
 
-@keyframes wiggle {
+@keyframes wiggle-binder-button {
     0% {
         transform: rotate(0deg);
     }

From 425d7499a2d9e1ca13c879ad8c7e8d2790332a3d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Feb 2022 11:44:01 +0100
Subject: [PATCH 097/821] compat FuzzyCompletions = "0.3,0.4,0.5"

---
 Project.toml                           | 2 +-
 src/runner/NotebookProcessProject.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Project.toml b/Project.toml
index 916ed19f26..5fd7297426 100644
--- a/Project.toml
+++ b/Project.toml
@@ -25,7 +25,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
 Configurations = "0.15, 0.16, 0.17"
-FuzzyCompletions = "0.3,0.4"
+FuzzyCompletions = "0.3,0.4,0.5"
 HTTP = "^0.9.1"
 MsgPack = "1.1"
 RelocatableFolders = "0.1"
diff --git a/src/runner/NotebookProcessProject.toml b/src/runner/NotebookProcessProject.toml
index c4ab0afd8b..35b0b10f3d 100644
--- a/src/runner/NotebookProcessProject.toml
+++ b/src/runner/NotebookProcessProject.toml
@@ -12,4 +12,4 @@ Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
-FuzzyCompletions = "0.3,0.4"
+FuzzyCompletions = "0.3,0.4,0.5"

From b911de6b09f2dbb75b2b0b0f5493f14468e2026a Mon Sep 17 00:00:00 2001
From: Derek Ryan Strong <drstrong@protonmail.com>
Date: Sat, 12 Feb 2022 02:45:07 -0800
Subject: [PATCH 098/821] Remove duplicate "of" in Plots sample notebook
 (#1903)

---
 sample/Plots.jl.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sample/Plots.jl.jl b/sample/Plots.jl.jl
index 313197612d..436207f68f 100644
--- a/sample/Plots.jl.jl
+++ b/sample/Plots.jl.jl
@@ -38,7 +38,7 @@ apples = [15, 25, 80, 75, 50, 30, 35, 15, 25, 35]
 
 # ╔═╡ a405ae4c-9ad9-11ea-0008-f763e098846d
 md"""
-Great, let's plot them! The basic syntax of of `Plots` is very simple.
+Great, let's plot them! The basic syntax of `Plots` is very simple.
 """
 
 # ╔═╡ 12a8c222-9ad9-11ea-2544-355bd080367f

From a14bcbabf3cca932a38d7d2d7d832240e3d12fb2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Feb 2022 11:52:56 +0100
Subject: [PATCH 099/821] docs for `WorkspaceManager.poll`

---
 src/evaluation/WorkspaceManager.jl | 34 ++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index a606823c88..aae50e5e4f 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -474,6 +474,40 @@ move_vars(session_notebook, bump_workspace_module(session_notebook)..., to_delet
     move_vars(args...; kwargs...)
 )
 
+"""
+```julia
+poll(query::Function, timeout::Real=Inf64, interval::Real=1/20)::Bool
+```
+
+Keep running your function `query()` in intervals until it returns `true`, or until `timeout` seconds have passed.
+
+`poll` returns `true` if `query()` returned `true`. If `timeout` seconds have passed, `poll` returns `false`.
+
+# Example
+```julia
+vals = [1,2,3]
+
+@async for i in 1:5
+    sleep(1)
+    vals[3] = 99
+end
+
+poll(8 #= seconds =#) do
+    vals[3] == 99
+end # returns `true` (after 5 seconds)!
+
+###
+
+@async for i in 1:5
+    sleep(1)
+    vals[3] = 5678
+end
+
+poll(2 #= seconds =#) do
+    vals[3] == 5678
+end # returns `false` (after 2 seconds)!
+```
+"""
 function poll(query::Function, timeout::Real=Inf64, interval::Real=1/20)
     start = time()
     while time() < start + timeout

From 9c237a14a5e49d62a08026ad85d494d7b189b764 Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Sun, 13 Feb 2022 12:07:38 +0100
Subject: [PATCH 100/821] Fix parsing `f(;)`, fixes #1912

---
 frontend/components/CellInput/scopestate_statefield.js | 4 ++--
 frontend/components/CellInput/tests/scopestate.test.js | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/components/CellInput/scopestate_statefield.js b/frontend/components/CellInput/scopestate_statefield.js
index 6fe6a0f2a2..270bf7ab21 100644
--- a/frontend/components/CellInput/scopestate_statefield.js
+++ b/frontend/components/CellInput/scopestate_statefield.js
@@ -122,7 +122,7 @@ let explorer_function_definition_argument = (cursor, doc, scopestate, verbose =
 
     if ((match = match_function_call_argument(cursor)`; ${t.many("named_args")}`)) {
         // "Parameters", the `y, z` in `function f(x; y, z) end`
-        let { named_args } = match
+        let { named_args = [] } = match
         for (let { node: named_arg } of named_args) {
             scopestate = explorer_function_definition_argument(named_arg, doc, scopestate, verbose)
         }
@@ -759,7 +759,7 @@ export let explore_variable_usage = (
                 let match = null
                 if ((match = match_function_call_argument(arg)`; ${t.many("named_args")}`)) {
                     // "Parameters", the part in `f(x; y, z)` after the `;`
-                    let { named_args } = match
+                    let { named_args = [] } = match
                     for (let { node: named_arg } of named_args) {
                         let match = null
                         if ((match = match_function_call_named_argument(named_arg)`${t.as("name")} = ${t.as("value")}`)) {
diff --git a/frontend/components/CellInput/tests/scopestate.test.js b/frontend/components/CellInput/tests/scopestate.test.js
index 96072cb61b..5dc05e668c 100644
--- a/frontend/components/CellInput/tests/scopestate.test.js
+++ b/frontend/components/CellInput/tests/scopestate.test.js
@@ -145,3 +145,7 @@ Deno.test("Macros", () => {
 Deno.test("Lonely bare tuple", () => {
     test_implicit(jl`defined, = (global_var,)`)
 })
+
+Deno.test("Very, very lonely arguments", () => {
+    test_implicit(jl`global_var(;)`)
+})

From 4bacb231b5435a2b60438dc67bcce5a2928209b1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 14 Feb 2022 19:52:04 +0100
Subject: [PATCH 101/821] tests whitespace

---
 test/React.jl            | 218 +++++++++++++++++++--------------------
 test/ReloadFromFile.jl   |   2 +-
 test/RichOutput.jl       |  24 ++---
 test/WorkspaceManager.jl |  12 +--
 test/packages/Basic.jl   |  13 ++-
 5 files changed, 136 insertions(+), 133 deletions(-)

diff --git a/test/React.jl b/test/React.jl
index 3069b89f13..7c74f513e5 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -42,12 +42,12 @@ import Distributed
         @test notebook.cells[2].runtime !== nothing
 
         update_run!(🍭, notebook, notebook.cells[3])
-        @test notebook.cells[3].errored == false
+        @test notebook.cells[3] |> noerror
         @test notebook.cells[3].output.rootassignee === nothing
     
         update_run!(🍭, notebook, notebook.cells[4])
         @test notebook.cells[4].output.body == "16"
-        @test notebook.cells[4].errored == false
+        @test notebook.cells[4] |> noerror
         @test notebook.cells[4].output.rootassignee === nothing
 
         setcode(notebook.cells[1], "x = 912")
@@ -62,7 +62,7 @@ import Distributed
         setcode(notebook.cells[2], "y = 2")
         update_run!(🍭, notebook, notebook.cells[1:2])
         update_run!(🍭, notebook, notebook.cells[5:6])
-        @test notebook.cells[5].errored == false
+        @test notebook.cells[5] |> noerror
         @test notebook.cells[6].output.body == "3"
 
         setcode(notebook.cells[2], "y = 1")
@@ -105,16 +105,16 @@ import Distributed
     
         setcode(notebook.cells[1], "")
         update_run!(🍭, notebook, notebook.cells[1])
-        @test notebook.cells[1].errored == false
-        @test notebook.cells[2].errored == false
+        @test notebook.cells[1] |> noerror
+        @test notebook.cells[2] |> noerror
     
     # https://github.com/fonsp/Pluto.jl/issues/26
         setcode(notebook.cells[1], "x = 1")
         update_run!(🍭, notebook, notebook.cells[1])
         setcode(notebook.cells[2], "x")
         update_run!(🍭, notebook, notebook.cells[2])
-        @test notebook.cells[1].errored == false
-        @test notebook.cells[2].errored == false
+        @test notebook.cells[1] |> noerror
+        @test notebook.cells[2] |> noerror
 
         update_run!(🍭, notebook, notebook.cells[3])
         update_run!(🍭, notebook, notebook.cells[4])
@@ -123,8 +123,8 @@ import Distributed
     
         setcode(notebook.cells[3], "")
         update_run!(🍭, notebook, notebook.cells[3])
-        @test notebook.cells[3].errored == false
-        @test notebook.cells[4].errored == false
+        @test notebook.cells[3] |> noerror
+        @test notebook.cells[4] |> noerror
     
         update_run!(🍭, notebook, notebook.cells[5])
         update_run!(🍭, notebook, notebook.cells[6])
@@ -133,8 +133,8 @@ import Distributed
     
         setcode(notebook.cells[5], "")
         update_run!(🍭, notebook, notebook.cells[5])
-        @test notebook.cells[5].errored == false
-        @test notebook.cells[6].errored == false
+        @test notebook.cells[5] |> noerror
+        @test notebook.cells[6] |> noerror
 
         WorkspaceManager.unmake_workspace((🍭, notebook))
     end
@@ -278,12 +278,12 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[1:1])
 
         @test notebook.cells[1].errored == true # this cell is before the using Dates and will error
-        @test notebook.cells[3].errored == false # using the position in the notebook this cell will not error
+        @test notebook.cells[3] |> noerror # using the position in the notebook this cell will not error
 
         update_run!(🍭, notebook, notebook.cells[2:2])
 
-        @test notebook.cells[1].errored == false
-        @test notebook.cells[3].errored == false
+        @test notebook.cells[1] |> noerror
+        @test notebook.cells[3] |> noerror
     end
 
     @testset "Reactive usings 2" begin
@@ -297,8 +297,8 @@ import Distributed
 
         update_run!(🍭, notebook, notebook.cells)
 
-        @test notebook.cells[1].errored == false
-        @test notebook.cells[3].errored == false
+        @test notebook.cells[1] |> noerror
+        @test notebook.cells[3] |> noerror
 
         setcode(notebook.cells[2], "")
         update_run!(🍭, notebook, notebook.cells[2:2])
@@ -646,8 +646,8 @@ import Distributed
         fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells[1:4])
-        @test notebook.cells[1].errored == false
-        @test notebook.cells[2].errored == false
+        @test notebook.cells[1] |> noerror
+        @test notebook.cells[2] |> noerror
         @test notebook.cells[3].output.body == "1"
         @test notebook.cells[4].output.body == "2"
 
@@ -660,15 +660,15 @@ import Distributed
         
         setcode(notebook.cells[1], "a(x) = 1")
         update_run!(🍭, notebook, notebook.cells[1])
-        @test notebook.cells[1].errored == false
-        @test notebook.cells[2].errored == false
+        @test notebook.cells[1] |> noerror
+        @test notebook.cells[2] |> noerror
         @test notebook.cells[3].output.body == "1"
         @test notebook.cells[4].output.body == "2"
 
         setcode(notebook.cells[1], "")
         update_run!(🍭, notebook, notebook.cells[1])
-        @test notebook.cells[1].errored == false
-        @test notebook.cells[2].errored == false
+        @test notebook.cells[1] |> noerror
+        @test notebook.cells[2] |> noerror
         @test notebook.cells[3].errored == true
         @test notebook.cells[4].output.body == "2"
 
@@ -680,16 +680,16 @@ import Distributed
 
         setcode(notebook.cells[5], "")
         update_run!(🍭, notebook, notebook.cells[5])
-        @test notebook.cells[5].errored == false
-        @test notebook.cells[6].errored == false
+        @test notebook.cells[5] |> noerror
+        @test notebook.cells[6] |> noerror
         @test notebook.cells[7].errored == true
         @test notebook.cells[8].output.body == "6"
 
         setcode(notebook.cells[5], "b = 5")
         setcode(notebook.cells[6], "")
         update_run!(🍭, notebook, notebook.cells[5:6])
-        @test notebook.cells[5].errored == false
-        @test notebook.cells[6].errored == false
+        @test notebook.cells[5] |> noerror
+        @test notebook.cells[6] |> noerror
         @test notebook.cells[7].output.body == "12"
         @test notebook.cells[8].errored == true
 
@@ -697,8 +697,8 @@ import Distributed
         @test notebook.cells[12].output.body == "missing"
 
         update_run!(🍭, notebook, notebook.cells[9:10])
-        @test notebook.cells[9].errored == false
-        @test notebook.cells[10].errored == false
+        @test notebook.cells[9] |> noerror
+        @test notebook.cells[10] |> noerror
         @test notebook.cells[11].output.body == "9"
         @test notebook.cells[12].output.body == "10"
         @test notebook.cells[13].output.body == "10"
@@ -727,20 +727,20 @@ import Distributed
         @test notebook.cells[18].errored == true
 
         update_run!(🍭, notebook, notebook.cells[14])
-        @test notebook.cells[16].errored == false
+        @test notebook.cells[16] |> noerror
         @test notebook.cells[17].errored == true
-        @test notebook.cells[18].errored == false
+        @test notebook.cells[18] |> noerror
 
         update_run!(🍭, notebook, notebook.cells[15])
-        @test notebook.cells[16].errored == false
-        @test notebook.cells[17].errored == false
-        @test notebook.cells[18].errored == false
+        @test notebook.cells[16] |> noerror
+        @test notebook.cells[17] |> noerror
+        @test notebook.cells[18] |> noerror
 
         setcode(notebook.cells[14], "")
         update_run!(🍭, notebook, notebook.cells[14])
         @test notebook.cells[16].errored == true
-        @test notebook.cells[17].errored == false
-        @test notebook.cells[18].errored == false
+        @test notebook.cells[17] |> noerror
+        @test notebook.cells[18] |> noerror
 
         setcode(notebook.cells[15], "")
         update_run!(🍭, notebook, notebook.cells[15])
@@ -755,8 +755,8 @@ import Distributed
         # Cell("e(22)"),
 
         update_run!(🍭, notebook, notebook.cells[19:22])
-        @test notebook.cells[19].errored == false
-        @test notebook.cells[21].errored == false
+        @test notebook.cells[19] |> noerror
+        @test notebook.cells[21] |> noerror
         @test notebook.cells[22].errored == true
 
         setcode(notebook.cells[20], "asdf(x) = asdf(x,x)")
@@ -770,38 +770,38 @@ import Distributed
 
         setcode(notebook.cells[20], "")
         update_run!(🍭, notebook, notebook.cells[20])
-        @test notebook.cells[19].errored == false
-        @test notebook.cells[20].errored == false
-        @test notebook.cells[21].errored == false
+        @test notebook.cells[19] |> noerror
+        @test notebook.cells[20] |> noerror
+        @test notebook.cells[21] |> noerror
         @test notebook.cells[22].errored == true
 
         setcode(notebook.cells[19], "begin struct asdf; x; y; end; asdf(x) = asdf(x,x); end")
         setcode(notebook.cells[20], "")
         update_run!(🍭, notebook, notebook.cells[19:20])
-        @test notebook.cells[19].errored == false
-        @test notebook.cells[20].errored == false
-        @test notebook.cells[21].errored == false
-        @test notebook.cells[22].errored == false
+        @test notebook.cells[19] |> noerror
+        @test notebook.cells[20] |> noerror
+        @test notebook.cells[21] |> noerror
+        @test notebook.cells[22] |> noerror
 
         update_run!(🍭, notebook, notebook.cells[23:27])
-        @test notebook.cells[23].errored == false
-        @test notebook.cells[24].errored == false
-        @test notebook.cells[25].errored == false
-        @test notebook.cells[26].errored == false
-        @test notebook.cells[27].errored == false
+        @test notebook.cells[23] |> noerror
+        @test notebook.cells[24] |> noerror
+        @test notebook.cells[25] |> noerror
+        @test notebook.cells[26] |> noerror
+        @test notebook.cells[27] |> noerror
         update_run!(🍭, notebook, notebook.cells[23:27])
-        @test notebook.cells[23].errored == false
-        @test notebook.cells[24].errored == false
-        @test notebook.cells[25].errored == false
-        @test notebook.cells[26].errored == false
-        @test notebook.cells[27].errored == false
+        @test notebook.cells[23] |> noerror
+        @test notebook.cells[24] |> noerror
+        @test notebook.cells[25] |> noerror
+        @test notebook.cells[26] |> noerror
+        @test notebook.cells[27] |> noerror
 
         setcode.(notebook.cells[23:27], [""])
         update_run!(🍭, notebook, notebook.cells[23:27])
 
         setcode(notebook.cells[23], "@assert !any(isdefined.([@__MODULE__], [Symbol(:e,i) for i in 1:14]))")
         update_run!(🍭, notebook, notebook.cells[23])
-        @test notebook.cells[23].errored == false
+        @test notebook.cells[23] |> noerror
 
         WorkspaceManager.unmake_workspace((🍭, notebook))
 
@@ -970,23 +970,23 @@ import Distributed
         
         setcode(notebook.cells[1], "")
         update_run!(🍭, notebook, notebook.cells[1])
-        @test notebook.cells[1].errored == false
+        @test notebook.cells[1] |> noerror
         @test occursinerror("x not defined", notebook.cells[2])
 
         update_run!(🍭, notebook, notebook.cells[4])
         update_run!(🍭, notebook, notebook.cells[3])
-        @test notebook.cells[3].errored == false
-        @test notebook.cells[4].errored == false
+        @test notebook.cells[3] |> noerror
+        @test notebook.cells[4] |> noerror
         update_run!(🍭, notebook, notebook.cells[3])
-        @test notebook.cells[3].errored == false
-        @test notebook.cells[4].errored == false
+        @test notebook.cells[3] |> noerror
+        @test notebook.cells[4] |> noerror
         setcode(notebook.cells[3], "struct a; x; y end")
         update_run!(🍭, notebook, notebook.cells[3])
-        @test notebook.cells[3].errored == false
-        @test notebook.cells[4].errored == false
+        @test notebook.cells[3] |> noerror
+        @test notebook.cells[4] |> noerror
         setcode(notebook.cells[3], "")
         update_run!(🍭, notebook, notebook.cells[3])
-        @test notebook.cells[3].errored == false
+        @test notebook.cells[3] |> noerror
         @test notebook.cells[4].errored == true
 
 
@@ -1009,13 +1009,13 @@ import Distributed
 
         update_run!(🍭, notebook, notebook.cells[1])
         @test notebook.cells[1].output.body == "f" || startswith(notebook.cells[1].output.body, "f (generic function with ")
-        @test notebook.cells[1].errored == false
+        @test notebook.cells[1] |> noerror
 
         update_run!(🍭, notebook, notebook.cells[2:3])
-        @test notebook.cells[2].errored == false
-        @test notebook.cells[3].errored == false
+        @test notebook.cells[2] |> noerror
+        @test notebook.cells[3] |> noerror
         update_run!(🍭, notebook, notebook.cells[3])
-        @test notebook.cells[3].errored == false
+        @test notebook.cells[3] |> noerror
 
         update_run!(🍭, notebook, notebook.cells[4])
         @test notebook.cells[4].output.body == "2"
@@ -1103,7 +1103,7 @@ import Distributed
     @testset "Changing functions" begin
 
         update_run!(🍭, notebook, notebook.cells[2])
-        @test notebook.cells[2].errored == false
+        @test notebook.cells[2] |> noerror
 
         update_run!(🍭, notebook, notebook.cells[1])
         update_run!(🍭, notebook, notebook.cells[3])
@@ -1112,12 +1112,12 @@ import Distributed
         setcode(notebook.cells[1], "y = 2")
         update_run!(🍭, notebook, notebook.cells[1])
         @test notebook.cells[3].output.body == "5"
-        @test notebook.cells[2].errored == false
+        @test notebook.cells[2] |> noerror
 
         setcode(notebook.cells[1], "y")
         update_run!(🍭, notebook, notebook.cells[1])
         @test occursinerror("UndefVarError", notebook.cells[1])
-        @test notebook.cells[2].errored == false
+        @test notebook.cells[2] |> noerror
         @test occursinerror("UndefVarError", notebook.cells[3])
 
         update_run!(🍭, notebook, notebook.cells[4])
@@ -1126,7 +1126,7 @@ import Distributed
 
         setcode(notebook.cells[4], "g(a) = a+a")
         update_run!(🍭, notebook, notebook.cells[4])
-        @test notebook.cells[4].errored == false
+        @test notebook.cells[4] |> noerror
         @test notebook.cells[5].errored == true
 
         setcode(notebook.cells[5], "g(5)")
@@ -1136,18 +1136,18 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[6])
         update_run!(🍭, notebook, notebook.cells[7])
         update_run!(🍭, notebook, notebook.cells[8])
-        @test notebook.cells[6].errored == false
-        @test notebook.cells[7].errored == false
+        @test notebook.cells[6] |> noerror
+        @test notebook.cells[7] |> noerror
         @test notebook.cells[8].errored == true
     
         setcode(notebook.cells[6], "h(x::Float64) = 2.0 * x")
         update_run!(🍭, notebook, notebook.cells[6])
-        @test notebook.cells[6].errored == false
+        @test notebook.cells[6] |> noerror
         @test notebook.cells[7].errored == true
-        @test notebook.cells[8].errored == false
+        @test notebook.cells[8] |> noerror
 
         update_run!(🍭, notebook, notebook.cells[9:10])
-        @test notebook.cells[9].errored == false
+        @test notebook.cells[9] |> noerror
         @test notebook.cells[10].output.body == "true"
 
         setcode(notebook.cells[9], "p = p")
@@ -1156,48 +1156,48 @@ import Distributed
 
         setcode(notebook.cells[9], "p = 9")
         update_run!(🍭, notebook, notebook.cells[9])
-        @test notebook.cells[9].errored == false
+        @test notebook.cells[9] |> noerror
         @test notebook.cells[10].output.body == "false"
         
         setcode(notebook.cells[9], "p(x) = 9")
         update_run!(🍭, notebook, notebook.cells[9])
-        @test notebook.cells[9].errored == false
+        @test notebook.cells[9] |> noerror
         @test notebook.cells[10].output.body == "true"
     end
 
     @testset "Extending imported functions" begin
         update_run!(🍭, notebook, notebook.cells[11:15])
-        @test_broken notebook.cells[11].errored == false
-        @test_broken notebook.cells[12].errored == false # multiple definitions for `Something` should be okay? == false
-        @test notebook.cells[13].errored == false
+        @test_broken notebook.cells[11] |> noerror
+        @test_broken notebook.cells[12] |> noerror # multiple definitions for `Something` should be okay? == false
+        @test notebook.cells[13] |> noerror
         @test notebook.cells[14].errored == true # the definition for a was created before `a` was used, so it hides the `a` from `Something`
         @test notebook.cells[15].output.body == "15"
 
         
         @test_nowarn update_run!(🍭, notebook, notebook.cells[13:15])
-        @test notebook.cells[13].errored == false
+        @test notebook.cells[13] |> noerror
         @test notebook.cells[14].errored == true # the definition for a was created before `a` was used, so it hides the `a` from `Something`
         @test notebook.cells[15].output.body == "15"
 
         @test_nowarn update_run!(🍭, notebook, notebook.cells[16:20])
-        @test notebook.cells[16].errored == false
+        @test notebook.cells[16] |> noerror
         @test occursinerror("Multiple", notebook.cells[17])
         @test occursinerror("Multiple", notebook.cells[18])
         @test occursinerror("UndefVarError", notebook.cells[19])
         @test occursinerror("UndefVarError", notebook.cells[20])
 
         @test_nowarn update_run!(🍭, notebook, notebook.cells[21:24])
-        @test notebook.cells[21].errored == false
-        @test notebook.cells[22].errored == false
-        @test notebook.cells[23].errored == false
+        @test notebook.cells[21] |> noerror
+        @test notebook.cells[22] |> noerror
+        @test notebook.cells[23] |> noerror
         @test notebook.cells[23].output.body == "\"🐟\""
         @test notebook.cells[24].output.body == "24"
 
         setcode(notebook.cells[22], "import .Wow: c")
         @test_nowarn update_run!(🍭, notebook, notebook.cells[22])
-        @test notebook.cells[22].errored == false
+        @test notebook.cells[22] |> noerror
         @test notebook.cells[23].output.body == "\"🐟\""
-        @test notebook.cells[23].errored == false
+        @test notebook.cells[23] |> noerror
         @test notebook.cells[24].errored == true # the extension should no longer exist
 
         # https://github.com/fonsp/Pluto.jl/issues/59
@@ -1235,7 +1235,7 @@ import Distributed
 
     @testset "Using external libraries" begin
         update_run!(🍭, notebook, notebook.cells[30:31])
-        @test notebook.cells[30].errored == false
+        @test notebook.cells[30] |> noerror
         @test notebook.cells[31].output.body == "31"
         update_run!(🍭, notebook, notebook.cells[31])
         @test notebook.cells[31].output.body == "31"
@@ -1266,10 +1266,10 @@ import Distributed
         @test notebook.cells[2].output.body == "4"
 
         update_run!(🍭, notebook, notebook.cells[3:6])
-        @test notebook.cells[3].errored == false
-        @test notebook.cells[4].errored == false
-        @test notebook.cells[5].errored == false
-        @test notebook.cells[6].errored == false
+        @test notebook.cells[3] |> noerror
+        @test notebook.cells[4] |> noerror
+        @test notebook.cells[5] |> noerror
+        @test notebook.cells[6] |> noerror
         @test notebook.cells[6].output.body == "9"
 
         setcode(notebook.cells[3], "b = -3")
@@ -1277,7 +1277,7 @@ import Distributed
         @test notebook.cells[6].output.body == "3"
 
         update_run!(🍭, notebook, notebook.cells[7:8])
-        @test notebook.cells[7].errored == false
+        @test notebook.cells[7] |> noerror
         @test notebook.cells[8].output.body == "5"
 
         setcode(notebook.cells[3], "b = 3")
@@ -1347,7 +1347,7 @@ import Distributed
 
         update_run!(🍭, notebook, notebook.cells[9:10])
         @test !occursinerror("UndefVarError", notebook.cells[9])
-        @test notebook.cells[10].errored == false
+        @test notebook.cells[10] |> noerror
 
         update_run!(🍭, notebook, notebook.cells[11])
         @test_broken notebook.cells[9].errored == true
@@ -1359,7 +1359,7 @@ import Distributed
 
         update_run!(🍭, notebook, notebook.cells[13:15])
         @test notebook.cells[13].output.body == "15"
-        @test notebook.cells[14].errored == false
+        @test notebook.cells[14] |> noerror
 
         setcode(notebook.cells[15], "orange = 10005")
         update_run!(🍭, notebook, notebook.cells[15])
@@ -1493,7 +1493,7 @@ import Distributed
         ])
 
         update_run!(🍭, notebook, notebook.cells)
-        @test notebook.cells[1].errored == false
+        @test notebook.cells[1] |> noerror
         @test notebook.cells[1].output.body == "false"
         @test notebook.cells[22].output.body == "Expr"
         @test notebook.cells[25].output.body == ":(:value)"
@@ -1534,7 +1534,7 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[6])
         @test old != notebook.cells[6].output.body
 
-        @test notebook.cells[7].errored == false
+        @test notebook.cells[7] |> noerror
         @test notebook.cells[7].output.body == "false"
 
         @test occursinerror("UndefVarError", notebook.cells[8])
@@ -1553,13 +1553,13 @@ import Distributed
         @test notebook.cells[19].output.body == ":(1 + 1)"
         @test notebook.cells[20].output.body == ":(1 + 1)"
 
-        @test notebook.cells[27].errored == false
+        @test notebook.cells[27] |> noerror
         @test notebook.topology.codes[notebook.cells[27]].function_wrapped == false
-        @test notebook.cells[28].errored == false
+        @test notebook.cells[28] |> noerror
         
         update_run!(🍭, notebook, notebook.cells[29:30])
-        @test notebook.cells[29].errored == false
-        @test notebook.cells[30].errored == false
+        @test notebook.cells[29] |> noerror
+        @test notebook.cells[30] |> noerror
         
 
         WorkspaceManager.unmake_workspace((🍭, notebook))
@@ -1644,21 +1644,21 @@ import Distributed
         
 
         update_run!(🍭, notebook, notebook.cells[16:18])
-        @test notebook.cells[16].errored == false
+        @test notebook.cells[16] |> noerror
         @test notebook.cells[16].output.body == "34"
-        @test notebook.cells[17].errored == false
-        @test notebook.cells[18].errored == false
+        @test notebook.cells[17] |> noerror
+        @test notebook.cells[18] |> noerror
 
         setcode(notebook.cells[18], "υ = 8")
         update_run!(🍭, notebook, notebook.cells[18])
         @test notebook.cells[16].output.body == "24"
         
         update_run!(🍭, notebook, notebook.cells[19:22])
-        @test notebook.cells[19].errored == false
+        @test notebook.cells[19] |> noerror
         @test notebook.cells[19].output.body == "60"
-        @test notebook.cells[20].errored == false
-        @test notebook.cells[21].errored == false
-        @test notebook.cells[22].errored == false
+        @test notebook.cells[20] |> noerror
+        @test notebook.cells[21] |> noerror
+        @test notebook.cells[22] |> noerror
 
         setcode(notebook.cells[22], "y = 0")
         update_run!(🍭, notebook, notebook.cells[22])
diff --git a/test/ReloadFromFile.jl b/test/ReloadFromFile.jl
index a9c4bb909c..a6a5eadbb6 100644
--- a/test/ReloadFromFile.jl
+++ b/test/ReloadFromFile.jl
@@ -45,7 +45,7 @@ import Pkg
     end
     
     @test notebook.cells[2].output.body == "246"
-    @test notebook.cells[3].errored == false
+    @test notebook.cells[3] |> noerror
     
     original_rand_output = notebook.cells[3].output.body
     
diff --git a/test/RichOutput.jl b/test/RichOutput.jl
index 2bfc98e8bc..8e61e2a342 100644
--- a/test/RichOutput.jl
+++ b/test/RichOutput.jl
@@ -189,10 +189,10 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
 
             update_run!(🍭, notebook, notebook.cells)
 
-            @test notebook.cells[1].errored == false
-            @test notebook.cells[2].errored == false
-            @test notebook.cells[3].errored == false
-            @test notebook.cells[4].errored == false
+            @test notebook.cells[1] |> noerror
+            @test notebook.cells[2] |> noerror
+            @test notebook.cells[3] |> noerror
+            @test notebook.cells[4] |> noerror
         end
     end
 
@@ -259,9 +259,9 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
         @test occursin("String?", string(notebook.cells[13].output.body)) # Issue 1490.
 
         @test notebook.cells[10].output.mime isa MIME"text/plain"
-        @test notebook.cells[10].errored == false
+        @test notebook.cells[10] |> noerror
         
-        @test notebook.cells[17].errored == false  # Issue 1815
+        @test notebook.cells[17] |> noerror  # Issue 1815
 
         # to see if we truncated correctly, we convert the output to string and check how big it is
         # because we don't want to test too specifically
@@ -309,26 +309,26 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
             update_run!(🍭, notebook, notebook.cells[3:end])
             @test occursinerror("syntax: extra token after", notebook.cells[3])
 
-            @test notebook.cells[4].errored == false
+            @test notebook.cells[4] |> noerror
             @test notebook.cells[4].output.body == "4"
             @test notebook.cells[4].output.rootassignee == :c
 
-            @test notebook.cells[5].errored == false
+            @test notebook.cells[5] |> noerror
             @test notebook.cells[5].output.body == ""
             @test notebook.cells[5].output.rootassignee === nothing
 
-            @test notebook.cells[6].errored == false
+            @test notebook.cells[6] |> noerror
             @test notebook.cells[6].output.body == "6"
             @test notebook.cells[6].output.rootassignee === nothing
 
-            @test notebook.cells[7].errored == false
+            @test notebook.cells[7] |> noerror
             @test notebook.cells[7].output.body == ""
             @test notebook.cells[7].output.rootassignee === nothing
 
-            @test notebook.cells[8].errored == false
+            @test notebook.cells[8] |> noerror
             @test notebook.cells[8].output.body == ""
 
-            @test notebook.cells[9].errored == false
+            @test notebook.cells[9] |> noerror
             @test notebook.cells[9].output.body == ""
 
             @test occursinerror("syntax: extra token after", notebook.cells[10])
diff --git a/test/WorkspaceManager.jl b/test/WorkspaceManager.jl
index f90987d6a5..64e0a5d2c3 100644
--- a/test/WorkspaceManager.jl
+++ b/test/WorkspaceManager.jl
@@ -91,15 +91,15 @@ import Distributed
 
         update_run!(🍭, notebook, notebook.cells)
 
-        @test notebook.cells[1].errored == false
-        @test notebook.cells[2].errored == false
-        @test notebook.cells[3].errored == false
-        @test notebook.cells[4].errored == false
-        @test notebook.cells[5].errored == false
+        @test notebook.cells[1] |> noerror
+        @test notebook.cells[2] |> noerror
+        @test notebook.cells[3] |> noerror
+        @test notebook.cells[4] |> noerror
+        @test notebook.cells[5] |> noerror
 
         setcode(notebook.cells[5], "length(nb.cells)")
         update_run!(🍭, notebook, notebook.cells[5])
-        @test notebook.cells[5].errored == false
+        @test notebook.cells[5] |> noerror
 
 
         desired_nprocs = Distributed.nprocs() - 1
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index b87dea6f02..d53b88bb93 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -8,18 +8,21 @@ import Pluto.PkgUtils
 import Pluto.PkgCompat
 import Distributed
 
+# We have our own registry for these test! Take a look at https://github.com/JuliaPluto/PlutoPkgTestRegistry#readme for more info about the test packages and their dependencies.
+
 const pluto_test_registry_spec = Pkg.RegistrySpec(;
     url="https://github.com/JuliaPluto/PlutoPkgTestRegistry", 
     uuid=Base.UUID("96d04d5f-8721-475f-89c4-5ee455d3eda0"),
     name="PlutoPkgTestRegistry",
 )
 
+
 @testset "Built-in Pkg" begin
     
     # Pkg.Registry.rm("General")
     Pkg.Registry.add(pluto_test_registry_spec)
 
-
+    # We have our own registry for these test! Take a look at https://github.com/JuliaPluto/PlutoPkgTestRegistry#readme for more info about the test packages and their dependencies.
     @testset "Basic" begin
         fakeclient = ClientSession(:fake, nothing)
         🍭 = ServerSession()
@@ -282,7 +285,7 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
 
         @test noerror(notebook.cells[3])
         @test noerror(notebook.cells[4])
-        @test notebook.cells[5].errored == false
+        @test notebook.cells[5] |> noerror
 
         @test !has_embedded_pkgfiles(notebook)
 
@@ -446,13 +449,13 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
         # Cells that use Example will error because the package is not installed.
 
         # @test Distributed.remotecall_eval(Main, p, quote
-        #     nb.cells[1].errored == false
+        #     nb.cells[1] |> noerror
         # end)
         @test Distributed.remotecall_eval(Main, p, quote
-            nb.cells[2].errored == false
+            nb.cells[2] |> noerror
         end)
         # @test Distributed.remotecall_eval(Main, p, quote
-        #     nb.cells[3].errored == false
+        #     nb.cells[3] |> noerror
         # end)
         # @test Distributed.remotecall_eval(Main, p, quote
         #     nb.cells[3].output.body == "25"

From 83177dc47a1e617bd36c52ee5f81ba9792adfe0a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 14 Feb 2022 23:08:45 +0100
Subject: [PATCH 102/821] oopsie!

---
 test/packages/Basic.jl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index d53b88bb93..adb1ce074a 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -449,13 +449,13 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
         # Cells that use Example will error because the package is not installed.
 
         # @test Distributed.remotecall_eval(Main, p, quote
-        #     nb.cells[1] |> noerror
+        #     nb.cells[1].errored == false
         # end)
         @test Distributed.remotecall_eval(Main, p, quote
-            nb.cells[2] |> noerror
+            nb.cells[2].errored == false
         end)
         # @test Distributed.remotecall_eval(Main, p, quote
-        #     nb.cells[3] |> noerror
+        #     nb.cells[3].errored == false
         # end)
         # @test Distributed.remotecall_eval(Main, p, quote
         #     nb.cells[3].output.body == "25"

From 4885362c467be4a28c711ca471f514c69a975c00 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 14 Feb 2022 23:09:25 +0100
Subject: [PATCH 103/821] whitespace

---
 src/analysis/TopologicalOrder.jl  |  2 +-
 src/analysis/topological_order.jl | 10 +++++-----
 src/evaluation/Run.jl             |  2 +-
 src/notebook/Notebook.jl          |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/analysis/TopologicalOrder.jl b/src/analysis/TopologicalOrder.jl
index 4fa1e49521..bd159522bf 100644
--- a/src/analysis/TopologicalOrder.jl
+++ b/src/analysis/TopologicalOrder.jl
@@ -4,7 +4,7 @@ import .ExpressionExplorer: SymbolsState, FunctionName
 Base.@kwdef struct TopologicalOrder
 	input_topology::NotebookTopology
 	"Cells that form a directed acyclic graph, in topological order."
-	runnable::Array{Cell,1}
+	runnable::Vector{Cell}
 	"Cells that are in a directed cycle, with corresponding `ReactivityError`s."
 	errable::Dict{Cell,ReactivityError}
 end
diff --git a/src/analysis/topological_order.jl b/src/analysis/topological_order.jl
index d9bafd6cee..e95bf456f5 100644
--- a/src/analysis/topological_order.jl
+++ b/src/analysis/topological_order.jl
@@ -6,7 +6,7 @@ struct Cycle <: ChildExplorationResult
 end
 
 "Return a `TopologicalOrder` that lists the cells to be evaluated in a single reactive run, in topological order. Includes the given roots."
-function topological_order(notebook::Notebook, topology::NotebookTopology, roots::Array{Cell,1}; allow_multiple_defs=false)::TopologicalOrder
+function topological_order(notebook::Notebook, topology::NotebookTopology, roots::Vector{Cell}; allow_multiple_defs=false)::TopologicalOrder
 	entries = Cell[]
 	exits = Cell[]
 	errable = Dict{Cell,ReactivityError}()
@@ -109,12 +109,12 @@ function disjoint(a::Set, b::Set)
 end
 
 "Return the cells that reference any of the symbols defined by the given cell. Non-recursive: only direct dependencies are found."
-function where_referenced(notebook::Notebook, topology::NotebookTopology, myself::Cell)::Array{Cell,1}
+function where_referenced(notebook::Notebook, topology::NotebookTopology, myself::Cell)::Vector{Cell}
 	to_compare = union(topology.nodes[myself].definitions, topology.nodes[myself].soft_definitions, topology.nodes[myself].funcdefs_without_signatures)
 	where_referenced(notebook, topology, to_compare)
 end
 "Return the cells that reference any of the given symbols. Non-recursive: only direct dependencies are found."
-function where_referenced(notebook::Notebook, topology::NotebookTopology, to_compare::Set{Symbol})::Array{Cell,1}
+function where_referenced(notebook::Notebook, topology::NotebookTopology, to_compare::Set{Symbol})::Vector{Cell}
 	return filter(notebook.cells) do cell
 		!disjoint(to_compare, topology.nodes[cell].references)
 	end
@@ -132,7 +132,7 @@ end
 
 
 "Return the cells that also assign to any variable or method defined by the given cell. If more than one cell is returned (besides the given cell), then all of them should throw a `MultipleDefinitionsError`. Non-recursive: only direct dependencies are found."
-function where_assigned(notebook::Notebook, topology::NotebookTopology, myself::Cell)::Array{Cell,1}
+function where_assigned(notebook::Notebook, topology::NotebookTopology, myself::Cell)::Vector{Cell}
 	self = topology.nodes[myself]
 	return filter(notebook.cells) do cell
 		other = topology.nodes[cell]
@@ -147,7 +147,7 @@ function where_assigned(notebook::Notebook, topology::NotebookTopology, myself::
 	end
 end
 
-function where_assigned(notebook::Notebook, topology::NotebookTopology, to_compare::Set{Symbol})::Array{Cell,1}
+function where_assigned(notebook::Notebook, topology::NotebookTopology, to_compare::Set{Symbol})::Vector{Cell}
 	filter(notebook.cells) do cell
 		other = topology.nodes[cell]
 		!(
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index d0dc39a2f3..2ad0b3156b 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -402,7 +402,7 @@ end
 
 
 "Do all the things!"
-function update_save_run!(session::ServerSession, notebook::Notebook, cells::Array{Cell,1}; save::Bool=true, run_async::Bool=false, prerender_text::Bool=false, kwargs...)
+function update_save_run!(session::ServerSession, notebook::Notebook, cells::Vector{Cell}; save::Bool=true, run_async::Bool=false, prerender_text::Bool=false, kwargs...)
 	old = notebook.topology
 	new = notebook.topology = updated_topology(old, notebook, cells) # macros are not yet resolved
 
diff --git a/src/notebook/Notebook.jl b/src/notebook/Notebook.jl
index c2e5452b86..c1338d0a15 100644
--- a/src/notebook/Notebook.jl
+++ b/src/notebook/Notebook.jl
@@ -56,7 +56,7 @@ Base.@kwdef mutable struct Notebook
     bonds::Dict{Symbol,BondValue}=Dict{Symbol,BondValue}()
 end
 
-Notebook(cells::Array{Cell,1}, path::AbstractString, notebook_id::UUID) = Notebook(
+Notebook(cells::Vector{Cell}, path::AbstractString, notebook_id::UUID) = Notebook(
     cells_dict=Dict(map(cells) do cell
         (cell.cell_id, cell)
     end),
@@ -65,7 +65,7 @@ Notebook(cells::Array{Cell,1}, path::AbstractString, notebook_id::UUID) = Notebo
     notebook_id=notebook_id,
 )
 
-Notebook(cells::Array{Cell,1}, path::AbstractString=numbered_until_new(joinpath(new_notebooks_directory(), cutename()))) = Notebook(cells, path, uuid1())
+Notebook(cells::Vector{Cell}, path::AbstractString=numbered_until_new(joinpath(new_notebooks_directory(), cutename()))) = Notebook(cells, path, uuid1())
 
 function Base.getproperty(notebook::Notebook, property::Symbol)
     if property == :cells

From 1f57985ce646ce5c71fa5a171789f5f24da1d143 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 15 Feb 2022 00:52:49 +0100
Subject: [PATCH 104/821] whitespace

---
 test/Events.jl         |  2 +-
 test/Notebook.jl       | 16 ++++++++--------
 test/helpers.jl        | 21 ++++++++++++++-------
 test/packages/Basic.jl |  2 +-
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/test/Events.jl b/test/Events.jl
index bdd56dee0f..fc5b941eb5 100644
--- a/test/Events.jl
+++ b/test/Events.jl
@@ -9,7 +9,7 @@ import UUIDs: UUID
 
     events = []
     function test_listener(a::PlutoEvent)
-        @info "this run!"
+        # @info "this run!"
         push!(events, typeof(a))
     end
     🍭 = ServerSession()
diff --git a/test/Notebook.jl b/test/Notebook.jl
index ab6336dc7d..5e34ed350b 100644
--- a/test/Notebook.jl
+++ b/test/Notebook.jl
@@ -137,13 +137,13 @@ end
             save_notebook(nb)
             # @info "File" name Text(read(nb.path,String))
             result = load_notebook_nobackup(nb.path)
-            @test notebook_inputs_equal(nb, result)
+            @test_notebook_inputs_equal(nb, result)
         end
     end
 
     @testset "I/O overloaded" begin
         @testset "$(name)" for (name, nb) in nbs
-            @test let
+            let
                 tasks = []
                 for i in 1:16
                     push!(tasks, @async save_notebook(nb))
@@ -153,7 +153,7 @@ end
                 end
                 wait.(tasks)
                 result = load_notebook_nobackup(nb.path)
-                notebook_inputs_equal(nb, result)
+                @test_notebook_inputs_equal(nb, result)
             end
         end
     end
@@ -251,15 +251,15 @@ end
         @testset "$(name)" for (name, nb) in nbs
             file_contents = sprint(save_notebook, nb)
 
-            @test let
+            let
                 result = sread(load_notebook_nobackup, file_contents, nb.path)
-                notebook_inputs_equal(nb, result)
+                @test_notebook_inputs_equal(nb, result)
             end
 
-            @test let
+            let
                 file_contents_windowsed = replace(file_contents, "\n" => "\r\n")
                 result_windowsed = sread(load_notebook_nobackup, file_contents_windowsed, nb.path)
-                notebook_inputs_equal(nb, result_windowsed)
+                @test_notebook_inputs_equal(nb, result_windowsed)
             end
         end
     end
@@ -343,7 +343,7 @@ end
         write(jl_path, embedded_jl)
         
         result = load_notebook_nobackup(jl_path)
-        @test notebook_inputs_equal(nb, result; check_paths_equality=false)
+        @test_notebook_inputs_equal(nb, result, false)
 
         
         filename = "howdy.jl"
diff --git a/test/helpers.jl b/test/helpers.jl
index c259e5d232..a1ec18f830 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -129,13 +129,20 @@ function occursinerror(needle, haystack::Pluto.Cell)
 end
 
 "Test notebook equality, ignoring cell UUIDs and such."
-function notebook_inputs_equal(nbA, nbB; check_paths_equality=true)
-    x = !check_paths_equality || (normpath(nbA.path) == normpath(nbB.path))
-
-    to_compare(cell) = (cell.cell_id, cell.code_folded, cell.code)
-    y = to_compare.(nbA.cells) == to_compare.(nbB.cells)
-    
-    x && y
+macro test_notebook_inputs_equal(nbA, nbB, check_paths_equality::Bool=true)
+    quote
+        nbA = $(esc(nbA))
+        nbB = $(esc(nbB))
+        if $(check_paths_equality)
+            @test normpath(nbA.path) == normpath(nbB.path)
+        end
+        
+        @test length(nbA.cells) == length(nbB.cells)
+        @test getproperty.(nbA.cells, :cell_id) == getproperty.(nbB.cells, :cell_id)
+        @test getproperty.(nbA.cells, :code_folded) == getproperty.(nbB.cells, :code_folded)
+        @test getproperty.(nbA.cells, :code) == getproperty.(nbB.cells, :code)
+        
+    end |> Base.remove_linenums!
 end
 
 "Whether the given .jl file can be run without any errors. While notebooks cells can be in arbitrary order, their order in the save file must be topological.
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index adb1ce074a..25c8f61210 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -76,7 +76,7 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
 
 
         old_A_terminal = deepcopy(terminals["PlutoPkgTestA"])
-        @show old_A_terminal
+        # @show old_A_terminal
 
         update_save_run!(🍭, notebook, notebook.cells[[3, 4]]) # import B
 

From 5c61a9303446554131d93ae9e7edc685806a30ec Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 14 Feb 2022 23:08:45 +0100
Subject: [PATCH 105/821] oopsie!


From 2cca8697499f9733c182fa79702aa5eaeed91281 Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Tue, 15 Feb 2022 01:36:38 +0100
Subject: [PATCH 106/821] Open external links in new tab, fixes #1 (#1916)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/Editor.js                 |  3 ++
 .../HijackExternalLinksToOpenInNewTab.js      | 35 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 frontend/components/HackySideStuff/HijackExternalLinksToOpenInNewTab.js

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index d9376cbd71..48c81b5433 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -32,6 +32,7 @@ import { ProgressBar } from "./ProgressBar.js"
 import { IsolatedCell } from "./Cell.js"
 import { RawHTMLContainer } from "./CellOutput.js"
 import { RecordingPlaybackUI, RecordingUI } from "./RecordingUI.js"
+import { HijackExternalLinksToOpenInNewTab } from "./HackySideStuff/HijackExternalLinksToOpenInNewTab.js"
 
 const default_path = "..."
 const DEBUG_DIFFING = false
@@ -1205,6 +1206,8 @@ patch: ${JSON.stringify(
         >`
 
         return html`
+            ${this.state.disable_ui === false && html`<${HijackExternalLinksToOpenInNewTab} />`}
+            
             <${PlutoContext.Provider} value=${this.actions}>
                 <${PlutoBondsContext.Provider} value=${this.state.notebook.bonds}>
                     <${PlutoJSInitializingContext.Provider} value=${this.js_init_set}>
diff --git a/frontend/components/HackySideStuff/HijackExternalLinksToOpenInNewTab.js b/frontend/components/HackySideStuff/HijackExternalLinksToOpenInNewTab.js
new file mode 100644
index 0000000000..3871d4bc99
--- /dev/null
+++ b/frontend/components/HackySideStuff/HijackExternalLinksToOpenInNewTab.js
@@ -0,0 +1,35 @@
+import { useEffect } from "../../imports/Preact.js"
+
+/**
+ * Time flies when you're building Pluto...
+ * At one moment you self-assignee to issue number #1, next moment we're approaching issue #2000...
+ * 
+ * We can't just put `<base target="_blank">` in the `<head>`, because this also opens hash links
+ * like `#id` in a new tab...
+ * 
+ * This components takes every click event on an <a> that points to another origin (i.e. not `#id`)
+ * and sneakily puts in a `target="_blank"` attribute so it opens in a new tab.
+ *
+ * Fixes https://github.com/fonsp/Pluto.jl/issues/1
+ * Based on https://stackoverflow.com/a/12552017/2681964
+ */
+export let HijackExternalLinksToOpenInNewTab = () => {
+    useEffect(() => {
+        let handler = (event) => {
+            if (event.defaultPrevented) return
+
+            const origin = event.target.closest(`a`)
+
+            if (origin && !origin.hasAttribute("target")) {
+                let as_url = new URL(origin.href)
+                if (as_url.origin !== window.location.origin) {
+                    origin.target = "_blank"
+                }
+            }
+        }
+        document.addEventListener("click", handler)
+        return () => document.removeEventListener("click", handler)
+    })
+
+    return null
+}

From 63748e1c41a9d2bcf50f1a6a34db70baae89e07e Mon Sep 17 00:00:00 2001
From: Joel Dahne <joel@dahne.eu>
Date: Tue, 15 Feb 2022 01:38:13 +0100
Subject: [PATCH 107/821] Fix logging getting stuck when `maxlog` is specified
 and don't print `maxlog`, fixes #1902 (#1911)

---
 src/evaluation/WorkspaceManager.jl |  6 ++-
 test/Logging.jl                    | 67 +++++++++++++++++++++++++-----
 2 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index aae50e5e4f..6ce1cbde2e 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -169,9 +169,13 @@ function start_relaying_logs((session, notebook)::SN, log_channel::Distributed.R
                 try
                     max_log = parse(Int, next_log["kwargs"][maybe_max_log][2] |> first)
 
+                    # Don't include maxlog in the log-message, in line
+                    # with how Julia handles it.
+                    deleteat!(next_log["kwargs"], maybe_max_log)
+
                     # Don't show message with id more than max_log times
                     if max_log isa Int && n_logs >= max_log
-                        return
+                        continue
                     end
                 catch
                 end
diff --git a/test/Logging.jl b/test/Logging.jl
index eb0930cc7f..a19673eca6 100644
--- a/test/Logging.jl
+++ b/test/Logging.jl
@@ -11,20 +11,65 @@ using Pluto.WorkspaceManager: poll
     🍭.connected_clients[fakeclient.id] = fakeclient
 
     @testset "Logging respects maxlog" begin
-        notebook = Notebook(Cell.([
-            """
-            for i in 1:10
-                @info "logging" i maxlog=2
+        @testset "Single log" begin
+            notebook = Notebook(Cell.([
+                """
+                for i in 1:10
+                    @info "logging" i maxlog=2
+                end
+                """,
+            ]))
+
+            update_run!(🍭, notebook, notebook.cells)
+            @test notebook.cells[begin] |> noerror
+
+            @test poll(5, 1/60) do
+                length(notebook.cells[begin].logs) == 2
+            end
+
+            # Check that maxlog doesn't occur in the message
+            @test all(notebook.cells[begin].logs) do log
+                all(log["kwargs"]) do kwarg
+                    kwarg[1] != "maxlog"
+                end
+            end
+
+            WorkspaceManager.unmake_workspace((🍭, notebook))
+        end
+
+        @testset "Multiple log" begin
+            notebook = Notebook(Cell.([
+                """
+                for i in 1:10
+                    @info "logging" i maxlog=2
+                    @info "logging more" maxlog = 4
+                    @info "even more logging"
+                end
+                """,
+            ]))
+
+            update_run!(🍭, notebook, notebook.cells)
+            @test notebook.cells[begin] |> noerror
+
+            # Wait until all 16 logs are in
+            @test poll(5, 1/60) do
+                length(notebook.cells[begin].logs) == 16
             end
-            """,
-        ]))
 
-        update_run!(🍭, notebook, notebook.cells)
-        @test notebook.cells[begin] |> noerror
+            # Get the ids of the three logs and their counts. We are
+            # assuming that the logs are ordered same as in the loop.
+            ids = unique(getindex.(notebook.cells[begin].logs, "id"))
+            counts = [count(log -> log["id"] == id, notebook.cells[begin].logs) for id in ids]
+            @test counts == [2, 4, 10]
+
+            # Check that maxlog doesn't occur in the messages
+            @test all(notebook.cells[begin].logs) do log
+                all(log["kwargs"]) do kwarg
+                    kwarg[1] != "maxlog"
+                end
+            end
 
-        @test poll(5, 1/60) do
-            length(notebook.cells[begin].logs) == 2
+            WorkspaceManager.unmake_workspace((🍭, notebook))
         end
-        WorkspaceManager.unmake_workspace((🍭, notebook))
     end
 end

From c7f94672113cb8b5cb1a3a93d4fc831e9ceb48e6 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 15 Feb 2022 13:50:35 +0100
Subject: [PATCH 108/821] Update bug_report.md

---
 .github/ISSUE_TEMPLATE/bug_report.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 92cdf08c5d..caa87d86f7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -12,6 +12,7 @@ Thank you for reporting an issue about Pluto! Let's get it fixed!
 # To report an issue, you need two things:
 1. 📹 A video recording demonstrating the problem. (You can drag a video file into this box)
 2. 📝 A short Pluto notebook file. (Upload the notebook file to https://gist.github.com/ and include the link.)
+3. 🤕 Try to clearly explain what the problem is, it might not be obvious to others! Instead of saying: "This does not work.", try to say: "I expected ..., but instead I am seeing ..."
 
 
 🙋 But my issue is really simple, I don't want to make a screen recording / notebook!

From 5b24a1fb32f30733ad92b107323c70a8d9857f5b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 15 Feb 2022 15:33:10 +0100
Subject: [PATCH 109/821] frontend tests: better debugging?

---
 test/frontend/helpers/common.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/frontend/helpers/common.js b/test/frontend/helpers/common.js
index 3e45ea4ac8..b9a96949c1 100644
--- a/test/frontend/helpers/common.js
+++ b/test/frontend/helpers/common.js
@@ -81,11 +81,11 @@ export const waitForContentToBecome = async (page, selector, targetContent) => {
   return getTextContent(page, selector);
 };
 
-export const clickAndWaitForNavigation = (page, selector) =>
-  Promise.all([
-    page.waitForNavigation({ waitUntil: "networkidle0" }),
-    page.click(selector),
-  ]);
+export const clickAndWaitForNavigation = async (page, selector) => {
+  let t = page.waitForNavigation({ waitUntil: "networkidle0" })
+  await page.click(selector)
+  await t
+}
 
 const dismissBeforeUnloadDialogs = (page) => {
   page.on("dialog", async (dialog) => {

From b93918abdd136697907327603ba88aea65e23081 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 15 Feb 2022 15:33:31 +0100
Subject: [PATCH 110/821] Make sure that the watch file task does not hang

---
 src/webserver/SessionActions.jl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 94cba17888..4f63f5c3d3 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -95,12 +95,16 @@ function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
     end
 
     in_session() = get(session.notebooks, nb.notebook_id, nothing) === nb
-    session.options.server.auto_reload_from_file && @asynclog while in_session()
+    session.options.server.auto_reload_from_file && @spawnlog while in_session()
         if !isfile(nb.path)
             # notebook file deleted... let's ignore this, changing the notebook will cause it to save again. Fine for now
             sleep(2)
         else
-            watch_file(nb.path)
+            e = watch_file(nb.path, 3)
+            if e.timedout
+                continue
+            end
+            
             # the above call is blocking until the file changes
             
             local modified_time = mtime(nb.path)

From 20e7e50bf1249dc2005728f97abf820c7533ac20 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 15 Feb 2022 15:40:08 +0100
Subject: [PATCH 111/821] oops

---
 src/webserver/SessionActions.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 4f63f5c3d3..6eb3393173 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -95,7 +95,7 @@ function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
     end
 
     in_session() = get(session.notebooks, nb.notebook_id, nothing) === nb
-    session.options.server.auto_reload_from_file && @spawnlog while in_session()
+    session.options.server.auto_reload_from_file && @asynclog while in_session()
         if !isfile(nb.path)
             # notebook file deleted... let's ignore this, changing the notebook will cause it to save again. Fine for now
             sleep(2)

From d6db07920adb95336d92f0310eb9fbbd779f1120 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 15 Feb 2022 15:57:20 +0100
Subject: [PATCH 112/821] Update Test.yml

---
 .github/workflows/Test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 8bd5540875..f5a53091da 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -9,6 +9,7 @@ on:
             - "frontend/**"
             - "frontend-bundler/**"
             - "frontend-dist/**"
+            - "test/frontend/**"
             - "**.md"
         branches:
             - main

From c7219600919216661d02a7b782e24e2301adea7b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 15 Feb 2022 19:04:26 +0100
Subject: [PATCH 113/821] Fix frontend tests!! (#1922)

---
 test/frontend/helpers/common.js | 42 ++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/test/frontend/helpers/common.js b/test/frontend/helpers/common.js
index b9a96949c1..6b0b229300 100644
--- a/test/frontend/helpers/common.js
+++ b/test/frontend/helpers/common.js
@@ -2,6 +2,44 @@ import path from "path";
 import mkdirp from "mkdirp";
 import * as process from "process";
 
+// from https://github.com/puppeteer/puppeteer/issues/1908#issuecomment-380308269
+class InflightRequests {
+  constructor(page) {
+    this._page = page;
+    this._requests = new Map();
+    this._onStarted = this._onStarted.bind(this);
+    this._onFinished = this._onFinished.bind(this);
+    this._page.on('request', this._onStarted);
+    this._page.on('requestfinished', this._onFinished);
+    this._page.on('requestfailed', this._onFinished);
+  }
+
+  _onStarted(request) { this._requests.set(request, 1 + (this._requests.get(request) ?? 0)); }
+  _onFinished(request) { this._requests.set(request, -1 + (this._requests.get(request) ?? 0)); }
+ 
+  inflightRequests() { return Array.from([...this._requests.entries()].flatMap(([k,v]) => v > 0 ? [k] : [])); }  
+
+  dispose() {
+    this._page.removeListener('request', this._onStarted);
+    this._page.removeListener('requestfinished', this._onFinished);
+    this._page.removeListener('requestfailed', this._onFinished);
+  }
+}
+
+const with_connections_debug = (page, action) => {
+  const tracker = new InflightRequests(page);
+  return action().finally(() => {
+    tracker.dispose();
+    const inflight = tracker.inflightRequests();
+    if(inflight.length > 0) {
+      console.warn("Open connections: ", inflight.map(request => request.url()));
+    }
+  }).catch(e => {
+    
+    throw e
+  })
+}
+
 export const getTextContent = (page, selector) => {
   // https://developer.mozilla.org/en-US/docs/Web/API/Node/textContent#differences_from_innertext
   return page.evaluate(
@@ -82,7 +120,9 @@ export const waitForContentToBecome = async (page, selector, targetContent) => {
 };
 
 export const clickAndWaitForNavigation = async (page, selector) => {
-  let t = page.waitForNavigation({ waitUntil: "networkidle0" })
+  let t = with_connections_debug(page, () => page.waitForNavigation({ waitUntil: "networkidle0" })).catch(e => {
+    console.warn("Network idle never happened after navigation... weird!", e)
+  })
   await page.click(selector)
   await t
 }

From 7a74c63e887772d543b336d3540ddf588aa76965 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 16 Feb 2022 14:27:11 +0100
Subject: [PATCH 114/821] Store cell order in NotebookTopology (#1920)

---
 src/Pluto.jl                       |   1 +
 src/analysis/DependencyCache.jl    |  24 ++++---
 src/analysis/ExpressionExplorer.jl |   5 +-
 src/analysis/MoreAnalysis.jl       |   2 +-
 src/analysis/Topology.jl           |  45 +++++-------
 src/analysis/TopologyUpdate.jl     |  20 ++++--
 src/analysis/data structures.jl    | 110 +++++++++++++++++++++++++++++
 src/analysis/topological_order.jl  |  29 ++++----
 src/evaluation/Run.jl              |  41 ++++++++---
 src/notebook/Notebook.jl           |  44 ++++++++----
 test/React.jl                      |  12 ++--
 test/data structures.jl            | 104 +++++++++++++++++++++++++++
 test/packages/Basic.jl             |   2 +-
 test/runtests.jl                   |   1 +
 14 files changed, 347 insertions(+), 93 deletions(-)
 create mode 100644 src/analysis/data structures.jl
 create mode 100644 test/data structures.jl

diff --git a/src/Pluto.jl b/src/Pluto.jl
index e6c3ff3bb5..90a95b6519 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -47,6 +47,7 @@ include("./analysis/ReactiveNode.jl")
 include("./packages/PkgCompat.jl")
 
 include("./notebook/Cell.jl")
+include("./analysis/data structures.jl")
 include("./analysis/Topology.jl")
 include("./analysis/Errors.jl")
 include("./analysis/TopologicalOrder.jl")
diff --git a/src/analysis/DependencyCache.jl b/src/analysis/DependencyCache.jl
index 00ee819a09..750144142e 100644
--- a/src/analysis/DependencyCache.jl
+++ b/src/analysis/DependencyCache.jl
@@ -4,15 +4,16 @@ Gets a dictionary of all symbols and the respective cells which are dependent on
 Changes in the given cell cause re-evaluation of these cells.
 Note that only direct dependents are given here, not indirect dependents.
 """
-function downstream_cells_map(cell::Cell, notebook::Notebook)::Dict{Symbol,Vector{Cell}}
-    defined_symbols = let node = notebook.topology.nodes[cell]
+function downstream_cells_map(cell::Cell, topology::NotebookTopology)::Dict{Symbol,Vector{Cell}}
+    defined_symbols = let node = topology.nodes[cell]
         node.definitions ∪ node.funcdefs_without_signatures
     end
     return Dict{Symbol,Vector{Cell}}(
-        sym => where_referenced(notebook, notebook.topology, Set([sym]))
+        sym => where_referenced(topology, Set([sym]))
         for sym in defined_symbols
     )
 end
+@deprecate downstream_cells_map(cell::Cell, notebook::Notebook) downstream_cells_map(cell, notebook.topology)
 
 """
 Gets a dictionary of all symbols and the respective cells on which the given cell depends.
@@ -20,20 +21,21 @@ Gets a dictionary of all symbols and the respective cells on which the given cel
 Changes in these cells cause re-evaluation of the given cell.
 Note that only direct dependencies are given here, not indirect dependencies.
 """
-function upstream_cells_map(cell::Cell, notebook::Notebook)::Dict{Symbol,Vector{Cell}}
-    referenced_symbols = notebook.topology.nodes[cell].references
+function upstream_cells_map(cell::Cell, topology::NotebookTopology)::Dict{Symbol,Vector{Cell}}
+    referenced_symbols = topology.nodes[cell].references
     return Dict{Symbol,Vector{Cell}}(
-        sym => where_assigned(notebook, notebook.topology, Set([sym]) )
+        sym => where_assigned(topology, Set([sym]) )
         for sym in referenced_symbols
     )
 end
+@deprecate upstream_cells_map(cell::Cell, notebook::Notebook) upstream_cells_map(cell, notebook.topology)
 
 "Fills cell dependency information for display in the GUI"
-function update_dependency_cache!(cell::Cell, notebook::Notebook)
+function update_dependency_cache!(cell::Cell, topology::NotebookTopology)
     cell.cell_dependencies = CellDependencies(
-        downstream_cells_map(cell, notebook), 
-        upstream_cells_map(cell, notebook), 
-        cell_precedence_heuristic(notebook.topology, cell),
+        downstream_cells_map(cell, topology), 
+        upstream_cells_map(cell, topology), 
+        cell_precedence_heuristic(topology, cell),
     )
 end
 
@@ -41,6 +43,6 @@ end
 function update_dependency_cache!(notebook::Notebook)
     notebook._cached_topological_order = topological_order(notebook)
     for cell in values(notebook.cells_dict)
-        update_dependency_cache!(cell, notebook)
+        update_dependency_cache!(cell, notebook.topology)
     end
 end
diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index cb54f70a0a..20c2a62b0b 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -309,8 +309,9 @@ function macro_has_special_heuristic_inside(; symstate::SymbolsState, expr::Expr
         module_usings_imports = ExpressionExplorer.compute_usings_imports(expr),
     )
     local fake_topology = Pluto.NotebookTopology(
-        nodes = Pluto.DefaultDict(Pluto.ReactiveNode, Dict(fake_cell => fake_reactive_node)),
-        codes = Pluto.DefaultDict(Pluto.ExprAnalysisCache, Dict(fake_cell => fake_expranalysiscache))
+        nodes = Pluto.ImmutableDefaultDict(Pluto.ReactiveNode, Dict(fake_cell => fake_reactive_node)),
+        codes = Pluto.ImmutableDefaultDict(Pluto.ExprAnalysisCache, Dict(fake_cell => fake_expranalysiscache)),
+        cell_order = Pluto.ImmutableVector([fake_cell]),
     )
 
     return Pluto.cell_precedence_heuristic(fake_topology, fake_cell) < 9
diff --git a/src/analysis/MoreAnalysis.jl b/src/analysis/MoreAnalysis.jl
index 232b5893e3..7db3f28b53 100644
--- a/src/analysis/MoreAnalysis.jl
+++ b/src/analysis/MoreAnalysis.jl
@@ -62,7 +62,7 @@ end
 function _upstream_recursive!(found::Set{Cell}, notebook::Notebook, topology::NotebookTopology, from::Vector{Cell})::Nothing
     for cell in from
         references = topology.nodes[cell].references
-        for upstream in Pluto.where_assigned(notebook, topology, references)
+        for upstream in Pluto.where_assigned(topology, references)
             if upstream ∉ found
                 push!(found, upstream)
                 _upstream_recursive!(found, notebook, topology, Cell[upstream])
diff --git a/src/analysis/Topology.jl b/src/analysis/Topology.jl
index 7c26c0b8d7..655421706c 100644
--- a/src/analysis/Topology.jl
+++ b/src/analysis/Topology.jl
@@ -25,42 +25,29 @@ function ExprAnalysisCache(old_cache::ExprAnalysisCache; new_properties...)
     ExprAnalysisCache(;properties...)
 end
 
-struct DefaultDict{K,V} <: AbstractDict{K,V}
-    default::Union{Function,DataType}
-    container::Dict{K,V}
-end
-
-
 "The (information needed to create the) dependency graph of a notebook. Cells are linked by the names of globals that they define and reference. 🕸"
 Base.@kwdef struct NotebookTopology
-    nodes::DefaultDict{Cell,ReactiveNode} = DefaultDict{Cell,ReactiveNode}(ReactiveNode)
-    codes::DefaultDict{Cell,ExprAnalysisCache}=DefaultDict{Cell,ExprAnalysisCache}(ExprAnalysisCache)
+    nodes::ImmutableDefaultDict{Cell,ReactiveNode}=ImmutableDefaultDict{Cell,ReactiveNode}(ReactiveNode)
+    codes::ImmutableDefaultDict{Cell,ExprAnalysisCache}=ImmutableDefaultDict{Cell,ExprAnalysisCache}(ExprAnalysisCache)
+    cell_order::ImmutableVector{Cell}=ImmutableVector{Cell}()
 
-    unresolved_cells::Set{Cell} = Set{Cell}()
+    unresolved_cells::ImmutableSet{Cell} = ImmutableSet{Cell}()
 end
 
+# BIG TODO HERE: CELL ORDER
+all_cells(topology::NotebookTopology) = topology.cell_order.c
 
 is_resolved(topology::NotebookTopology) = isempty(topology.unresolved_cells)
 
 function set_unresolved(topology::NotebookTopology, unresolved_cells::Vector{Cell})
-    codes = Dict{Cell,ExprAnalysisCache}(cell => ExprAnalysisCache(topology.codes[cell]; function_wrapped=false, forced_expr_id=nothing) for cell in unresolved_cells)
-    NotebookTopology(nodes=topology.nodes, codes=merge(topology.codes, codes), unresolved_cells=union(topology.unresolved_cells, unresolved_cells))
-end
-
-DefaultDict{K,V}(default::Union{Function,DataType}) where {K,V} = DefaultDict{K,V}(default, Dict{K,V}())
-
-function Base.getindex(aid::DefaultDict{K,V}, key::K)::V where {K,V}
-    get!(aid.default, aid.container, key)
-end
-function Base.merge(a1::DefaultDict{K,V}, a2::DefaultDict{K,V}) where {K,V}
-    DefaultDict{K,V}(a1.default, merge(a1.container, a2.container))
-end
-function Base.merge(a1::DefaultDict{K,V}, a2::AbstractDict) where {K,V}
-    DefaultDict{K,V}(a1.default, merge(a1.container, a2))
+    codes = Dict{Cell,ExprAnalysisCache}(
+        cell => ExprAnalysisCache(topology.codes[cell]; function_wrapped=false, forced_expr_id=nothing)
+        for cell in unresolved_cells
+    )
+    NotebookTopology(
+        nodes=topology.nodes, 
+        codes=merge(topology.codes, codes), 
+        unresolved_cells=union(topology.unresolved_cells, unresolved_cells),
+        cell_order = topology.cell_order,
+    )
 end
-Base.setindex!(aid::DefaultDict, args...) = Base.setindex!(aid.container, args...)
-Base.delete!(aid::DefaultDict, args...) = Base.delete!(aid.container, args...)
-Base.keys(aid::DefaultDict) = Base.keys(aid.container)
-Base.values(aid::DefaultDict) = Base.values(aid.container)
-Base.length(aid::DefaultDict) = Base.length(aid.container)
-Base.iterate(aid::DefaultDict, args...) = Base.iterate(aid.container, args...)
diff --git a/src/analysis/TopologyUpdate.jl b/src/analysis/TopologyUpdate.jl
index 2378396eb7..0f9e1f4017 100644
--- a/src/analysis/TopologyUpdate.jl
+++ b/src/analysis/TopologyUpdate.jl
@@ -6,7 +6,7 @@ function updated_topology(old_topology::NotebookTopology, notebook::Notebook, ce
 	
 	updated_codes = Dict{Cell,ExprAnalysisCache}()
 	updated_nodes = Dict{Cell,ReactiveNode}()
-	unresolved_cells = copy(old_topology.unresolved_cells)
+	unresolved_cells = copy(old_topology.unresolved_cells.c)
 	for cell in cells
 		old_code = old_topology.codes[cell]
 		if old_code.code !== cell.code
@@ -34,10 +34,20 @@ function updated_topology(old_topology::NotebookTopology, notebook::Notebook, ce
 	new_nodes = merge(old_topology.nodes, updated_nodes)
 
 	for removed_cell in setdiff(keys(old_topology.nodes), notebook.cells)
-		delete!(new_nodes, removed_cell)
-		delete!(new_codes, removed_cell)
+		delete_unsafe!(new_nodes, removed_cell)
+		delete_unsafe!(new_codes, removed_cell)
 		delete!(unresolved_cells, removed_cell)
 	end
-
-	NotebookTopology(nodes=new_nodes, codes=new_codes, unresolved_cells=unresolved_cells)
+	
+	# TODO: this could be cached in a better way if it matters
+	cell_order = notebook.cells == old_topology.cell_order ?
+		old_topology.cell_order : # if the order is the same, we can reuse the old one
+		ImmutableVector(notebook.cells) # (this will do a shallow copy)
+	
+	NotebookTopology(;
+		nodes=new_nodes, 
+		codes=new_codes, 
+		unresolved_cells=ImmutableSet(unresolved_cells; skip_copy=true), 
+		cell_order
+	)
 end
diff --git a/src/analysis/data structures.jl b/src/analysis/data structures.jl
new file mode 100644
index 0000000000..6f0c2cb89b
--- /dev/null
+++ b/src/analysis/data structures.jl	
@@ -0,0 +1,110 @@
+
+begin
+    """
+    ```julia
+    ImmutableSet{T}(xs::Set{T})
+    ```
+    
+    Wraps around, and behaves like a regular `Set`, but mutating operations (like `push!` or `empty!`) are not allowed.
+    
+    When called on a set, a *shallow copy* of the set is stored. This means that it's fine to mutate the input set after creating an `ImmutableSet` from it. To prevent this, call `ImmutableSet(xs; skip_copy=true)`.
+    """
+	struct ImmutableSet{T} <: AbstractSet{T}
+		c::Set{T}
+		ImmutableSet{T}(s::Set{T}; skip_copy::Bool=false) where T = new{T}(skip_copy ? s : copy(s))
+	end
+	ImmutableSet(s::Set{T}; skip_copy::Bool=false) where T = ImmutableSet{T}(s; skip_copy)
+	
+	ImmutableSet(arg) = let
+		s = Set(arg)
+		ImmutableSet{eltype(s)}(s; skip_copy=true)
+	end
+	ImmutableSet{T}() where T = ImmutableSet{T}(Set{T}(); skip_copy=true)
+	ImmutableSet() = ImmutableSet(Set(); skip_copy=true)
+
+	Base.copy(s::ImmutableSet) = ImmutableSet(copy(s.c))
+	Base.in(x, s::ImmutableSet) = Base.in(x, s.c)
+	Base.isempty(s::ImmutableSet) = Base.isempty(s.c)
+	Base.length(s::ImmutableSet) = Base.length(s.c)
+	Base.iterate(s::ImmutableSet, i...) = Base.iterate(s.c, i...)
+    Base.setdiff(s::ImmutableSet, i...) = ImmutableSet(setdiff(s.c, i...))
+end
+
+begin
+    """
+    ```julia
+    ImmutableVector{T}(xs::Vector{T})
+    ```
+    
+    Wraps around, and behaves like a regular `Vector`, but mutating operations (like `push!` or `setindex!`) are not allowed.
+    
+    When called on a vector, a *shallow copy* of the vector is stored. This means that it's fine to mutate the input vector after creating an `ImmutableVector` from it. To prevent this, call `ImmutableVector(xs; skip_copy=true)`.
+    """
+	struct ImmutableVector{T} <: AbstractVector{T}
+		c::Vector{T}
+		ImmutableVector{T}(x; skip_copy::Bool=false) where T = new{T}(skip_copy ? x : copy(x))
+	end
+	ImmutableVector(x::AbstractVector{T}; kwargs...) where T = ImmutableVector{T}(x; kwargs...)
+	ImmutableVector{T}() where T = ImmutableVector{T}(Vector{T}())
+
+	Base.copy(s::ImmutableVector) = ImmutableVector(copy(s.c))
+	Base.in(x, s::ImmutableVector) = Base.in(x, s.c)
+	Base.isempty(s::ImmutableVector) = Base.isempty(s.c)
+	Base.length(s::ImmutableVector) = Base.length(s.c)
+	Base.size(s::ImmutableVector) = Base.size(s.c)
+	Base.iterate(s::ImmutableVector, i...) = Base.iterate(s.c, i...)
+	Base.getindex(s::ImmutableVector, i::Integer) = Base.getindex(s.c, i)
+	Base.getindex(s::ImmutableVector, i...) = ImmutableVector(Base.getindex(s.c, i...))
+    delete_unsafe!(s::ImmutableSet, args...) = Base.delete!(s.c, args...)
+end
+
+begin
+    """
+    ```julia
+    ImmutableDefaultDict{K,V}(default::Function, container::Dict{K,V})
+    ```
+    
+    Wraps around, and behaves like a regular `Dict`, but if a key is not found, it will call return `default()`.
+    """
+    struct ImmutableDefaultDict{K,V} <: AbstractDict{K,V}
+        default::Union{Function,DataType}
+        container::Dict{K,V}
+    end
+
+    ImmutableDefaultDict{K,V}(default::Union{Function,DataType}) where {K,V} = ImmutableDefaultDict{K,V}(default, Dict{K,V}())
+
+    function Base.getindex(aid::ImmutableDefaultDict{K,V}, key::K)::V where {K,V}
+        get!(aid.default, aid.container, key)
+    end
+    function Base.merge(a1::ImmutableDefaultDict{K,V}, a2::ImmutableDefaultDict{K,V}) where {K,V}
+        ImmutableDefaultDict{K,V}(a1.default, merge(a1.container, a2.container))
+    end
+    function Base.merge(a1::ImmutableDefaultDict{K,V}, a2::AbstractDict) where {K,V}
+        ImmutableDefaultDict{K,V}(a1.default, merge(a1.container, a2))
+    end
+    # disabled because it's immutable!
+    # Base.setindex!(aid::ImmutableDefaultDict{K,V}, args...) where {K,V} = Base.setindex!(aid.container, args...)
+    # Base.delete!(aid::ImmutableDefaultDict{K,V}, args...) where {K,V} = Base.delete!(aid.container, args...)
+    delete_unsafe!(aid::ImmutableDefaultDict{K,V}, args...) where {K,V} = Base.delete!(aid.container, args...)
+    Base.copy(aid::ImmutableDefaultDict{K,V}) where {K,V} = ImmutableDefaultDict{K,V}(aid.default, copy(aid.container))
+    Base.keys(aid::ImmutableDefaultDict) = Base.keys(aid.container)
+    Base.values(aid::ImmutableDefaultDict) = Base.values(aid.container)
+    Base.length(aid::ImmutableDefaultDict) = Base.length(aid.container)
+    Base.iterate(aid::ImmutableDefaultDict, args...) = Base.iterate(aid.container, args...)
+end
+
+"""
+```julia
+setdiffkeys(d::Dict{K,V}, key_itrs...)::Dict{K,V}
+```
+
+Apply `setdiff` on the keys of a dictionary.
+
+# Example
+```julia
+setdiffkeys(Dict(1 => "one", 2 => "two", 3 => "three"), [1, 3])
+# result: `Dict(2 => "two")`
+```
+"""
+setdiffkeys(d::Dict{K,V}, key_itrs...) where {K,V} = Dict{K,V}(k => d[k] for k in setdiff(keys(d), key_itrs...))
+setdiffkeys(d::ImmutableDefaultDict{K,V}, key_itrs...) where {K,V} = ImmutableDefaultDict{K,V}(d.default, setdiffkeys(d.container, key_itrs...))
diff --git a/src/analysis/topological_order.jl b/src/analysis/topological_order.jl
index e95bf456f5..534909663a 100644
--- a/src/analysis/topological_order.jl
+++ b/src/analysis/topological_order.jl
@@ -5,8 +5,10 @@ struct Cycle <: ChildExplorationResult
 	cycled_cells::Vector{Cell}
 end
 
+@deprecate topological_order(::Notebook, topology::NotebookTopology, args...; kwargs...) topological_order(topology, args...; kwargs...)
+
 "Return a `TopologicalOrder` that lists the cells to be evaluated in a single reactive run, in topological order. Includes the given roots."
-function topological_order(notebook::Notebook, topology::NotebookTopology, roots::Vector{Cell}; allow_multiple_defs=false)::TopologicalOrder
+function topological_order(topology::NotebookTopology, roots::AbstractVector{Cell}; allow_multiple_defs=false)::TopologicalOrder
 	entries = Cell[]
 	exits = Cell[]
 	errable = Dict{Cell,ReactivityError}()
@@ -39,13 +41,13 @@ function topological_order(notebook::Notebook, topology::NotebookTopology, roots
 
 		push!(entries, cell)
 
-		assigners = where_assigned(notebook, topology, cell)
+		assigners = where_assigned(topology, cell)
 		if !allow_multiple_defs && length(assigners) > 1
 			for c in assigners
 				errable[c] = MultipleDefinitionsError(topology, c, assigners)
 			end
 		end
-		referencers = where_referenced(notebook, topology, cell) |> Iterators.reverse
+		referencers = where_referenced(topology, cell) |> Iterators.reverse
 		for c in (allow_multiple_defs ? referencers : union(assigners, referencers))
 			if c != cell
 				child_result = bfs(c)
@@ -96,7 +98,7 @@ end
 function topological_order(notebook::Notebook)
 	cached = notebook._cached_topological_order
 	if cached === nothing || cached.input_topology !== notebook.topology
-		topological_order(notebook, notebook.topology, notebook.cells)
+		topological_order(notebook.topology, all_cells(notebook.topology))
 	else
 		cached
 	end
@@ -109,16 +111,17 @@ function disjoint(a::Set, b::Set)
 end
 
 "Return the cells that reference any of the symbols defined by the given cell. Non-recursive: only direct dependencies are found."
-function where_referenced(notebook::Notebook, topology::NotebookTopology, myself::Cell)::Vector{Cell}
+function where_referenced(topology::NotebookTopology, myself::Cell)::Vector{Cell}
 	to_compare = union(topology.nodes[myself].definitions, topology.nodes[myself].soft_definitions, topology.nodes[myself].funcdefs_without_signatures)
-	where_referenced(notebook, topology, to_compare)
+	where_referenced(topology, to_compare)
 end
 "Return the cells that reference any of the given symbols. Non-recursive: only direct dependencies are found."
-function where_referenced(notebook::Notebook, topology::NotebookTopology, to_compare::Set{Symbol})::Vector{Cell}
-	return filter(notebook.cells) do cell
+function where_referenced(topology::NotebookTopology, to_compare::Set{Symbol})::Vector{Cell}
+	return filter(all_cells(topology)) do cell
 		!disjoint(to_compare, topology.nodes[cell].references)
 	end
 end
+where_referenced(::Notebook, args...) = where_referenced(args...)
 
 "Returns whether or not the edge between two cells is composed only of \"soft\"-definitions"
 function is_soft_edge(topology::NotebookTopology, parent_cell::Cell, child_cell::Cell)
@@ -132,9 +135,9 @@ end
 
 
 "Return the cells that also assign to any variable or method defined by the given cell. If more than one cell is returned (besides the given cell), then all of them should throw a `MultipleDefinitionsError`. Non-recursive: only direct dependencies are found."
-function where_assigned(notebook::Notebook, topology::NotebookTopology, myself::Cell)::Vector{Cell}
+function where_assigned(topology::NotebookTopology, myself::Cell)::Vector{Cell}
 	self = topology.nodes[myself]
-	return filter(notebook.cells) do cell
+	return filter(all_cells(topology)) do cell
 		other = topology.nodes[cell]
 		!(
 			disjoint(self.definitions,                 other.definitions) &&
@@ -147,8 +150,8 @@ function where_assigned(notebook::Notebook, topology::NotebookTopology, myself::
 	end
 end
 
-function where_assigned(notebook::Notebook, topology::NotebookTopology, to_compare::Set{Symbol})::Vector{Cell}
-	filter(notebook.cells) do cell
+function where_assigned(topology::NotebookTopology, to_compare::Set{Symbol})::Vector{Cell}
+	filter(all_cells(topology)) do cell
 		other = topology.nodes[cell]
 		!(
 			disjoint(to_compare, other.definitions) &&
@@ -156,6 +159,8 @@ function where_assigned(notebook::Notebook, topology::NotebookTopology, to_compa
 		)
 	end
 end
+where_assigned(::Notebook, args...) = where_assigned(args...)
+
 
 "Return whether any cell references the given symbol. Used for the @bind mechanism."
 function is_referenced_anywhere(notebook::Notebook, topology::NotebookTopology, sym::Symbol)::Bool
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 2ad0b3156b..244eb1582c 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -39,23 +39,24 @@ function run_reactive!(session::ServerSession, notebook::Notebook, old_topology:
             Dict(cell => ExprAnalysisCache() for cell in removed_cells)
         ),
         unresolved_cells = new_topology.unresolved_cells,
+        cell_order = new_topology.cell_order,
     )
 
     # save the old topological order - we'll delete variables assigned from it and re-evalutate its cells unless the cells have already run previously in the reactive run
-    old_order = topological_order(notebook, old_topology, roots)
+    old_order = topological_order(old_topology, roots)
 
     old_runnable = setdiff(old_order.runnable, already_run)
     to_delete_vars = union!(Set{Symbol}(), defined_variables(old_topology, old_runnable)...)
     to_delete_funcs = union!(Set{Tuple{UUID,FunctionName}}(), defined_functions(old_topology, old_runnable)...)
 
     # get the new topological order
-    new_order = topological_order(notebook, new_topology, union(roots, keys(old_order.errable)))
+    new_order = topological_order(new_topology, union(roots, keys(old_order.errable)))
     new_runnable = setdiff(new_order.runnable, already_run)
     to_run_raw = setdiff(union(new_runnable, old_runnable), keys(new_order.errable))::Vector{Cell} # TODO: think if old error cell order matters
 
     # find (indirectly) deactivated cells and update their status
     deactivated = filter(c -> c.running_disabled, notebook.cells)
-    indirectly_deactivated = collect(topological_order(notebook, new_topology, deactivated))
+    indirectly_deactivated = collect(topological_order(new_topology, deactivated))
     for cell in indirectly_deactivated
         cell.running = false
         cell.queued = false
@@ -250,7 +251,12 @@ is_macro_identifier(symbol::Symbol) = startswith(string(symbol), "@")
 function with_new_soft_definitions(topology::NotebookTopology, cell::Cell, soft_definitions)
     old_node = topology.nodes[cell]
     new_node = union!(ReactiveNode(), old_node, ReactiveNode(soft_definitions=soft_definitions))
-    NotebookTopology(codes=topology.codes, nodes=merge(topology.nodes, Dict(cell => new_node)), unresolved_cells=topology.unresolved_cells)
+    NotebookTopology(
+		codes=topology.codes, 
+		nodes=merge(topology.nodes, Dict(cell => new_node)), 
+		unresolved_cells=topology.unresolved_cells,
+		cell_order=topology.cell_order,
+	)
 end
 
 collect_implicit_usings(topology::NotebookTopology, cell::Cell) = ExpressionExplorer.collect_implicit_usings(topology.codes[cell].module_usings_imports)
@@ -374,7 +380,12 @@ function resolve_topology(
 	all_nodes = merge(unresolved_topology.nodes, new_nodes)
 	all_codes = merge(unresolved_topology.codes, new_codes)
 
-	NotebookTopology(nodes=all_nodes, codes=all_codes, unresolved_cells=still_unresolved_nodes)
+	NotebookTopology(
+		nodes=all_nodes, 
+		codes=all_codes, 
+		unresolved_cells=ImmutableSet(still_unresolved_nodes; skip_copy=true),
+		cell_order=unresolved_topology.cell_order,
+	)
 end
 
 """Tries to add information about macro calls without running any code, using knowledge about common macros.
@@ -393,7 +404,12 @@ function static_resolve_topology(topology::NotebookTopology)
 	new_nodes = Dict{Cell,ReactiveNode}(cell => static_macroexpand(topology, cell) for cell in topology.unresolved_cells)
 	all_nodes = merge(topology.nodes, new_nodes)
 
-	NotebookTopology(nodes=all_nodes, codes=topology.codes, unresolved_cells=topology.unresolved_cells)
+	NotebookTopology(
+		nodes=all_nodes, 
+		codes=topology.codes, 
+		unresolved_cells=topology.unresolved_cells,
+		cell_order=topology.cell_order,
+	)
 end
 
 ###
@@ -444,11 +460,14 @@ function update_save_run!(session::ServerSession, notebook::Notebook, cells::Vec
 		end
 		
 		# for the remaining cells, clear their topology info so that they won't run as dependencies
-		for cell in setdiff(to_run_online, setup_cells)
-			delete!(notebook.topology.nodes, cell)
-			delete!(notebook.topology.codes, cell)
-			delete!(notebook.topology.unresolved_cells, cell)
-		end
+		old = notebook.topology
+		to_remove = setdiff(to_run_online, setup_cells)
+		notebook.topology = NotebookTopology(
+			nodes=setdiffkeys(old.nodes, to_remove),
+			codes=setdiffkeys(old.codes, to_remove),
+			unresolved_cells=setdiff(old.unresolved_cells, to_remove),
+			cell_order=old.cell_order,
+		)
 		
 		# and don't run them
 		to_run_online = to_run_online ∩ setup_cells
diff --git a/src/notebook/Notebook.jl b/src/notebook/Notebook.jl
index c1338d0a15..034ff748ea 100644
--- a/src/notebook/Notebook.jl
+++ b/src/notebook/Notebook.jl
@@ -26,7 +26,7 @@ Base.@kwdef mutable struct Notebook
     
     path::String
     notebook_id::UUID=uuid1()
-    topology::NotebookTopology=NotebookTopology()
+    topology::NotebookTopology
     _cached_topological_order::Union{Nothing,TopologicalOrder}=nothing
 
     # buffer will contain all unfetched updates - must be big enough
@@ -56,26 +56,33 @@ Base.@kwdef mutable struct Notebook
     bonds::Dict{Symbol,BondValue}=Dict{Symbol,BondValue}()
 end
 
-Notebook(cells::Vector{Cell}, path::AbstractString, notebook_id::UUID) = Notebook(
+_collect_cells(cells_dict::Dict{UUID,Cell}, cells_order::Vector{UUID}) = 
+    map(i -> cells_dict[i], cells_order)
+_initial_topology(cells_dict::Dict{UUID,Cell}, cells_order::Vector{UUID}) =
+    NotebookTopology(;
+        cell_order=ImmutableVector(_collect_cells(cells_dict, cells_order)),
+    )
+    
+function Notebook(cells::Vector{Cell}, path::AbstractString, notebook_id::UUID)
     cells_dict=Dict(map(cells) do cell
         (cell.cell_id, cell)
-    end),
-    cell_order=map(x -> x.cell_id, cells),
-    path=path,
-    notebook_id=notebook_id,
-)
+    end)
+    cell_order=map(x -> x.cell_id, cells)
+    Notebook(;
+        cells_dict, cell_order,
+        topology=_initial_topology(cells_dict, cell_order),
+        path=path,
+        notebook_id=notebook_id,
+    )
+end
 
 Notebook(cells::Vector{Cell}, path::AbstractString=numbered_until_new(joinpath(new_notebooks_directory(), cutename()))) = Notebook(cells, path, uuid1())
 
 function Base.getproperty(notebook::Notebook, property::Symbol)
     if property == :cells
-        cells_dict = getfield(notebook, :cells_dict)
-        cell_order = getfield(notebook, :cell_order)
-        map(cell_order) do id
-            cells_dict[id]
-        end
+        _collect_cells(notebook.cells_dict, notebook.cell_order)
     elseif property == :cell_inputs
-        getfield(notebook, :cells_dict)
+        notebook.cells_dict
     else
         getfield(notebook, property)
     end
@@ -279,7 +286,14 @@ function load_notebook_nobackup(io, path)::Notebook
         k ∈ appeared_order
     end
 
-    Notebook(cells_dict=appeared_cells_dict, cell_order=appeared_order, path=path, nbpkg_ctx=nbpkg_ctx, nbpkg_installed_versions_cache=nbpkg_cache(nbpkg_ctx))
+    Notebook(;
+        cells_dict=appeared_cells_dict, 
+        cell_order=appeared_order,
+        topology=_initial_topology(appeared_cells_dict, appeared_order),
+        path=path, 
+        nbpkg_ctx=nbpkg_ctx, 
+        nbpkg_installed_versions_cache=nbpkg_cache(nbpkg_ctx),
+    )
 end
 
 function load_notebook_nobackup(path::String)::Notebook
@@ -307,7 +321,7 @@ function load_notebook(path::String; disable_writing_notebook_files::Bool=false)
     update_dependency_cache!(loaded)
 
     disable_writing_notebook_files || save_notebook(loaded)
-    loaded.topology = NotebookTopology()
+    loaded.topology = NotebookTopology(; cell_order=ImmutableVector(loaded.cells))
 
     disable_writing_notebook_files || if only_versions_or_lineorder_differ(path, backup_path)
         rm(backup_path)
diff --git a/test/React.jl b/test/React.jl
index 7c74f513e5..856bb447f9 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -148,11 +148,11 @@ import Distributed
         ])
         notebook.topology = Pluto.updated_topology(notebook.topology, notebook, notebook.cells)
 
-        let topo_order = Pluto.topological_order(notebook, notebook.topology, notebook.cells[[1]])
+        let topo_order = Pluto.topological_order(notebook.topology, notebook.cells[[1]])
             @test indexin(topo_order.runnable, notebook.cells) == [1,2]
             @test topo_order.errable |> keys == notebook.cells[[3,4]] |> Set
         end
-        let topo_order = Pluto.topological_order(notebook, notebook.topology, notebook.cells[[1]], allow_multiple_defs=true)
+        let topo_order = Pluto.topological_order(notebook.topology, notebook.cells[[1]], allow_multiple_defs=true)
             @test indexin(topo_order.runnable, notebook.cells) == [1,3,4,2] # x first, y second and third, z last
             # this also tests whether multiple defs run in page order
             @test topo_order.errable == Dict()
@@ -204,14 +204,14 @@ import Distributed
         ])
         notebook.topology = Pluto.updated_topology(notebook.topology, notebook, notebook.cells)
 
-        topo_order = Pluto.topological_order(notebook, notebook.topology, notebook.cells)
+        topo_order = Pluto.topological_order(notebook.topology, notebook.cells)
         @test indexin(topo_order.runnable, notebook.cells) == [6, 5, 4, 7, 3, 1, 2, 8]
         # 6, 5, 4, 3 should run first (this is implemented using `cell_precedence_heuristic`), in that order
         # 1, 2, 7 remain, and should run in notebook order.
 
         # if the cells were placed in reverse order...
         reverse!(notebook.cell_order)
-        topo_order = Pluto.topological_order(notebook, notebook.topology, notebook.cells)
+        topo_order = Pluto.topological_order(notebook.topology, notebook.cells)
         @test indexin(topo_order.runnable, reverse(notebook.cells)) == [6, 5, 4, 7, 3, 8, 2, 1]
         # 6, 5, 4, 3 should run first (this is implemented using `cell_precedence_heuristic`), in that order
         # 1, 2, 7 remain, and should run in notebook order, which is 7, 2, 1.
@@ -233,7 +233,7 @@ import Distributed
 
         notebook.topology = Pluto.updated_topology(notebook.topology, notebook, notebook.cells)
 
-        topo_order = Pluto.topological_order(notebook, notebook.topology, notebook.cells)
+        topo_order = Pluto.topological_order(notebook.topology, notebook.cells)
 
         comesbefore(A, first, second) = findfirst(isequal(first),A) < findfirst(isequal(second), A)
 
@@ -261,7 +261,7 @@ import Distributed
         ])
 
         notebook.topology = Pluto.updated_topology(notebook.topology, notebook, notebook.cells)
-        topo_order = Pluto.topological_order(notebook, notebook.topology, notebook.cells)
+        topo_order = Pluto.topological_order(notebook.topology, notebook.cells)
         run_order = indexin(topo_order.runnable, notebook.cells)
 
         @test run_order == [3, 1, 2]
diff --git a/test/data structures.jl b/test/data structures.jl
new file mode 100644
index 0000000000..4a532e9a9c
--- /dev/null
+++ b/test/data structures.jl	
@@ -0,0 +1,104 @@
+import Pluto: ImmutableVector, ImmutableSet, ImmutableDefaultDict, setdiffkeys
+
+@testset "ImmutableCollections" begin
+    
+    
+    
+    
+
+# ╔═╡ bd27d82e-62d6-422c-8fbe-61993dc4c268
+@test isempty(ImmutableVector{Int}())
+
+# ╔═╡ d4f2016a-b093-4619-9ccb-3e99bf6fdc9b
+@test ImmutableVector{Int32}([1,2,3]).c |> eltype == Int32
+
+# ╔═╡ 055f21c0-3741-4762-ac4e-4c89633afbc4
+let
+	x = [1,2,3]
+	y = ImmutableVector(x)
+	push!(x,4)
+	@test y == [1,2,3]
+end
+
+# ╔═╡ 52310ade-6e06-4ab8-8589-444c161cd93b
+let
+	x = [1,2,3]
+	y = ImmutableVector{Int32}(x)
+	push!(x,4)
+	@test y == [1,2,3]
+end
+
+# ╔═╡ d61600f0-2202-4228-8d35-380f732214e7
+ImmutableSet()
+
+# ╔═╡ d3871580-cd22-48c1-a1fd-d13a7f2f2135
+ImmutableSet{Int}()
+
+# ╔═╡ 2af00467-8bbf-49d8-bfe3-6f8d6307e900
+ImmutableSet{Int64}(Set([1,2]); skip_copy=true)
+
+# ╔═╡ 46836112-7c5c-4ffd-8d1e-93a2c8990b20
+@test ImmutableSet{Int64}(Set([1,2]); skip_copy=true) == Set([1,2])
+
+# ╔═╡ fd687b2e-8bec-48b2-810e-38ef00bf567b
+let
+	x = [1.1,2,3]
+	y = ImmutableVector(x; skip_copy=true)
+	push!(x,4)
+	@test y == [1.1,2,3,4]
+end
+
+# ╔═╡ f4dddf0b-cf0a-41d0-880e-6a8fac7c60cb
+let
+	x = [1.1,2,3]
+	y = ImmutableVector{Float64}(x; skip_copy=true)
+	push!(x,4)
+	@test y == [1.1,2,3,4]
+end
+
+# ╔═╡ 25c78371-f12d-44ae-b180-32b88d3aa4f5
+@test eltype(ImmutableSet([2,3,4])) == Int
+
+# ╔═╡ 45115ac6-6586-458c-83e6-d661c2ce8db2
+let
+	x = Set([1,2,3])
+	y = ImmutableSet(x)
+	push!(x,4)
+	@test y == Set([1,2,3])
+end
+
+# ╔═╡ 4f26640d-31d2-44c4-bbba-82c18d7497ae
+let
+	x = Set([1.1,2,3])
+	y = ImmutableSet(x; skip_copy=true)
+	push!(x,4)
+	@test y == Set([1.1,2,3,4])
+end
+
+# ╔═╡ eac9c95b-a2b6-4f1f-8cce-a2ad4c0972c5
+@test union(ImmutableSet([1,2]),[2,3]) == ImmutableSet([1,2,3])
+
+# ╔═╡ bff65a2c-8654-4403-8e34-58aac8616729
+@test filter(x -> true, ImmutableVector([1,2,3])) == [1,2,3]
+
+# ╔═╡ ce3cdb24-e851-4cc3-9955-b34fe358b41a
+@test ImmutableVector([1,2,3])[2:end] isa ImmutableVector
+
+# ╔═╡ c61196d6-f529-4883-b334-ed1b0f653acf
+
+
+# ╔═╡ 5c2b3440-7231-42df-b4e5-619001d225a8
+ImmutableSet([123,234])
+
+
+
+@test setdiffkeys(Dict(1=>2,3=>4),[3]) == Dict(1=>2)
+
+let
+	d = setdiffkeys(ImmutableDefaultDict(() -> 7, Dict(1=>2,3=>4)),[3])
+	@test d[1] == 2 && d[3] == 7
+end
+
+@test setdiff(ImmutableSet([1,2]), [2]) isa ImmutableSet
+
+end
\ No newline at end of file
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index 25c8f61210..bf61b8fc79 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -372,7 +372,7 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
         ])
         fakeclient.connected_notebook = notebook
 
-        notebook.topology = Pluto.updated_topology(Pluto.NotebookTopology(), notebook, notebook.cells) |> Pluto.static_resolve_topology
+        notebook.topology = Pluto.updated_topology(Pluto.NotebookTopology(cell_order=Pluto.ImmutableVector(notebook.cells)), notebook, notebook.cells) |> Pluto.static_resolve_topology
 
         @test !Pluto.use_plutopkg(notebook.topology)
         order = collect(Pluto.topological_order(notebook))
diff --git a/test/runtests.jl b/test/runtests.jl
index ba9ea13bff..62622f7e63 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -35,6 +35,7 @@ include("./MethodSignatures.jl")
 include("./MoreAnalysis.jl")
 include("./Analysis.jl")
 include("./webserver_utils.jl")
+include("./data structures.jl")
 include("./DependencyCache.jl")
 include("./Throttled.jl")
 include("./cell_disabling.jl")

From d34e2a8f9228b21368a29a980cc10cf45de02e2f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 22 Feb 2022 12:59:13 +0100
Subject: [PATCH 115/821] whitespace

---
 frontend/components/CellInput.js              | 6 +++---
 frontend/components/CellInput/mixedParsers.js | 8 ++++----
 frontend/components/CellOutput.js             | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index b286692577..e68866dc04 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -49,7 +49,7 @@ import {
     pythonLanguage,
 } from "../imports/CodemirrorPlutoSetup.js"
 
-import { markdown, html as htmlLang, javascript, sqlLang, python, julia_andrey } from "./CellInput/mixedParsers.js"
+import { markdown, html as htmlLang, javascript, sqlLang, python, julia_mixed } from "./CellInput/mixedParsers.js"
 import { pluto_autocomplete } from "./CellInput/pluto_autocomplete.js"
 import { NotebookpackagesFacet, pkgBubblePlugin } from "./CellInput/pkg_bubble_plugin.js"
 import { awesome_line_wrapping } from "./CellInput/awesome_line_wrapping.js"
@@ -618,9 +618,9 @@ export const CellInput = ({
                     }),
                     EditorState.tabSize.of(4),
                     indentUnit.of("\t"),
-                    julia_andrey(),
+                    julia_mixed(),
                     markdown({
-                        defaultCodeLanguage: julia_andrey(),
+                        defaultCodeLanguage: julia_mixed(),
                     }),
                     htmlLang(), //Provides tag closing!,
                     javascript(),
diff --git a/frontend/components/CellInput/mixedParsers.js b/frontend/components/CellInput/mixedParsers.js
index aab8abba04..b2434945da 100644
--- a/frontend/components/CellInput/mixedParsers.js
+++ b/frontend/components/CellInput/mixedParsers.js
@@ -12,7 +12,7 @@ import {
     sql,
     javascript,
     python,
-    julia_andrey as julia_andrey_original,
+    julia_andrey,
     parseCode,
 } from "../../imports/CodemirrorPlutoSetup.js"
 
@@ -161,11 +161,11 @@ const juliaWrapper = parseMixed((node, input) => {
     return { parser, overlay }
 })
 
-const julia_andrey = (config) => {
-    const julia = julia_andrey_original(config)
+const julia_mixed = (config) => {
+    const julia = julia_andrey(config)
     // @ts-ignore
     julia.language.parser = julia.language.parser.configure({ wrap: juliaWrapper })
     return julia
 }
 
-export { julia_andrey, sqlLang, pythonLanguage, javascript, htmlLanguage, javascriptLanguage, python, markdown, html }
+export { julia_mixed, sqlLang, pythonLanguage, javascript, htmlLanguage, javascriptLanguage, python, markdown, html }
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 029dd4e4f4..d873f6e85f 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -16,7 +16,7 @@ import { pluto_syntax_colors } from "./CellInput.js"
 import { useState } from "../imports/Preact.js"
 
 import hljs from "../imports/highlightjs.js"
-import { julia_andrey } from "./CellInput/mixedParsers.js"
+import { julia_mixed } from "./CellInput/mixedParsers.js"
 
 export class CellOutput extends Component {
     constructor() {
@@ -514,7 +514,7 @@ export let highlight = (code_element, language) => {
                         defaultHighlightStyle.fallback,
                         EditorState.tabSize.of(4),
                         // TODO Other languages possibly?
-                        language === "julia" ? julia_andrey() : null,
+                        language === "julia" ? julia_mixed() : null,
                         EditorView.lineWrapping,
                         EditorView.editable.of(false),
                     ].filter((x) => x != null),

From 6f6a852a9ca2830ac58f14b6678b71fe72598e6d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 22 Feb 2022 12:59:25 +0100
Subject: [PATCH 116/821] whitespace

---
 frontend/components/CellOutput.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index d873f6e85f..f640a2cec9 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -466,10 +466,9 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
                     container.current.querySelectorAll("code").forEach((code_element) => {
                         code_element.classList.forEach((className) => {
                             if (className.startsWith("language-")) {
-                                let language = className.substr(9)
-
                                 // Remove "language-"
-                                highlight(code_element, language)
+                                let language = className.substring(9)
+                                // highlight(code_element, language)
                             }
                         })
                     })

From e6c5a3679deaf7081178422bfa1e8fadfab4c24c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 22 Feb 2022 13:14:27 +0100
Subject: [PATCH 117/821] update highlightjs

---
 frontend/components/CellOutput.js | 6 ++++--
 frontend/highlightjs.css          | 5 ++++-
 frontend/imports/highlightjs.js   | 8 +++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index f640a2cec9..e4593b566b 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -468,11 +468,13 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
                             if (className.startsWith("language-")) {
                                 // Remove "language-"
                                 let language = className.substring(9)
-                                // highlight(code_element, language)
+                                highlight(code_element, language)
                             }
                         })
                     })
-                } catch (err) {}
+                } catch (err) {
+                    console.warn("Highlighting failed", err)
+                }
             } finally {
                 js_init_set?.delete(container.current)
             }
diff --git a/frontend/highlightjs.css b/frontend/highlightjs.css
index 7ae6ec2dac..922c4cdd0c 100644
--- a/frontend/highlightjs.css
+++ b/frontend/highlightjs.css
@@ -50,12 +50,15 @@ code.hljs {
 }
 .hljs-bullet,
 .hljs-link,
-.hljs-meta,
 .hljs-selector-id,
 .hljs-symbol,
 .hljs-title {
     color: var(--cm-link-color);
 }
+.hljs-meta {
+    color: var(--cm-macro-color);
+    font-weight: 700;
+}
 .hljs-built_in,
 .hljs-class .hljs-title,
 .hljs-title.class_ {
diff --git a/frontend/imports/highlightjs.js b/frontend/imports/highlightjs.js
index 15fd1190ff..17ffd64503 100644
--- a/frontend/imports/highlightjs.js
+++ b/frontend/imports/highlightjs.js
@@ -1,13 +1,11 @@
 // @ts-ignore
-import hljs from "https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.3.1/build/es/highlight.min.js"
+import hljs from "https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.4.0/build/es/highlight.min.js"
 // @ts-ignore
-import hljs_julia from "https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.3.1/build/es/languages/julia.min.js"
+import hljs_julia from "https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.4.0/build/es/languages/julia.min.js"
 // @ts-ignore
-import hljs_juliarepl from "https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.3.1/build/es/languages/julia-repl.min.js"
+import hljs_juliarepl from "https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.4.0/build/es/languages/julia-repl.min.js"
 
 hljs.registerLanguage("julia", hljs_julia)
 hljs.registerLanguage("julia-repl", hljs_juliarepl)
-// https://github.com/highlightjs/highlight.js/pull/3432
-hljs.registerAliases(["jldoctest"], { languageName: "julia-repl" })
 
 export default hljs

From 476b37a63dfe49808efa3362964034aba124cca0 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 22 Feb 2022 13:14:37 +0100
Subject: [PATCH 118/821] css tweak

---
 frontend/light_color.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/light_color.css b/frontend/light_color.css
index 42244c8ad3..252d0782cd 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -132,7 +132,7 @@
         --helpbox-notfound-header-color: rgb(139, 139, 139);
         --helpbox-text-color: black;
         --code-section-bg-color: whitesmoke;
-        --code-section-bg-color: #dbdbdb;
+        --code-section-bg-color: #f3f3f3;
 
         /*footer*/
         --footer-color: #333333;

From cc67e2f4c475915a71fdf23fc97725584f381566 Mon Sep 17 00:00:00 2001
From: Jerry Ling <jerryling315@gmail.com>
Date: Tue, 22 Feb 2022 07:23:01 -0500
Subject: [PATCH 119/821] Update WebServer.jl (#1933)

---
 src/webserver/WebServer.jl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index d20c57d45a..2ce23baa5e 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -55,6 +55,8 @@ For the full list, see the [`Pluto.Configuration`](@ref) module. Some **common p
 - `launch_browser`: Optional. Whether to launch the system default browser. Disable this on SSH and such.
 - `host`: Optional. The default `host` is `"127.0.0.1"`. For wild setups like Docker and heroku, you might need to change this to `"0.0.0.0"`.
 - `port`: Optional. The default `port` is `1234`.
+- `auto_reload_from_file`: Reload when the `.jl` file is modified. The default is `false`.
+- `secret`: Set a fixed secret for access.
 
 ## Technobabble
 

From a57727e9ea94f2d98d06c50f5868ac507958c561 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 22 Feb 2022 14:39:37 +0100
Subject: [PATCH 120/821] =?UTF-8?q?=F0=9F=99=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/CellInput.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index e68866dc04..6fc78bb1ce 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -50,6 +50,7 @@ import {
 } from "../imports/CodemirrorPlutoSetup.js"
 
 import { markdown, html as htmlLang, javascript, sqlLang, python, julia_mixed } from "./CellInput/mixedParsers.js"
+import { julia_andrey } from "../imports/CodemirrorPlutoSetup.js"
 import { pluto_autocomplete } from "./CellInput/pluto_autocomplete.js"
 import { NotebookpackagesFacet, pkgBubblePlugin } from "./CellInput/pkg_bubble_plugin.js"
 import { awesome_line_wrapping } from "./CellInput/awesome_line_wrapping.js"

From f633e5b43c046458fcaec2aa9068c4a86c825b43 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Tue, 22 Feb 2022 14:51:28 +0100
Subject: [PATCH 121/821] Use `precompile` for `SessionActions.open` (#1934)

---
 src/webserver/SessionActions.jl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 6eb3393173..802f56fc06 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -137,6 +137,7 @@ function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
     
     nb
 end
+precompile(SessionActions.open, (ServerSession, String))
 
 function save_upload(content::Vector{UInt8})
     save_path = emptynotebook().path

From 5c3c4688c236c9496e99962319de8e957828ca89 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 22 Feb 2022 16:59:35 +0100
Subject: [PATCH 122/821] =?UTF-8?q?=F0=9F=90=A6=20Fix=20#1894?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/editor.css | 1 +
 frontend/index.css  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/editor.css b/frontend/editor.css
index ef3d334d38..767725608b 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2488,6 +2488,7 @@ body > nav#slide_controls > button.next > span::after {
 .cm-editor .cm-tooltip.cm-tooltip-autocomplete > ul > li {
     /* this is the line height rounded to an integer to prevent jiggle */
     height: 16px;
+    overflow-y: hidden;
     /* font-size: 16px; */
     line-height: 16px;
     border-radius: 3px;
diff --git a/frontend/index.css b/frontend/index.css
index 28ec2b92b1..e3ada1c1a8 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -175,6 +175,7 @@ pluto-filepicker button {
 .cm-editor .cm-tooltip.cm-tooltip-autocomplete > ul > li {
     /* this is the line height rounded to an integer to prevent jiggle */
     height: 16px;
+    overflow-y: hidden;
     /* font-size: 16px; */
     line-height: 16px;
     border-radius: 3px;

From 728be33496ccb73171b3b1a64b7a95f0ab09747a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 22 Feb 2022 17:02:31 +0100
Subject: [PATCH 123/821] whitespace? (#1942)

---
 src/evaluation/Run.jl              | 29 ++++++++++++++++++++++++++---
 src/evaluation/WorkspaceManager.jl |  4 ++--
 src/runner/PlutoRunner.jl          |  4 +++-
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 244eb1582c..8da19e73e0 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -6,7 +6,16 @@ import .WorkspaceManager: macroexpand_in_workspace
 Base.push!(x::Set{Cell}) = x
 
 "Run given cells and all the cells that depend on them, based on the topology information before and after the changes."
-function run_reactive!(session::ServerSession, notebook::Notebook, old_topology::NotebookTopology, new_topology::NotebookTopology, roots::Vector{Cell}; deletion_hook::Function = WorkspaceManager.move_vars, user_requested_run::Bool = true, already_in_run::Bool = false, already_run::Vector{Cell} = Cell[])::TopologicalOrder
+function run_reactive!(
+	session::ServerSession, 
+	notebook::Notebook, 
+	old_topology::NotebookTopology, new_topology::NotebookTopology, 
+	roots::Vector{Cell}; 
+	deletion_hook::Function = WorkspaceManager.move_vars, 
+	user_requested_run::Bool = true, 
+	already_in_run::Bool = false, 
+	already_run::Vector{Cell} = Cell[]
+)::TopologicalOrder
     if !already_in_run
         # make sure that we're the only `run_reactive!` being executed - like a semaphor
         take!(notebook.executetoken)
@@ -192,7 +201,13 @@ function defined_functions(topology::NotebookTopology, cells)
 end
 
 "Run a single cell non-reactively, set its output, return run information."
-function run_single!(session_notebook::Union{Tuple{ServerSession,Notebook},WorkspaceManager.Workspace}, cell::Cell, reactive_node::ReactiveNode, expr_cache::ExprAnalysisCache; user_requested_run::Bool=true)
+function run_single!(
+	session_notebook::Union{Tuple{ServerSession,Notebook},WorkspaceManager.Workspace}, 
+	cell::Cell, 
+	reactive_node::ReactiveNode, 
+	expr_cache::ExprAnalysisCache; 
+	user_requested_run::Bool=true
+)
 	run = WorkspaceManager.eval_format_fetch_in_workspace(
 		session_notebook, 
 		expr_cache.parsedcode, 
@@ -418,7 +433,15 @@ end
 
 
 "Do all the things!"
-function update_save_run!(session::ServerSession, notebook::Notebook, cells::Vector{Cell}; save::Bool=true, run_async::Bool=false, prerender_text::Bool=false, kwargs...)
+function update_save_run!(
+	session::ServerSession, 
+	notebook::Notebook, 
+	cells::Vector{Cell}; 
+	save::Bool=true, 
+	run_async::Bool=false, 
+	prerender_text::Bool=false, 
+	kwargs...
+)
 	old = notebook.topology
 	new = notebook.topology = updated_topology(old, notebook, cells) # macros are not yet resolved
 
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 6ce1cbde2e..236f04417f 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -344,7 +344,7 @@ function eval_format_fetch_in_workspace(
     forced_expr_id::Union{PlutoRunner.ObjectID,Nothing}=nothing,
     user_requested_run::Bool=true,
     known_published_objects::Vector{String}=String[],
-)::NamedTuple{(:output_formatted, :errored, :interrupted, :process_exited, :runtime, :published_objects, :has_pluto_hook_features),Tuple{PlutoRunner.MimedOutput,Bool,Bool,Bool,Union{UInt64,Nothing},Dict{String,Any},Bool}}
+)::PlutoRunner.FormattedCellResult
 
     workspace = get_workspace(session_notebook)
 
@@ -397,7 +397,7 @@ function format_fetch_in_workspace(
     ends_with_semicolon, 
     known_published_objects::Vector{String}=String[],
     showmore_id::Union{PlutoRunner.ObjectDimPair,Nothing}=nothing,
-)::NamedTuple{(:output_formatted, :errored, :interrupted, :process_exited, :runtime, :published_objects, :has_pluto_hook_features),Tuple{PlutoRunner.MimedOutput,Bool,Bool,Bool,Union{UInt64,Nothing},Dict{String,Any},Bool}}
+)::PlutoRunner.FormattedCellResult
     workspace = get_workspace(session_notebook)
     
     # instead of fetching the output value (which might not make sense in our context, since the user can define structs, types, functions, etc), we format the cell output on the worker, and fetch the formatted output.
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 2e0204b714..43a5eddff5 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -760,13 +760,15 @@ const table_column_display_limit_increase = 30
 
 const tree_display_extra_items = Dict{UUID,Dict{ObjectDimPair,Int64}}()
 
+const FormattedCellResult = NamedTuple{(:output_formatted, :errored, :interrupted, :process_exited, :runtime, :published_objects, :has_pluto_hook_features),Tuple{PlutoRunner.MimedOutput,Bool,Bool,Bool,Union{UInt64,Nothing},Dict{String,Any},Bool}}
+
 function formatted_result_of(
     cell_id::UUID, 
     ends_with_semicolon::Bool, 
     known_published_objects::Vector{String}=String[],
     showmore::Union{ObjectDimPair,Nothing}=nothing, 
     workspace::Module=Main,
-)::NamedTuple{(:output_formatted, :errored, :interrupted, :process_exited, :runtime, :published_objects, :has_pluto_hook_features),Tuple{PlutoRunner.MimedOutput,Bool,Bool,Bool,Union{UInt64,Nothing},Dict{String,Any},Bool}}
+)::FormattedCellResult
     load_integrations_if_needed()
     currently_running_cell_id[] = cell_id
 

From c173673778969c23aa22f8b04f605017765bb96c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 22 Feb 2022 18:28:31 +0100
Subject: [PATCH 124/821] Update Test.yml

---
 .github/workflows/Test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index f5a53091da..ee987c91e3 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -16,6 +16,9 @@ on:
     pull_request:
         paths-ignore:
             - "frontend/**"
+            - "frontend-bundler/**"
+            - "frontend-dist/**"
+            - "test/frontend/**"
             - "**.md"
         branches-ignore:
             - release

From 31625b1e61a1496e14583e6c91591ae3762c1d04 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 22 Feb 2022 21:51:06 +0100
Subject: [PATCH 125/821] =?UTF-8?q?=F0=9F=8F=83=20Don't=20use=20body.class?=
 =?UTF-8?q?List=20for=20ctrl=5Fdown=20to=20avoid=20style=20recalc=20(#1945?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Editor.js | 18 ++++++++++++++----
 frontend/editor.css           | 10 +++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 48c81b5433..777a99f211 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -974,18 +974,28 @@ patch: ${JSON.stringify(
             this.patch_listeners.forEach((f) => f(patches))
         }
 
+        let ctrl_down_last_val = { current: false }
+        const set_ctrl_down = (value) => {
+            if (value !== ctrl_down_last_val.current) {
+                ctrl_down_last_val.current = value
+                document.body.querySelectorAll("pluto-variable-link").forEach((el) => {
+                    el.setAttribute("data-ctrl-down", value ? "true" : "false")
+                })
+            }
+        }
+
         document.addEventListener("keyup", (e) => {
-            document.body.classList.toggle("ctrl_down", has_ctrl_or_cmd_pressed(e))
+            set_ctrl_down(has_ctrl_or_cmd_pressed(e))
         })
         document.addEventListener("visibilitychange", (e) => {
-            document.body.classList.toggle("ctrl_down", false)
+            set_ctrl_down(false)
             setTimeout(() => {
-                document.body.classList.toggle("ctrl_down", false)
+                set_ctrl_down(false)
             }, 100)
         })
 
         document.addEventListener("keydown", (e) => {
-            document.body.classList.toggle("ctrl_down", has_ctrl_or_cmd_pressed(e))
+            set_ctrl_down(has_ctrl_or_cmd_pressed(e))
             // if (e.defaultPrevented) {
             //     return
             // }
diff --git a/frontend/editor.css b/frontend/editor.css
index 767725608b..b246a606b0 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2553,13 +2553,13 @@ Based on "Paraíso (Light)" by Jan T. Sott:
     }
 }
 
-body.ctrl_down [data-pluto-variable],
-body.ctrl_down [data-cell-variable] {
+[data-ctrl-down="true"][data-pluto-variable],
+[data-ctrl-down="true"][data-cell-variable] {
     text-decoration-color: #d177e6;
     cursor: pointer;
 }
-body.ctrl_down [data-pluto-variable]:hover,
-body.ctrl_down [data-pluto-variable]:hover * {
+[data-ctrl-down="true"][data-pluto-variable]:hover,
+[data-ctrl-down="true"][data-pluto-variable]:hover * {
     /* This basically `color: #af5bc3`, but it works for emoji too!! */
     color: transparent !important;
     text-shadow: 0 0 #af5bc3;
@@ -2570,7 +2570,7 @@ body.ctrl_down [data-pluto-variable]:hover * {
     /* Can give this cool styles later as well, but not for now nahhh */
     text-decoration: none;
 }
-body.ctrl_down [data-cell-variable]:hover * {
+[data-ctrl-down="true"][data-cell-variable]:hover * {
     /* This basically `color: #af5bc3`, but it works for emoji too!! */
     color: transparent !important;
     text-shadow: 0 0 #af5bc3;

From fe3b59bf60e0722d8b69ae661b380d49a4c4c262 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 00:04:07 +0100
Subject: [PATCH 126/821] Fix #1809 again

By sticking to the MDN spec :)
---
 frontend/components/DropRuler.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/frontend/components/DropRuler.js b/frontend/components/DropRuler.js
index 1ef654dfd6..ea7fc6c115 100644
--- a/frontend/components/DropRuler.js
+++ b/frontend/components/DropRuler.js
@@ -14,7 +14,6 @@ export class DropRuler extends Component {
             this.cell_edges.push(last(cell_nodes).offsetTop + last(cell_nodes).scrollHeight)
         }
         this.getDropIndexOf = ({ pageX, pageY }) => {
-            const notebook = document.querySelector("pluto-notebook")
             const distances = this.cell_edges.map((p) => Math.abs(p - pageY - 8)) // 8 is the magic computer number: https://en.wikipedia.org/wiki/8
             return argmin(distances)
         }
@@ -29,14 +28,7 @@ export class DropRuler extends Component {
     componentDidMount() {
         document.addEventListener("dragstart", (e) => {
             let target = /** @type {Element} */ (e.target)
-            if (!target.matches("pluto-shoulder")) {
-                this.setState({
-                    drag_start: false,
-                    drag_target: false,
-                })
-                this.props.set_scroller({ up: false, down: false })
-                this.dropee = null
-            } else {
+            if (target.matches("pluto-shoulder")) {
                 this.dropee = target.parentElement
                 e.dataTransfer.setData("text/pluto-cell", this.props.serialize_selected(this.dropee.id))
                 this.dropped = false
@@ -47,6 +39,13 @@ export class DropRuler extends Component {
                     drop_index: this.getDropIndexOf(e),
                 })
                 this.props.set_scroller({ up: true, down: true })
+            } else {
+                this.setState({
+                    drag_start: false,
+                    drag_target: false,
+                })
+                this.props.set_scroller({ up: false, down: false })
+                this.dropee = null
             }
         })
         document.addEventListener("dragenter", (e) => {
@@ -54,6 +53,7 @@ export class DropRuler extends Component {
             if (!this.state.drag_target) this.precompute_cell_edges()
             this.lastenter = e.target
             this.setState({ drag_target: true })
+            e.preventDefault()
         })
         document.addEventListener("dragleave", (e) => {
             if (e.dataTransfer.types[0] !== "text/pluto-cell") return
@@ -69,6 +69,10 @@ export class DropRuler extends Component {
             this.setState({
                 drop_index: this.getDropIndexOf(e),
             })
+            if (this.state.drag_start) {
+                // Then we're dragging a cell from within the notebook. Use a move icon:
+                e.dataTransfer.dropEffect = "move"
+            }
             e.preventDefault()
         })
         document.addEventListener("dragend", (e) => {

From c0c40db9146e5cb76b261b70f378c3737106601c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 00:18:35 +0100
Subject: [PATCH 127/821] Disable CM highlighting in live docs / cell output
 (#1939)

---
 frontend/components/CellOutput.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index e4593b566b..08b6a50622 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -488,6 +488,9 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
     return html`<div class="raw-html-wrapper ${className}" ref=${container}></div>`
 }
 
+// https://github.com/fonsp/Pluto.jl/issues/1692
+const ENABLE_CM_HIGHLIGHTING = false
+
 /** @param {HTMLElement} code_element */
 export let highlight = (code_element, language) => {
     language = language.toLowerCase()
@@ -495,6 +498,7 @@ export let highlight = (code_element, language) => {
 
     if (code_element.children.length === 0) {
         if (
+            ENABLE_CM_HIGHLIGHTING &&
             language === "julia" &&
             // CodeMirror does not want to render inside a `<details>`...
             // I tried to debug this, it does not happen on a clean webpage with the same CM versions:

From 5f052aa34e3f04eb8100937df01465d4f0566434 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 00:18:50 +0100
Subject: [PATCH 128/821] Disable CM mixed parser (#1940)

---
 frontend/components/CellInput.js  |  25 ++-
 frontend/components/CellOutput.js |   5 +-
 sample/JavaScript.jl              | 275 +++++++++++++++++++++++++++++-
 3 files changed, 292 insertions(+), 13 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 6fc78bb1ce..7f72310d0e 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -63,6 +63,8 @@ import { commentKeymap } from "./CellInput/comment_mixed_parsers.js"
 import { debug_syntax_plugin } from "./CellInput/debug_syntax_plugin.js"
 import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
 
+export const ENABLE_CM_MIXED_PARSER = false
+
 export const pluto_syntax_colors = HighlightStyle.define(
     [
         /* The following three need a specific version of the julia parser, will add that later (still messing with it 😈) */
@@ -619,14 +621,21 @@ export const CellInput = ({
                     }),
                     EditorState.tabSize.of(4),
                     indentUnit.of("\t"),
-                    julia_mixed(),
-                    markdown({
-                        defaultCodeLanguage: julia_mixed(),
-                    }),
-                    htmlLang(), //Provides tag closing!,
-                    javascript(),
-                    python(),
-                    sqlLang,
+                    ...(ENABLE_CM_MIXED_PARSER
+                        ? [
+                              julia_mixed(),
+                              markdown({
+                                  defaultCodeLanguage: julia_mixed(),
+                              }),
+                              htmlLang(), //Provides tag closing!,
+                              javascript(),
+                              python(),
+                              sqlLang,
+                          ]
+                        : [
+                              //
+                              julia_andrey(),
+                          ]),
                     go_to_definition_plugin,
                     pluto_autocomplete({
                         request_autocomplete: async ({ text }) => {
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 08b6a50622..ebd37216c2 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -12,11 +12,12 @@ import register from "../imports/PreactCustomElement.js"
 
 import { EditorState, EditorView, defaultHighlightStyle } from "../imports/CodemirrorPlutoSetup.js"
 
-import { pluto_syntax_colors } from "./CellInput.js"
+import { pluto_syntax_colors, ENABLE_CM_MIXED_PARSER } from "./CellInput.js"
 import { useState } from "../imports/Preact.js"
 
 import hljs from "../imports/highlightjs.js"
 import { julia_mixed } from "./CellInput/mixedParsers.js"
+import { julia_andrey } from "../imports/CodemirrorPlutoSetup.js"
 
 export class CellOutput extends Component {
     constructor() {
@@ -519,7 +520,7 @@ export let highlight = (code_element, language) => {
                         defaultHighlightStyle.fallback,
                         EditorState.tabSize.of(4),
                         // TODO Other languages possibly?
-                        language === "julia" ? julia_mixed() : null,
+                        language === "julia" ? (ENABLE_CM_MIXED_PARSER ? julia_mixed() : julia_andrey()) : null,
                         EditorView.lineWrapping,
                         EditorView.editable.of(false),
                     ].filter((x) => x != null),
diff --git a/sample/JavaScript.jl b/sample/JavaScript.jl
index 0ee47f5ab9..d5ec691e74 100644
--- a/sample/JavaScript.jl
+++ b/sample/JavaScript.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.17.7
+# v0.18.0
 
 using Markdown
 using InteractiveUtils
@@ -766,6 +766,255 @@ details(x, summary="Show more") = @htl("""
 	</details>
 	""")
 
+# ╔═╡ 93abe0dc-f041-475f-9ef7-d8ee4408414b
+details(md"""
+	```htmlmixed
+	
+	<article class="learning">
+		<h4>
+			Learning HTML and CSS
+		</h4>
+		<p>
+			It is easy to learn HTML and CSS because they are not 'programming languages' like Julia and JavaScript, they are <em>markup languages</em>: there are no loops, functions or arrays, you only <em>declare</em> how your document is structured (HTML) and what that structure looks like on a 2D color display (CSS).
+		</p>
+		<p>
+			As an example, this is what this cell looks like, written in HTML and CSS:
+		</p>
+	</article>
+
+
+	<style>
+
+		article.learning {
+			background: #fde6ea4c;
+			padding: 1em;
+			border-radius: 5px;
+		}
+
+		article.learning h4::before {
+			content: "☝️";
+		}
+
+		article.learning p::first-letter {
+			font-size: 1.5em;
+			font-family: cursive;
+		}
+
+	</style>
+	```
+	""", "Show with syntax highlighting")
+
+# ╔═╡ d12b98df-8c3f-4620-ba3c-2f3dadac521b
+details(md"""
+	```htmlmixed
+	<script>
+
+	// interpolate the data 🐸
+	const data = $(simple_data)
+
+	const span = document.createElement("span")
+	span.innerText = data.msg.repeat(data.times)
+	
+	return span
+	</script>
+	```
+	""", "Show with syntax highlighting")
+
+# ╔═╡ 94561cb1-2325-49b6-8b22-943923fdd91b
+details(md"""
+	```htmlmixed
+	<script src="https://cdn.jsdelivr.net/npm/d3@6.2.0/dist/d3.min.js"></script>
+
+	<script>
+
+	// interpolate the data 🐸
+	const data = $(my_data)
+
+	const svg = DOM.svg(600,200)
+	const s = d3.select(svg)
+
+	s.selectAll("text")
+		.data(data)
+		.join("text")
+		.attr("x", d => d.coordinate[0])
+		.attr("y", d => d.coordinate[1])
+		.style("fill", "red")
+		.text(d => d.name)
+
+	return svg
+	</script>
+	```
+	""", "Show with syntax highlighting")
+
+# ╔═╡ b0c246ed-b871-461b-9541-280e49b49136
+details(md"""
+```htmlmixed
+<div>
+<button>$(text)</button>
+
+<script>
+
+	// Select elements relative to `currentScript`
+	const div = currentScript.parentElement
+	const button = div.querySelector("button")
+
+	// we wrapped the button in a `div` to hide its default behaviour from Pluto
+
+	let count = 0
+
+	button.addEventListener("click", (e) => {
+		count += 1
+
+		// we dispatch the input event on the div, not the button, because 
+		// Pluto's `@bind` mechanism listens for events on the **first element** in the
+		// HTML output. In our case, that's the div.
+
+		div.value = count
+		div.dispatchEvent(new CustomEvent("input"))
+		e.preventDefault()
+	})
+
+	// Set the initial value
+	div.value = count
+
+</script>
+</div>
+```
+""", "Show with syntax highlighting")
+
+# ╔═╡ d121e085-c69b-490f-b315-c11a9abd57a6
+details(md"""
+	```htmlmixed
+	<script>
+	
+	let data = $(films)
+	
+	// html`...` is from https://github.com/observablehq/stdlib
+	// note the escaped dollar signs:
+	let Film = ({title, director, year}) => html`
+		<li class="film">
+			<b>\${title}</b> by <em>\${director}</em> (\${year})
+		</li>
+	`
+	
+	// the returned HTML node is rendered
+	return html`
+		<ul>
+			\${data.map(Film)}
+		</ul>
+	`
+	
+	</script>
+	```
+	""", "Show with syntax highlighting")
+
+# ╔═╡ d4bdc4fe-2af8-402f-950f-2afaf77c62de
+details(md"""
+	```htmlmixed
+	<script id="something">
+	
+	console.log("'this' is currently:", this)
+
+	if(this == null) {
+		return html`<blockquote>I am running for the first time!</blockqoute>`
+	} else {
+		return html`<blockquote><b>I was triggered by reactivity!</b></blockqoute>`
+	}
+
+
+	</script>
+	```
+	""", "Show with syntax highlighting")
+
+# ╔═╡ e910982c-8508-4729-a75d-8b5b847918b6
+details(md"""
+```htmlmixed
+<script src="https://cdn.jsdelivr.net/npm/d3@6.2.0/dist/d3.min.js"></script>
+
+<script id="hello">
+
+const positions = $(dot_positions)
+
+const svg = this == null ? DOM.svg(600,200) : this
+const s = this == null ? d3.select(svg) : this.s
+
+s.selectAll("circle")
+	.data(positions)
+	.join("circle")
+	.transition()
+	.duration(300)
+	.attr("cx", d => d)
+	.attr("cy", 100)
+	.attr("r", 10)
+	.attr("fill", "gray")
+
+
+const output = svg
+output.s = s
+return output
+</script>
+```
+""", "Show with syntax highlighting")
+
+# ╔═╡ 05d28aa2-9622-4e62-ab39-ca4c7dde6eb4
+details(md"""
+	```htmlmixed
+	<script type="module" id="asdf">
+		//await new Promise(r => setTimeout(r, 1000))
+
+		const { html, render, Component, useEffect, useLayoutEffect, useState, useRef, useMemo, createContext, useContext, } = await import( "https://cdn.jsdelivr.net/npm/htm@3.0.4/preact/standalone.mjs")
+
+		const node = this ?? document.createElement("div")
+
+		const new_state = $(state)
+
+		if(this == null){
+
+			// PREACT APP STARTS HERE
+
+			const Item = ({value}) => {
+				const [loading, set_loading] = useState(true)
+
+				useEffect(() => {
+					set_loading(true)
+
+					const handle = setTimeout(() => {
+						set_loading(false)
+					}, 1000)
+
+					return () => clearTimeout(handle)
+				}, [value])
+
+				return html`<li>\${loading ? 
+					html`<em>Loading...</em>` : 
+					value
+				}</li>`
+			}
+
+			const App = () => {
+
+				const [state, set_state] = useState(new_state)
+				node.set_app_state = set_state
+
+				return html`<h5>Hello world!</h5>
+					<ul>\${
+					state.x.map((x,i) => html`<\${Item} value=\${x} key=\${i}/>`)
+				}</ul>`;
+			}
+
+			// PREACT APP ENDS HERE
+
+			render(html`<\${App}/>`, node);
+
+		} else {
+
+			node.set_app_state(new_state)
+		}
+		return node
+	</script>
+	```
+	""", "Show with syntax highlighting")
+
 # ╔═╡ cc318a19-316f-4fd9-8436-fb1d42f888a3
 demo_img = let
 	url = "https://user-images.githubusercontent.com/6933510/116753174-fa40ab80-aa06-11eb-94d7-88f4171970b2.jpeg"
@@ -845,6 +1094,10 @@ git-tree-sha1 = "024fe24d83e4a5bf5fc80501a314ce0d1aa35597"
 uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
 version = "0.11.0"
 
+[[CompilerSupportLibraries_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
+
 [[Dates]]
 deps = ["Printf"]
 uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
@@ -906,7 +1159,7 @@ uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
 uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 
 [[LinearAlgebra]]
-deps = ["Libdl"]
+deps = ["Libdl", "libblastrampoline_jll"]
 uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [[Logging]]
@@ -929,6 +1182,10 @@ uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
 [[NetworkOptions]]
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
+[[OpenBLAS_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
+uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
+
 [[Parsers]]
 deps = ["Dates"]
 git-tree-sha1 = "0b5cfbb704034b5b4c1869e36634438a047df065"
@@ -954,7 +1211,7 @@ deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
 uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 
 [[Random]]
-deps = ["Serialization"]
+deps = ["SHA", "Serialization"]
 uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [[Reexport]]
@@ -1002,6 +1259,10 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 deps = ["Libdl"]
 uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
 
+[[libblastrampoline_jll]]
+deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
+uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
+
 [[nghttp2_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
@@ -1016,6 +1277,7 @@ uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
 # ╠═571613a1-6b4b-496d-9a68-aac3f6a83a4b
 # ╟─168e13f7-2ff2-4207-be56-e57755041d36
 # ╠═28ae1424-67dc-4b76-a172-1185cc76cb59
+# ╟─93abe0dc-f041-475f-9ef7-d8ee4408414b
 # ╟─ea39c63f-7466-4015-a66c-08bd9c716343
 # ╟─8b082f9a-073e-4112-9422-4087850fc89e
 # ╟─d70a3a02-ef3a-450f-bf5a-4a0d7f6262e2
@@ -1041,14 +1303,17 @@ uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
 # ╟─7afbf8ef-e91c-45b9-bf22-24201cbb4828
 # ╠═b226da72-9512-4d14-8582-2f7787c25028
 # ╠═a6fd1f7b-a8fc-420d-a8bb-9f549842ad3e
+# ╟─d12b98df-8c3f-4620-ba3c-2f3dadac521b
 # ╟─965f3660-6ec4-4a86-a2a2-c167dbe9315f
 # ╠═01ce31a9-6856-4ee7-8bce-7ce635167457
 # ╠═00d97588-d591-4dad-9f7d-223c237deefd
 # ╠═21f57310-9ceb-423c-a9ce-5beb1060a5a3
+# ╟─94561cb1-2325-49b6-8b22-943923fdd91b
 # ╟─7d9d6c28-131a-4b2a-84f8-5c085f387e85
 # ╟─0866afc2-fd42-42b7-a572-9d824cf8b83b
 # ╟─75e1a973-7ef0-4ac5-b3e2-5edb63577927
 # ╠═e8d8a60e-489b-467a-b49c-1fa844807751
+# ╟─b0c246ed-b871-461b-9541-280e49b49136
 # ╠═9346d8e2-9ba0-4475-a21f-11bdd018bc60
 # ╠═7822fdb7-bee6-40cc-a089-56bb32d77fe6
 # ╟─701de4b8-42d3-46a3-a399-d7761dccd83d
@@ -1064,21 +1329,25 @@ uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
 # ╟─4cf27df3-6a69-402e-a71c-26538b2a52e7
 # ╟─5721ad33-a51a-4a91-adb2-0915ea0efa13
 # ╠═c857bb4b-4cf4-426e-b340-592cf7700434
+# ╟─d121e085-c69b-490f-b315-c11a9abd57a6
 # ╟─fc8984c8-4668-418a-b258-a1718809470c
 # ╠═846354c8-ba3b-4be7-926c-d3c9cc9add5f
 # ╟─a33c7d7a-8071-448e-abd6-4e38b5444a3a
 # ╠═91f3dab8-5521-44a0-9890-8d988a994076
 # ╠═dcaae662-4a4f-4dd3-8763-89ea9eab7d43
+# ╟─d4bdc4fe-2af8-402f-950f-2afaf77c62de
 # ╟─e77cfefc-429d-49db-8135-f4604f6a9f0b
 # ╠═2d5689f5-1d63-4b8b-a103-da35933ad26e
 # ╠═6dd221d1-7fd8-446e-aced-950512ea34bc
 # ╠═0a9d6e2d-3a41-4cd5-9a4e-a9b76ed89fa9
 # ╟─0962d456-1a76-4b0d-85ff-c9e7dc66621d
 # ╠═bf9b36e8-14c5-477b-a54b-35ba8e415c77
+# ╟─e910982c-8508-4729-a75d-8b5b847918b6
 # ╟─781adedc-2da7-4394-b323-e508d614afae
 # ╟─de789ad1-8197-48ae-81b2-a21ec2340ae0
 # ╠═85483b28-341e-4ed6-bb1e-66c33613725e
 # ╠═9e37c18c-3ebb-443a-9663-bb4064391d6e
+# ╟─05d28aa2-9622-4e62-ab39-ca4c7dde6eb4
 # ╠═3266f9e6-42ad-4103-8db3-b87d2c315290
 # ╟─ebec177c-4c33-45a4-bdbd-f16944631aff
 # ╟─da7091f5-8ba2-498b-aa8d-bbf3b4505b81

From 6421f8d269fd5b89939535ce058f9dc61b08e36f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 01:02:49 +0100
Subject: [PATCH 129/821] =?UTF-8?q?=F0=9F=A6=8A=20fix=20frontend=20tests?=
 =?UTF-8?q?=20(#1943)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/frontend/helpers/pluto.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/frontend/helpers/pluto.js b/test/frontend/helpers/pluto.js
index 65aaea0bb9..d596edb16b 100644
--- a/test/frontend/helpers/pluto.js
+++ b/test/frontend/helpers/pluto.js
@@ -75,7 +75,9 @@ export const getCellIds = (page) => page.evaluate(() => Array.from(document.quer
  */
 export const waitForPlutoToCalmDown = async (page) => {
     await page.waitForTimeout(1000)
-    await page.waitForFunction(() => document.body._update_is_ongoing === false && document.querySelector(`pluto-cell.running, pluto-cell.queued`) === null)
+    await page.waitForFunction(
+        () => document.querySelector("body")._update_is_ongoing === false && document.querySelector(`pluto-cell.running, pluto-cell.queued`) === null
+    )
 }
 
 /**
@@ -99,7 +101,7 @@ export const waitForCellOutputToChange = (page, cellId, currentOutput) => {
 
 export const waitForNoUpdateOngoing = async (page, options = {}) => {
     await page.waitForTimeout(1000)
-    return await page.waitForFunction(() => document.body._update_is_ongoing === false, options)
+    return await page.waitForFunction(() => document.querySelector("body")._update_is_ongoing === false, options)
 }
 
 /**

From 1b73bbe56c96a72d7d07cac673db3cb6f92665ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Wed, 23 Feb 2022 02:35:10 +0200
Subject: [PATCH 130/821] Fix #1781 - cell selection/move performance
 regression (#1944)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/Cell.js      | 95 +++++++++++++++-----------------
 frontend/components/CellInput.js |  6 +-
 frontend/components/DropRuler.js | 20 +++++--
 frontend/components/Editor.js    | 18 +++---
 frontend/components/Notebook.js  | 56 +++++++++++--------
 5 files changed, 105 insertions(+), 90 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 1adb104f38..dd2bb943ea 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -1,5 +1,5 @@
 import _ from "../imports/lodash.js"
-import { html, useState, useEffect, useMemo, useRef, useContext, useLayoutEffect } from "../imports/Preact.js"
+import { html, useState, useEffect, useMemo, useRef, useContext, useLayoutEffect, useCallback } from "../imports/Preact.js"
 
 import { CellOutput } from "./CellOutput.js"
 import { CellInput } from "./CellInput.js"
@@ -36,7 +36,6 @@ const useCellApi = (node_ref, published_object_keys, pluto_actions) => {
  *  cell_dependencies: import("./Editor.js").CellDependencyData
  *  nbpkg: import("./Editor.js").NotebookPkgData?,
  *  selected: boolean,
- *  selected_cells: Array<string>,
  *  force_hide_input: boolean,
  *  focus_after_creation: boolean,
  *  [key: string]: any,
@@ -48,23 +47,19 @@ export const Cell = ({
     cell_dependencies,
     cell_input_local,
     notebook_id,
-    on_update_doc_query,
-    on_change,
-    on_focus_neighbor,
     selected,
-    selected_cells,
     force_hide_input,
     focus_after_creation,
     is_process_ready,
     disable_input,
     nbpkg,
+    global_definition_locations,
 }) => {
     let pluto_actions = useContext(PlutoContext)
-    const notebook = pluto_actions.get_notebook()
-    let variables_in_all_notebook = Object.fromEntries(
-        Object.values(notebook?.cell_dependencies ?? {}).flatMap((x) => Object.keys(x.downstream_cells_map).map((variable) => [variable, x.cell_id]))
-    )
-    const variables = Object.keys(notebook?.cell_dependencies?.[cell_id]?.downstream_cells_map || {})
+    const on_update_doc_query = pluto_actions.set_doc_query
+    const on_focus_neighbor = pluto_actions.focus_on_neighbor
+    const on_change = useCallback((val) => pluto_actions.set_local_cell(cell_id, val), [cell_id, pluto_actions])
+    const variables = useMemo(() => Object.keys(cell_dependencies), [cell_dependencies])
     // cm_forced_focus is null, except when a line needs to be highlighted because it is part of a stack trace
     const [cm_forced_focus, set_cm_forced_focus] = useState(null)
     const [cm_highlighted_line, set_cm_highlighted_line] = useState(null)
@@ -131,7 +126,36 @@ export const Cell = ({
     const set_waiting_to_run_smart = (x) => set_waiting_to_run(x && should_set_waiting_to_run_ref.current)
 
     const cell_api_ready = useCellApi(node_ref, published_object_keys, pluto_actions)
-
+    const on_delete = useCallback(() => {
+        pluto_actions.confirm_delete_multiple("Delete", pluto_actions.get_selected_cells(cell_id, selected))
+    }, [pluto_actions, selected, cell_id])
+    const on_submit = useCallback(() => {
+        if (!disable_input_ref.current) {
+            set_waiting_to_run_smart(true)
+            pluto_actions.set_and_run_multiple([cell_id])
+        }
+    }, [pluto_actions, set_waiting_to_run, cell_id])
+    const on_change_cell_input = useCallback(
+        (new_code) => {
+            if (!disable_input_ref.current) {
+                if (code_folded && cm_forced_focus != null) {
+                    pluto_actions.fold_remote_cells([cell_id], false)
+                }
+                on_change(new_code)
+            }
+        },
+        [code_folded, cm_forced_focus, pluto_actions, on_change]
+    )
+    const on_add_after = useCallback(() => {
+        pluto_actions.add_remote_cell(cell_id, "after")
+    }, [pluto_actions, cell_id, selected])
+    const on_code_fold = useCallback(() => {
+        pluto_actions.fold_remote_cells(pluto_actions.get_selected_cells(cell_id, selected), !code_folded)
+    }, [pluto_actions, cell_id, selected, code_folded])
+    const on_run = useCallback(() => {
+        pluto_actions.set_and_run_multiple(pluto_actions.get_selected_cells(cell_id, selected))
+        set_waiting_to_run_smart(true)
+    }, [pluto_actions, cell_id, selected, set_waiting_to_run_smart])
     return html`
         <pluto-cell
             ref=${node_ref}
@@ -153,18 +177,7 @@ export const Cell = ({
         >
             ${variables.map((name) => html`<span id=${encodeURI(name)} />`)}
             <pluto-shoulder draggable="true" title="Drag to move cell">
-                <button
-                    onClick=${() => {
-                        let cells_to_fold = selected ? selected_cells : [cell_id]
-                        pluto_actions.update_notebook((notebook) => {
-                            for (let cell_id of cells_to_fold) {
-                                notebook.cell_inputs[cell_id].code_folded = !code_folded
-                            }
-                        })
-                    }}
-                    class="foldcode"
-                    title="Show/hide code"
-                >
+                <button onClick=${on_code_fold} class="foldcode" title="Show/hide code">
                     <span></span>
                 </button>
             </pluto-shoulder>
@@ -183,34 +196,16 @@ export const Cell = ({
                 local_code=${cell_input_local?.code ?? code}
                 remote_code=${code}
                 cell_dependencies=${cell_dependencies}
-                variables_in_all_notebook=${variables_in_all_notebook}
+                global_definition_locations=${global_definition_locations}
                 disable_input=${disable_input}
                 focus_after_creation=${focus_after_creation}
                 cm_forced_focus=${cm_forced_focus}
                 set_cm_forced_focus=${set_cm_forced_focus}
                 show_input=${show_input}
-                on_submit=${() => {
-                    if (!disable_input_ref.current) {
-                        set_waiting_to_run_smart(true)
-                        pluto_actions.set_and_run_multiple([cell_id])
-                    }
-                }}
-                on_delete=${() => {
-                    let cells_to_delete = selected ? selected_cells : [cell_id]
-                    pluto_actions.confirm_delete_multiple("Delete", cells_to_delete)
-                }}
-                on_add_after=${() => {
-                    pluto_actions.add_remote_cell(cell_id, "after")
-                }}
-                on_fold=${(new_folded) => pluto_actions.fold_remote_cell(cell_id, new_folded)}
-                on_change=${(new_code) => {
-                    if (!disable_input_ref.current) {
-                        if (code_folded && cm_forced_focus != null) {
-                            pluto_actions.fold_remote_cell(cell_id, false)
-                        }
-                        on_change(new_code)
-                    }
-                }}
+                on_submit=${on_submit}
+                on_delete=${on_delete}
+                on_add_after=${on_add_after}
+                on_change=${on_change_cell_input}
                 on_update_doc_query=${on_update_doc_query}
                 on_focus_neighbor=${on_focus_neighbor}
                 on_line_heights=${set_line_heights}
@@ -229,11 +224,7 @@ export const Cell = ({
                 cell_id=${cell_id}
                 running_disabled=${running_disabled}
                 depends_on_disabled_cells=${depends_on_disabled_cells}
-                on_run=${() => {
-                    set_waiting_to_run_smart(true)
-                    let cell_to_run = selected ? selected_cells : [cell_id]
-                    pluto_actions.set_and_run_multiple(cell_to_run)
-                }}
+                on_run=${on_run}
                 on_interrupt=${() => {
                     pluto_actions.interrupt_remote(cell_id)
                 }}
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 7f72310d0e..c5245fdc6e 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -325,7 +325,7 @@ let line_and_ch_to_cm6_position = (/** @type {import("../imports/CodemirrorPluto
  *  scroll_into_view_after_creation: boolean,
  *  cell_dependencies: import("./Editor.js").CellDependencyData,
  *  nbpkg: import("./Editor.js").NotebookPkgData?,
- *  variables_in_all_notebook: { [variable_name: string]: string },
+ *  global_definition_locations: { [variable_name: string]: string },
  *  [key: string]: any,
  * }} props
  */
@@ -353,7 +353,7 @@ export const CellInput = ({
     show_logs,
     set_show_logs,
     cm_highlighted_line,
-    variables_in_all_notebook,
+    global_definition_locations,
 }) => {
     let pluto_actions = useContext(PlutoContext)
 
@@ -364,7 +364,7 @@ export const CellInput = ({
     on_change_ref.current = on_change
 
     let nbpkg_compartment = useCompartment(newcm_ref, NotebookpackagesFacet.of(nbpkg))
-    let global_definitions_compartment = useCompartment(newcm_ref, GlobalDefinitionsFacet.of(variables_in_all_notebook))
+    let global_definitions_compartment = useCompartment(newcm_ref, GlobalDefinitionsFacet.of(global_definition_locations))
     let highlighted_line_compartment = useCompartment(newcm_ref, HighlightLineFacet.of(cm_highlighted_line))
     let editable_compartment = useCompartment(newcm_ref, EditorState.readOnly.of(disable_input))
 
diff --git a/frontend/components/DropRuler.js b/frontend/components/DropRuler.js
index ea7fc6c115..7ed6c49916 100644
--- a/frontend/components/DropRuler.js
+++ b/frontend/components/DropRuler.js
@@ -1,4 +1,5 @@
 import { html, Component } from "../imports/Preact.js"
+import _ from "../imports/lodash.js"
 
 export class DropRuler extends Component {
     constructor() {
@@ -6,7 +7,7 @@ export class DropRuler extends Component {
         this.dropee = null
         this.dropped = null
         this.cell_edges = []
-        this.pointer_position = {}
+        this.pointer_position = { pageX: 0, pageY: 0 }
         this.precompute_cell_edges = () => {
             /** @type {Array<HTMLElement>} */
             const cell_nodes = Array.from(document.querySelectorAll("pluto-notebook > pluto-cell"))
@@ -61,14 +62,24 @@ export class DropRuler extends Component {
                 this.setState({ drag_target: false })
             }
         })
+        const precompute_cell_edges_throttled = _.throttle(this.precompute_cell_edges, 4000, { leading: false, trailing: true })
+        const update_drop_index_throttled = _.throttle(
+            () => {
+                this.setState({
+                    drop_index: this.getDropIndexOf(this.pointer_position),
+                })
+            },
+            300,
+            { leading: false, trailing: true }
+        )
         document.addEventListener("dragover", (e) => {
             // Called continuously during drag
             if (e.dataTransfer.types[0] !== "text/pluto-cell") return
             this.pointer_position = e
 
-            this.setState({
-                drop_index: this.getDropIndexOf(e),
-            })
+            precompute_cell_edges_throttled()
+            update_drop_index_throttled()
+
             if (this.state.drag_start) {
                 // Then we're dragging a cell from within the notebook. Use a move icon:
                 e.dataTransfer.dropEffect = "move"
@@ -77,6 +88,7 @@ export class DropRuler extends Component {
         })
         document.addEventListener("dragend", (e) => {
             // Called after drag, also when dropped outside of the browser or when ESC is pressed
+            update_drop_index_throttled.flush()
             this.setState({
                 drag_start: false,
                 drag_target: false,
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 777a99f211..2792bfe664 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -489,12 +489,14 @@ export class Editor extends Component {
                     }
                 }
             },
-            fold_remote_cell: async (cell_id, newFolded) => {
-                if (!newFolded) {
-                    this.setState({ last_created_cell: cell_id })
+            fold_remote_cells: async (cell_ids, newFolded) => {
+                if (!newFolded && cell_ids.length > 0) {
+                    this.setState({ last_created_cell: cell_ids[cell_ids.length - 1] })
                 }
                 await update_notebook((notebook) => {
-                    notebook.cell_inputs[cell_id].code_folded = newFolded
+                    for (let cell_id of cell_ids) {
+                        notebook.cell_inputs[cell_id].code_folded = newFolded
+                    }
                 })
             },
             set_and_run_all_changed_remote_cells: () => {
@@ -556,6 +558,9 @@ export class Editor extends Component {
                     false
                 )
             },
+            /** This actions avoids pushing selected cells all the way down, which is too heavy to handle! */
+            get_selected_cells: (cell_id, /** @type {boolean} */ allow_other_selected_cells) =>
+                allow_other_selected_cells ? this.state.selected_cells : [cell_id],
             get_avaible_versions: async ({ package_name, notebook_id }) => {
                 const { message } = await this.client.send("nbpkg_available_versions", { package_name: package_name }, { notebook_id: notebook_id })
                 return message.versions
@@ -1325,9 +1330,6 @@ patch: ${JSON.stringify(
                         <${Notebook}
                             notebook=${this.state.notebook}
                             cell_inputs_local=${this.state.cell_inputs_local}
-                            on_update_doc_query=${this.actions.set_doc_query}
-                            on_cell_input=${this.actions.set_local_cell}
-                            on_focus_neighbor=${this.actions.focus_on_neighbor}
                             disable_input=${this.state.disable_ui || !this.state.connected /* && this.state.binder_phase == null*/}
                             show_logs=${this.state.show_logs}
                             set_show_logs=${(enabled) => this.setState({ show_logs: enabled })}
@@ -1354,7 +1356,7 @@ patch: ${JSON.stringify(
                                 on_selection=${(selected_cell_ids) => {
                                     // @ts-ignore
                                     if (
-                                        selected_cell_ids.length !== this.state.selected_cells ||
+                                        selected_cell_ids.length !== this.state.selected_cells.length ||
                                         _.difference(selected_cell_ids, this.state.selected_cells).length !== 0
                                     ) {
                                         this.setState({
diff --git a/frontend/components/Notebook.js b/frontend/components/Notebook.js
index 2c6677ec48..dcdf606806 100644
--- a/frontend/components/Notebook.js
+++ b/frontend/components/Notebook.js
@@ -1,20 +1,36 @@
 import { PlutoContext } from "../common/PlutoContext.js"
-import { html, useContext, useEffect, useMemo, useState } from "../imports/Preact.js"
+import { html, useContext, useEffect, useMemo, useRef, useState } from "../imports/Preact.js"
 
 import { Cell } from "./Cell.js"
 import { nbpkg_fingerprint } from "./PkgStatusMark.js"
 
+/** Like `useMemo`, but explain to the console what invalidated the memo. */
+const useMemoDebug = (fn, args) => {
+    const last_values = useRef(args)
+    return useMemo(() => {
+        const new_values = args
+        console.group("useMemoDebug: something changed!")
+        if (last_values.current.length !== new_values.length) {
+            console.log("Length changed. ", " old ", last_values.current, " new ", new_values)
+        } else {
+            for (let i = 0; i < last_values.current.length; i++) {
+                if (last_values.current[i] !== new_values[i]) {
+                    console.log("Element changed. Index: ", i, " old ", last_values.current[i], " new ", new_values[i])
+                }
+            }
+        }
+        console.groupEnd()
+        return fn()
+    }, args)
+}
+
 let CellMemo = ({
     cell_result,
     cell_input,
     cell_input_local,
     notebook_id,
-    on_update_doc_query,
-    on_cell_input,
     cell_dependencies,
-    on_focus_neighbor,
     selected,
-    selected_cells,
     focus_after_creation,
     force_hide_input,
     is_process_ready,
@@ -22,8 +38,8 @@ let CellMemo = ({
     show_logs,
     set_show_logs,
     nbpkg,
+    global_definition_locations,
 }) => {
-    const selected_cells_diffable_primitive = (selected_cells || []).join("")
     const { body, last_run_timestamp, mime, persist_js_state, rootassignee } = cell_result?.output || {}
     const { queued, running, runtime, errored, depends_on_disabled_cells, logs } = cell_result || {}
     const { cell_id, code, code_folded, running_disabled } = cell_input || {}
@@ -35,11 +51,7 @@ let CellMemo = ({
                 cell_input=${cell_input}
                 cell_input_local=${cell_input_local}
                 notebook_id=${notebook_id}
-                on_update_doc_query=${on_update_doc_query}
-                on_change=${(val) => on_cell_input(cell_input.cell_id, val)}
-                on_focus_neighbor=${on_focus_neighbor}
                 selected=${selected}
-                selected_cells=${selected_cells}
                 force_hide_input=${force_hide_input}
                 focus_after_creation=${focus_after_creation}
                 is_process_ready=${is_process_ready}
@@ -47,6 +59,7 @@ let CellMemo = ({
                 show_logs=${show_logs}
                 set_show_logs=${set_show_logs}
                 nbpkg=${nbpkg}
+                global_definition_locations=${global_definition_locations}
             />
         `
     }, [
@@ -67,18 +80,15 @@ let CellMemo = ({
         code_folded,
         cell_input_local,
         notebook_id,
-        on_update_doc_query,
-        on_cell_input,
         cell_dependencies,
-        on_focus_neighbor,
         selected,
-        selected_cells_diffable_primitive,
         force_hide_input,
         focus_after_creation,
         is_process_ready,
         disable_input,
         show_logs,
         ...nbpkg_fingerprint(nbpkg),
+        global_definition_locations,
     ])
 }
 
@@ -111,9 +121,6 @@ const render_cell_outputs_minimum = 20
 export const Notebook = ({
     notebook,
     cell_inputs_local,
-    on_update_doc_query,
-    on_cell_input,
-    on_focus_neighbor,
     last_created_cell,
     selected_cells,
     is_initializing,
@@ -143,7 +150,13 @@ export const Notebook = ({
             }, render_cell_outputs_delay(notebook.cell_order.length))
         }
     }, [cell_outputs_delayed, notebook.cell_order.length])
-
+    let global_definition_locations = useMemo(
+        () =>
+            Object.fromEntries(
+                Object.values(notebook?.cell_dependencies ?? {}).flatMap((x) => Object.keys(x.downstream_cells_map).map((variable) => [variable, x.cell_id]))
+            ),
+        [notebook?.cell_dependencies]
+    )
     return html`
         <pluto-notebook id=${notebook.notebook_id}>
             ${notebook.cell_order
@@ -161,14 +174,10 @@ export const Notebook = ({
                             logs: [],
                         }}
                         cell_input=${notebook.cell_inputs[cell_id]}
-                        cell_dependencies=${notebook.cell_dependencies[cell_id] ?? {}}
+                        cell_dependencies=${notebook?.cell_dependencies?.[cell_id] ?? {}}
                         cell_input_local=${cell_inputs_local[cell_id]}
                         notebook_id=${notebook.notebook_id}
-                        on_update_doc_query=${on_update_doc_query}
-                        on_cell_input=${on_cell_input}
-                        on_focus_neighbor=${on_focus_neighbor}
                         selected=${selected_cells.includes(cell_id)}
-                        selected_cells=${selected_cells}
                         focus_after_creation=${last_created_cell === cell_id}
                         force_hide_input=${false}
                         is_process_ready=${is_process_ready}
@@ -176,6 +185,7 @@ export const Notebook = ({
                         show_logs=${show_logs}
                         set_show_logs=${set_show_logs}
                         nbpkg=${notebook.nbpkg}
+                        global_definition_locations=${global_definition_locations}
                     />`
                 )}
         </pluto-notebook>

From 906e3460c0457866faa8b4eb4b40a95b1718c3f5 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 01:35:57 +0100
Subject: [PATCH 131/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 5fd7297426..4ac0193e48 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.18.0"
+version = "0.18.1"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 5b858ded0db12517cf053215b1b40709b5772369 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 02:14:01 +0100
Subject: [PATCH 132/821] Update index.css

---
 frontend/index.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/index.css b/frontend/index.css
index e3ada1c1a8..09e847ce32 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -262,17 +262,17 @@ body.nosessions ul#new ~ * {
 }
 
 #recent li.running button > span::after {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-circle.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-circle.svg");
     filter: var(--image-filters);
 }
 
 #recent li.recent button > span::after {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg");
     filter: var(--image-filters);
 }
 
 #recent li.transitioning button > span::after {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/ellipsis-horizontal-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/ellipsis-horizontal-outline.svg");
     filter: var(--image-filters);
 }
 

From 19e455484158457249d47cfa9b8386f4bb2ef78c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 11:55:00 +0100
Subject: [PATCH 133/821] =?UTF-8?q?=F0=9F=93=81=20Fix=20#1785?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/webserver/REPLTools.jl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/webserver/REPLTools.jl b/src/webserver/REPLTools.jl
index b4b5fd9b35..ab87db0d09 100644
--- a/src/webserver/REPLTools.jl
+++ b/src/webserver/REPLTools.jl
@@ -17,8 +17,13 @@ responses[:completepath] = function response_completepath(🙋::ClientRequest)
     pos = lastindex(path)
 
     results, loc, found = complete_path(path, pos)
+    # too many candiates otherwise. -0.1 instead of 0 to enable autocompletions for paths: `/` or `/asdf/`
     isenough(x) = x ≥ -0.1
-    filter!(isenough ∘ score, results) # too many candiates otherwise. -0.1 instead of 0 to enable autocompletions for paths: `/` or `/asdf/`
+    ishidden(path_completion) = let p = path_completion.path
+        @info p basename(isdirpath(p) ? dirname(p) : p)
+        startswith(basename(isdirpath(p) ? dirname(p) : p), ".")
+    end
+    filter!(p -> !ishidden(p) && (isenough ∘ score)(p), results)
 
     start_utf8 = let
         # REPLCompletions takes into account that spaces need to be prefixed with `\` in the shell, so it subtracts the number of spaces in the filename from `start`:

From e6b55d1c285b3cc07721eb21b241b5dca46aa136 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 13:25:29 +0100
Subject: [PATCH 134/821] HTTP header: Referrer-Policy: same-origin

---
 src/webserver/WebServer.jl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 2ce23baa5e..1597d1760c 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -242,7 +242,8 @@ function run(session::ServerSession, pluto_router)
             request.response::HTTP.Response = response_body
             request.response.request = request
             try
-                HTTP.setheader(http, "Referrer-Policy" => "origin-when-cross-origin")
+                # https://github.com/fonsp/Pluto.jl/pull/722
+                HTTP.setheader(http, "Referrer-Policy" => "same-origin")
                 HTTP.startwrite(http)
                 write(http, request.response.body)
                 HTTP.closewrite(http)

From 6b07f9107284a37bfeb4aaf1578622381ec97b29 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 13:26:10 +0100
Subject: [PATCH 135/821] HTTP header: Server: Pluto/0.18.1 Julia/1.7.1

See #1102
---
 src/webserver/WebServer.jl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 1597d1760c..6172e371e5 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -244,6 +244,8 @@ function run(session::ServerSession, pluto_router)
             try
                 # https://github.com/fonsp/Pluto.jl/pull/722
                 HTTP.setheader(http, "Referrer-Policy" => "same-origin")
+                # https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#:~:text=is%202%20minutes.-,14.38%20Server
+                HTTP.setheader(http, "Server" => "Pluto.jl/$(PLUTO_VERSION_STR[2:end]) Julia/$(JULIA_VERSION_STR[2:end])")
                 HTTP.startwrite(http)
                 write(http, request.response.body)
                 HTTP.closewrite(http)

From 3286275e616dd6eda2c12a484beab9be0f2ef605 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 13:31:08 +0100
Subject: [PATCH 136/821] remove console.log

---
 src/webserver/REPLTools.jl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/webserver/REPLTools.jl b/src/webserver/REPLTools.jl
index ab87db0d09..e80a8c2444 100644
--- a/src/webserver/REPLTools.jl
+++ b/src/webserver/REPLTools.jl
@@ -20,7 +20,6 @@ responses[:completepath] = function response_completepath(🙋::ClientRequest)
     # too many candiates otherwise. -0.1 instead of 0 to enable autocompletions for paths: `/` or `/asdf/`
     isenough(x) = x ≥ -0.1
     ishidden(path_completion) = let p = path_completion.path
-        @info p basename(isdirpath(p) ? dirname(p) : p)
         startswith(basename(isdirpath(p) ? dirname(p) : p), ".")
     end
     filter!(p -> !ishidden(p) && (isenough ∘ score)(p), results)

From a640db64da5b936d13cf5f60043a510f2fc7fedb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 13:34:43 +0100
Subject: [PATCH 137/821] HTTP header: Content-Length

See #1102
---
 src/webserver/WebServer.jl    | 3 +++
 src/webserver/WebSocketFix.jl | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 6172e371e5..c1ee31f303 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -226,6 +226,8 @@ function run(session::ServerSession, pluto_router)
                 end
             end
         else
+            # then it's a regular HTTP request, not a WS upgrade
+            
             request::HTTP.Request = http.message
             request.body = read(http)
             HTTP.closeread(http)
@@ -242,6 +244,7 @@ function run(session::ServerSession, pluto_router)
             request.response::HTTP.Response = response_body
             request.response.request = request
             try
+                HTTP.setheader(http, "Content-Length" => string(length(request.response.body)))
                 # https://github.com/fonsp/Pluto.jl/pull/722
                 HTTP.setheader(http, "Referrer-Policy" => "same-origin")
                 # https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#:~:text=is%202%20minutes.-,14.38%20Server
diff --git a/src/webserver/WebSocketFix.jl b/src/webserver/WebSocketFix.jl
index 517724bcaa..a7ad726938 100644
--- a/src/webserver/WebSocketFix.jl
+++ b/src/webserver/WebSocketFix.jl
@@ -5,14 +5,14 @@ import HTTP.WebSockets
 
 function readframe(ws::WebSockets.WebSocket)
     header = WebSockets.readheader(ws.io)
-    @debug 1 "WebSocket ➡️  $header"
+    # @debug 1 "WebSocket ➡️  $header"
 
     if header.length > 0
         if length(ws.rxpayload) < header.length
             resize!(ws.rxpayload, header.length)
         end
         unsafe_read(ws.io, pointer(ws.rxpayload), header.length)
-        @debug 2 "          ➡️  \"$(String(ws.rxpayload[1:header.length]))\""
+        # @debug 2 "          ➡️  \"$(String(ws.rxpayload[1:header.length]))\""
     end
     l = Int(header.length)
     if header.hasmask

From b57444cdc8d7a7c787855a7fc0c3e2a60ec19507 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 15:09:31 +0100
Subject: [PATCH 138/821] CSS: close fallbacks for JuliaMono while loading

---
 frontend/editor.css   | 19 ++++++++++---------
 frontend/index.css    |  2 +-
 frontend/treeview.css |  6 +++---
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index b246a606b0..4946ed319e 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -28,6 +28,7 @@
     /* use the value "contextual" to enable contextual ligatures `document.documentElement.style.setProperty('--pluto-operator-ligatures', 'contextual');`
         for julia mono see here: https://cormullion.github.io/pages/2020-07-26-JuliaMono/#contextual_and_stylistic_alternates_and_ligatures */
     --pluto-operator-ligatures: none;
+    --julia-mono-font-stack: JuliaMono, Menlo, "Roboto Mono", "Lucida Sans Typewriter", "Source Code Pro", monospace;
     --sans-serif-font-stack: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
 
     color-scheme: light dark;
@@ -222,13 +223,13 @@ a:hover {
 }
 
 pluto-output code {
-    font-family: JuliaMono, monospace;
+    font-family: var(--julia-mono-font-stack);
     font-size: 0.75em; /* not rem */
     font-variant-ligatures: none;
 }
 
 pluto-output code .cm-editor .cm-line {
-    font-family: JuliaMono, monospace;
+    font-family: var(--julia-mono-font-stack);
 }
 
 pluto-output pre > code {
@@ -253,7 +254,7 @@ pluto-output pre {
     word-break: break-all;
     tab-size: 4;
     -moz-tab-size: 4; /* https://bugzilla.mozilla.org/show_bug.cgi?id=737785 */
-    font-family: JuliaMono, monospace;
+    font-family: var(--julia-mono-font-stack);
     font-size: 0.75rem;
     font-variant-ligatures: none;
 }
@@ -406,7 +407,7 @@ pluto-output table > thead {
 }
 
 pluto-output table > tbody td {
-    font-family: JuliaMono, monospace;
+    font-family: var(--julia-mono-font-stack);
     font-size: 0.75rem;
     font-variant-ligatures: none;
 }
@@ -720,7 +721,7 @@ body.binder > header > nav#at_the_top > pluto-filepicker > * {
 body.binder > header > nav#at_the_top > pluto-filepicker > a {
     display: block;
     font-size: 16px;
-    font-family: JuliaMono, monospace;
+    font-family: var(--julia-mono-font-stack);
     opacity: 0.8;
     text-decoration: none;
 }
@@ -1024,7 +1025,7 @@ pluto-output:not(.rich_output) {
 }
 
 pluto-output > assignee {
-    font-family: JuliaMono, monospace;
+    font-family: var(--julia-mono-font-stack);
     font-size: 0.75rem;
     font-variant-ligatures: none;
 }
@@ -2077,7 +2078,7 @@ pluto-helpbox > section hr {
 .pluto-docs-binding > span {
     display: inline-block;
     transform: translate(-19px, -16px);
-    font-family: "JuliaMono", monospace;
+    font-family: var(--julia-mono-font-stack);
     font-size: 0.9rem;
     font-weight: 700;
     margin-top: -1em;
@@ -2518,7 +2519,7 @@ pluto-input .cm-editor .cm-tooltip.cm-tooltip-autocomplete > ul > li {
 .cm-completionIcon::before {
     /* TODO This loses all color when it's not font-family: JuliaMono, which can happen */
     content: "⚫";
-    font-family: JuliaMono, monospace !important;
+    font-family: var(--julia-mono-font-stack) !important;
     color: transparent;
     font-size: 0.75rem;
     margin-right: 0.5em;
@@ -2585,7 +2586,7 @@ Based on "Paraíso (Light)" by Jan T. Sott:
 pluto-input .cm-editor .cm-content,
 pluto-input .cm-editor .cm-scroller,
 .cm-editor .cm-tooltip-autocomplete .cm-completionLabel {
-    font-family: JuliaMono, monospace !important;
+    font-family: var(--julia-mono-font-stack) !important;
     font-variant-ligatures: none;
     font-size: 0.75rem;
 }
diff --git a/frontend/index.css b/frontend/index.css
index 09e847ce32..be60eb9b71 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -223,7 +223,7 @@ pluto-filepicker button {
 }
 
 .cm-editor .cm-tooltip-autocomplete .cm-completionLabel {
-    font-family: JuliaMono, monospace !important;
+    font-family: JuliaMono, Menlo, "Roboto Mono", "Lucida Sans Typewriter", "Source Code Pro", monospace !important;
     font-variant-ligatures: none;
     font-size: 0.75rem;
 }
diff --git a/frontend/treeview.css b/frontend/treeview.css
index 4a4448b8ae..54487b2545 100644
--- a/frontend/treeview.css
+++ b/frontend/treeview.css
@@ -8,7 +8,7 @@
 
 pluto-tree,
 pluto-tree-pair {
-    font-family: JuliaMono, monospace;
+    font-family: var(--julia-mono-font-stack);
     font-size: 0.75rem;
 }
 pluto-tree {
@@ -256,7 +256,7 @@ jlerror > section > ol > li > mark {
     background: var(--jlerror-mark-bg-color);
     border-radius: 6px;
     color: var(--jlerror-mark-color);
-    font-family: JuliaMono, monospace;
+    font-family: var(--julia-mono-font-stack);
     font-variant-ligatures: none;
 }
 jlerror > section > ol > li > em > a {
@@ -282,7 +282,7 @@ table.pluto-table td {
 
 table.pluto-table .schema-types {
     color: var(--pluto-schema-types-color);
-    font-family: "JuliaMono", monospace;
+    font-family: var(--julia-mono-font-stack);
     font-size: 0.75rem;
     opacity: 0;
 }

From a64ba16d42d6a13780542cb5a2c69596814b8776 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 15:35:39 +0100
Subject: [PATCH 139/821] MathJax.js: even lazier load (#1947)

---
 frontend/common/SetupMathJax.js | 111 +++++++++++++++++++-------------
 frontend/components/Editor.js   |   5 ++
 frontend/editor.html            |   4 +-
 3 files changed, 72 insertions(+), 48 deletions(-)

diff --git a/frontend/common/SetupMathJax.js b/frontend/common/SetupMathJax.js
index e56bae6f03..f0e8f8f658 100644
--- a/frontend/common/SetupMathJax.js
+++ b/frontend/common/SetupMathJax.js
@@ -1,50 +1,69 @@
-// @ts-nocheck
-const deprecated = () => console.warn("Pluto uses MathJax 3, but a MathJax 2 function was called.")
+import "https://cdn.jsdelivr.net/npm/requestidlecallback-polyfill@1.0.2/index.js"
 
-window.MathJax = {
-    options: {
-        ignoreHtmlClass: "no-MαθJax",
-        processHtmlClass: "tex",
-    },
-    startup: {
-        typeset: true, // because we load MathJax asynchronously
-        ready: () => {
-            window.MathJax.startup.defaultReady()
+export const setup_mathjax = () => {
+    const deprecated = () => console.warn("Pluto uses MathJax 3, but a MathJax 2 function was called.")
 
-            // plotly uses MathJax 2, so we have this shim to make it work kindof
-            window.MathJax.Hub = {
-                Queue: function () {
-                    for (var i = 0, m = arguments.length; i < m; i++) {
-                        var fn = window.MathJax.Callback(arguments[i])
-                        window.MathJax.startup.promise = window.MathJax.startup.promise.then(fn)
-                    }
-                    return window.MathJax.startup.promise
-                },
-                Typeset: function (elements, callback) {
-                    var promise = window.MathJax.typesetPromise(elements)
-                    if (callback) {
-                        promise = promise.then(callback)
-                    }
-                    return promise
-                },
-                Register: {
-                    MessageHook: deprecated,
-                    StartupHook: deprecated,
-                    LoadHook: deprecated,
-                },
-                Config: deprecated,
-                Configured: deprecated,
-                setRenderer: deprecated,
-            }
+    // @ts-ignore
+    window.MathJax = {
+        options: {
+            ignoreHtmlClass: "no-MαθJax",
+            processHtmlClass: "tex",
         },
-    },
-    tex: {
-        inlineMath: [
-            ["$", "$"],
-            ["\\(", "\\)"],
-        ],
-    },
-    svg: {
-        fontCache: "global",
-    },
+        startup: {
+            typeset: true, // because we load MathJax asynchronously
+            ready: () => {
+                // @ts-ignore
+                window.MathJax.startup.defaultReady()
+
+                // plotly uses MathJax 2, so we have this shim to make it work kindof
+                // @ts-ignore
+                window.MathJax.Hub = {
+                    Queue: function () {
+                        for (var i = 0, m = arguments.length; i < m; i++) {
+                            // @ts-ignore
+                            var fn = window.MathJax.Callback(arguments[i])
+                            // @ts-ignore
+                            window.MathJax.startup.promise = window.MathJax.startup.promise.then(fn)
+                        }
+                        // @ts-ignore
+                        return window.MathJax.startup.promise
+                    },
+                    Typeset: function (elements, callback) {
+                        // @ts-ignore
+                        var promise = window.MathJax.typesetPromise(elements)
+                        if (callback) {
+                            promise = promise.then(callback)
+                        }
+                        return promise
+                    },
+                    Register: {
+                        MessageHook: deprecated,
+                        StartupHook: deprecated,
+                        LoadHook: deprecated,
+                    },
+                    Config: deprecated,
+                    Configured: deprecated,
+                    setRenderer: deprecated,
+                }
+            },
+        },
+        tex: {
+            inlineMath: [
+                ["$", "$"],
+                ["\\(", "\\)"],
+            ],
+        },
+        svg: {
+            fontCache: "global",
+        },
+    }
+
+    requestIdleCallback(
+        () => {
+            console.log("Loading mathjax!!")
+            const script = document.head.querySelector("#MathJax-script")
+            script.setAttribute("src", script.getAttribute("not-the-src-yet"))
+        },
+        { timeout: 2000 }
+    )
 }
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 2792bfe664..0d19bb67f5 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -25,6 +25,7 @@ import { PlutoContext, PlutoBondsContext, PlutoJSInitializingContext, SetWithEmp
 import { unpack } from "../common/MsgPack.js"
 import { PkgTerminalView } from "./PkgTerminalView.js"
 import { start_binder, BinderPhase, count_stat } from "../common/Binder.js"
+import { setup_mathjax } from "../common/SetupMathJax.js"
 import { read_Uint8Array_with_progress, FetchProgress } from "./FetchProgress.js"
 import { BinderButton } from "./BinderButton.js"
 import { slider_server_actions, nothing_actions } from "../common/SliderServerClient.js"
@@ -1165,6 +1166,10 @@ patch: ${JSON.stringify(
         if (old_state.disable_ui !== this.state.disable_ui) {
             this.on_disable_ui()
         }
+        if (old_state.initializing && !this.state.initializing) {
+            console.info("Initialization done!")
+            setup_mathjax()
+        }
 
         if (old_state.notebook.nbpkg?.restart_recommended_msg !== new_state.notebook.nbpkg?.restart_recommended_msg) {
             console.warn(`New restart recommended message: ${new_state.notebook.nbpkg?.restart_recommended_msg}`)
diff --git a/frontend/editor.html b/frontend/editor.html
index 40f8f2b10d..0a2d36b338 100644
--- a/frontend/editor.html
+++ b/frontend/editor.html
@@ -46,8 +46,8 @@
     <script src="./editor.js" type="module" defer></script>
     <script src="./warn_old_browsers.js"></script>
 
-    <script src="./common/SetupMathJax.js"></script>
-    <script type="text/javascript" id="MathJax-script" src="https://cdn.jsdelivr.net/npm/mathjax@3.1.2/es5/tex-svg-full.js" async></script>
+    <!-- This script will be enabled by JS after the notebook has initialized to prevent taking up bandwidth during the initial load. -->
+    <script type="text/javascript" id="MathJax-script" not-the-src-yet="https://cdn.jsdelivr.net/npm/mathjax@3.1.2/es5/tex-svg-full.js" async></script>
 </head>
 
 <body class="loading no-MαθJax"></body>

From 0a2145f9db4cdc939efe24d5c064596d17c52eb5 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 16:00:52 +0100
Subject: [PATCH 140/821] =?UTF-8?q?=F0=9F=90=8A=20Fix=20#1929=20causing=20?=
 =?UTF-8?q?a=20permanent=20break?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/CellOutput.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index ebd37216c2..a8098b84ba 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -482,6 +482,7 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
         })
 
         return () => {
+            js_init_set?.delete(container.current)
             invalidate_scripts.current?.()
         }
     }, [body, persist_js_state, last_run_timestamp, pluto_actions])

From 9a163a31e0d22e9f837600a286e415d3386a5735 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Feb 2022 21:54:48 +0100
Subject: [PATCH 141/821] =?UTF-8?q?=E2=8C=9B=EF=B8=8F=20Progress=20bar=20i?=
 =?UTF-8?q?n=20isolated=20cell=20view=20(#1950)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Editor.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 0d19bb67f5..4d8f2e78b7 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1194,6 +1194,7 @@ patch: ${JSON.stringify(
                 <${PlutoContext.Provider} value=${this.actions}>
                     <${PlutoBondsContext.Provider} value=${this.state.notebook.bonds}>
                         <${PlutoJSInitializingContext.Provider} value=${this.js_init_set}>
+                            <${ProgressBar} notebook=${this.state.notebook} binder_phase=${this.state.binder_phase} status=${status}/>
                             <div style="width: 100%">
                                 ${this.state.notebook.cell_order.map(
                                     (cell_id, i) => html`

From 47bcaf0fc3f0333bb5431684b61ebef74a553d80 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 25 Feb 2022 13:39:56 +0100
Subject: [PATCH 142/821] Create FUNDING.yml

---
 .github/FUNDING.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000..2231ae1755
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+open_collective: julialang

From ec2bc1cb828d3747700ebd6a50b37ce3980d1a83 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 25 Feb 2022 18:24:55 +0100
Subject: [PATCH 143/821] css tweak

---
 frontend/editor.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/editor.css b/frontend/editor.css
index 4946ed319e..edadd9396e 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2013,6 +2013,7 @@ pluto-helpbox .cm-line {
     /* from https://docs.julialang.org/en/v1/assets/themes/documenter-light.css */
     font-family: "Roboto Mono", "SFMono-Regular", "Menlo", "Consolas", "Liberation Mono", "DejaVu Sans Mono", monospace;
     font-size: 0.95em;
+    line-height: initial;
 }
 pluto-helpbox pre code {
     font-size: 1em;

From 4bd8ec58987c2d57a72e6ed78b4e87083669f3df Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 25 Feb 2022 20:27:24 +0100
Subject: [PATCH 144/821] =?UTF-8?q?=E2=8F=B3=20Fix=20progress=20bar=20CSS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Logs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
index e9907b892b..663804abc2 100644
--- a/frontend/components/Logs.js
+++ b/frontend/components/Logs.js
@@ -84,7 +84,7 @@ const Progress = ({ progress }) => {
     const bar_ref = useRef(null)
 
     useLayoutEffect(() => {
-        bar_ref.current.style.backgroundSize = `${progress * 100}%`
+        bar_ref.current.style.backgroundSize = `${progress * 100}% 100%`
     }, [progress])
 
     return html`<pluto-progress-bar ref=${bar_ref}>${Math.ceil(100 * progress)}%</pluto-progress-bar>`

From ecc31e76ff9e49d7b29176f4c80d8e9551a9424c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 25 Feb 2022 20:46:57 +0100
Subject: [PATCH 145/821] Safari: fix smooth scroll polyfill

---
 frontend/common/Polyfill.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/common/Polyfill.js b/frontend/common/Polyfill.js
index 28e226aa45..9764bda7b8 100644
--- a/frontend/common/Polyfill.js
+++ b/frontend/common/Polyfill.js
@@ -27,4 +27,5 @@ if (Blob.prototype.arrayBuffer == null) {
     }
 }
 
-import "https://cdn.jsdelivr.net/npm/smoothscroll-polyfill@0.4.4/dist/smoothscroll.min.js"
+import { polyfill as scroll_polyfill } from "https://esm.sh/seamless-scroll-polyfill@2.1.8/lib/polyfill.js"
+scroll_polyfill()

From 529266d60cf57bbe5ab08ecc61b3f1f358892c33 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 25 Feb 2022 22:10:48 +0100
Subject: [PATCH 146/821] small CSS refactors

---
 frontend/components/PkgPopup.js | 20 ++++++++++----------
 frontend/dark_color.css         |  3 ++-
 frontend/editor.css             | 21 ++++-----------------
 frontend/light_color.css        |  1 +
 4 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/frontend/components/PkgPopup.js b/frontend/components/PkgPopup.js
index a1b297437a..7bdd469061 100644
--- a/frontend/components/PkgPopup.js
+++ b/frontend/components/PkgPopup.js
@@ -9,6 +9,13 @@ import { package_status, nbpkg_fingerprint_without_terminal } from "./PkgStatusM
 import { PkgTerminalView } from "./PkgTerminalView.js"
 import { useDebouncedTruth } from "./RunArea.js"
 
+// This funny thing is a way to tell parcel to bundle these files..
+// Eventually I'll write a plugin that is able to parse html`...`, but this is it for now.
+// https://parceljs.org/languages/javascript/#url-dependencies
+export const arrow_up_circle_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-up-circle-outline.svg", import.meta.url)
+export const document_text_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg", import.meta.url)
+export const help_circle_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/help-circle-outline.svg", import.meta.url)
+
 export const PkgPopup = ({ notebook }) => {
     let pluto_actions = useContext(PlutoContext)
 
@@ -90,13 +97,6 @@ export const PkgPopup = ({ notebook }) => {
 
     const showupdate = pkg_status?.offer_update ?? false
 
-    // This funny thing is a way to tell parcel to bundle these files..
-    // Eventually I'll write a plugin that is able to parse html`...`, but this is it for now.
-    // https://parceljs.org/languages/javascript/#url-dependencies
-    const circle_outline_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-up-circle-outline.svg", import.meta.url)
-    const document_text_outline_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg", import.meta.url)
-    const help_circle_outline_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/help-circle-outline.svg", import.meta.url)
-
     // <header>${recent_event?.package_name}</header>
     return html`<pkg-popup
         class=${cl({
@@ -126,7 +126,7 @@ export const PkgPopup = ({ notebook }) => {
                     }
                     e.preventDefault()
                 }}
-                ><img alt="i" src=${circle_outline_icon} width="17"
+                ><img alt="⬆️" src=${arrow_up_circle_icon} width="17"
             /></a>
             <a
                 class="toggle-terminal"
@@ -138,10 +138,10 @@ export const PkgPopup = ({ notebook }) => {
                     set_showterminal(!showterminal)
                     e.preventDefault()
                 }}
-                ><img alt="i" src=${document_text_outline_icon} width="17"
+                ><img alt="📄" src=${document_text_icon} width="17"
             /></a>
             <a class="help" target="_blank" title="Go to help page" href="https://github.com/fonsp/Pluto.jl/wiki/%F0%9F%8E%81-Package-management"
-                ><img alt="i" src=${help_circle_outline_icon} width="17"
+                ><img alt="❔" src=${help_circle_icon} width="17"
             /></a>
         </div>
         <${PkgTerminalView} value=${terminal_value ?? "Loading..."} />
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index c995ce31f4..51cbe22b99 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -88,7 +88,8 @@
         --loading-grad-color-2: #d0d4d7;
         /*saveall container*/
         --overlay-button-bg: #2c2c2c;
-        --overlay-button-border: #c7a74670;
+        --overlay-button-border: #9e9e9e70;
+        --overlay-button-border-save: #c7a74670;
         --overlay-button-color: white;
 
         /*input_context_menu*/
diff --git a/frontend/editor.css b/frontend/editor.css
index edadd9396e..768be1f9b7 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -30,6 +30,8 @@
     --pluto-operator-ligatures: none;
     --julia-mono-font-stack: JuliaMono, Menlo, "Roboto Mono", "Lucida Sans Typewriter", "Source Code Pro", monospace;
     --sans-serif-font-stack: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
+    --lato-ui-font-stack: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, Helvetica, Arial, "Apple Color Emoji",
+        "Segoe UI Emoji", "Segoe UI Symbol", system-ui, sans-serif;
 
     color-scheme: light dark;
 }
@@ -901,24 +903,9 @@ main > preamble {
     pointer-events: none;
 }
 
-main > preamble #saveall-container {
-    margin-left: auto;
-    pointer-events: all;
-    right: min(0px, 700px + 25px - 100vw);
-    position: relative;
-    background: var(--overlay-button-bg);
-    color: var(--overlay-button-color);
-    padding: 5px 8px;
-    border: 3px solid var(--overlay-button-border);
-    border-radius: 12px;
-    height: 35px;
-    font-family: "Segoe UI Emoji", "Roboto Mono", monospace;
-    font-size: 0.75rem;
-    pointer-events: all;
-}
-
 .overlay-button {
     background: var(--overlay-button-bg);
+    color: var(--overlay-button-color);
     padding: 5px 8px;
     border: 3px solid var(--overlay-button-border);
     border-radius: 12px;
@@ -1695,7 +1682,7 @@ pkg-popup {
     border-radius: 10px;
     padding: 8px;
     overflow-wrap: break-word;
-    font-family: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
+    font-family: var(--lato-ui-font-stack);
     opacity: 0;
     transform: scale(0.2);
     transform-origin: left;
diff --git a/frontend/light_color.css b/frontend/light_color.css
index 252d0782cd..fa33f154a7 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -93,6 +93,7 @@
         /*saveall container*/
         --overlay-button-bg: #ffffff;
         --overlay-button-border: #f3f2f2;
+        --overlay-button-border-save: #f3f2f2;
 
         /*input_context_menu*/
         --input-context-menu-border-color: rgba(0, 0, 0, 0.1);

From b80f2c92c3197cf918f23919063ae9326f0439f9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 25 Feb 2022 23:24:06 +0100
Subject: [PATCH 147/821] CompatHelper: bump compat for RelocatableFolders to
 0.2, (keep existing compat) (#1953)

Co-authored-by: CompatHelper Julia <compathelper_noreply@julialang.org>
---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 4ac0193e48..bf03618f83 100644
--- a/Project.toml
+++ b/Project.toml
@@ -28,7 +28,7 @@ Configurations = "0.15, 0.16, 0.17"
 FuzzyCompletions = "0.3,0.4,0.5"
 HTTP = "^0.9.1"
 MsgPack = "1.1"
-RelocatableFolders = "0.1"
+RelocatableFolders = "0.1, 0.2"
 Tables = "1"
 julia = "^1.6"
 

From 8f088f7a9a84d2b98eb2e456bb5b5a2c726dd315 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 25 Feb 2022 23:30:10 +0100
Subject: [PATCH 148/821] =?UTF-8?q?=F0=9F=92=AC=20Generalized=20PkgPopup?=
 =?UTF-8?q?=20to=20any=20popup=20type=20(#1956)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Editor.js                 |  4 +-
 frontend/components/PkgStatusMark.js          | 10 ++--
 frontend/components/{PkgPopup.js => Popup.js} | 51 +++++++++++++------
 frontend/editor.css                           | 33 ++++++++----
 4 files changed, 68 insertions(+), 30 deletions(-)
 rename frontend/components/{PkgPopup.js => Popup.js} (82%)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 4d8f2e78b7..9300b2ae42 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -16,7 +16,7 @@ import { UndoDelete } from "./UndoDelete.js"
 import { SlideControls } from "./SlideControls.js"
 import { Scroller } from "./Scroller.js"
 import { ExportBanner } from "./ExportBanner.js"
-import { PkgPopup } from "./PkgPopup.js"
+import { Popup } from "./Popup.js"
 
 import { slice_utf8, length_utf8 } from "../common/UnicodeTools.js"
 import { has_ctrl_or_cmd_pressed, ctrl_or_cmd_name, is_mac_keyboard, in_textarea_or_input } from "../common/KeyboardShortcuts.js"
@@ -1378,7 +1378,7 @@ patch: ${JSON.stringify(
                         on_update_doc_query=${this.actions.set_doc_query}
                         notebook=${this.state.notebook}
                     />
-                    <${PkgPopup} notebook=${this.state.notebook}/>
+                    <${Popup} notebook=${this.state.notebook}/>
                     <${UndoDelete}
                         recently_deleted=${this.state.recently_deleted}
                         on_click=${() => {
diff --git a/frontend/components/PkgStatusMark.js b/frontend/components/PkgStatusMark.js
index 9bc8abdf08..36594e817d 100644
--- a/frontend/components/PkgStatusMark.js
+++ b/frontend/components/PkgStatusMark.js
@@ -115,9 +115,10 @@ export const PkgStatusMark = ({ package_name, pluto_actions, notebook_id, nbpkg
             <button
                 onClick=${(event) => {
                     window.dispatchEvent(
-                        new CustomEvent("open nbpkg popup", {
+                        new CustomEvent("open pluto popup", {
                             detail: {
-                                status_mark_element: event.currentTarget.parentElement,
+                                type: "nbpkg",
+                                source_element: event.currentTarget.parentElement,
                                 package_name: package_name,
                                 is_disable_pkg: false,
                             },
@@ -144,9 +145,10 @@ export const PkgActivateMark = ({ package_name }) => {
             <button
                 onClick=${(event) => {
                     window.dispatchEvent(
-                        new CustomEvent("open nbpkg popup", {
+                        new CustomEvent("open pluto popup", {
                             detail: {
-                                status_mark_element: event.currentTarget.parentElement,
+                                type: "nbpkg",
+                                source_element: event.currentTarget.parentElement,
                                 package_name: package_name,
                                 is_disable_pkg: true,
                             },
diff --git a/frontend/components/PkgPopup.js b/frontend/components/Popup.js
similarity index 82%
rename from frontend/components/PkgPopup.js
rename to frontend/components/Popup.js
index 7bdd469061..5bc230dfc0 100644
--- a/frontend/components/PkgPopup.js
+++ b/frontend/components/Popup.js
@@ -16,25 +16,25 @@ export const arrow_up_circle_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-t
 export const document_text_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg", import.meta.url)
 export const help_circle_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/help-circle-outline.svg", import.meta.url)
 
-export const PkgPopup = ({ notebook }) => {
-    let pluto_actions = useContext(PlutoContext)
-
+export const Popup = ({ notebook }) => {
     const [recent_event, set_recent_event] = useState(null)
-    const [pkg_status, set_pkg_status] = useState(null)
+    const recent_source_element_ref = useRef(null)
     const pos_ref = useRef("")
 
     const open = (e) => {
-        const el = e.detail.status_mark_element
+        const el = e.detail.source_element
+        recent_source_element_ref.current = el
 
-        pos_ref.current = `top: ${el.getBoundingClientRect().top - document.body.getBoundingClientRect().top}px; left: min(max(0px,100vw - 251px - 30px), ${
-            el.getBoundingClientRect().left - document.body.getBoundingClientRect().left
-        }px);`
+        const elb = el.getBoundingClientRect()
+        const bodyb = document.body.getBoundingClientRect()
+
+        pos_ref.current = `top: ${0.5 * (elb.top + elb.bottom) - bodyb.top}px; left: min(max(0px,100vw - 251px - 30px), ${elb.right - bodyb.left}px);`
         set_recent_event(e.detail)
     }
 
     useEffect(() => {
         const onpointerdown = (e) => {
-            if (e.target?.closest("pkg-popup") == null && e.target?.closest("pkg-status-mark") == null) {
+            if (e.target?.closest("pluto-popup") == null && (e.target == null || !recent_source_element_ref.current?.contains(e.target))) {
                 set_recent_event(null)
             }
         }
@@ -43,17 +43,40 @@ export const PkgPopup = ({ notebook }) => {
                 set_recent_event(null)
             }
         }
-        window.addEventListener("open nbpkg popup", open)
+        window.addEventListener("open pluto popup", open)
         window.addEventListener("pointerdown", onpointerdown)
         document.addEventListener("keydown", onkeydown)
 
         return () => {
-            window.removeEventListener("open nbpkg popup", open)
+            window.removeEventListener("open pluto popup", open)
             window.removeEventListener("pointerdown", onpointerdown)
             document.removeEventListener("keydown", onkeydown)
         }
     }, [])
 
+    const pkg_popup = PkgPopup({
+        notebook,
+        recent_event,
+        clear_recent_event: () => set_recent_event(null),
+    })
+    const info_popup = html`<div>${recent_event?.body}</div>`
+
+    const type = recent_event?.type
+    return html`<pluto-popup
+        class=${cl({
+            visible: recent_event != null,
+        })}
+        style="${pos_ref.current}"
+    >
+        ${type === "nbpkg" ? pkg_popup : type === "info" ? info_popup : null}
+    </pluto-popup>`
+}
+
+const PkgPopup = ({ notebook, recent_event, clear_recent_event }) => {
+    let pluto_actions = useContext(PlutoContext)
+
+    const [pkg_status, set_pkg_status] = useState(null)
+
     useEffect(() => {
         let still_valid = true
         if (recent_event == null) {
@@ -81,7 +104,7 @@ export const PkgPopup = ({ notebook }) => {
 
     // hide popup when nbpkg is switched on/off
     useEffect(() => {
-        set_recent_event(null)
+        clear_recent_event()
     }, [notebook.nbpkg?.enabled ?? true])
 
     const [showterminal, set_showterminal] = useState(false)
@@ -100,12 +123,10 @@ export const PkgPopup = ({ notebook }) => {
     // <header>${recent_event?.package_name}</header>
     return html`<pkg-popup
         class=${cl({
-            visible: recent_event != null,
             busy,
-            showterminal: showterminal,
+            showterminal,
             showupdate,
         })}
-        style="${pos_ref.current}"
     >
         ${pkg_status?.hint ?? "Loading..."}
         <div class="pkg-buttons">
diff --git a/frontend/editor.css b/frontend/editor.css
index 768be1f9b7..bc1be5440e 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -932,6 +932,9 @@ main > preamble #saveall-container {
     }
 }
 
+main > preamble #saveall-container.ask_to_save {
+    border-color: var(--overlay-button-border-save);
+}
 main > preamble #saveall-container.saving,
 main > preamble #saveall-container.saved {
     border-color: transparent;
@@ -1666,7 +1669,7 @@ pkg-status-mark.disable_pkg > button > span::after {
     filter: var(--image-filters);
 }
 
-pkg-popup {
+pluto-popup {
     display: block;
     position: absolute;
     z-index: 50;
@@ -1674,13 +1677,10 @@ pkg-popup {
     /* top: calc((1.5em - 200px) * 0.5); */
     width: min(90vw, 251px);
     /* min-height: 80px; */
-    margin-left: 1.1rem;
-    margin-top: calc(0.5 * (1rem - 80px));
-    background: var(--pkg-popup-bg);
-    border: 3px solid var(--pkg-popup-border-color);
-    color: var(--black);
-    border-radius: 10px;
-    padding: 8px;
+    margin-left: 0.4rem;
+    margin-top: 0px;
+    margin-top: -1rem;
+    /* margin-top: calc(0.5 * (1rem - 80px)); */
     overflow-wrap: break-word;
     font-family: var(--lato-ui-font-stack);
     opacity: 0;
@@ -1690,13 +1690,28 @@ pkg-popup {
     pointer-events: none;
 }
 
-pkg-popup.visible {
+pluto-popup.visible {
     opacity: 1;
     transform: scale(1);
     transition: transform 0.2s ease-in-out, opacity 0.2s ease-in-out;
     pointer-events: initial;
 }
 
+pluto-popup > * {
+    display: block;
+    background: var(--overlay-button-bg);
+    border: 3px solid var(--overlay-button-border);
+    color: var(--black);
+    border-radius: 10px;
+    padding: 8px;
+    /* Slightly changes the layout of the three pkg buttons... in just the way that we want it! */
+    position: absolute;
+}
+pluto-popup > pkg-popup {
+    background: var(--pkg-popup-bg);
+    border: 3px solid var(--pkg-popup-border-color);
+}
+
 pkg-popup.busy {
     border: 3px solid hsl(282deg 31% 62%);
 }

From 04ea1e5fe955afc8e1a71d15d0f9addb41aef29c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Mar 2022 17:50:52 +0100
Subject: [PATCH 149/821] =?UTF-8?q?=F0=9F=8F=8E=20Fix=20race=20condition?=
 =?UTF-8?q?=20with=20WorkspaceManager.workspaces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/evaluation/Tokens.jl           | 43 ------------------------------
 src/evaluation/WorkspaceManager.jl | 11 ++++----
 2 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/src/evaluation/Tokens.jl b/src/evaluation/Tokens.jl
index 1dca8452b9..21b0ce14e2 100644
--- a/src/evaluation/Tokens.jl
+++ b/src/evaluation/Tokens.jl
@@ -48,49 +48,6 @@ function request!(queue::RequestQueue)
     end
 end
 
-###
-
-mutable struct Promise{T}
-    value::Union{Nothing,Some{T}}
-    task::Union{Nothing,Task}
-end
-
-"
-    Promise{T}(f::Function)
-
-Run `f` asynchronously, and return a `Promise` to its result of type `T`. Call `fetch` on the returned `Promise` to await the result.
-
-It's just like a `Task`, except the result is a type parameter.
-
-# Example
-
-```
-julia> p = Promise() do
-    sleep(5)
-    1 + 2
-end;
-
-julia> fetch(p)
-3
-```
-
-"
-function Promise{T}(f::Function) where T
-    p = Promise{T}(nothing, nothing)
-    p.task = @async begin
-        p.value = Some(f())
-    end
-    return p
-end
-Promise(f::Function) = Promise{Any}(f)
-
-function Base.fetch(p::Promise{T})::T where T
-	wait(p.task)
-	something(p.value)
-end
-
-
-
 
 "Like @async except it prints errors to the terminal. 👶"
 macro asynclog(expr)
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 236f04417f..2b81348844 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -1,7 +1,7 @@
 module WorkspaceManager
 import UUIDs: UUID
 import ..Pluto
-import ..Pluto: Configuration, Notebook, Cell, ProcessStatus, ServerSession, ExpressionExplorer, pluto_filename, Token, withtoken, Promise, tamepath, project_relative_path, putnotebookupdates!, UpdateMessage
+import ..Pluto: Configuration, Notebook, Cell, ProcessStatus, ServerSession, ExpressionExplorer, pluto_filename, Token, withtoken, tamepath, project_relative_path, putnotebookupdates!, UpdateMessage
 import ..Pluto.PkgCompat
 import ..Configuration: CompilerOptions, _merge_notebook_compiler_options, _convert_to_flags
 import ..Pluto.ExpressionExplorer: FunctionName
@@ -29,7 +29,7 @@ process_preamble() = quote
     ENV["JULIA_REVISE_WORKER_ONLY"] = "1"
 end
 
-const workspaces = Dict{UUID,Promise{Workspace}}()
+const workspaces = Dict{UUID,Task}()
 
 const SN = Tuple{ServerSession,Notebook}
 
@@ -251,10 +251,11 @@ end
 "Return the `Workspace` of `notebook`; will be created if none exists yet."
 function get_workspace(session_notebook::SN)::Workspace
     session, notebook = session_notebook
-    promise = get!(workspaces, notebook.notebook_id) do
-        Promise{Workspace}(() -> make_workspace(session_notebook))
+    task = get!(workspaces, notebook.notebook_id) do
+        Task(() -> make_workspace(session_notebook))
     end
-    fetch(promise)
+    istaskstarted(task) || schedule(task)
+    fetch(task)
 end
 get_workspace(workspace::Workspace)::Workspace = workspace
 

From 964b1f553927d8347a8d18803ca5794aa1b12a05 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Mar 2022 17:52:18 +0100
Subject: [PATCH 150/821] =?UTF-8?q?=F0=9F=8F=8E=20Avoid=20run=5Freactive!?=
 =?UTF-8?q?=20causing=20a=20process=20restart?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/evaluation/Run.jl | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 8da19e73e0..e94493ed4d 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -22,6 +22,8 @@ function run_reactive!(
     else
         @assert !isready(notebook.executetoken) "run_reactive!(; already_in_run=true) was called when no reactive run was launched."
     end
+	
+	@assert will_run_code(notebook)
 
     old_workspace_name, _ = WorkspaceManager.bump_workspace_module((session, notebook))
 
@@ -102,7 +104,9 @@ function run_reactive!(
     to_delete_funcs = union!(to_delete_funcs, defined_functions(new_topology, new_errable)...)
 
     to_reimport = union!(Set{Expr}(), map(c -> new_topology.codes[c].module_usings_imports.usings, setdiff(notebook.cells, to_run))...)
-    deletion_hook((session, notebook), old_workspace_name, nothing, to_delete_vars, to_delete_funcs, to_reimport; to_run) # `deletion_hook` defaults to `WorkspaceManager.move_vars`
+    if will_run_code(notebook)
+		deletion_hook((session, notebook), old_workspace_name, nothing, to_delete_vars, to_delete_funcs, to_reimport; to_run) # `deletion_hook` defaults to `WorkspaceManager.move_vars`
+	end
 
     delete!.([notebook.bonds], to_delete_vars)
 
@@ -116,7 +120,7 @@ function run_reactive!(
 		cell.logs = []
 		send_notebook_changes_throttled()
 
-        if any_interrupted || notebook.wants_to_interrupt
+        if any_interrupted || notebook.wants_to_interrupt || !will_run_code(notebook)
             relay_reactivity_error!(cell, InterruptException())
         else
             run = run_single!(
@@ -137,7 +141,9 @@ function run_reactive!(
         end
 
         implicit_usings = collect_implicit_usings(new_topology, cell)
-        if !is_resolved(new_topology) && can_help_resolve_cells(new_topology, cell)
+		if !will_run_code(notebook)
+			# then skip these special cases.
+        elseif !is_resolved(new_topology) && can_help_resolve_cells(new_topology, cell)
             notebook.topology = new_new_topology = resolve_topology(session, notebook, new_topology, old_workspace_name)
 
             if !isempty(implicit_usings)
@@ -371,7 +377,11 @@ function resolve_topology(
 			end
 
 			result = try
-				analyze_macrocell(cell)
+				if will_run_code(notebook)
+					analyze_macrocell(cell)
+				else
+					Failure(ErrorException("shutdown"))
+				end
 			catch error
 				@error "Macro call expansion failed with a non-macroexpand error" error
 				Failure(error)

From 9d776145c667800018cbac7b04db3747ed670811 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Mar 2022 17:55:03 +0100
Subject: [PATCH 151/821] =?UTF-8?q?=F0=9F=8F=8E=20unmake=5Fworkspace:=20wa?=
 =?UTF-8?q?rn=20that=20same-process=20workspace=20cannot=20be=20unmade?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/evaluation/WorkspaceManager.jl |  10 ++-
 test/Events.jl                     |   2 +-
 test/Logging.jl                    | 103 ++++++++++++++++++++---------
 test/React.jl                      |  38 +++++------
 test/RichOutput.jl                 |   8 +--
 test/WorkspaceManager.jl           |   2 +-
 6 files changed, 105 insertions(+), 58 deletions(-)

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 2b81348844..13062c70a2 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -259,8 +259,8 @@ function get_workspace(session_notebook::SN)::Workspace
 end
 get_workspace(workspace::Workspace)::Workspace = workspace
 
-"Try our best to delete the workspace. `ProcessWorkspace` will have its worker process terminated."
-function unmake_workspace(session_notebook::Union{SN,Workspace}; async=false)
+"Try our best to delete the workspace. `Workspace` will have its worker process terminated."
+function unmake_workspace(session_notebook::SN; async::Bool=false, verbose::Bool=true)
     workspace = get_workspace(session_notebook)
     workspace.discarded = true
 
@@ -275,6 +275,12 @@ function unmake_workspace(session_notebook::Union{SN,Workspace}; async=false)
             end)
         end
         async || wait(t)
+    else
+        if !isready(workspace.dowork_token)
+            @error "Cannot unmake a workspace running inside the same process: the notebook is still running."
+        elseif verbose
+            @warn "Cannot unmake a workspace running inside the same process: the notebook might still be running. If you are sure that your code is not running the notebook async, then you can use the `verbose=false` keyword argument to disable this message."
+        end
     end
 end
 
diff --git a/test/Events.jl b/test/Events.jl
index fc5b941eb5..990b223b6e 100644
--- a/test/Events.jl
+++ b/test/Events.jl
@@ -26,7 +26,7 @@ import UUIDs: UUID
     fakeclient.connected_notebook = notebook
 
     update_run!(🍭, notebook, notebook.cells)
-    WorkspaceManager.unmake_workspace((🍭, notebook))
+    WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     @test_broken events[1:3] == ["NewNotebookEvent", "OpenNotebookEvent" , "FileSaveEvent"]
 
 # Pluto.CustomLaunchEvent: Gets fired
diff --git a/test/Logging.jl b/test/Logging.jl
index a19673eca6..bd960f0097 100644
--- a/test/Logging.jl
+++ b/test/Logging.jl
@@ -9,67 +9,108 @@ using Pluto.WorkspaceManager: poll
 
     fakeclient = ClientSession(:fake, nothing)
     🍭.connected_clients[fakeclient.id] = fakeclient
+<<<<<<< Updated upstream
+=======
+    
+    notebook = Notebook(Cell.([
+        "println(123)",
+        "println(stdout, 123)",
+        "println(stderr, 123)",
+        "display(123)",
+        "show(123)",
+        "popdisplay()",
+        "println(123)",
+        "pushdisplay(TextDisplay(devnull))",
+        "print(12); print(3)", # 9
+        
+        """
+        for i in 1:10
+            @info "logging" i maxlog=2
+        end
+        """, # 10
+        
+        """
+        for i in 1:10
+            @info "logging" i maxlog=2
+            @info "logging more" maxlog = 4
+            @info "even more logging"
+        end
+        """, # 11
+    ]))
+    
+    
+    @testset "Stdout" begin
+        
+        idx_123 = [1,2,3,4,5,7,9]
+
+        update_run!(🍭, notebook, notebook.cells[1:9])
+        @test notebook.cells[1] |> noerror
+        @test notebook.cells[2] |> noerror
+        @test notebook.cells[3] |> noerror
+        @test notebook.cells[4] |> noerror
+        @test notebook.cells[5] |> noerror
+        @test notebook.cells[6] |> noerror
+        @test notebook.cells[7] |> noerror
+        @test notebook.cells[8] |> noerror
+        @test notebook.cells[9] |> noerror
+
+        @test poll(5, 1/60) do
+            all(notebook.cells[idx_123]) do c
+                length(c.logs) == 1
+            end
+        end
+        
+        @testset "123 - $(i)" for i in idx_123
+            log = only(notebook.cells[i].logs)
+            @test log["level"] == "LogLevel(-555)"
+            @test strip(log["msg"][1]) == "123"
+            @test log["msg"][2] == MIME"text/plain"()
+        end
+    end
+>>>>>>> Stashed changes
 
     @testset "Logging respects maxlog" begin
         @testset "Single log" begin
-            notebook = Notebook(Cell.([
-                """
-                for i in 1:10
-                    @info "logging" i maxlog=2
-                end
-                """,
-            ]))
-
-            update_run!(🍭, notebook, notebook.cells)
-            @test notebook.cells[begin] |> noerror
+            
+            update_run!(🍭, notebook, notebook.cells[10])
+            @test notebook.cells[10] |> noerror
 
             @test poll(5, 1/60) do
-                length(notebook.cells[begin].logs) == 2
+                length(notebook.cells[10].logs) == 2
             end
 
             # Check that maxlog doesn't occur in the message
-            @test all(notebook.cells[begin].logs) do log
+            @test all(notebook.cells[10].logs) do log
                 all(log["kwargs"]) do kwarg
                     kwarg[1] != "maxlog"
                 end
             end
 
-            WorkspaceManager.unmake_workspace((🍭, notebook))
         end
 
         @testset "Multiple log" begin
-            notebook = Notebook(Cell.([
-                """
-                for i in 1:10
-                    @info "logging" i maxlog=2
-                    @info "logging more" maxlog = 4
-                    @info "even more logging"
-                end
-                """,
-            ]))
-
-            update_run!(🍭, notebook, notebook.cells)
-            @test notebook.cells[begin] |> noerror
+            update_run!(🍭, notebook, notebook.cells[11])
+            @test notebook.cells[11] |> noerror
 
             # Wait until all 16 logs are in
             @test poll(5, 1/60) do
-                length(notebook.cells[begin].logs) == 16
+                length(notebook.cells[11].logs) == 16
             end
 
             # Get the ids of the three logs and their counts. We are
             # assuming that the logs are ordered same as in the loop.
-            ids = unique(getindex.(notebook.cells[begin].logs, "id"))
-            counts = [count(log -> log["id"] == id, notebook.cells[begin].logs) for id in ids]
+            ids = unique(getindex.(notebook.cells[11].logs, "id"))
+            counts = [count(log -> log["id"] == id, notebook.cells[11].logs) for id in ids]
             @test counts == [2, 4, 10]
 
             # Check that maxlog doesn't occur in the messages
-            @test all(notebook.cells[begin].logs) do log
+            @test all(notebook.cells[11].logs) do log
                 all(log["kwargs"]) do kwarg
                     kwarg[1] != "maxlog"
                 end
             end
-
-            WorkspaceManager.unmake_workspace((🍭, notebook))
         end
     end
+
+    WorkspaceManager.unmake_workspace((🍭, notebook))
 end
diff --git a/test/React.jl b/test/React.jl
index 856bb447f9..d4f61539d1 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -80,7 +80,7 @@ import Distributed
             notebook.cells[8].output.body == string(Distributed.myid())
         end
 
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     
     end
 
@@ -136,7 +136,7 @@ import Distributed
         @test notebook.cells[5] |> noerror
         @test notebook.cells[6] |> noerror
 
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     @testset "Mutliple assignments topology" begin
@@ -396,7 +396,7 @@ import Distributed
 
         @test all(noerror, notebook.cells)
 
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     @testset "Function dependencies" begin
@@ -447,7 +447,7 @@ import Distributed
         setcode.(notebook.cells, [""])
         update_run!(🍭, notebook, notebook.cells)
 
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     @testset "More challenging reactivity of extended function" begin
@@ -486,7 +486,7 @@ import Distributed
         # Empty and run cells to remove the Base overloads that we created, just to be sure
         setcode.(notebook.cells, [""])
         update_run!(🍭, notebook, notebook.cells)
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     @testset "multiple cells cycle" begin
@@ -521,7 +521,7 @@ import Distributed
 
         setcode.(notebook.cells, [""])
         update_run!(🍭, notebook, notebook.cells)
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     @testset "Reactive methods definitions" begin
@@ -555,7 +555,7 @@ import Distributed
 
         setcode.(notebook.cells, [""])
         update_run!(🍭, notebook, notebook.cells)
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     @testset "Don't lose basic generic types with macros" begin
@@ -602,7 +602,7 @@ import Distributed
 
         setcode.(notebook.cells, [""])
         update_run!(🍭, notebook, notebook.cells)
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     @testset "Multiple methods across cells" begin
@@ -803,7 +803,7 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[23])
         @test notebook.cells[23] |> noerror
 
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
 
         # for some unsupported edge cases, see:
         # https://github.com/fonsp/Pluto.jl/issues/177#issuecomment-645039993
@@ -953,7 +953,7 @@ import Distributed
         setcode.(notebook.cells, [""])
         update_run!(🍭, notebook, notebook.cells)
         
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     @testset "Variable deletion" begin
@@ -990,7 +990,7 @@ import Distributed
         @test notebook.cells[4].errored == true
 
 
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     @testset "Recursion" begin
@@ -1024,7 +1024,7 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[2])
         @test notebook.cells[4].output.body == "4"
 
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     @testset "Variable cannot reference its previous value" begin
@@ -1038,7 +1038,7 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[1])
         @test occursinerror("UndefVarError", notebook.cells[1])
 
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     notebook = Notebook([
@@ -1244,7 +1244,7 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[30:31])
         @test occursinerror("UndefVarError", notebook.cells[31])
     end
-    WorkspaceManager.unmake_workspace((🍭, notebook))
+    WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
 
     @testset "Functional programming" begin
         notebook = Notebook([
@@ -1284,7 +1284,7 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[3])
         @test notebook.cells[8].output.body == "11"
 
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
         
     end
 
@@ -1365,7 +1365,7 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[15])
         @test notebook.cells[13].output.body == "10005"
 
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     @testset "No top level return" begin
@@ -1437,7 +1437,7 @@ import Distributed
         @test notebook.cells[17] |> noerror
         @test notebook.cells[18] |> noerror
 
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     @testset "Function wrapping" begin
@@ -1562,7 +1562,7 @@ import Distributed
         @test notebook.cells[30] |> noerror
         
 
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
 
 
         @testset "Expression hash" begin
@@ -1664,6 +1664,6 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[22])
         @test notebook.cells[19].output.body == "38"
 
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 end
diff --git a/test/RichOutput.jl b/test/RichOutput.jl
index 8e61e2a342..c0892f543d 100644
--- a/test/RichOutput.jl
+++ b/test/RichOutput.jl
@@ -98,7 +98,7 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
             @test sizes[2] < sizes[1] * 1.5
             @test sizes[4] < sizes[3] * 1.5
 
-            WorkspaceManager.unmake_workspace((🍭, notebook))
+            WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
         end
 
         @testset "Overloaded Base.show" begin
@@ -133,7 +133,7 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
             @test notebook.cells[3].output.mime isa MIME"text/plain"
             @test notebook.cells[3].output.body == "3"
             
-            WorkspaceManager.unmake_workspace((🍭, notebook))
+            WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
         end
 
         
@@ -336,7 +336,7 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
             @test occursinerror("syntax: extra token after", notebook.cells[11])
         end
 
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     @testset "Stack traces" begin
@@ -417,7 +417,7 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
                 @test occursin(escape_me, st[:msg])
             end
 
-            WorkspaceManager.unmake_workspace((🍭, notebook))
+            WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
         end
 
     end
diff --git a/test/WorkspaceManager.jl b/test/WorkspaceManager.jl
index 64e0a5d2c3..a6b1073789 100644
--- a/test/WorkspaceManager.jl
+++ b/test/WorkspaceManager.jl
@@ -61,7 +61,7 @@ import Distributed
         @test notebook.cells[3].output.body == "3"
         @test notebook.cells[4].output.body == "3"
         
-        WorkspaceManager.unmake_workspace((🍭, notebook))
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
     Sys.iswindows() || @testset "Pluto inside Pluto" begin

From 5205bf5b4a0df6ee46392cb8caa9882dfeccb7a9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Mar 2022 17:56:26 +0100
Subject: [PATCH 152/821] =?UTF-8?q?=F0=9F=8F=8E=20Prevent=20SessionActions?=
 =?UTF-8?q?.shutdown=20from=20allowing=20a=20sneaky=20restart=20later?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/webserver/SessionActions.jl | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 802f56fc06..7f061ee513 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -1,6 +1,6 @@
 module SessionActions
 
-import ..Pluto: ServerSession, Notebook, Cell, emptynotebook, tamepath, new_notebooks_directory, without_pluto_file_extension, numbered_until_new, readwrite, update_save_run!, update_from_file, wait_until_file_unchanged, putnotebookupdates!, putplutoupdates!, load_notebook, clientupdate_notebook_list, WorkspaceManager, try_event_call, NewNotebookEvent, OpenNotebookEvent, ShutdownNotebookEvent, @asynclog
+import ..Pluto: ServerSession, Notebook, Cell, emptynotebook, tamepath, new_notebooks_directory, without_pluto_file_extension, numbered_until_new, readwrite, update_save_run!, update_from_file, wait_until_file_unchanged, putnotebookupdates!, putplutoupdates!, load_notebook, clientupdate_notebook_list, WorkspaceManager, try_event_call, NewNotebookEvent, OpenNotebookEvent, ShutdownNotebookEvent, @asynclog, ProcessStatus
 using FileWatching
 import ..Pluto.DownloadCool: download_cool
 
@@ -198,10 +198,14 @@ function new(session::ServerSession; run_async=true, notebook_id::UUID=uuid1())
     nb
 end
 
-"Shut down `notebook` inside `session`."
-function shutdown(session::ServerSession, notebook::Notebook; keep_in_session=false, async=false)
+"Shut down `notebook` inside `session`. If `keep_in_session` is `false` (default), you will not be allowed to run a notebook with the same notebook_id again."
+function shutdown(session::ServerSession, notebook::Notebook; keep_in_session::Bool=false, async::Bool=false, verbose::Bool=true)
     notebook.nbpkg_restart_recommended_msg = nothing
     notebook.nbpkg_restart_required_msg = nothing
+    
+    if notebook.process_status == ProcessStatus.ready || notebook.process_status == ProcessStatus.starting
+        notebook.process_status = ProcessStatus.no_process
+    end
 
     if !keep_in_session
         listeners = putnotebookupdates!(session, notebook) # TODO: shutdown message
@@ -211,7 +215,7 @@ function shutdown(session::ServerSession, notebook::Notebook; keep_in_session=fa
             @async close(client.stream)
         end
     end
-    WorkspaceManager.unmake_workspace((session, notebook); async=async)
+    WorkspaceManager.unmake_workspace((session, notebook); async, verbose, allow_restart=keep_in_session)
     try_event_call(session, ShutdownNotebookEvent(notebook))
 end
 

From 6603fa4fbd6001a784a7db378f829718fc4bd800 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Mar 2022 18:14:03 +0100
Subject: [PATCH 153/821] whoops

---
 test/Logging.jl | 51 +++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/test/Logging.jl b/test/Logging.jl
index bd960f0097..2d674a7fa7 100644
--- a/test/Logging.jl
+++ b/test/Logging.jl
@@ -9,8 +9,6 @@ using Pluto.WorkspaceManager: poll
 
     fakeclient = ClientSession(:fake, nothing)
     🍭.connected_clients[fakeclient.id] = fakeclient
-<<<<<<< Updated upstream
-=======
     
     notebook = Notebook(Cell.([
         "println(123)",
@@ -39,35 +37,34 @@ using Pluto.WorkspaceManager: poll
     ]))
     
     
-    @testset "Stdout" begin
+    # @testset "Stdout" begin
         
-        idx_123 = [1,2,3,4,5,7,9]
+    #     idx_123 = [1,2,3,4,5,7,9]
 
-        update_run!(🍭, notebook, notebook.cells[1:9])
-        @test notebook.cells[1] |> noerror
-        @test notebook.cells[2] |> noerror
-        @test notebook.cells[3] |> noerror
-        @test notebook.cells[4] |> noerror
-        @test notebook.cells[5] |> noerror
-        @test notebook.cells[6] |> noerror
-        @test notebook.cells[7] |> noerror
-        @test notebook.cells[8] |> noerror
-        @test notebook.cells[9] |> noerror
+    #     update_run!(🍭, notebook, notebook.cells[1:9])
+    #     @test notebook.cells[1] |> noerror
+    #     @test notebook.cells[2] |> noerror
+    #     @test notebook.cells[3] |> noerror
+    #     @test notebook.cells[4] |> noerror
+    #     @test notebook.cells[5] |> noerror
+    #     @test notebook.cells[6] |> noerror
+    #     @test notebook.cells[7] |> noerror
+    #     @test notebook.cells[8] |> noerror
+    #     @test notebook.cells[9] |> noerror
 
-        @test poll(5, 1/60) do
-            all(notebook.cells[idx_123]) do c
-                length(c.logs) == 1
-            end
-        end
+    #     @test poll(5, 1/60) do
+    #         all(notebook.cells[idx_123]) do c
+    #             length(c.logs) == 1
+    #         end
+    #     end
         
-        @testset "123 - $(i)" for i in idx_123
-            log = only(notebook.cells[i].logs)
-            @test log["level"] == "LogLevel(-555)"
-            @test strip(log["msg"][1]) == "123"
-            @test log["msg"][2] == MIME"text/plain"()
-        end
-    end
->>>>>>> Stashed changes
+    #     @testset "123 - $(i)" for i in idx_123
+    #         log = only(notebook.cells[i].logs)
+    #         @test log["level"] == "LogLevel(-555)"
+    #         @test strip(log["msg"][1]) == "123"
+    #         @test log["msg"][2] == MIME"text/plain"()
+    #     end
+    # end
 
     @testset "Logging respects maxlog" begin
         @testset "Single log" begin

From 09169ae9cb59217db00dac8016389bda8e826a15 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Mar 2022 18:14:15 +0100
Subject: [PATCH 154/821] =?UTF-8?q?=F0=9F=8F=8E=20Keep=20a=20"banned"=20li?=
 =?UTF-8?q?st=20of=20notebook=5Fids=20that=20should=20never=20restart?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Just to be sure
---
 src/evaluation/WorkspaceManager.jl | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 13062c70a2..bc07101ab1 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -30,6 +30,8 @@ process_preamble() = quote
 end
 
 const workspaces = Dict{UUID,Task}()
+"Set of notebook IDs that we will never make a process for again."
+const discarded_workspaces = Set{UUID}()
 
 const SN = Tuple{ServerSession,Notebook}
 
@@ -44,6 +46,7 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
     end
 
     pid = if use_distributed
+        @debug "Creating workspace process" notebook.path length(notebook.cells)
         create_workspaceprocess(;compiler_options=_merge_notebook_compiler_options(notebook, session.options.compiler))
     else
         pid = Distributed.myid()
@@ -81,7 +84,9 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
     cd_workspace(workspace, notebook.path)
     use_nbpkg_environment((session, notebook), workspace)
 
-    is_offline_renderer || (notebook.process_status = ProcessStatus.ready)
+    is_offline_renderer || if notebook.process_status == ProcessStatus.starting
+        notebook.process_status = ProcessStatus.ready
+    end
     return workspace
 end
 
@@ -251,6 +256,11 @@ end
 "Return the `Workspace` of `notebook`; will be created if none exists yet."
 function get_workspace(session_notebook::SN)::Workspace
     session, notebook = session_notebook
+    if notebook.notebook_id in discarded_workspaces
+        @debug "This should not happen" notebook.process_status
+        error("Cannot run code in this notebook: it has already shut down.")
+    end
+    
     task = get!(workspaces, notebook.notebook_id) do
         Task(() -> make_workspace(session_notebook))
     end
@@ -260,9 +270,11 @@ end
 get_workspace(workspace::Workspace)::Workspace = workspace
 
 "Try our best to delete the workspace. `Workspace` will have its worker process terminated."
-function unmake_workspace(session_notebook::SN; async::Bool=false, verbose::Bool=true)
+function unmake_workspace(session_notebook::SN; async::Bool=false, verbose::Bool=true, allow_restart::Bool=true)
+    session, notebook = session_notebook
     workspace = get_workspace(session_notebook)
     workspace.discarded = true
+    allow_restart || push!(discarded_workspaces, notebook.notebook_id)
 
     if workspace.pid != Distributed.myid()
         filter!(p -> fetch(p.second).pid != workspace.pid, workspaces)

From d48552e2eb45388720ba90502b9b66d247179c83 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Mar 2022 18:15:41 +0100
Subject: [PATCH 155/821] =?UTF-8?q?=F0=9F=8F=8E=20Fix=20race=20conditions?=
 =?UTF-8?q?=20in=20webserver=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/webserver.jl | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/test/webserver.jl b/test/webserver.jl
index d63f5e9b68..46ac076283 100644
--- a/test/webserver.jl
+++ b/test/webserver.jl
@@ -1,7 +1,7 @@
 using HTTP
 using Test
 using Pluto
-using Pluto: ServerSession, ClientSession, SessionActions
+using Pluto: ServerSession, ClientSession, SessionActions, WorkspaceManager
 using Pluto.Configuration
 using Pluto.Configuration: notebook_path_suggestion, from_flat_kwargs, _convert_to_flags
 using Pluto.WorkspaceManager: WorkspaceManager, poll
@@ -19,35 +19,51 @@ using Pluto.WorkspaceManager: WorkspaceManager, poll
     
 
     # without notebook at startup
-    options = Pluto.Configuration.from_flat_kwargs(; port, launch_browser=false, workspace_use_distributed=false, require_secret_for_access=false, require_secret_for_open_links=false)
+    options = Pluto.Configuration.from_flat_kwargs(; port, launch_browser=false, workspace_use_distributed=true, require_secret_for_access=false, require_secret_for_open_links=false)
     🍭 = Pluto.ServerSession(; options)
     server_task = @async Pluto.run(🍭)
+    
+    # FYI, you should normally use a PlutoEvent for things we do in this test instead of polling! Don't use this as an example.
     @test poll(5) do
         server_running()
     end
     
     @test isempty(🍭.notebooks)
     
-    download(local_url("sample/JavaScript.jl"))
+    HTTP.get(local_url("sample/JavaScript.jl"); retry=false)
     
+    # wait for the notebook to be added to the session
     @test poll(5) do
         length(🍭.notebooks) == 1
     end
     
     notebook = only(values(🍭.notebooks))
     
-    file_contents = read(download(local_url("notebookfile?id=$(notebook.notebook_id)")), String)
+    # right now, the notebook was only added to the session and assigned an ID. Let's wait for it to get a process:
+    @test poll(15) do
+        haskey(WorkspaceManager.workspaces, notebook.notebook_id)
+    end
+    sleep(1)
+    
+    # Note that the notebook is running async right now! It's not finished yet. But we can already run these tests:
+    
+    fileA = download(local_url("notebookfile?id=$(notebook.notebook_id)"))
+    fileB = tempname()
+    write(fileB, sprint(Pluto.save_notebook, notebook))
     
-    @assert file_contents == sprint(Pluto.save_notebook, notebook)
+    @test Pluto.only_versions_or_lineorder_differ(fileA, fileB)
     
     export_contents = read(download(local_url("notebookexport?id=$(notebook.notebook_id)")), String)
     
-    @assert occursin(string(Pluto.PLUTO_VERSION), export_contents)
-    @assert occursin("</html>", export_contents)
+    @test occursin(string(Pluto.PLUTO_VERSION), export_contents)
+    @test occursin("</html>", export_contents)
     
-    WorkspaceManager.unmake_workspace((🍭, notebook))
+    SessionActions.shutdown(🍭, notebook; keep_in_session=false)
     
-    @async schedule(server_task, InterruptException(); error=true)
+    schedule(server_task, InterruptException(); error=true)
+    # wait for the server task to finish
+    # normally this `wait` would rethrow the above InterruptException, but Pluto.run should catch for InterruptExceptions and not bubble them up.
+    wait(server_task)
 end
 
 end # testset

From 4a7573bb9f2c4b9d76c1213e0a5ca5160b685ec1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Mar 2022 18:42:11 +0100
Subject: [PATCH 156/821] increate test timeout

---
 test/webserver.jl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/webserver.jl b/test/webserver.jl
index 46ac076283..4e0a68a3ca 100644
--- a/test/webserver.jl
+++ b/test/webserver.jl
@@ -24,7 +24,7 @@ using Pluto.WorkspaceManager: WorkspaceManager, poll
     server_task = @async Pluto.run(🍭)
     
     # FYI, you should normally use a PlutoEvent for things we do in this test instead of polling! Don't use this as an example.
-    @test poll(5) do
+    @test poll(10) do
         server_running()
     end
     
@@ -33,14 +33,14 @@ using Pluto.WorkspaceManager: WorkspaceManager, poll
     HTTP.get(local_url("sample/JavaScript.jl"); retry=false)
     
     # wait for the notebook to be added to the session
-    @test poll(5) do
+    @test poll(10) do
         length(🍭.notebooks) == 1
     end
     
     notebook = only(values(🍭.notebooks))
     
     # right now, the notebook was only added to the session and assigned an ID. Let's wait for it to get a process:
-    @test poll(15) do
+    @test poll(60) do
         haskey(WorkspaceManager.workspaces, notebook.notebook_id)
     end
     sleep(1)

From a13644e583382ea147a17aaace4ededb215a9235 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Mar 2022 18:46:54 +0100
Subject: [PATCH 157/821] =?UTF-8?q?=F0=9F=8F=8E=20Update=20server=20shutdo?=
 =?UTF-8?q?wn=20callback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/webserver/WebServer.jl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index c1ee31f303..cb00bf0f64 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -303,8 +303,10 @@ function run(session::ServerSession, pluto_router)
             @async swallow_exception(() -> close(client.stream), Base.IOError)
         end
         empty!(session.connected_clients)
+        for nb in values(session.notebooks)
+            @asynclog SessionActions.shutdown(session, nb; keep_in_session=false, async=false, verbose=false)
+        end
         for (notebook_id, ws) in WorkspaceManager.workspaces
-            @async WorkspaceManager.unmake_workspace(fetch(ws))
         end
     end
 

From 5a519c7713620a7a12339eea01ec328ea44d672d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Mar 2022 21:11:04 +0100
Subject: [PATCH 158/821] test 1.8 beta

---
 .github/workflows/Test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index ee987c91e3..db5a6bf10d 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -33,7 +33,7 @@ jobs:
         strategy:
             matrix:
                 # We test quite a lot of versions because we do some OS and version specific things unfortunately
-                julia-version: ["1.6", "1.7"] #, "nightly"]
+                julia-version: ["1.6", "1.7", "~1.8.0-0"] #, "nightly"]
                 os: [ubuntu-latest, macOS-latest, windows-latest]
 
         steps:

From 9dba4075bd79e8b6566be31564afe40843eb832d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Mar 2022 21:19:41 +0100
Subject: [PATCH 159/821] frontend test tweaks

---
 test/frontend/helpers/pluto.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/frontend/helpers/pluto.js b/test/frontend/helpers/pluto.js
index d596edb16b..9552b0d281 100644
--- a/test/frontend/helpers/pluto.js
+++ b/test/frontend/helpers/pluto.js
@@ -76,7 +76,7 @@ export const getCellIds = (page) => page.evaluate(() => Array.from(document.quer
 export const waitForPlutoToCalmDown = async (page) => {
     await page.waitForTimeout(1000)
     await page.waitForFunction(
-        () => document.querySelector("body")._update_is_ongoing === false && document.querySelector(`pluto-cell.running, pluto-cell.queued`) === null
+        () => document?.querySelector("body")?._update_is_ongoing === false && document?.querySelector(`pluto-cell.running, pluto-cell.queued`) === null
     )
 }
 
@@ -101,7 +101,7 @@ export const waitForCellOutputToChange = (page, cellId, currentOutput) => {
 
 export const waitForNoUpdateOngoing = async (page, options = {}) => {
     await page.waitForTimeout(1000)
-    return await page.waitForFunction(() => document.querySelector("body")._update_is_ongoing === false, options)
+    return await page.waitForFunction(() => document.querySelector("body")?._update_is_ongoing === false, options)
 }
 
 /**

From 001c2ab9f0c8c68042ac0230e65e598d342a960e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Mar 2022 21:44:59 +0100
Subject: [PATCH 160/821] hide one interrupt error message

---
 src/webserver/SessionActions.jl | 76 ++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 7f061ee513..5f7fb2ffd7 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -95,44 +95,50 @@ function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
     end
 
     in_session() = get(session.notebooks, nb.notebook_id, nothing) === nb
-    session.options.server.auto_reload_from_file && @asynclog while in_session()
-        if !isfile(nb.path)
-            # notebook file deleted... let's ignore this, changing the notebook will cause it to save again. Fine for now
-            sleep(2)
-        else
-            e = watch_file(nb.path, 3)
-            if e.timedout
-                continue
-            end
-            
-            # the above call is blocking until the file changes
-            
-            local modified_time = mtime(nb.path)
-            local _tries = 0
-            
-            # mtime might return zero if the file is temporarily removed
-            while modified_time == 0.0 && _tries < 10
-                modified_time = mtime(nb.path)
-                _tries += 1
-                sleep(.05)
-            end
-            
-            # current_time = time()
-            # @info "File changed" (current_time - nb.last_save_time) (modified_time - nb.last_save_time) (current_time - modified_time)
-            if !in_session()
-                break
-            end
-            
-            # if current_time - nb.last_save_time < 2.0
-                # @info "Notebook was saved by me very recently, not reloading from file."
-            if modified_time == 0.0
-                # @warn "Failed to hot reload: file no longer exists."
-            elseif modified_time - nb.last_save_time < session.options.server.auto_reload_from_file_cooldown
-                # @info "Modified time is very close to my last save time, not reloading from file."
+    session.options.server.auto_reload_from_file && @asynclog try
+        while in_session()
+            if !isfile(nb.path)
+                # notebook file deleted... let's ignore this, changing the notebook will cause it to save again. Fine for now
+                sleep(2)
             else
-                update_from_file_throttled()
+                e = watch_file(nb.path, 3)
+                if e.timedout
+                    continue
+                end
+                
+                # the above call is blocking until the file changes
+                
+                local modified_time = mtime(nb.path)
+                local _tries = 0
+                
+                # mtime might return zero if the file is temporarily removed
+                while modified_time == 0.0 && _tries < 10
+                    modified_time = mtime(nb.path)
+                    _tries += 1
+                    sleep(.05)
+                end
+                
+                # current_time = time()
+                # @info "File changed" (current_time - nb.last_save_time) (modified_time - nb.last_save_time) (current_time - modified_time)
+                if !in_session()
+                    break
+                end
+                
+                # if current_time - nb.last_save_time < 2.0
+                    # @info "Notebook was saved by me very recently, not reloading from file."
+                if modified_time == 0.0
+                    # @warn "Failed to hot reload: file no longer exists."
+                elseif modified_time - nb.last_save_time < session.options.server.auto_reload_from_file_cooldown
+                    # @info "Modified time is very close to my last save time, not reloading from file."
+                else
+                    update_from_file_throttled()
+                end
             end
         end
+    catch e
+        if !(e isa InterruptException)
+            rethrow(e)
+        end
     end
     
     nb

From bfd7eccf6af2a2dd255afd13f2a211119b63410b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Mar 2022 21:59:56 +0100
Subject: [PATCH 161/821] =?UTF-8?q?=F0=9F=93=BA=20Show=20stdout=20and=20st?=
 =?UTF-8?q?derr=20in=20notebook=20(#1957)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Logs.js        |  51 +++++++++-
 frontend/editor.css                |  65 +++++++++++++
 sample/logging.jl                  |  96 ------------------
 sample/test_logging.jl             | 150 +++++++++++++++++++++++++++++
 src/evaluation/WorkspaceManager.jl |   7 +-
 src/runner/PlutoRunner.jl          | 129 +++++++++++++++++++------
 test/Logging.jl                    |  48 ++++-----
 7 files changed, 392 insertions(+), 154 deletions(-)
 delete mode 100644 sample/logging.jl

diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
index 663804abc2..10daad42b7 100644
--- a/frontend/components/Logs.js
+++ b/frontend/components/Logs.js
@@ -2,6 +2,7 @@ import _ from "../imports/lodash.js"
 import { cl } from "../common/ClassTable.js"
 import { html, useState, useEffect, useLayoutEffect, useRef, useMemo } from "../imports/Preact.js"
 import { SimpleOutputBody } from "./TreeView.js"
+import { help_circle_icon } from "./Popup.js"
 
 // Defined in editor.css
 const GRID_WIDTH = 10
@@ -101,6 +102,7 @@ const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
     const [inspecting, set_inspecting] = useState(false)
 
     const is_progress = is_progress_log({ level, kwargs })
+    const is_stdout = level === "LogLevel(-555)"
     let progress = null
     if (is_progress) {
         progress = kwargs.find((p) => p[0] === "progress")[1][0]
@@ -115,6 +117,9 @@ const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
         level = "Progress"
         y = 0
     }
+    if (is_stdout) {
+        level = "Stdout"
+    }
 
     useLayoutEffect(() => {
         node_ref.current.style.gridColumn = `${x + 1}`
@@ -151,17 +156,55 @@ const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
               onMouseleave=${() => set_cm_highlighted_line(null)}
           >
               <pluto-log-dot-sizer>
+                  ${is_stdout
+                      ? html`<${MoreInfo}
+                            body=${html`This text was written to the ${" "}<a href="https://en.wikipedia.org/wiki/Standard_streams" target="_blank"
+                                    >terminal stream</a
+                                >${" "}while running the cell. It is not the${" "}<em>output value</em>${" "}of this cell.`}
+                        />`
+                      : null}
                   <pluto-log-dot class=${level}
-                      >${!is_progress
-                          ? html`${mimepair_output(msg)}${kwargs.map(
+                      >${is_progress
+                          ? html`<${Progress} progress=${progress} />`
+                          : is_stdout
+                          ? html`<${MoreInfo}
+                                    body=${html`${"This text was written to the "}
+                                        <a href="https://en.wikipedia.org/wiki/Standard_streams" target="_blank">terminal stream</a
+                                        >${" while running the cell. "}<span style="opacity: .5"
+                                            >${"(It is not the "}<em>return value</em>${" of the cell.)"}</span
+                                        >`}
+                                />
+                                <pre>${msg[0]}</pre>`
+                          : html`${mimepair_output(msg)}${kwargs.map(
                                 ([k, v]) =>
                                     html`
                                         <pluto-log-dot-kwarg><pluto-key>${k}</pluto-key> <pluto-value>${mimepair_output(v)}</pluto-value></pluto-log-dot-kwarg>
                                     `
-                            )}`
-                          : html`<${Progress} progress=${progress} />`}</pluto-log-dot
+                            )}`}</pluto-log-dot
                   >
               </pluto-log-dot-sizer>
           </pluto-log-dot-positioner>`
         : html`<pluto-log-dot-positioner ref=${node_ref}></pluto-log-dot-positioner>`
 }
+
+const MoreInfo = ({ body }) => {
+    return html`<a
+        class="stdout-info"
+        target="_blank"
+        title="Click for more info"
+        href="#"
+        onClick=${(e) => {
+            window.dispatchEvent(
+                new CustomEvent("open pluto popup", {
+                    detail: {
+                        type: "info",
+                        source_element: e.currentTarget,
+                        body,
+                    },
+                })
+            )
+            e.preventDefault()
+        }}
+        ><img alt="❔" src=${help_circle_icon} width="17"
+    /></a>`
+}
diff --git a/frontend/editor.css b/frontend/editor.css
index bc1be5440e..03f5cbb043 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1732,10 +1732,12 @@ pkg-popup .pkg-buttons {
     flex-direction: row;
 }
 
+a.stdout-info img,
 pkg-popup .pkg-buttons img {
     filter: var(--image-filters);
 }
 
+a.stdout-info,
 pkg-popup .pkg-buttons > * {
     display: block;
     height: 17px;
@@ -2398,6 +2400,69 @@ pluto-log-dot.Progress {
     overflow: hidden;
     padding: 0px;
 }
+pluto-log-dot.Stdout {
+    /* filter: sepia(0.3); */
+    --inner: hsl(36deg 20% 37%);
+    --outer: hsl(31deg 12% 28%);
+    background: radial-gradient(var(--inner), var(--inner) 20%, var(--outer));
+    color: #8ed975;
+    border: 6px solid #b7b7b7;
+    text-shadow: 1px 1px 2px #0000005e;
+    min-width: 18em;
+}
+pluto-log-dot.Stdout::after,
+pluto-log-dot.Stdout::before {
+    content: " ";
+    left: 6px;
+    right: 6px;
+    top: 6px;
+    bottom: 6px;
+    position: absolute;
+    display: block;
+    pointer-events: none;
+}
+pluto-log-dot.Stdout::before {
+    opacity: 0.3;
+    background: linear-gradient(349deg, #000000, transparent);
+}
+pluto-log-dot.Stdout::after {
+    --crt-spacing: 7px;
+    background: linear-gradient(180deg, hsl(37deg 20% 27%), transparent, #1a1a1a);
+    background-size: 100% var(--crt-spacing);
+    background-repeat: repeat;
+    opacity: 0.2;
+    animation: scroll-crt 1s linear infinite;
+    animation-play-state: paused;
+}
+/* To make space in the top right for the info button. */
+pluto-log-dot.Stdout pre::before {
+    content: " ";
+    width: 24px;
+    /* float is weird but it does exactly what we want here: take up space or trigger text wrapping only if needed to clear the top right corner. */
+    float: right;
+}
+
+a.stdout-info {
+    position: absolute;
+    right: 2px;
+    top: 2px;
+    z-index: 50;
+    pointer-events: initial;
+}
+
+@keyframes scroll-crt {
+    0% {
+        background-position: 0px 0px;
+    }
+    100% {
+        background-position: 0px var(--crt-spacing);
+    }
+}
+@media (prefers-reduced-motion: no-preference) {
+    pluto-log-dot.Stdout:hover::after {
+        animation-play-state: running;
+    }
+}
 
 pluto-log-dot jltree,
 pluto-log-dot jlpair {
diff --git a/sample/logging.jl b/sample/logging.jl
deleted file mode 100644
index 8ae18126e4..0000000000
--- a/sample/logging.jl
+++ /dev/null
@@ -1,96 +0,0 @@
-### A Pluto.jl notebook ###
-# v0.14.1
-
-using Markdown
-using InteractiveUtils
-
-# This Pluto notebook uses @bind for interactivity. When running this notebook outside of Pluto, the following 'mock version' of @bind gives bound variables a default value (instead of an error).
-macro bind(def, element)
-    quote
-        local el = $(esc(element))
-        global $(esc(def)) = Core.applicable(Base.get, el) ? Base.get(el) : missing
-        el
-    end
-end
-
-# ╔═╡ 65e8cd4e-dcc0-4b06-bb4b-566c1f19f794
-using PlutoUI
-
-# ╔═╡ 091d33fe-fffe-11ea-131f-01f4248b30ea
-@info "23aaa"
-
-# ╔═╡ e35e35f4-71c8-4f3b-8c72-4b3ffe4766a3
-@info collect(1:100)
-
-# ╔═╡ 2d01cdaa-fffe-11ea-09f5-63527a1b0f87
-x = 233564653
-
-# ╔═╡ c50f7178-8c7d-4319-82d9-b9154e8892d9
-for x in 1:20
-	@info "This is too long."
-end
-
-# ╔═╡ e5a8e7bd-5734-4254-914d-6f87670bf7d4
-@bind wow html"<input type=checkbox>"
-
-# ╔═╡ 2883b3d8-fffe-11ea-0a0f-bbd85ec665ea
-begin
-	
-	wow && @info "a"
-	wow && @info "b"
-	wow && @info "c"
-	wow && @info "d"
-	
-	try
-		sqrt(-1)
-	catch e
-		@error "99" exception=(e, catch_backtrace())
-	end
-	nothing
-end
-
-# ╔═╡ 786b7146-8eab-4390-a746-3ccf25d1c4c8
-for i in 1:10
-	@info i
-	@debug i
-	sleep(.05)
-end
-
-# ╔═╡ 3599eb82-0003-11eb-3814-dfd0f5737846
-for i in 1:10
-	
-	@debug i
-	@info i*100
-	if isodd(i)
-		@warn "Oh no!" i
-		@error i
-	end
-	sleep(.1)
-end
-
-# ╔═╡ f6147e0c-796f-4f5d-b000-93d790683a54
-@info md"# hello"
-
-# ╔═╡ f017b4d5-38ac-4498-8e58-770337a0d17d
-md"""
-
-# Hello
-
-
-I am a footnote $(@info("Inside text!")), how cool is that!
-
-But im not working :(
-"""
-
-# ╔═╡ Cell order:
-# ╠═091d33fe-fffe-11ea-131f-01f4248b30ea
-# ╠═e35e35f4-71c8-4f3b-8c72-4b3ffe4766a3
-# ╠═2d01cdaa-fffe-11ea-09f5-63527a1b0f87
-# ╠═c50f7178-8c7d-4319-82d9-b9154e8892d9
-# ╠═e5a8e7bd-5734-4254-914d-6f87670bf7d4
-# ╠═2883b3d8-fffe-11ea-0a0f-bbd85ec665ea
-# ╠═786b7146-8eab-4390-a746-3ccf25d1c4c8
-# ╠═3599eb82-0003-11eb-3814-dfd0f5737846
-# ╠═65e8cd4e-dcc0-4b06-bb4b-566c1f19f794
-# ╠═f6147e0c-796f-4f5d-b000-93d790683a54
-# ╠═f017b4d5-38ac-4498-8e58-770337a0d17d
diff --git a/sample/test_logging.jl b/sample/test_logging.jl
index 89b1966e1f..0fc9549401 100644
--- a/sample/test_logging.jl
+++ b/sample/test_logging.jl
@@ -252,6 +252,156 @@ m.g(123)
 # ╔═╡ 0c9de395-19a9-4ec3-a918-ea3f9835ef18
 
 
+# ╔═╡ 091d33fe-fffe-11ea-131f-01f4248b30ea
+@info "23aaa"
+
+# ╔═╡ e35e35f4-71c8-4f3b-8c72-4b3ffe4766a3
+@info collect(1:100)
+
+# ╔═╡ 2d01cdaa-fffe-11ea-09f5-63527a1b0f87
+x = 233564653
+
+# ╔═╡ c50f7178-8c7d-4319-82d9-b9154e8892d9
+for x in 1:20
+	@info "This is too long."
+end
+
+# ╔═╡ e5a8e7bd-5734-4254-914d-6f87670bf7d4
+@bind wow html"<input type=checkbox>"
+
+# ╔═╡ 2883b3d8-fffe-11ea-0a0f-bbd85ec665ea
+begin
+	
+	wow && @info "a"
+	wow && @info "b"
+	wow && @info "c"
+	wow && @info "d"
+	
+	try
+		sqrt(-1)
+	catch e
+		@error "99" exception=(e, catch_backtrace())
+	end
+	nothing
+end
+
+# ╔═╡ 786b7146-8eab-4390-a746-3ccf25d1c4c8
+for i in 1:10
+	@info i
+	@debug i
+	sleep(.05)
+end
+
+# ╔═╡ 3599eb82-0003-11eb-3814-dfd0f5737846
+for i in 1:10
+	
+	@debug i
+	@info i*100
+	if isodd(i)
+		@warn "Oh no!" i
+		@error i
+	end
+	sleep(.1)
+end
+
+# ╔═╡ f6147e0c-796f-4f5d-b000-93d790683a54
+@info md"# hello"
+
+# ╔═╡ f017b4d5-38ac-4498-8e58-770337a0d17d
+md"""
+
+# Hello
+
+
+I am a footnote $(@info("Inside text!")), how cool is that!
+
+But im not working :(
+"""
+
+
+# ╔═╡ edde2e33-9b83-4502-85d6-13c947589f55
+md"# Logging"
+
+# ╔═╡ e68681b0-df0c-4b4d-8304-d600d511cc74
+function f(x,y)
+	sin(3*sqrt(x^2 + y^2)) < 0.0
+end
+
+# ╔═╡ 988f6343-c1b2-41e2-a3f0-b5eb6653087a
+md"""
+![](https://cdn.vox-cdn.com/thumbor/sgjCRJzWvyufDoVKCPKPrsyhZoA=/1400x0/filters:no_upscale()/cdn.vox-cdn.com/uploads/chorus_asset/file/10161377/iprimus_180205_2248_0003.jpg)
+"""
+
+# ╔═╡ c07a9c5f-3807-431f-a020-8eb127a226dc
+begin
+	println("Here is some ascii art!")
+	println()
+
+	@time for y in LinRange(5,-5,21)
+		for x in LinRange(-5,5,40)
+			print(f(x,y) ? "X" : " ")
+		end
+		println()
+	end
+end
+
+# ╔═╡ eb26cb00-1196-41a7-8e81-92641aa8dbd7
+run(`ls -lha $(first(DEPOT_PATH))`)
+
+# ╔═╡ 9e27dc8c-0a18-4adb-b3b1-9bdd315caaa9
+with_terminal() do
+	println(123)
+end
+
+# ╔═╡ 755e37af-0f21-4612-8c4c-cc294048b527
+for p in readdir(first(DEPOT_PATH))
+	print(p)
+	print("/")
+	print("\t\t")
+	print("(", Base.format_bytes(rand(1:10_000_000)), ")")
+	println()
+	print("  ")
+	print()
+	println()
+end
+
+# ╔═╡ 51f4dc20-7cf6-4f08-b500-0c71f6ac01b7
+
+
+# ╔═╡ 94380ba8-247b-4e9c-9c6b-a40b04e2bcfb
+import FileTrees
+
+# ╔═╡ 7dcf9a68-4a73-4301-a1ed-39963309d028
+t = FileTrees.FileTree(joinpath(first(DEPOT_PATH), "environments"))
+
+# ╔═╡ 7a9c4221-27c7-4195-9946-3a7190dfb07f
+FileTrees.load(t) do z
+	rand()
+end
+
+# ╔═╡ 1ea9e96a-ce26-4807-9d80-114638a3952b
+FileTrees.children(t)
+
+# ╔═╡ 05461fd2-a7ce-4ed7-a622-102242547874
+import Logging
+
+# ╔═╡ 3cbaa462-5714-4d7c-83e3-a957763b8d91
+begin
+	print(123)
+	@info 123
+	@info 123
+end
+
+# ╔═╡ 1e49c42a-364e-47eb-85d9-42e73fdc2371
+Logging.@logmsg Logging.LogLevel(-10) "asdf"
+
+# ╔═╡ 13c5ce42-4eee-480b-b490-c40ef4bc8cb5
+Logging.@logmsg Logging.LogLevel(-100) "asdf"
+
+# ╔═╡ b38ae226-0a6c-49e3-b55d-ebdbf0652842
+Logging.@logmsg Logging.LogLevel(-555) "asdf"
+
+
 # ╔═╡ 00000000-0000-0000-0000-000000000001
 PLUTO_PROJECT_TOML_CONTENTS = """
 [deps]
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index bc07101ab1..fac1ccbaae 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -366,10 +366,12 @@ function eval_format_fetch_in_workspace(
 )::PlutoRunner.FormattedCellResult
 
     workspace = get_workspace(session_notebook)
+    
+    is_on_this_process = workspace.pid == Distributed.myid()
 
     # if multiple notebooks run on the same process, then we need to `cd` between the different notebook paths
     if session_notebook isa Tuple
-        if workspace.pid == Distributed.myid()
+        if is_on_this_process
             cd_workspace(workspace, session_notebook[2].path)
         end
         use_nbpkg_environment(session_notebook, workspace)
@@ -386,8 +388,9 @@ function eval_format_fetch_in_workspace(
             $(QuoteNode(expr)), 
             $cell_id, 
             $function_wrapped_info,
-            $forced_expr_id,
+            $forced_expr_id;
             user_requested_run=$user_requested_run,
+            capture_stdout=$(!is_on_this_process),
         )))
         put!(workspace.dowork_token)
         nothing
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 43a5eddff5..e3653d5ae3 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -452,7 +452,15 @@ If the third argument is a `Tuple{Set{Symbol}, Set{Symbol}}` containing the refe
 
 This function is memoized: running the same expression a second time will simply call the same generated function again. This is much faster than evaluating the expression, because the function only needs to be Julia-compiled once. See https://github.com/fonsp/Pluto.jl/pull/720
 """
-function run_expression(m::Module, expr::Any, cell_id::UUID, function_wrapped_info::Union{Nothing,Tuple{Set{Symbol},Set{Symbol}}}=nothing, forced_expr_id::Union{ObjectID,Nothing}=nothing; user_requested_run::Bool=true)
+function run_expression(
+    m::Module, 
+    expr::Any, 
+    cell_id::UUID, 
+    function_wrapped_info::Union{Nothing,Tuple{Set{Symbol},Set{Symbol}}}=nothing, 
+    forced_expr_id::Union{ObjectID,Nothing}=nothing; 
+    user_requested_run::Bool=true,
+    capture_stdout::Bool=true,
+)
     if user_requested_run
         # TODO Time elapsed? Possibly relays errors in cleanup function?
         UseEffectCleanups.trigger_cleanup(cell_id)
@@ -514,34 +522,36 @@ function run_expression(m::Module, expr::Any, cell_id::UUID, function_wrapped_in
         throw("Expression still contains macro calls!!")
     end
 
-    result, runtime = if function_wrapped_info === nothing
-        toplevel_expr = Expr(:toplevel, expr)
-        wrapped = timed_expr(toplevel_expr)
-        ans, runtime = run_inside_trycatch(m, wrapped)
-        (ans, add_runtimes(runtime, expansion_runtime))
-    else
-        expr_id = forced_expr_id !== nothing ? forced_expr_id : expr_hash(expr)
-        local computer = get(computers, cell_id, nothing)
-        if computer === nothing || computer.expr_id !== expr_id
-            try
-                computer = register_computer(expr, expr_id, cell_id, collect.(function_wrapped_info)...)
-            catch e
-                # @error "Failed to generate computer function" expr exception=(e,stacktrace(catch_backtrace()))
-                return run_expression(m, original_expr, cell_id, nothing; user_requested_run=user_requested_run)
+    result, runtime = with_io_to_logs(; enabled=capture_stdout, loglevel=stdout_log_level) do
+        if function_wrapped_info === nothing
+            toplevel_expr = Expr(:toplevel, expr)
+            wrapped = timed_expr(toplevel_expr)
+            ans, runtime = run_inside_trycatch(m, wrapped)
+            (ans, add_runtimes(runtime, expansion_runtime))
+        else
+            expr_id = forced_expr_id !== nothing ? forced_expr_id : expr_hash(expr)
+            local computer = get(computers, cell_id, nothing)
+            if computer === nothing || computer.expr_id !== expr_id
+                try
+                    computer = register_computer(expr, expr_id, cell_id, collect.(function_wrapped_info)...)
+                catch e
+                    # @error "Failed to generate computer function" expr exception=(e,stacktrace(catch_backtrace()))
+                    return run_expression(m, original_expr, cell_id, nothing; user_requested_run=user_requested_run)
+                end
             end
-        end
 
-        # This check solves the problem of a cell like `false && variable_that_does_not_exist`. This should run without error, but will fail in our function-wrapping-magic because we get the value of `variable_that_does_not_exist` before calling the generated function.
-        # The fix is to detect this situation and run the expression in the classical way.
-        ans, runtime = if any(name -> !isdefined(m, name), computer.input_globals)
-            # Do run_expression but with function_wrapped_info=nothing so it doesn't go in a Computer()
-            # @warn "Got variables that don't exist, running outside of computer" not_existing=filter(name -> !isdefined(m, name), computer.input_globals)
-            run_expression(m, original_expr, cell_id; user_requested_run)
-        else
-            run_inside_trycatch(m, () -> compute(m, computer))
-        end
+            # This check solves the problem of a cell like `false && variable_that_does_not_exist`. This should run without error, but will fail in our function-wrapping-magic because we get the value of `variable_that_does_not_exist` before calling the generated function.
+            # The fix is to detect this situation and run the expression in the classical way.
+            ans, runtime = if any(name -> !isdefined(m, name), computer.input_globals)
+                # Do run_expression but with function_wrapped_info=nothing so it doesn't go in a Computer()
+                # @warn "Got variables that don't exist, running outside of computer" not_existing=filter(name -> !isdefined(m, name), computer.input_globals)
+                run_expression(m, original_expr, cell_id; user_requested_run)
+            else
+                run_inside_trycatch(m, () -> compute(m, computer))
+            end
 
-        ans, add_runtimes(runtime, expansion_runtime)
+            ans, add_runtimes(runtime, expansion_runtime)
+        end
     end
 
     if (result isa CapturedException) && (result.ex isa InterruptException)
@@ -844,6 +854,8 @@ Base.IOContext(io::IOContext, ::Nothing) = io
 "The `IOContext` used for converting arbitrary objects to pretty strings."
 const default_iocontext = IOContext(devnull, :color => false, :limit => true, :displaysize => (18, 88), :is_pluto => true, :pluto_supported_integration_features => supported_integration_features)
 
+const default_stdout_iocontext = IOContext(devnull, :color => false, :limit => true, :displaysize => (18, 75), :is_pluto => false)
+
 const imagemimes = [MIME"image/svg+xml"(), MIME"image/png"(), MIME"image/jpg"(), MIME"image/jpeg"(), MIME"image/bmp"(), MIME"image/gif"()]
 # in descending order of coolness
 # text/plain always matches - almost always
@@ -1991,10 +2003,11 @@ function Logging.shouldlog(::PlutoLogger, level, _module, _...)
     level = convert(Logging.LogLevel, level)
     (_module isa Module && is_pluto_workspace(_module)) ||
         level >= Logging.Info ||
-        level == Logging.LogLevel(-1)
+        level == Logging.LogLevel(-1) ||
+        level == stdout_log_level
 end
 
-Logging.min_enabled_level(::PlutoLogger) = Logging.Debug
+Logging.min_enabled_level(::PlutoLogger) = min(Logging.Debug, stdout_log_level)
 Logging.catch_exceptions(::PlutoLogger) = false
 function Logging.handle_message(::PlutoLogger, level, msg, _module, group, id, file, line; kwargs...)
     # println("receiving msg from ", _module, " ", group, " ", id, " ", msg, " ", level, " ", line, " ", file)
@@ -2021,6 +2034,66 @@ function Logging.handle_message(::PlutoLogger, level, msg, _module, group, id, f
     end
 end
 
+const stdout_log_level = Logging.LogLevel(-555) # https://en.wikipedia.org/wiki/555_timer_IC
+function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogLevel=Logging.LogLevel(1))
+    if !enabled
+        return f()
+    end
+    # Taken from https://github.com/JuliaDocs/IOCapture.jl/blob/master/src/IOCapture.jl with some modifications to make it log.
+    
+    # Original implementation from Documenter.jl (MIT license)
+    # Save the default output streams.
+    default_stdout = stdout
+    default_stderr = stderr
+
+    # Redirect both the `stdout` and `stderr` streams to a single `Pipe` object.
+    pipe = Pipe()
+    Base.link_pipe!(pipe; reader_supports_async = true, writer_supports_async = true)
+    pe_stdout = IOContext(pipe.in, default_stdout_iocontext)
+    pe_stderr = IOContext(pipe.in, default_stdout_iocontext)
+    redirect_stdout(pe_stdout)
+    redirect_stderr(pe_stderr)
+
+    # Bytes written to the `pipe` are captured in `output` and eventually converted to a
+    # `String`. We need to use an asynchronous task to continously tranfer bytes from the
+    # pipe to `output` in order to avoid the buffer filling up and stalling write() calls in
+    # user code.
+    output = IOBuffer()
+    buffer_redirect_task = @async write(output, pipe)
+
+    # To make the `display` function work.
+    redirect_display = TextDisplay(pe_stdout)
+    pushdisplay(redirect_display)
+
+    # Run the function `f`, capturing all output that it might have generated.
+    # Success signals whether the function `f` did or did not throw an exception.
+    result = try
+        f()
+    finally
+        # Restore display
+        try
+            popdisplay(redirect_display)
+        catch e
+            # This happens when the user calls `popdisplay()`, fine.
+            # @warn "Pluto's display was already removed?" e
+        end
+        # Restore the original output streams.
+        redirect_stdout(default_stdout)
+        redirect_stderr(default_stderr)
+        close(pe_stdout)
+        close(pe_stderr)
+        wait(buffer_redirect_task)
+    end
+
+
+    output = String(take!(output))
+    if !isempty(output)
+        Logging.@logmsg loglevel output
+    end
+
+    result
+end
+
 # we put this in __init__ to fix a world age problem
 function __init__()
     if !isdefined(Main, Symbol("##Pluto_logger_switched")) && Distributed.myid() != 1
diff --git a/test/Logging.jl b/test/Logging.jl
index 2d674a7fa7..1a29535d8f 100644
--- a/test/Logging.jl
+++ b/test/Logging.jl
@@ -37,34 +37,34 @@ using Pluto.WorkspaceManager: poll
     ]))
     
     
-    # @testset "Stdout" begin
+    @testset "Stdout" begin
         
-    #     idx_123 = [1,2,3,4,5,7,9]
+        idx_123 = [1,2,3,4,5,7,9]
 
-    #     update_run!(🍭, notebook, notebook.cells[1:9])
-    #     @test notebook.cells[1] |> noerror
-    #     @test notebook.cells[2] |> noerror
-    #     @test notebook.cells[3] |> noerror
-    #     @test notebook.cells[4] |> noerror
-    #     @test notebook.cells[5] |> noerror
-    #     @test notebook.cells[6] |> noerror
-    #     @test notebook.cells[7] |> noerror
-    #     @test notebook.cells[8] |> noerror
-    #     @test notebook.cells[9] |> noerror
+        update_run!(🍭, notebook, notebook.cells[1:9])
+        @test notebook.cells[1] |> noerror
+        @test notebook.cells[2] |> noerror
+        @test notebook.cells[3] |> noerror
+        @test notebook.cells[4] |> noerror
+        @test notebook.cells[5] |> noerror
+        @test notebook.cells[6] |> noerror
+        @test notebook.cells[7] |> noerror
+        @test notebook.cells[8] |> noerror
+        @test notebook.cells[9] |> noerror
 
-    #     @test poll(5, 1/60) do
-    #         all(notebook.cells[idx_123]) do c
-    #             length(c.logs) == 1
-    #         end
-    #     end
+        @test poll(5, 1/60) do
+            all(notebook.cells[idx_123]) do c
+                length(c.logs) == 1
+            end
+        end
         
-    #     @testset "123 - $(i)" for i in idx_123
-    #         log = only(notebook.cells[i].logs)
-    #         @test log["level"] == "LogLevel(-555)"
-    #         @test strip(log["msg"][1]) == "123"
-    #         @test log["msg"][2] == MIME"text/plain"()
-    #     end
-    # end
+        @testset "123 - $(i)" for i in idx_123
+            log = only(notebook.cells[i].logs)
+            @test log["level"] == "LogLevel(-555)"
+            @test strip(log["msg"][1]) == "123"
+            @test log["msg"][2] == MIME"text/plain"()
+        end
+    end
 
     @testset "Logging respects maxlog" begin
         @testset "Single log" begin

From d6887f21328fa10821aa33a922f8f92e333488b7 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 2 Mar 2022 19:59:17 +0100
Subject: [PATCH 162/821] Logs: fix wrapping in kwarg values

---
 frontend/editor.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 03f5cbb043..2ada14d072 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2478,7 +2478,7 @@ pluto-log-dot-kwarg {
     flex-direction: row;
 }
 pluto-log-dot-kwarg > * {
-    flex: 0 0 auto;
+    flex: 0 1 auto;
 }
 pluto-log-dot-kwarg > pluto-key {
     color: var(--pluto-schema-types-color);

From 22cd3bcff2d3cf89908efd76b257c9aed479bfff Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 2 Mar 2022 20:00:00 +0100
Subject: [PATCH 163/821] SimpleCellOutput cleanup

---
 frontend/components/CellOutput.js |  5 ++---
 frontend/components/TreeView.js   | 21 +++++++--------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index a8098b84ba..d968025aa3 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -142,12 +142,11 @@ export const OutputBody = ({ mime, body, cell_id, persist_js_state = false, last
             </div>`
             break
         case "application/vnd.pluto.table+object":
-            return html` <${TableView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} />`
+            return html`<${TableView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} />`
             break
         case "application/vnd.pluto.stacktrace+object":
             return html`<div><${ErrorMessage} cell_id=${cell_id} ...${body} /></div>`
             break
-            body.cell_id
         case "application/vnd.pluto.divelement+object":
             return DivElement({ cell_id, ...body })
             break
@@ -161,7 +160,7 @@ export const OutputBody = ({ mime, body, cell_id, persist_js_state = false, last
             }
             break
         default:
-            return html``
+            return html`<pre title="Something went wrong displaying this object">🛑</pre>`
             break
     }
 }
diff --git a/frontend/components/TreeView.js b/frontend/components/TreeView.js
index 3613e39aac..d7ffeaa5ec 100644
--- a/frontend/components/TreeView.js
+++ b/frontend/components/TreeView.js
@@ -1,6 +1,6 @@
 import { html, useRef, useState, useContext } from "../imports/Preact.js"
 
-import { PlutoImage, RawHTMLContainer } from "./CellOutput.js"
+import { OutputBody, PlutoImage, RawHTMLContainer } from "./CellOutput.js"
 import { PlutoContext } from "../common/PlutoContext.js"
 
 // this is different from OutputBody because:
@@ -8,7 +8,9 @@ import { PlutoContext } from "../common/PlutoContext.js"
 // i think this is because i wrote those css classes with the assumption that pluto cell output is wrapped in a div, and tree viewer contents are not
 // whatever
 //
-// TODO: remove this, use OutputBody instead, and fix the CSS classes so that i all looks nice again
+// We use a `<pre>${body}` instead of `<pre><code>${body}`, also for some CSS reasons that I forgot
+//
+// TODO: remove this, use OutputBody instead (maybe add a `wrap_in_div` option), and fix the CSS classes so that i all looks nice again
 export const SimpleOutputBody = ({ mime, body, cell_id, persist_js_state }) => {
     switch (mime) {
         case "image/png":
@@ -19,22 +21,13 @@ export const SimpleOutputBody = ({ mime, body, cell_id, persist_js_state }) => {
         case "image/svg+xml":
             return html`<${PlutoImage} mime=${mime} body=${body} />`
             break
-        case "text/html":
-            return html`<${RawHTMLContainer} body=${body} persist_js_state=${persist_js_state} />`
-            break
+        case "text/plain":
+            return html`<pre class="no-block">${body}</pre>`
         case "application/vnd.pluto.tree+object":
             return html`<${TreeView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} />`
             break
-        case "application/vnd.pluto.table+object":
-            return html` <${TableView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} />`
-            break
-        case "application/vnd.pluto.divelement+object":
-            return DivElement({ cell_id, ...body })
-            break
-        case "text/plain":
-            return html`<pre class="no-block">${body}</pre>`
         default:
-            return html`<pre title="Something went wrong displaying this object">🛑</pre>`
+            return OutputBody({ mime, body, cell_id, persist_js_state, last_run_timestamp: null })
             break
     }
 }

From 4807143f504a94c2b0f8946a0b3a7ae608972d24 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 2 Mar 2022 20:05:52 +0100
Subject: [PATCH 164/821] Logs: format (ex, backtrace) as error (#1962)

---
 frontend/editor.css       | 6 ++++++
 src/runner/PlutoRunner.jl | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 2ada14d072..7ca1d0eb3e 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2464,6 +2464,12 @@ a.stdout-info {
     }
 }
 
+pluto-log-dot jlerror {
+    display: block;
+    background: var(--main-bg-color);
+    padding: 0.6rem;
+    border-radius: 0.5rem;
+}
 pluto-log-dot jltree,
 pluto-log-dot jlpair {
     font-size: 0.6rem;
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index e3653d5ae3..1c9ac91052 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -2022,7 +2022,7 @@ function Logging.handle_message(::PlutoLogger, level, msg, _module, group, id, f
             "file" => string(file),
             "cell_id" => currently_running_cell_id[],
             "line" => line isa Union{Int32,Int64} ? line : nothing,
-            "kwargs" => Tuple{String,Any}[(string(k), format_output_default(v)) for (k, v) in kwargs],
+            "kwargs" => Tuple{String,Any}[(string(k), format_log_value(v)) for (k, v) in kwargs],
             )
         )
         
@@ -2034,6 +2034,9 @@ function Logging.handle_message(::PlutoLogger, level, msg, _module, group, id, f
     end
 end
 
+format_log_value(v) = format_output_default(v)
+format_log_value(v::Tuple{<:Exception,Vector{<:Any}}) = format_output(CapturedException(v...))
+
 const stdout_log_level = Logging.LogLevel(-555) # https://en.wikipedia.org/wiki/555_timer_IC
 function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogLevel=Logging.LogLevel(1))
     if !enabled

From 787a6040f4100b0aec0b900e03ea8b23a3732800 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 2 Mar 2022 20:59:06 +0100
Subject: [PATCH 165/821] whops

---
 frontend/components/CellOutput.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index d968025aa3..c7d4beec5b 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -159,6 +159,11 @@ export const OutputBody = ({ mime, body, cell_id, persist_js_state = false, last
                 return html`<div></div>`
             }
             break
+        case null:
+        case undefined:
+        case "":
+            return html``
+            break
         default:
             return html`<pre title="Something went wrong displaying this object">🛑</pre>`
             break

From 2d93917239e6f1e5fe9a8962c3dc5c5a2116f09f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 2 Mar 2022 21:07:45 +0100
Subject: [PATCH 166/821] =?UTF-8?q?=F0=9F=90=A0=20Fix=20#1960?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Cell.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index dd2bb943ea..8fdff97bb6 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -59,7 +59,7 @@ export const Cell = ({
     const on_update_doc_query = pluto_actions.set_doc_query
     const on_focus_neighbor = pluto_actions.focus_on_neighbor
     const on_change = useCallback((val) => pluto_actions.set_local_cell(cell_id, val), [cell_id, pluto_actions])
-    const variables = useMemo(() => Object.keys(cell_dependencies), [cell_dependencies])
+    const variables = useMemo(() => Object.keys(cell_dependencies?.downstream_cells_map ?? {}), [cell_dependencies])
     // cm_forced_focus is null, except when a line needs to be highlighted because it is part of a stack trace
     const [cm_forced_focus, set_cm_forced_focus] = useState(null)
     const [cm_highlighted_line, set_cm_highlighted_line] = useState(null)

From 082316d3f72dbfef39bc3f3549ce63eb3a189ed2 Mon Sep 17 00:00:00 2001
From: Paul Berg <naydex.mc+github@gmail.com>
Date: Sun, 6 Mar 2022 15:04:15 +0100
Subject: [PATCH 167/821] improve support for benchmarktools (#1966)

* support @benchmark

* __module__ is replaced by ref to module in expanded expr

* Update ExpressionExplorer.jl

* test is not broken yayyy
---
 src/analysis/ExpressionExplorer.jl | 26 ++++++++++++++++++--------
 src/runner/PlutoRunner.jl          | 12 ++++++++++--
 test/ExpressionExplorer.jl         | 10 ++++++++++
 test/MacroAnalysis.jl              |  2 +-
 4 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 20c2a62b0b..de70eb1a06 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -211,17 +211,20 @@ function split_funcname(funcname_ex::Symbol)::FunctionName
     Symbol[funcname_ex|>without_dotprefix|>without_dotsuffix]
 end
 
+# this includes GlobalRef - it's fine that we don't recognise it, because you can't assign to a globalref?
+function split_funcname(::Any)::FunctionName
+    Symbol[]
+end
+
+"Allows comparing tuples to vectors since having constant vectors can be slower"
+all_iters_eq(a, b) = length(a) == length(b) && all((aa == bb for (aa, bb) in zip(a, b)))
+
 function is_just_dots(ex::Expr)
     ex.head == :(.) && all(is_just_dots, ex.args)
 end
 is_just_dots(::Union{QuoteNode,Symbol,GlobalRef}) = true
 is_just_dots(::Any) = false
 
-# this includes GlobalRef - it's fine that we don't recognise it, because you can't assign to a globalref?
-function split_funcname(::Any)::FunctionName
-    Symbol[]
-end
-
 """Turn `Symbol(".+")` into `:(+)`"""
 function without_dotprefix(funcname::Symbol)::Symbol
     fn_str = String(funcname)
@@ -475,18 +478,25 @@ function explore!(ex::Expr, scopestate::ScopeState)::SymbolsState
                 SymbolsState(references = Set{Symbol}([funcname[1]]), funccalls = Set{FunctionName}([funcname]))
             end
 
+            # Explore code inside function arguments:
+            union!(symstate, explore!(Expr(:block, ex.args[2:end]...), scopestate))
+
             # Make `@macroexpand` and `Base.macroexpand` reactive by referencing the first macro in the second
             # argument to the call.
-            if ([:Base, :macroexpand] == funcname || [:macroexpand] == funcname) &&
+            if (all_iters_eq((:Base, :macroexpand), funcname) || all_iters_eq((:macroexpand,), funcname)) &&
                length(ex.args) >= 3 &&
                ex.args[3] isa QuoteNode &&
                Meta.isexpr(ex.args[3].value, :macrocall)
                 expanded_macro = split_funcname(ex.args[3].value.args[1])
                 union!(symstate, SymbolsState(macrocalls = Set{FunctionName}([expanded_macro])))
+            elseif all_iters_eq((:BenchmarkTools, :generate_benchmark_definition), funcname) &&
+                length(ex.args) == 10
+                for child in ex.args[7:9]
+                    (Meta.isexpr(child, :copyast, 1) && child.args[1] isa QuoteNode && child.args[1].value isa Expr) || continue
+                    union!(symstate, explore!(child.args[1].value, scopestate))
+                end
             end
 
-            # Explore code inside function arguments:
-            union!(symstate, explore!(Expr(:block, ex.args[2:end]...), scopestate))
             return symstate
         else
             return explore!(Expr(:block, ex.args...), scopestate)
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 1c9ac91052..d81c012ade 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -77,7 +77,10 @@ function increment_current_module()::Symbol
     new_workspace_name = Symbol("workspace#", id)
 
     new_module = Core.eval(Main, :(
-        module $(new_workspace_name) $(workspace_preamble...) end
+        module $(new_workspace_name)
+            $(workspace_preamble...)
+            const var"#___this_module_name" = $(new_workspace_name)
+        end
     ))
 
     new_workspace_name
@@ -163,6 +166,11 @@ replace_pluto_properties_in_expr(::GiveMeCellID; cell_id, kwargs...) = cell_id
 replace_pluto_properties_in_expr(::GiveMeRerunCellFunction; rerun_cell_function, kwargs...) = rerun_cell_function
 replace_pluto_properties_in_expr(::GiveMeRegisterCleanupFunction; register_cleanup_function, kwargs...) = register_cleanup_function
 replace_pluto_properties_in_expr(expr::Expr; kwargs...) = Expr(expr.head, map(arg -> replace_pluto_properties_in_expr(arg; kwargs...), expr.args)...)
+replace_pluto_properties_in_expr(m::Module; kwargs...) = if startswith(string(nameof(m)), "workspace#")
+    Symbol("#___this_module_name")
+else
+    m
+end
 replace_pluto_properties_in_expr(other; kwargs...) = other
 
 "Similar to [`replace_pluto_properties_in_expr`](@ref), but just checks for existance and doesn't check for [`GiveMeCellID`](@ref)"
@@ -249,7 +257,7 @@ function try_macroexpand(mod, cell_uuid, expr)
         @warn "try_macroexpand expression not :toplevel or :block" expr
         Expr(:block, expr)
     end
-    
+
     elapsed_ns = time_ns()
     expanded_expr = macroexpand(mod, expr_not_toplevel)
     elapsed_ns = time_ns() - elapsed_ns
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index 1abc6797eb..a0d8926901 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -588,6 +588,16 @@ Some of these @test_broken lines are commented out to prevent printing to the te
             references=[:x],
         )
     end
+    @testset "Special reactivity rules" begin
+        @test testee(
+            :(BenchmarkTools.generate_benchmark_definition(Main, Symbol[], Any[], Symbol[], (), $(Expr(:copyast, QuoteNode(:(f(x, y, z))))), $(Expr(:copyast, QuoteNode(:(A + B)))), $(Expr(:copyast, QuoteNode(nothing))), BenchmarkTools.parameters())),
+            [:Main, :BenchmarkTools, :Any, :Symbol, :x, :y, :z, :A, :B], [], [[:BenchmarkTools, :generate_benchmark_definition], [:BenchmarkTools, :parameters], :f, :+], []
+        )
+        @test testee(
+            :(Base.macroexpand(Main, $(QuoteNode(:(@enum a b c))))),
+            [:Main, :Base], [], [[:Base, :macroexpand]], [], [Symbol("@enum")]
+        )
+    end
     @testset "Extracting `using` and `import`" begin
         expr = quote
             using A
diff --git a/test/MacroAnalysis.jl b/test/MacroAnalysis.jl
index 98757f5260..b10d3b9cc0 100644
--- a/test/MacroAnalysis.jl
+++ b/test/MacroAnalysis.jl
@@ -679,7 +679,7 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         module_from_cell2 = cell(2).output.body[:elements][1][2][1]
         module_from_cell3 = cell(3).output.body
 
-        @test_broken module_from_cell2 == module_from_cell3
+        @test module_from_cell2 == module_from_cell3
     end
 
     @testset "Definitions" begin

From 684049986db276bfe974f26ba82c8d241ebf63a4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 7 Mar 2022 12:24:10 +0100
Subject: [PATCH 168/821] Show "Loading..." during init when cells are
 truncated

---
 frontend/components/Notebook.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/components/Notebook.js b/frontend/components/Notebook.js
index dcdf606806..7d58508b88 100644
--- a/frontend/components/Notebook.js
+++ b/frontend/components/Notebook.js
@@ -188,6 +188,9 @@ export const Notebook = ({
                         global_definition_locations=${global_definition_locations}
                     />`
                 )}
+            ${cell_outputs_delayed && notebook.cell_order.length >= render_cell_outputs_minimum
+                ? html`<div style="font-family: system-ui; font-style: italic; text-align: center; padding: 5rem 1rem;">Loading...</div>`
+                : null}
         </pluto-notebook>
     `
 }

From 38d255a47116030cb3272bd8871c63b6a89afd11 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 7 Mar 2022 18:55:20 +0100
Subject: [PATCH 169/821] Update preact import and remove prebundle

---
 frontend/imports/Preact.js          | 586 ++--------------------------
 frontend/imports/Preact.original.js |  45 ---
 frontend/imports/bundle.sh          |   1 -
 3 files changed, 43 insertions(+), 589 deletions(-)
 delete mode 100644 frontend/imports/Preact.original.js
 delete mode 100755 frontend/imports/bundle.sh

diff --git a/frontend/imports/Preact.js b/frontend/imports/Preact.js
index 3e0a27d570..b938009bb2 100644
--- a/frontend/imports/Preact.js
+++ b/frontend/imports/Preact.js
@@ -1,544 +1,44 @@
-var te = Object.defineProperty;
-var ne = (e, t)=>{
-    for(var n in t)te(e, n, {
-        get: t[n],
-        enumerable: !0
-    });
-};
-var N = {
-};
-ne(N, {
-    Component: ()=>S
-    ,
-    Fragment: ()=>P
-    ,
-    cloneElement: ()=>se
-    ,
-    createContext: ()=>ce
-    ,
-    createElement: ()=>V
-    ,
-    createRef: ()=>re
-    ,
-    h: ()=>V
-    ,
-    hydrate: ()=>ee
-    ,
-    isValidElement: ()=>F
-    ,
-    options: ()=>d
-    ,
-    render: ()=>Z
-    ,
-    toChildArray: ()=>K
-});
-var d, F, C, H, R, I, U = {
-}, L = [], _e = /acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|itera/i;
-function b(e, t) {
-    for(var n in t)e[n] = t[n];
-    return e;
+// @ts-nocheck
+import {
+    //
+    render,
+    Component,
+    h,
+    cloneElement,
+    createContext,
+    createRef,
+    hydrate,
+} from "https://esm.sh/v66/preact@10.6.6?target=es2020"
+import {
+    //
+    useEffect,
+    useLayoutEffect,
+    useState,
+    useRef,
+    useMemo,
+    useCallback,
+    useContext,
+} from "https://esm.sh/v66/preact@10.6.6/hooks?target=es2020"
+
+import htm from "https://esm.sh/v66/htm@3.1.0?target=es2020"
+
+const html = htm.bind(h)
+
+export {
+    //
+    html,
+    render,
+    Component,
+    useEffect,
+    useLayoutEffect,
+    useState,
+    useRef,
+    useMemo,
+    useCallback,
+    createContext,
+    createRef,
+    useContext,
+    h,
+    cloneElement,
+    hydrate,
 }
-function O(e) {
-    var t = e.parentNode;
-    t && t.removeChild(e);
-}
-function V(e, t, n) {
-    var o, l, _, c = arguments, s = {
-    };
-    for(_ in t)_ == "key" ? o = t[_] : _ == "ref" ? l = t[_] : s[_] = t[_];
-    if (arguments.length > 3) for(n = [
-        n
-    ], _ = 3; _ < arguments.length; _++)n.push(c[_]);
-    if (n != null && (s.children = n), typeof e == "function" && e.defaultProps != null) for(_ in e.defaultProps)s[_] === void 0 && (s[_] = e.defaultProps[_]);
-    return x(e, s, o, l, null);
-}
-function x(e, t, n, o, l) {
-    var _ = {
-        type: e,
-        props: t,
-        key: n,
-        ref: o,
-        __k: null,
-        __: null,
-        __b: 0,
-        __e: null,
-        __d: void 0,
-        __c: null,
-        __h: null,
-        constructor: void 0,
-        __v: l ?? ++d.__v
-    };
-    return d.vnode != null && d.vnode(_), _;
-}
-function re() {
-    return {
-        current: null
-    };
-}
-function P(e) {
-    return e.children;
-}
-function S(e, t) {
-    this.props = e, this.context = t;
-}
-function E(e, t) {
-    if (t == null) return e.__ ? E(e.__, e.__.__k.indexOf(e) + 1) : null;
-    for(var n; t < e.__k.length; t++)if ((n = e.__k[t]) != null && n.__e != null) return n.__e;
-    return typeof e.type == "function" ? E(e) : null;
-}
-function $(e) {
-    var t, n;
-    if ((e = e.__) != null && e.__c != null) {
-        for(e.__e = e.__c.base = null, t = 0; t < e.__k.length; t++)if ((n = e.__k[t]) != null && n.__e != null) {
-            e.__e = e.__c.base = n.__e;
-            break;
-        }
-        return $(e);
-    }
-}
-function M(e) {
-    (!e.__d && (e.__d = !0) && C.push(e) && !T.__r++ || R !== d.debounceRendering) && ((R = d.debounceRendering) || H)(T);
-}
-function T() {
-    for(var e; T.__r = C.length;)e = C.sort(function(t, n) {
-        return t.__v.__b - n.__v.__b;
-    }), C = [], e.some(function(t) {
-        var n, o, l, _, c, s;
-        t.__d && (c = (_ = (n = t).__v).__e, (s = n.__P) && (o = [], (l = b({
-        }, _)).__v = _.__v + 1, W(s, _, l, n.__n, s.ownerSVGElement !== void 0, _.__h != null ? [
-            c
-        ] : null, o, c ?? E(_), _.__h), B(o, _), _.__e != c && $(_)));
-    });
-}
-function J(e, t, n, o, l, _, c, s, p, u) {
-    var r, v, f, i, y, a, h, m = o && o.__k || L, g = m.length;
-    for(n.__k = [], r = 0; r < t.length; r++)if ((i = n.__k[r] = (i = t[r]) == null || typeof i == "boolean" ? null : typeof i == "string" || typeof i == "number" || typeof i == "bigint" ? x(null, i, null, null, i) : Array.isArray(i) ? x(P, {
-        children: i
-    }, null, null, null) : i.__b > 0 ? x(i.type, i.props, i.key, null, i.__v) : i) != null) {
-        if (i.__ = n, i.__b = n.__b + 1, (f = m[r]) === null || f && i.key == f.key && i.type === f.type) m[r] = void 0;
-        else for(v = 0; v < g; v++){
-            if ((f = m[v]) && i.key == f.key && i.type === f.type) {
-                m[v] = void 0;
-                break;
-            }
-            f = null;
-        }
-        W(e, i, f = f || U, l, _, c, s, p, u), y = i.__e, (v = i.ref) && f.ref != v && (h || (h = []), f.ref && h.push(f.ref, null, i), h.push(v, i.__c || y, i)), y != null ? (a == null && (a = y), typeof i.type == "function" && i.__k != null && i.__k === f.__k ? i.__d = p = j(i, p, e) : p = z(e, i, f, m, y, p), u || n.type !== "option" ? typeof n.type == "function" && (n.__d = p) : e.value = "") : p && f.__e == p && p.parentNode != e && (p = E(f));
-    }
-    for(n.__e = a, r = g; r--;)m[r] != null && (typeof n.type == "function" && m[r].__e != null && m[r].__e == n.__d && (n.__d = E(o, r + 1)), q(m[r], m[r]));
-    if (h) for(r = 0; r < h.length; r++)G(h[r], h[++r], h[++r]);
-}
-function j(e, t, n) {
-    var o, l;
-    for(o = 0; o < e.__k.length; o++)(l = e.__k[o]) && (l.__ = e, t = typeof l.type == "function" ? j(l, t, n) : z(n, l, l, e.__k, l.__e, t));
-    return t;
-}
-function K(e, t) {
-    return t = t || [], e == null || typeof e == "boolean" || (Array.isArray(e) ? e.some(function(n) {
-        K(n, t);
-    }) : t.push(e)), t;
-}
-function z(e, t, n, o, l, _) {
-    var c, s, p;
-    if (t.__d !== void 0) c = t.__d, t.__d = void 0;
-    else if (n == null || l != _ || l.parentNode == null) e: if (_ == null || _.parentNode !== e) e.appendChild(l), c = null;
-    else {
-        for(s = _, p = 0; (s = s.nextSibling) && p < o.length; p += 2)if (s == l) break e;
-        e.insertBefore(l, _), c = _;
-    }
-    return c !== void 0 ? c : l.nextSibling;
-}
-function oe(e, t, n, o, l) {
-    var _;
-    for(_ in n)_ === "children" || _ === "key" || _ in t || D(e, _, null, n[_], o);
-    for(_ in t)l && typeof t[_] != "function" || _ === "children" || _ === "key" || _ === "value" || _ === "checked" || n[_] === t[_] || D(e, _, t[_], n[_], o);
-}
-function Q(e, t, n) {
-    t[0] === "-" ? e.setProperty(t, n) : e[t] = n == null ? "" : typeof n != "number" || _e.test(t) ? n : n + "px";
-}
-function D(e, t, n, o, l) {
-    var _;
-    e: if (t === "style") if (typeof n == "string") e.style.cssText = n;
-    else {
-        if (typeof o == "string" && (e.style.cssText = o = ""), o) for(t in o)n && t in n || Q(e.style, t, "");
-        if (n) for(t in n)o && n[t] === o[t] || Q(e.style, t, n[t]);
-    }
-    else if (t[0] === "o" && t[1] === "n") _ = t !== (t = t.replace(/Capture$/, "")), t = t.toLowerCase() in e ? t.toLowerCase().slice(2) : t.slice(2), e.l || (e.l = {
-    }), e.l[t + _] = n, n ? o || e.addEventListener(t, _ ? Y : X, _) : e.removeEventListener(t, _ ? Y : X, _);
-    else if (t !== "dangerouslySetInnerHTML") {
-        if (l) t = t.replace(/xlink[H:h]/, "h").replace(/sName$/, "s");
-        else if (t !== "href" && t !== "list" && t !== "form" && t !== "tabIndex" && t !== "download" && t in e) try {
-            e[t] = n ?? "";
-            break e;
-        } catch (c) {
-        }
-        typeof n == "function" || (n != null && (n !== !1 || t[0] === "a" && t[1] === "r") ? e.setAttribute(t, n) : e.removeAttribute(t));
-    }
-}
-function X(e) {
-    this.l[e.type + !1](d.event ? d.event(e) : e);
-}
-function Y(e) {
-    this.l[e.type + !0](d.event ? d.event(e) : e);
-}
-function W(e, t, n, o, l, _, c, s, p) {
-    var u, r, v, f, i, y, a, h, m, g, w, k = t.type;
-    if (t.constructor !== void 0) return null;
-    n.__h != null && (p = n.__h, s = t.__e = n.__e, t.__h = null, _ = [
-        s
-    ]), (u = d.__b) && u(t);
-    try {
-        e: if (typeof k == "function") {
-            if (h = t.props, m = (u = k.contextType) && o[u.__c], g = u ? m ? m.props.value : u.__ : o, n.__c ? a = (r = t.__c = n.__c).__ = r.__E : ("prototype" in k && k.prototype.render ? t.__c = r = new k(h, g) : (t.__c = r = new S(h, g), r.constructor = k, r.render = ie), m && m.sub(r), r.props = h, r.state || (r.state = {
-            }), r.context = g, r.__n = o, v = r.__d = !0, r.__h = []), r.__s == null && (r.__s = r.state), k.getDerivedStateFromProps != null && (r.__s == r.state && (r.__s = b({
-            }, r.__s)), b(r.__s, k.getDerivedStateFromProps(h, r.__s))), f = r.props, i = r.state, v) k.getDerivedStateFromProps == null && r.componentWillMount != null && r.componentWillMount(), r.componentDidMount != null && r.__h.push(r.componentDidMount);
-            else {
-                if (k.getDerivedStateFromProps == null && h !== f && r.componentWillReceiveProps != null && r.componentWillReceiveProps(h, g), !r.__e && r.shouldComponentUpdate != null && r.shouldComponentUpdate(h, r.__s, g) === !1 || t.__v === n.__v) {
-                    r.props = h, r.state = r.__s, t.__v !== n.__v && (r.__d = !1), r.__v = t, t.__e = n.__e, t.__k = n.__k, t.__k.forEach(function(A) {
-                        A && (A.__ = t);
-                    }), r.__h.length && c.push(r);
-                    break e;
-                }
-                r.componentWillUpdate != null && r.componentWillUpdate(h, r.__s, g), r.componentDidUpdate != null && r.__h.push(function() {
-                    r.componentDidUpdate(f, i, y);
-                });
-            }
-            r.context = g, r.props = h, r.state = r.__s, (u = d.__r) && u(t), r.__d = !1, r.__v = t, r.__P = e, u = r.render(r.props, r.state, r.context), r.state = r.__s, r.getChildContext != null && (o = b(b({
-            }, o), r.getChildContext())), v || r.getSnapshotBeforeUpdate == null || (y = r.getSnapshotBeforeUpdate(f, i)), w = u != null && u.type === P && u.key == null ? u.props.children : u, J(e, Array.isArray(w) ? w : [
-                w
-            ], t, n, o, l, _, c, s, p), r.base = t.__e, t.__h = null, r.__h.length && c.push(r), a && (r.__E = r.__ = null), r.__e = !1;
-        } else _ == null && t.__v === n.__v ? (t.__k = n.__k, t.__e = n.__e) : t.__e = le(n.__e, t, n, o, l, _, c, p);
-        (u = d.diffed) && u(t);
-    } catch (A) {
-        t.__v = null, (p || _ != null) && (t.__e = s, t.__h = !!p, _[_.indexOf(s)] = null), d.__e(A, t, n);
-    }
-}
-function B(e, t) {
-    d.__c && d.__c(t, e), e.some(function(n) {
-        try {
-            e = n.__h, n.__h = [], e.some(function(o) {
-                o.call(n);
-            });
-        } catch (o) {
-            d.__e(o, n.__v);
-        }
-    });
-}
-function le(e, t, n, o, l, _, c, s) {
-    var p, u, r, v, f = n.props, i = t.props, y = t.type, a = 0;
-    if (y === "svg" && (l = !0), _ != null) {
-        for(; a < _.length; a++)if ((p = _[a]) && (p === e || (y ? p.localName == y : p.nodeType == 3))) {
-            e = p, _[a] = null;
-            break;
-        }
-    }
-    if (e == null) {
-        if (y === null) return document.createTextNode(i);
-        e = l ? document.createElementNS("http://www.w3.org/2000/svg", y) : document.createElement(y, i.is && i), _ = null, s = !1;
-    }
-    if (y === null) f === i || s && e.data === i || (e.data = i);
-    else {
-        if (_ = _ && L.slice.call(e.childNodes), u = (f = n.props || U).dangerouslySetInnerHTML, r = i.dangerouslySetInnerHTML, !s) {
-            if (_ != null) for(f = {
-            }, v = 0; v < e.attributes.length; v++)f[e.attributes[v].name] = e.attributes[v].value;
-            (r || u) && (r && (u && r.__html == u.__html || r.__html === e.innerHTML) || (e.innerHTML = r && r.__html || ""));
-        }
-        if (oe(e, i, f, l, s), r) t.__k = [];
-        else if (a = t.props.children, J(e, Array.isArray(a) ? a : [
-            a
-        ], t, n, o, l && y !== "foreignObject", _, c, e.firstChild, s), _ != null) for(a = _.length; a--;)_[a] != null && O(_[a]);
-        s || ("value" in i && (a = i.value) !== void 0 && (a !== e.value || y === "progress" && !a) && D(e, "value", a, f.value, !1), "checked" in i && (a = i.checked) !== void 0 && a !== e.checked && D(e, "checked", a, f.checked, !1));
-    }
-    return e;
-}
-function G(e, t, n) {
-    try {
-        typeof e == "function" ? e(t) : e.current = t;
-    } catch (o) {
-        d.__e(o, n);
-    }
-}
-function q(e, t, n) {
-    var o, l, _;
-    if (d.unmount && d.unmount(e), (o = e.ref) && (o.current && o.current !== e.__e || G(o, null, t)), n || typeof e.type == "function" || (n = (l = e.__e) != null), e.__e = e.__d = void 0, (o = e.__c) != null) {
-        if (o.componentWillUnmount) try {
-            o.componentWillUnmount();
-        } catch (c) {
-            d.__e(c, t);
-        }
-        o.base = o.__P = null;
-    }
-    if (o = e.__k) for(_ = 0; _ < o.length; _++)o[_] && q(o[_], t, n);
-    l != null && O(l);
-}
-function ie(e, t, n) {
-    return this.constructor(e, n);
-}
-function Z(e, t, n) {
-    var o, l, _;
-    d.__ && d.__(e, t), l = (o = typeof n == "function") ? null : n && n.__k || t.__k, _ = [], W(t, e = (!o && n || t).__k = V(P, null, [
-        e
-    ]), l || U, U, t.ownerSVGElement !== void 0, !o && n ? [
-        n
-    ] : l ? null : t.firstChild ? L.slice.call(t.childNodes) : null, _, !o && n ? n : l ? l.__e : t.firstChild, o), B(_, e);
-}
-function ee(e, t) {
-    Z(e, t, ee);
-}
-function se(e, t, n) {
-    var o, l, _, c = arguments, s = b({
-    }, e.props);
-    for(_ in t)_ == "key" ? o = t[_] : _ == "ref" ? l = t[_] : s[_] = t[_];
-    if (arguments.length > 3) for(n = [
-        n
-    ], _ = 3; _ < arguments.length; _++)n.push(c[_]);
-    return n != null && (s.children = n), x(e.type, s, o || e.key, l || e.ref, null);
-}
-function ce(e, t) {
-    var n = {
-        __c: t = "__cC" + I++,
-        __: e,
-        Consumer: function(o, l) {
-            return o.children(l);
-        },
-        Provider: function(o) {
-            var l, _;
-            return this.getChildContext || (l = [], (_ = {
-            })[t] = this, this.getChildContext = function() {
-                return _;
-            }, this.shouldComponentUpdate = function(c) {
-                this.props.value !== c.value && l.some(M);
-            }, this.sub = function(c) {
-                l.push(c);
-                var s = c.componentWillUnmount;
-                c.componentWillUnmount = function() {
-                    l.splice(l.indexOf(c), 1), s && s.call(c);
-                };
-            }), o.children;
-        }
-    };
-    return n.Provider.__ = n.Consumer.contextType = n;
-}
-d = {
-    __e: function(e, t) {
-        for(var n, o, l; t = t.__;)if ((n = t.__c) && !n.__) try {
-            if ((o = n.constructor) && o.getDerivedStateFromError != null && (n.setState(o.getDerivedStateFromError(e)), l = n.__d), n.componentDidCatch != null && (n.componentDidCatch(e), l = n.__d), l) return n.__E = n;
-        } catch (_) {
-            e = _;
-        }
-        throw e;
-    },
-    __v: 0
-}, F = function(e) {
-    return e != null && e.constructor === void 0;
-}, S.prototype.setState = function(e, t) {
-    var n;
-    n = this.__s != null && this.__s !== this.state ? this.__s : this.__s = b({
-    }, this.state), typeof e == "function" && (e = e(b({
-    }, n), this.props)), e && b(n, e), e != null && this.__v && (t && this.__h.push(t), M(this));
-}, S.prototype.forceUpdate = function(e) {
-    this.__v && (this.__e = !0, e && this.__h.push(e), M(this));
-}, S.prototype.render = P, C = [], H = typeof Promise == "function" ? Promise.prototype.then.bind(Promise.resolve()) : setTimeout, T.__r = 0, I = 0;
-var { createElement: ae , cloneElement: ue , toChildArray: de , hydrate: he , Fragment: ve , h: ye , createContext: me , options: ge , createRef: ke , isValidElement: be , Component: Ce , render: xe  } = N;
-var q1 = Object.defineProperty;
-var k = (_, e)=>{
-    for(var n in e)q1(_, n, {
-        get: e[n],
-        enumerable: !0
-    });
-};
-var h1 = {
-};
-k(h1, {
-    useCallback: ()=>S1
-    ,
-    useContext: ()=>B1
-    ,
-    useDebugValue: ()=>I1
-    ,
-    useEffect: ()=>R1
-    ,
-    useErrorBoundary: ()=>L1
-    ,
-    useImperativeHandle: ()=>V1
-    ,
-    useLayoutEffect: ()=>D1
-    ,
-    useMemo: ()=>l
-    ,
-    useReducer: ()=>x1
-    ,
-    useRef: ()=>T1
-    ,
-    useState: ()=>C1
-});
-var c, r, H1, a = 0, m = [], d1 = ge.__b, E1 = ge.__r, y = ge.diffed, b1 = ge.__c, g = ge.unmount;
-function i(_, e) {
-    ge.__h && ge.__h(r, _, a || e), a = 0;
-    var n = r.__H || (r.__H = {
-        __: [],
-        __h: []
-    });
-    return _ >= n.__.length && n.__.push({
-    }), n.__[_];
-}
-function C1(_) {
-    return a = 1, x1(A, _);
-}
-function x1(_, e, n) {
-    var t = i(c++, 2);
-    return t.t = _, t.__c || (t.__ = [
-        n ? n(e) : A(void 0, e),
-        function(o) {
-            var f = t.t(t.__[0], o);
-            t.__[0] !== f && (t.__ = [
-                f,
-                t.__[1]
-            ], t.__c.setState({
-            }));
-        }
-    ], t.__c = r), t.__;
-}
-function R1(_, e) {
-    var n = i(c++, 3);
-    !ge.__s && v(n.__H, e) && (n.__ = _, n.__H = e, r.__H.__h.push(n));
-}
-function D1(_, e) {
-    var n = i(c++, 4);
-    !ge.__s && v(n.__H, e) && (n.__ = _, n.__H = e, r.__h.push(n));
-}
-function T1(_) {
-    return a = 5, l(function() {
-        return {
-            current: _
-        };
-    }, []);
-}
-function V1(_, e, n) {
-    a = 6, D1(function() {
-        typeof _ == "function" ? _(e()) : _ && (_.current = e());
-    }, n == null ? n : n.concat(_));
-}
-function l(_, e) {
-    var n = i(c++, 7);
-    return v(n.__H, e) && (n.__ = _(), n.__H = e, n.__h = _), n.__;
-}
-function S1(_, e) {
-    return a = 8, l(function() {
-        return _;
-    }, e);
-}
-function B1(_) {
-    var e = r.context[_.__c], n = i(c++, 9);
-    return n.__c = _, e ? (n.__ == null && (n.__ = !0, e.sub(r)), e.props.value) : _.__;
-}
-function I1(_, e) {
-    ge.useDebugValue && ge.useDebugValue(e ? e(_) : _);
-}
-function L1(_) {
-    var e = i(c++, 10), n = C1();
-    return e.__ = _, r.componentDidCatch || (r.componentDidCatch = function(t) {
-        e.__ && e.__(t), n[1](t);
-    }), [
-        n[0],
-        function() {
-            n[1](void 0);
-        }
-    ];
-}
-function M1() {
-    m.forEach(function(_) {
-        if (_.__P) try {
-            _.__H.__h.forEach(s), _.__H.__h.forEach(p), _.__H.__h = [];
-        } catch (e) {
-            _.__H.__h = [], ge.__e(e, _.__v);
-        }
-    }), m = [];
-}
-ge.__b = function(_) {
-    r = null, d1 && d1(_);
-}, ge.__r = function(_) {
-    E1 && E1(_), c = 0;
-    var e = (r = _.__c).__H;
-    e && (e.__h.forEach(s), e.__h.forEach(p), e.__h = []);
-}, ge.diffed = function(_) {
-    y && y(_);
-    var e = _.__c;
-    e && e.__H && e.__H.__h.length && (m.push(e) !== 1 && H1 === ge.requestAnimationFrame || ((H1 = ge.requestAnimationFrame) || function(n) {
-        var t, o = function() {
-            clearTimeout(f), F1 && cancelAnimationFrame(t), setTimeout(n);
-        }, f = setTimeout(o, 100);
-        F1 && (t = requestAnimationFrame(o));
-    })(M1)), r = void 0;
-}, ge.__c = function(_, e) {
-    e.some(function(n) {
-        try {
-            n.__h.forEach(s), n.__h = n.__h.filter(function(t) {
-                return !t.__ || p(t);
-            });
-        } catch (t) {
-            e.some(function(o) {
-                o.__h && (o.__h = []);
-            }), e = [], ge.__e(t, n.__v);
-        }
-    }), b1 && b1(_, e);
-}, ge.unmount = function(_) {
-    g && g(_);
-    var e = _.__c;
-    if (e && e.__H) try {
-        e.__H.__.forEach(s);
-    } catch (n) {
-        ge.__e(n, e.__v);
-    }
-};
-var F1 = typeof requestAnimationFrame == "function";
-function s(_) {
-    var e = r;
-    typeof _.__c == "function" && _.__c(), r = e;
-}
-function p(_) {
-    var e = r;
-    _.__c = _.__(), r = e;
-}
-function v(_, e) {
-    return !_ || _.length !== e.length || e.some(function(n, t) {
-        return n !== _[t];
-    });
-}
-function A(_, e) {
-    return typeof e == "function" ? e(_) : e;
-}
-var { useRef: z1 , useMemo: G1 , useDebugValue: J1 , useErrorBoundary: K1 , useReducer: N1 , useLayoutEffect: O1 , useImperativeHandle: Q1 , useEffect: U1 , useCallback: W1 , useContext: X1 , useState: Y1  } = h1;
-var a1 = function(p, o, l, n) {
-    var v;
-    o[0] = 0;
-    for(var u = 1; u < o.length; u++){
-        var f = o[u++], t = o[u] ? (o[0] |= f ? 1 : 2, l[o[u++]]) : o[++u];
-        f === 3 ? n[0] = t : f === 4 ? n[1] = Object.assign(n[1] || {
-        }, t) : f === 5 ? (n[1] = n[1] || {
-        })[o[++u]] = t : f === 6 ? n[1][o[++u]] += t + "" : f ? (v = p.apply(t, a1(p, t, l, [
-            "",
-            null
-        ])), n.push(v), t[0] ? o[0] |= 2 : (o[u - 2] = 0, o[u] = v)) : n.push(t);
-    }
-    return n;
-}, d2 = new Map;
-function w(p) {
-    var o = d2.get(this);
-    return o || (o = new Map, d2.set(this, o)), (o = a1(this, o.get(p) || (o.set(p, o = function(l) {
-        for(var n, v, u = 1, f = "", t = "", g = [
-            0
-        ], c = function(i) {
-            u === 1 && (i || (f = f.replace(/^\s*\n\s*|\s*\n\s*$/g, ""))) ? g.push(0, i, f) : u === 3 && (i || f) ? (g.push(3, i, f), u = 2) : u === 2 && f === "..." && i ? g.push(4, i, 0) : u === 2 && f && !i ? g.push(5, 0, !0, f) : u >= 5 && ((f || !i && u === 5) && (g.push(u, 0, f, v), u = 6), i && (g.push(u, i, 0, v), u = 6)), f = "";
-        }, s = 0; s < l.length; s++){
-            s && (u === 1 && c(), c(s));
-            for(var m = 0; m < l[s].length; m++)n = l[s][m], u === 1 ? n === "<" ? (c(), g = [
-                g
-            ], u = 3) : f += n : u === 4 ? f === "--" && n === ">" ? (u = 1, f = "") : f = n + f[0] : t ? n === t ? t = "" : f += n : n === '"' || n === "'" ? t = n : n === ">" ? (c(), u = 1) : u && (n === "=" ? (u = 5, v = f, f = "") : n === "/" && (u < 5 || l[s][m + 1] === ">") ? (c(), u === 3 && (g = g[0]), u = g, (g = g[0]).push(2, 0, u), u = 0) : n === " " || n === "	" || n === `
-` || n === "\r" ? (c(), u = 2) : f += n), u === 3 && f === "!--" && (u = 4, g = g[0]);
-        }
-        return c(), g;
-    }(p)), o), arguments, [])).length > 1 ? o : o[0];
-}
-const html1 = w.bind(ye);
-export { html1 as html, xe as render, Ce as Component, U1 as useEffect, O1 as useLayoutEffect, Y1 as useState, z1 as useRef, G1 as useMemo, W1 as useCallback, me as createContext, ke as createRef, X1 as useContext, ye as h, ue as cloneElement, he as hydrate,  };
diff --git a/frontend/imports/Preact.original.js b/frontend/imports/Preact.original.js
deleted file mode 100644
index da4dad275a..0000000000
--- a/frontend/imports/Preact.original.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// @ts-nocheck
-import {
-    //
-    render,
-    Component,
-    h,
-    cloneElement,
-    createContext,
-    createRef,
-    hydrate,
-    createRef,
-} from "https://esm.sh/preact@10.5.13?target=es2020"
-import {
-    //
-    useEffect,
-    useLayoutEffect,
-    useState,
-    useRef,
-    useMemo,
-    useCallback,
-    useContext,
-} from "https://esm.sh/preact@10.5.13/hooks?target=es2020"
-
-import htm from "https://esm.sh/htm@3.0.4?target=es2020"
-
-const html = htm.bind(h)
-
-export {
-    //
-    html,
-    render,
-    Component,
-    useEffect,
-    useLayoutEffect,
-    useState,
-    useRef,
-    useMemo,
-    useCallback,
-    createContext,
-    createRef,
-    useContext,
-    h,
-    cloneElement,
-    hydrate,
-}
diff --git a/frontend/imports/bundle.sh b/frontend/imports/bundle.sh
deleted file mode 100755
index 2dffc71c2e..0000000000
--- a/frontend/imports/bundle.sh
+++ /dev/null
@@ -1 +0,0 @@
-deno bundle Preact.original.js Preact.js

From fb2315f9b246ef385a7dc27147b0ad9d636d1899 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 7 Mar 2022 21:12:54 +0100
Subject: [PATCH 170/821] bundler: Support search and JS imports without
 extension

---
 frontend-bundler/package-lock.json                   |  7 +------
 .../parcel-resolver-like-a-browser/https-resolver.js | 12 ++++++++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index 05385627c0..691ca8b386 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -3462,8 +3462,7 @@
                 "esprima": "^4.0.1",
                 "estraverse": "^4.2.0",
                 "esutils": "^2.0.2",
-                "optionator": "^0.8.1",
-                "source-map": "~0.6.1"
+                "optionator": "^0.8.1"
             },
             "bin": {
                 "escodegen": "bin/escodegen.js",
@@ -4779,7 +4778,6 @@
             "hasInstallScript": true,
             "dependencies": {
                 "mkdirp": "^1.0.4",
-                "msgpackr": "^1.3.7",
                 "nan": "^2.14.2",
                 "node-gyp-build": "^4.2.3",
                 "ordered-binary": "^1.0.0",
@@ -5073,9 +5071,6 @@
             "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.4.5.tgz",
             "integrity": "sha512-AFmAehFqidJaSAWig6cp+8MZU3r7rtL1sgBxzXR9YICfG8vGRemCcVoqPG81CqRHdxP/VX/DyM85wltqPseXNw==",
             "optional": true,
-            "dependencies": {
-                "msgpackr-extract": "^1.0.14"
-            },
             "optionalDependencies": {
                 "msgpackr-extract": "^1.0.14"
             }
diff --git a/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js b/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
index 018dcfbdfa..07187bd706 100644
--- a/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
+++ b/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
@@ -41,12 +41,20 @@ module.exports = new Resolver({
             let url = new URL(specifier)
 
             if (url.port !== "") throw new Error(`Port in urls not supported yet (${specifier})`)
-            if (url.search !== "") throw new Error(`Search in urls not supported yet (${specifier})`)
             if (url.hash !== "") throw new Error(`Hash in urls not supported yet (${specifier})`)
             if (url.username !== "") throw new Error(`Username in urls not supported (${specifier})`)
             if (url.password !== "") throw new Error(`Password in urls not supported (${specifier})`)
 
-            let url_to_path = path.join(url.protocol.slice(0, -1), url.hostname, ...url.pathname.slice(1).split("/"))
+            // If no file extension is given in the URL, guess one automatically.
+            let found_extension = /\.[a-zA-Z][a-zA-Z0-9].$/.exec(url.pathname)?.[0]
+            let extension_to_add = found_extension ?? (dependency.specifierType === "esm" ? ".mjs" : null)
+            // If a search is given in the URL, this will search be appended to the path, so we need to repeat the extension.
+            let should_add_extension = url.search !== "" || found_extension == null
+            let suffix = should_add_extension ? extension_to_add : ""
+
+            // Create a folder structure and file for the import. This folder structure will match the URL structure, to make sure that relative imports still work.
+            let filename_parts = (url.pathname.slice(1) + encodeURIComponent(url.search) + suffix).split("/")
+            let url_to_path = path.join(url.protocol.slice(0, -1), url.hostname, ...filename_parts)
             let fullpath = path.join(my_temp_cave, url_to_path)
             let folder = path.dirname(fullpath)
 

From 8014caece313c503915224f5e4f50525712b05fa Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 7 Mar 2022 21:59:40 +0100
Subject: [PATCH 171/821] set_bond_values_reactive: is_first_values should be
 false by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

technically breaking because this fixes PlutoSliderServer 😅
---
 src/evaluation/RunBonds.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/evaluation/RunBonds.jl b/src/evaluation/RunBonds.jl
index 293dbac18a..ce53d1ffb0 100644
--- a/src/evaluation/RunBonds.jl
+++ b/src/evaluation/RunBonds.jl
@@ -1,7 +1,7 @@
 function set_bond_values_reactive(; 
     session::ServerSession, notebook::Notebook, 
     bound_sym_names::AbstractVector{Symbol}, 
-    is_first_values::AbstractVector{Bool}=[true for x in bound_sym_names], 
+    is_first_values::AbstractVector{Bool}=[false for x in bound_sym_names], 
     initiator=nothing,
     kwargs...
 )::Union{Task,TopologicalOrder}

From 51b660847eef964b657f3923df3adf3b0e7c20cd Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Mon, 7 Mar 2022 22:24:49 +0100
Subject: [PATCH 172/821] fix a bug where the stdout popup throws an error
 (#1968)

---
 frontend/components/Popup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/Popup.js b/frontend/components/Popup.js
index 5bc230dfc0..851a4566d2 100644
--- a/frontend/components/Popup.js
+++ b/frontend/components/Popup.js
@@ -81,7 +81,7 @@ const PkgPopup = ({ notebook, recent_event, clear_recent_event }) => {
         let still_valid = true
         if (recent_event == null) {
             set_pkg_status(null)
-        } else {
+        } else if (recent_event?.type === "nbpkg") {
             ;(pluto_actions.get_avaible_versions({ package_name: recent_event.package_name, notebook_id: notebook.notebook_id }) ?? Promise.resolve([])).then(
                 (versions) => {
                     if (still_valid) {

From e04d81d392553a33664a3764d6da506e5b60c143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Thu, 10 Mar 2022 19:16:49 +0200
Subject: [PATCH 173/821] Pluto Session event listeners interface: Frontend
 extension (#1742)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/common/Environment.js    | 18 ++++++++++
 frontend/components/Editor.js     | 29 ++++++++++++++--
 frontend/components/FilePicker.js |  2 --
 frontend/components/Welcome.js    | 57 +++++++++++++++++++++++++------
 src/Configuration.jl              |  3 ++
 src/webserver/SessionActions.jl   | 11 ++++--
 6 files changed, 102 insertions(+), 18 deletions(-)
 create mode 100644 frontend/common/Environment.js

diff --git a/frontend/common/Environment.js b/frontend/common/Environment.js
new file mode 100644
index 0000000000..c398a4ef9e
--- /dev/null
+++ b/frontend/common/Environment.js
@@ -0,0 +1,18 @@
+function environment({
+    client,
+    editor,
+    imports: {
+        preact: { html, useEffect, useState, useMemo },
+    },
+}) {
+    const noop = () => false
+
+    return {
+        custom_editor_header_component: noop,
+        custom_welcome: noop,
+        custom_recent: noop,
+        custom_filepicker: noop,
+    }
+}
+
+export default environment
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 9300b2ae42..5e58bf22fe 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1,4 +1,5 @@
-import { html, Component, useState, useEffect, useMemo } from "../imports/Preact.js"
+import { html, Component } from "../imports/Preact.js"
+import * as preact from "../imports/Preact.js"
 import immer, { applyPatches, produceWithPatches } from "../imports/immer.js"
 import _ from "../imports/lodash.js"
 
@@ -35,6 +36,9 @@ import { RawHTMLContainer } from "./CellOutput.js"
 import { RecordingPlaybackUI, RecordingUI } from "./RecordingUI.js"
 import { HijackExternalLinksToOpenInNewTab } from "./HackySideStuff/HijackExternalLinksToOpenInNewTab.js"
 
+// This is imported asynchronously - uncomment for development
+// import environment from "../common/Environment.js"
+
 const default_path = "..."
 const DEBUG_DIFFING = false
 
@@ -264,6 +268,10 @@ export class Editor extends Component {
             last_created_cell: null,
             selected_cells: [],
 
+            extended_components: {
+                CustomHeader: null,
+            },
+
             is_recording: false,
             recording_waiting_to_start: false,
         }
@@ -703,6 +711,16 @@ patch: ${JSON.stringify(
         const on_establish_connection = async (client) => {
             // nasty
             Object.assign(this.client, client)
+            try {
+                const { default: environment } = await import(this.client.session_options.server.injected_javascript_data_url)
+                const { custom_editor_header_component } = environment({ client, editor: this, imports: { preact } })
+                this.setState({
+                    extended_components: {
+                        ...this.state.extended_components,
+                        CustomHeader: custom_editor_header_component,
+                    },
+                })
+            } catch (e) {}
 
             // @ts-ignore
             window.version_info = this.client.version_info // for debugging
@@ -1259,9 +1277,14 @@ patch: ${JSON.stringify(
                             }>
                                 <h1><img id="logo-big" src=${url_logo_big} alt="Pluto.jl" /><img id="logo-small" src=${url_logo_small} /></h1>
                             </a>
+                            ${
+                                this.state.extended_components.CustomHeader &&
+                                html`<${this.state.extended_components.CustomHeader} notebook_id=${this.state.notebook.notebook_id} />`
+                            }
                             <div class="flex_grow_1"></div>
                             ${
-                                status.binder
+                                this.state.extended_components.CustomHeader == null &&
+                                (status.binder
                                     ? html`<pluto-filepicker><a href=${this.export_url("notebookfile")} target="_blank">Save notebook...</a></pluto-filepicker>`
                                     : html`<${FilePicker}
                                           client=${this.client}
@@ -1273,7 +1296,7 @@ patch: ${JSON.stringify(
                                           }}
                                           placeholder="Save notebook..."
                                           button_label=${notebook.in_temp_dir ? "Choose" : "Move"}
-                                      />`
+                                      />`)
                             }
                             <div class="flex_grow_2"></div>
                             <button class="toggle_export" title="Export..." onClick=${() => {
diff --git a/frontend/components/FilePicker.js b/frontend/components/FilePicker.js
index 14d3bc6c0d..d20b354db9 100644
--- a/frontend/components/FilePicker.js
+++ b/frontend/components/FilePicker.js
@@ -63,10 +63,8 @@ export class FilePicker extends Component {
     componentDidMount() {
         const usesDarkTheme = window.matchMedia('(prefers-color-scheme: dark)').matches;
         this.cm = new EditorView({
-            /** Migration #0: New */
             state: EditorState.create({
                 doc: "",
-
                 extensions: [
                     drawSelection(),
                     EditorView.domEventHandlers({
diff --git a/frontend/components/Welcome.js b/frontend/components/Welcome.js
index b29660cdd2..37511b0bf9 100644
--- a/frontend/components/Welcome.js
+++ b/frontend/components/Welcome.js
@@ -1,11 +1,15 @@
 import _ from "../imports/lodash.js"
-import { html, Component } from "../imports/Preact.js"
+import { html, Component, useEffect, useState, useMemo } from "../imports/Preact.js"
+import * as preact from "../imports/Preact.js"
 
 import { FilePicker } from "./FilePicker.js"
 import { create_pluto_connection, fetch_pluto_releases } from "../common/PlutoConnection.js"
 import { cl } from "../common/ClassTable.js"
 import { PasteHandler } from "./PasteHandler.js"
 
+// This is imported asynchronously - uncomment for development
+// import environment from "../common/Environment.js"
+
 /**
  * @typedef CombinedNotebook
  * @type {{
@@ -116,6 +120,17 @@ export class Welcome extends Component {
             // recent_notebooks: null,
             combined_notebooks: /** @type {Array<CombinedNotebook>} */ (null), // will become an array
             connected: false,
+            extended_components: {
+                show_samples: true,
+                CustomWelcome: null,
+                Picker: {},
+                Recent: ({ recents }) => html`
+                    <p>Recent sessions:</p>
+                    <ul id="recent">
+                        ${recents}
+                    </ul>
+                `,
+            },
         }
         const set_notebook_state = (this.set_notebook_state = (path, new_state_props) => {
             this.setState((prevstate) => {
@@ -174,12 +189,23 @@ export class Welcome extends Component {
             on_connection_status: on_connection_status,
             on_reconnect: () => true,
         })
-        this.client_promise.then((client) => {
+        this.client_promise.then(async (client) => {
             Object.assign(this.client, client)
-
+            try {
+                const { default: environment } = await import(this.client.session_options.server.injected_javascript_data_url)
+                const { custom_welcome, custom_recent, custom_filepicker, show_samples = true } = environment({ client, editor: this, imports: { preact } })
+                this.setState({
+                    extended_components: {
+                        ...this.state.extended_components,
+                        Recent: custom_recent,
+                        Welcome: custom_welcome,
+                        Picker: custom_filepicker,
+                        show_samples,
+                    },
+                })
+            } catch (e) {}
             this.client.send("get_all_notebooks", {}, {}).then(({ message }) => {
                 const running = message.notebooks.map((nb) => create_empty_notebook(nb.path, nb.notebook_id))
-
                 const recent_notebooks = get_stored_recent_notebooks()
 
                 // show running notebooks first, in the order defined by the recent notebooks, then recent notebooks
@@ -331,22 +357,31 @@ export class Welcome extends Component {
                 </li>`
             })
         }
+        const {
+            show_samples,
+            Recent,
+            Picker: { text: open_file_label, placeholder },
+        } = this.state.extended_components
 
         return html`<p>New session:</p>
             <${PasteHandler} />
             <ul id="new">
-                <li>Open a <a href="sample">sample notebook</a></li>
+                ${show_samples && html`<li>Open a <a href="sample">sample notebook</a></li>`}
                 <li>Create a <a href="new">new notebook</a></li>
                 <li>
-                    Open from file:
-                    <${FilePicker} client=${this.client} value="" on_submit=${this.on_open_path} button_label="Open" placeholder="Enter path or URL..." />
+                    ${open_file_label || "Open from file"}:
+                    <${FilePicker}
+                        key=${placeholder}
+                        client=${this.client}
+                        value=""
+                        on_submit=${this.on_open_path}
+                        button_label="Open"
+                        placeholder=${placeholder ?? "Enter path or URL..."}
+                    />
                 </li>
             </ul>
             <br />
-            <p>Recent sessions:</p>
-            <ul id="recent">
-                ${recents}
-            </ul>`
+            <${Recent} cl=${cl} combined=${this.state.combined_notebooks} client=${this.client} recents=${recents} />`
     }
 }
 
diff --git a/src/Configuration.jl b/src/Configuration.jl
index d55ffbfba7..6f152fe978 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -46,6 +46,8 @@ The HTTP server options. See [`SecurityOptions`](@ref) for additional settings.
 - `auto_reload_from_file_ignore_pkg::Bool = false` Experimental flag, will be removed
 - `notebook::Union{Nothing,String} = nothing` Optional path of notebook to launch at start
 - `simulated_lag::Real=0.0` (internal) Extra lag to add to our server responses. Will be multiplied by `0.5 + rand()`.
+- `injected_javascript_data_url`::String = "data:text/javascript;base64," (internal) Optional javascript injectables to the front-end. Can be used to customize the editor, but this API is not meant for general use yet.
+
 """
 @option mutable struct ServerOptions
     root_url::Union{Nothing,String} = nothing
@@ -62,6 +64,7 @@ The HTTP server options. See [`SecurityOptions`](@ref) for additional settings.
     notebook::Union{Nothing,String,Vector{<:String}} = nothing
     init_with_file_viewer::Bool = false
     simulated_lag::Real = 0.0
+    injected_javascript_data_url::String = "data:text/javascript;base64,"
     on_event::Function = function(a) #= @info "$(typeof(a))" =# end
 end
 
diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 5f7fb2ffd7..2217e137dc 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -19,8 +19,15 @@ function Base.showerror(io::IO, e::UserError)
 end
 
 function open_url(session::ServerSession, url::AbstractString; kwargs...)
-    path = download_cool(url, emptynotebook().path)
-    open(session, path; kwargs...)
+    random_notebook = emptynotebook()
+    path = download_cool(url, random_notebook.path)
+    result = try_event_call(session, NewNotebookEvent(random_notebook))
+    nb = if result isa UUID
+        open(session, path; notebook_id=result, kwargs...)
+    else
+        open(session, path; kwargs...)
+    end
+    return nb
 end
 
 "Open the notebook at `path` into `session::ServerSession` and run it. Returns the `Notebook`."

From 87affb44bba0ce2a12d92f13a58df6742d5157e0 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 11 Mar 2022 13:41:16 +0100
Subject: [PATCH 174/821] some extra API

---
 src/analysis/ReactiveNode.jl | 4 ++++
 src/evaluation/Run.jl        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/analysis/ReactiveNode.jl b/src/analysis/ReactiveNode.jl
index 927474db7d..1a65180ef9 100644
--- a/src/analysis/ReactiveNode.jl
+++ b/src/analysis/ReactiveNode.jl
@@ -69,3 +69,7 @@ end
 
 # Convenience functions
 ReactiveNode(code::String) = ReactiveNode(try_compute_symbolreferences(Meta.parse(code)))
+ReactiveNode(code::Expr) = error("Use ReactiveNode_from_expr(code) instead.")
+
+# Mot just a method of ReactiveNode because an expression is not necessarily a `Expr`, e.g. `Meta.parse("\"hello!\"") isa String`.
+ReactiveNode_from_expr(expr::Any) = ReactiveNode(try_compute_symbolreferences(expr))
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index e94493ed4d..8ab766bc76 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -517,7 +517,7 @@ function update_save_run!(
 end
 
 update_save_run!(session::ServerSession, notebook::Notebook, cell::Cell; kwargs...) = update_save_run!(session, notebook, [cell]; kwargs...)
-update_run!(args...) = update_save_run!(args...; save=false)
+update_run!(args...; kwargs...) = update_save_run!(args...; save=false, kwargs...)
 
 function notebook_differences(from::Notebook, to::Notebook)
 	old_codes = Dict(

From 828835c46cedb77ea16f4ef32975d2435394aad6 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 11 Mar 2022 14:06:35 +0100
Subject: [PATCH 175/821] Update Preact.d.ts

---
 frontend/imports/Preact.d.ts | 42 ++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/frontend/imports/Preact.d.ts b/frontend/imports/Preact.d.ts
index 3b2382415b..c86a0fa748 100644
--- a/frontend/imports/Preact.d.ts
+++ b/frontend/imports/Preact.d.ts
@@ -1,23 +1,51 @@
 declare class ReactElement {}
 
-type ValidRenderResult = number | string | Array<ReactElement> | ReactElement
+type ComponentChild = number | string | Array<ReactElement> | ReactElement
 
 type Dispatch<A> = (value: A) => void
 type SetStateAction<S> = S | ((prevState: S) => S)
 
-export declare class Component<State = {}> {
-    state: State
+export interface ErrorInfo {
+	componentStack?: string;
+}
+
+export declare class Component<P = {}, S = {}> {
+	constructor(props?: P, context?: any);
+    
+    componentWillMount?(): void;
+	componentDidMount?(): void;
+	componentWillUnmount?(): void;
+	getChildContext?(): object;
+	componentWillReceiveProps?(nextProps: Readonly<P>, nextContext: any): void;
+	shouldComponentUpdate?(
+		nextProps: Readonly<P>,
+		nextState: Readonly<S>,
+		nextContext: any
+	): boolean;
+	componentWillUpdate?(
+		nextProps: Readonly<P>,
+		nextState: Readonly<S>,
+		nextContext: any
+	): void;
+	getSnapshotBeforeUpdate?(oldProps: Readonly<P>, oldState: Readonly<S>): any;
+	componentDidUpdate?(
+		previousProps: Readonly<P>,
+		previousState: Readonly<S>,
+		snapshot: any
+	): void;
+	componentDidCatch?(error: any, errorInfo: ErrorInfo): void;
+    state: S
     setState(state: any, callback?: any): void
     props: any
     base: HTMLElement
-    render(): ValidRenderResult
+    render(): ComponentChild
 }
 
 export declare function html(strings: TemplateStringsArray, ...interpolations: Array<any>): ReactElement
 
-export declare function render(vnode: ValidRenderResult, parent: Element | Document | ShadowRoot | DocumentFragment, replaceNode?: Element | Text): void
-export declare function hydrate(vnode: ValidRenderResult, parent: Element | Document | ShadowRoot | DocumentFragment): void
-export declare function cloneElement(vnode: ReactElement, props?: any, ...children: ValidRenderResult[]): ReactElement
+export declare function render(vnode: ComponentChild, parent: Element | Document | ShadowRoot | DocumentFragment, replaceNode?: Element | Text): void
+export declare function hydrate(vnode: ComponentChild, parent: Element | Document | ShadowRoot | DocumentFragment): void
+export declare function cloneElement(vnode: ReactElement, props?: any, ...children: ComponentChild[]): ReactElement
 export declare function h(type: string, props: any, ...children: any[]): ReactElement
 
 declare function SetState<T>(value: T): void

From e92fd454a1917d767840af94052910e1cb88817c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 11 Mar 2022 14:07:16 +0100
Subject: [PATCH 176/821] Move launch_params out of Editor.js

---
 frontend/components/Editor.js | 45 ++++++++++-------------------------
 frontend/editor.js            | 27 ++++++++++++++++++++-
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 5e58bf22fe..b8bc4a516a 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -66,7 +66,7 @@ const ProcessStatus = {
 /**
  * Map of status => Bool. In order of decreasing prioirty.
  */
-const statusmap = (state) => ({
+const statusmap = (state, launch_params) => ({
     disconnected: !(state.connected || state.initializing || state.static_preview),
     loading:
         (state.binder_phase != null && BinderPhase.wait_for_user < state.binder_phase && state.binder_phase < BinderPhase.ready) ||
@@ -189,37 +189,12 @@ const first_true_key = (obj) => {
 const url_logo_big = document.head.querySelector("link[rel='pluto-logo-big']").getAttribute("href")
 const url_logo_small = document.head.querySelector("link[rel='pluto-logo-small']").getAttribute("href")
 
-const url_params = new URLSearchParams(window.location.search)
-const launch_params = {
-    //@ts-ignore
-    notebook_id: url_params.get("id") ?? window.pluto_notebook_id,
-    //@ts-ignore
-    statefile: url_params.get("statefile") ?? window.pluto_statefile,
-    //@ts-ignore
-    notebookfile: url_params.get("notebookfile") ?? window.pluto_notebookfile,
-    //@ts-ignore
-    disable_ui: !!(url_params.get("disable_ui") ?? window.pluto_disable_ui),
-    //@ts-ignore
-    preamble_html: url_params.get("preamble_html") ?? window.pluto_preamble_html,
-    //@ts-ignore
-    isolated_cell_ids: url_params.has("isolated_cell_id") ? url_params.getAll("isolated_cell_id") : window.pluto_isolated_cell_ids,
-    //@ts-ignore
-    binder_url: url_params.get("binder_url") ?? window.pluto_binder_url,
-    //@ts-ignore
-    slider_server_url: url_params.get("slider_server_url") ?? window.pluto_slider_server_url,
-    //@ts-ignore
-    recording_url: url_params.get("recording_url") ?? window.pluto_recording_url,
-    //@ts-ignore
-    recording_audio_url: url_params.get("recording_audio_url") ?? window.pluto_recording_audio_url,
-}
-console.log("Launch parameters: ", launch_params)
-
 /**
  *
  * @returns {NotebookData}
  */
-const initial_notebook = () => ({
-    notebook_id: launch_params.notebook_id,
+const initial_notebook = ({ notebook_id }) => ({
+    notebook_id: notebook_id,
     path: default_path,
     shortpath: "",
     in_temp_dir: true,
@@ -237,11 +212,14 @@ const initial_notebook = () => ({
 })
 
 export class Editor extends Component {
-    constructor() {
-        super()
+    constructor(props) {
+        super(props)
+
+        console.log(this.props)
+        const { launch_params } = this.props
 
         this.state = {
-            notebook: /** @type {NotebookData} */ initial_notebook(),
+            notebook: /** @type {NotebookData} */ initial_notebook(this.props.launch_params),
             cell_inputs_local: /** @type {{ [id: string]: CellInputData }} */ ({}),
             desired_doc_query: null,
             recently_deleted: /** @type {Array<{ index: number, cell: CellInputData }>} */ (null),
@@ -1198,13 +1176,14 @@ patch: ${JSON.stringify(
     }
 
     componentWillUpdate(new_props, new_state) {
-        this.cached_status = statusmap(new_state)
+        this.cached_status = statusmap(new_state, this.props.launch_params)
     }
 
     render() {
+        const { launch_params } = this.props
         let { export_menu_open, notebook } = this.state
 
-        const status = this.cached_status ?? statusmap(this.state)
+        const status = this.cached_status ?? statusmap(this.state, launch_params)
         const statusval = first_true_key(status)
 
         if (status.isolated_cell_view) {
diff --git a/frontend/editor.js b/frontend/editor.js
index 7ee766bedd..ecbb9f8c00 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -3,5 +3,30 @@ import "./common/NodejsCompatibilityPolyfill.js"
 
 import { Editor } from "./components/Editor.js"
 
+const url_params = new URLSearchParams(window.location.search)
+const launch_params = {
+    //@ts-ignore
+    notebook_id: url_params.get("id") ?? window.pluto_notebook_id,
+    //@ts-ignore
+    statefile: url_params.get("statefile") ?? window.pluto_statefile,
+    //@ts-ignore
+    notebookfile: url_params.get("notebookfile") ?? window.pluto_notebookfile,
+    //@ts-ignore
+    disable_ui: !!(url_params.get("disable_ui") ?? window.pluto_disable_ui),
+    //@ts-ignore
+    preamble_html: url_params.get("preamble_html") ?? window.pluto_preamble_html,
+    //@ts-ignore
+    isolated_cell_ids: url_params.has("isolated_cell_id") ? url_params.getAll("isolated_cell_id") : window.pluto_isolated_cell_ids,
+    //@ts-ignore
+    binder_url: url_params.get("binder_url") ?? window.pluto_binder_url,
+    //@ts-ignore
+    slider_server_url: url_params.get("slider_server_url") ?? window.pluto_slider_server_url,
+    //@ts-ignore
+    recording_url: url_params.get("recording_url") ?? window.pluto_recording_url,
+    //@ts-ignore
+    recording_audio_url: url_params.get("recording_audio_url") ?? window.pluto_recording_audio_url,
+}
+console.log("Launch parameters: ", launch_params)
+
 // it's like a Rube Goldberg machine
-render(html`<${Editor} />`, document.body)
+render(html`<${Editor} launch_params=${launch_params} />`, document.body)

From 77e2f3fd55e9553038ea1addecd2652e5cf9b8fa Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 11 Mar 2022 14:30:54 +0100
Subject: [PATCH 177/821] Update Preact.d.ts

---
 frontend/imports/Preact.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/imports/Preact.d.ts b/frontend/imports/Preact.d.ts
index c86a0fa748..f22f8bb5eb 100644
--- a/frontend/imports/Preact.d.ts
+++ b/frontend/imports/Preact.d.ts
@@ -36,7 +36,7 @@ export declare class Component<P = {}, S = {}> {
 	componentDidCatch?(error: any, errorInfo: ErrorInfo): void;
     state: S
     setState(state: any, callback?: any): void
-    props: any
+    props: P
     base: HTMLElement
     render(): ComponentChild
 }

From 00bf3662b1b74a7e7f59ede4652d87fbb3bf10d5 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 11 Mar 2022 14:30:54 +0100
Subject: [PATCH 178/821] Update Preact.d.ts

---
 frontend/imports/Preact.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/imports/Preact.d.ts b/frontend/imports/Preact.d.ts
index c86a0fa748..f22f8bb5eb 100644
--- a/frontend/imports/Preact.d.ts
+++ b/frontend/imports/Preact.d.ts
@@ -36,7 +36,7 @@ export declare class Component<P = {}, S = {}> {
 	componentDidCatch?(error: any, errorInfo: ErrorInfo): void;
     state: S
     setState(state: any, callback?: any): void
-    props: any
+    props: P
     base: HTMLElement
     render(): ComponentChild
 }

From 23afa24c3fda3474104cc9526380edda0922f3b6 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 11 Mar 2022 15:17:46 +0100
Subject: [PATCH 179/821] Move initial state download out of Editor.js

---
 frontend/components/Editor.js | 96 +++++++++++++++--------------------
 frontend/editor.js            | 91 +++++++++++++++++++++++++++++++--
 2 files changed, 129 insertions(+), 58 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index b8bc4a516a..b0e94215b3 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -3,6 +3,7 @@ import * as preact from "../imports/Preact.js"
 import immer, { applyPatches, produceWithPatches } from "../imports/immer.js"
 import _ from "../imports/lodash.js"
 
+import { empty_notebook_state, set_disable_ui_css } from "../editor.js"
 import { create_pluto_connection } from "../common/PlutoConnection.js"
 import { init_feedback } from "../common/Feedback.js"
 import { serialize_cells, deserialize_cells, detect_deserializer } from "../common/Serialization.js"
@@ -21,13 +22,9 @@ import { Popup } from "./Popup.js"
 
 import { slice_utf8, length_utf8 } from "../common/UnicodeTools.js"
 import { has_ctrl_or_cmd_pressed, ctrl_or_cmd_name, is_mac_keyboard, in_textarea_or_input } from "../common/KeyboardShortcuts.js"
-import { handle_log } from "../common/Logging.js"
 import { PlutoContext, PlutoBondsContext, PlutoJSInitializingContext, SetWithEmptyCallback } from "../common/PlutoContext.js"
-import { unpack } from "../common/MsgPack.js"
-import { PkgTerminalView } from "./PkgTerminalView.js"
 import { start_binder, BinderPhase, count_stat } from "../common/Binder.js"
 import { setup_mathjax } from "../common/SetupMathJax.js"
-import { read_Uint8Array_with_progress, FetchProgress } from "./FetchProgress.js"
 import { BinderButton } from "./BinderButton.js"
 import { slider_server_actions, nothing_actions } from "../common/SliderServerClient.js"
 import { ProgressBar } from "./ProgressBar.js"
@@ -39,7 +36,7 @@ import { HijackExternalLinksToOpenInNewTab } from "./HackySideStuff/HijackExtern
 // This is imported asynchronously - uncomment for development
 // import environment from "../common/Environment.js"
 
-const default_path = "..."
+export const default_path = "..."
 const DEBUG_DIFFING = false
 
 // from our friends at https://stackoverflow.com/a/2117523
@@ -165,6 +162,22 @@ const first_true_key = (obj) => {
  * }}
  */
 
+/**
+ * @typedef LaunchParameters
+ * @type {{
+ *  notebook_id: string?,
+ *  statefile: string?,
+ *  notebookfile: string?,
+ *  disable_ui: boolean,
+ *  preamble_html: string?,
+ *  isolated_cell_ids: string[]?,
+ *  binder_url: string?,
+ *  slider_server_url: string?,
+ *  recording_url: string?,
+ *  recording_audio_url: string?,
+ * }}
+ */
+
 /**
  * @typedef NotebookData
  * @type {{
@@ -190,36 +203,19 @@ const url_logo_big = document.head.querySelector("link[rel='pluto-logo-big']").g
 const url_logo_small = document.head.querySelector("link[rel='pluto-logo-small']").getAttribute("href")
 
 /**
- *
- * @returns {NotebookData}
+ * @typedef EditorProps
+ * @type {{launch_params: LaunchParameters,initial_notebook_state: NotebookData,}}
+ * @augments Component<EditorProps,{}>
  */
-const initial_notebook = ({ notebook_id }) => ({
-    notebook_id: notebook_id,
-    path: default_path,
-    shortpath: "",
-    in_temp_dir: true,
-    process_status: "starting",
-    last_save_time: 0.0,
-    last_hot_reload_time: 0.0,
-    cell_inputs: {},
-    cell_results: {},
-    cell_dependencies: {},
-    cell_order: [],
-    cell_execution_order: [],
-    published_objects: {},
-    bonds: {},
-    nbpkg: null,
-})
-
 export class Editor extends Component {
-    constructor(props) {
+    constructor(/** @type {EditorProps} */ props) {
         super(props)
 
         console.log(this.props)
-        const { launch_params } = this.props
+        const { launch_params, initial_notebook_state } = this.props
 
         this.state = {
-            notebook: /** @type {NotebookData} */ initial_notebook(this.props.launch_params),
+            notebook: /** @type {NotebookData} */ initial_notebook_state,
             cell_inputs_local: /** @type {{ [id: string]: CellInputData }} */ ({}),
             desired_doc_query: null,
             recently_deleted: /** @type {Array<{ index: number, cell: CellInputData }>} */ (null),
@@ -227,7 +223,6 @@ export class Editor extends Component {
 
             disable_ui: launch_params.disable_ui,
             static_preview: launch_params.statefile != null,
-            statefile_download_progress: null,
             offer_binder: launch_params.notebookfile != null && launch_params.binder_url != null,
             binder_phase: null,
             binder_session_url: null,
@@ -647,7 +642,10 @@ patch: ${JSON.stringify(
                         let apply_promise = Promise.resolve()
                         if (message?.response?.from_reset) {
                             console.log("Trying to reset state after failure")
-                            apply_promise = apply_notebook_patches(message.patches, initial_notebook()).catch((e) => {
+                            apply_promise = apply_notebook_patches(
+                                message.patches,
+                                empty_notebook_state({ notebook_id: this.state.notebook.notebook_id })
+                            ).catch((e) => {
                                 alert("Oopsie!! please refresh your browser and everything will be alright!")
                                 throw e
                             })
@@ -748,7 +746,7 @@ patch: ${JSON.stringify(
                       actions: this.actions,
                       launch_params: launch_params,
                       apply_notebook_patches,
-                      get_original_state: () => this.original_state,
+                      get_original_state: () => this.props.initial_notebook_state,
                       get_current_state: () => this.state.notebook,
                   })
                 : nothing_actions({
@@ -756,30 +754,18 @@ patch: ${JSON.stringify(
                   })
 
         this.on_disable_ui = () => {
-            document.body.classList.toggle("disable_ui", this.state.disable_ui)
-            document.head.querySelector("link[data-pluto-file='hide-ui']").setAttribute("media", this.state.disable_ui ? "all" : "print")
+            set_disable_ui_css(this.state.disable_ui)
+
             //@ts-ignore
             this.actions = this.state.disable_ui || (launch_params.slider_server_url != null && !this.state.connected) ? this.fake_actions : this.real_actions //heyo
         }
         this.on_disable_ui()
 
-        this.original_state = null
         if (this.state.static_preview) {
-            ;(async () => {
-                const r = await fetch(launch_params.statefile)
-                const data = await read_Uint8Array_with_progress(r, (progress) => {
-                    this.setState({
-                        statefile_download_progress: progress,
-                    })
-                })
-                const state = unpack(data)
-                this.original_state = state
-                this.setState({
-                    notebook: state,
-                    initializing: false,
-                    binder_phase: this.state.offer_binder ? BinderPhase.wait_for_user : null,
-                })
-            })()
+            this.setState({
+                initializing: false,
+                binder_phase: this.state.offer_binder ? BinderPhase.wait_for_user : null,
+            })
             // view stats on https://stats.plutojl.org/
             count_stat(`article-view`)
         } else {
@@ -1317,16 +1303,16 @@ patch: ${JSON.stringify(
                         reset_notebook_state=${() =>
                             this.setStatePromise(
                                 immer((state) => {
-                                    state.notebook = this.original_state
+                                    state.notebook = this.props.initial_notebook_state
                                 })
                             )}
                     />
                     
-                    <${BinderButton} binder_phase=${this.state.binder_phase} start_binder=${() =>
-            start_binder({ setStatePromise: this.setStatePromise, connect: this.connect, launch_params: launch_params })} notebookfile=${
-            launch_params.notebookfile == null ? null : new URL(launch_params.notebookfile, window.location.href).href
-        } />
-                    <${FetchProgress} progress=${this.state.statefile_download_progress} />
+                    <${BinderButton} 
+                        binder_phase=${this.state.binder_phase} 
+                        start_binder=${() => start_binder({ setStatePromise: this.setStatePromise, connect: this.connect, launch_params: launch_params })} 
+                        notebookfile=${launch_params.notebookfile == null ? null : new URL(launch_params.notebookfile, window.location.href).href} />
+                    
                     ${launch_params.preamble_html ? html`<${RawHTMLContainer} body=${launch_params.preamble_html} className=${"preamble"} />` : null}
                     <${Main}>
                         <${Preamble}
diff --git a/frontend/editor.js b/frontend/editor.js
index ecbb9f8c00..a052ccf241 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -1,9 +1,18 @@
-import { html, render } from "./imports/Preact.js"
+import { html, render, useEffect, useRef, useState } from "./imports/Preact.js"
 import "./common/NodejsCompatibilityPolyfill.js"
 
-import { Editor } from "./components/Editor.js"
+import { Editor, default_path } from "./components/Editor.js"
+import { FetchProgress, read_Uint8Array_with_progress } from "./components/FetchProgress.js"
+import { BinderPhase } from "./common/Binder.js"
+import { unpack } from "./common/MsgPack.js"
+import { RawHTMLContainer } from "./components/CellOutput.js"
 
 const url_params = new URLSearchParams(window.location.search)
+
+/**
+ *
+ * @type {import("./components/Editor.js").LaunchParameters}
+ */
 const launch_params = {
     //@ts-ignore
     notebook_id: url_params.get("id") ?? window.pluto_notebook_id,
@@ -28,5 +37,81 @@ const launch_params = {
 }
 console.log("Launch parameters: ", launch_params)
 
+/**
+ *
+ * @returns {import("./components/Editor.js").NotebookData}
+ */
+export const empty_notebook_state = ({ notebook_id }) => ({
+    notebook_id: notebook_id,
+    path: default_path,
+    shortpath: "",
+    in_temp_dir: true,
+    process_status: "starting",
+    last_save_time: 0.0,
+    last_hot_reload_time: 0.0,
+    cell_inputs: {},
+    cell_results: {},
+    cell_dependencies: {},
+    cell_order: [],
+    cell_execution_order: [],
+    published_objects: {},
+    bonds: {},
+    nbpkg: null,
+})
+
+/**
+ *
+ * @param {{
+ *  launch_params: import("./components/Editor.js").LaunchParameters,
+ * }} props
+ */
+const EditorLoader = ({ launch_params }) => {
+    const static_preview = launch_params.statefile != null
+
+    const [statefile_download_progress, set_statefile_download_progress] = useState(null)
+
+    const initial_notebook_state_ref = useRef(empty_notebook_state(launch_params))
+    const [ready_for_editor, set_ready_for_editor] = useState(!static_preview)
+
+    useEffect(() => {
+        if (!ready_for_editor && static_preview) {
+            ;(async () => {
+                const r = await fetch(launch_params.statefile)
+                const data = await read_Uint8Array_with_progress(r, set_statefile_download_progress)
+                const state = unpack(data)
+                initial_notebook_state_ref.current = state
+                set_ready_for_editor(true)
+            })()
+        }
+    }, [ready_for_editor, static_preview, launch_params.statefile])
+
+    useEffect(() => {
+        set_disable_ui_css(launch_params.disable_ui)
+    }, [launch_params.disable_ui])
+
+    const preamble_element = launch_params.preamble_html ? html`<${RawHTMLContainer} body=${launch_params.preamble_html} className=${"preamble"} />` : null
+
+    return ready_for_editor
+        ? html`<${Editor} initial_notebook_state=${initial_notebook_state_ref.current} launch_params=${launch_params} preamble_element=${preamble_element} />`
+        : // todo: show preamble html
+          html`
+              ${preamble_element}
+              <${FetchProgress} progress=${statefile_download_progress} />
+          `
+}
+
 // it's like a Rube Goldberg machine
-render(html`<${Editor} launch_params=${launch_params} />`, document.body)
+render(html`<${EditorLoader} launch_params=${launch_params} />`, document.body)
+
+//////////////
+// utils:
+
+const set_attribute_if_needed = (element, attr, value) => {
+    if (element.getAttribute(attr) !== value) {
+        element.setAttribute(attr, value)
+    }
+}
+export const set_disable_ui_css = (val) => {
+    document.body.classList.toggle("disable_ui", val)
+    set_attribute_if_needed(document.head.querySelector("link[data-pluto-file='hide-ui']"), "media", val ? "all" : "print")
+}

From a3625c86ac5eee9fc8699d29f8d940dab4445d69 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 11 Mar 2022 15:33:59 +0100
Subject: [PATCH 180/821] weird

---
 frontend/editor.js | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/frontend/editor.js b/frontend/editor.js
index a052ccf241..156dd330e6 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -9,6 +9,22 @@ import { RawHTMLContainer } from "./components/CellOutput.js"
 
 const url_params = new URLSearchParams(window.location.search)
 
+//////////////
+// utils:
+
+const set_attribute_if_needed = (element, attr, value) => {
+    if (element.getAttribute(attr) !== value) {
+        element.setAttribute(attr, value)
+    }
+}
+export const set_disable_ui_css = (val) => {
+    document.body.classList.toggle("disable_ui", val)
+    set_attribute_if_needed(document.head.querySelector("link[data-pluto-file='hide-ui']"), "media", val ? "all" : "print")
+}
+
+/////////////
+// the rest:
+
 /**
  *
  * @type {import("./components/Editor.js").LaunchParameters}
@@ -102,16 +118,3 @@ const EditorLoader = ({ launch_params }) => {
 
 // it's like a Rube Goldberg machine
 render(html`<${EditorLoader} launch_params=${launch_params} />`, document.body)
-
-//////////////
-// utils:
-
-const set_attribute_if_needed = (element, attr, value) => {
-    if (element.getAttribute(attr) !== value) {
-        element.setAttribute(attr, value)
-    }
-}
-export const set_disable_ui_css = (val) => {
-    document.body.classList.toggle("disable_ui", val)
-    set_attribute_if_needed(document.head.querySelector("link[data-pluto-file='hide-ui']"), "media", val ? "all" : "print")
-}

From c45c5921977b00d88dedbafdaabe22e9dc985507 Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Fri, 11 Mar 2022 17:27:47 +0100
Subject: [PATCH 181/821] Make `currentScript` (not `document.currentScript`)
 work inside shadowdom

---
 frontend/components/CellOutput.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index c7d4beec5b..72142b74fc 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -248,13 +248,13 @@ let execute_inside_script_tag_that_replaces = async (script_element, fn) => {
         //@ts-ignore because of https://github.com/microsoft/TypeScript-DOM-lib-generator/issues/1260
         new_script_tag.attributes.setNamedItem(attr.cloneNode(true))
     }
+    new_script_tag.textContent = `{
+        window.____FUNCTION_TO_RUN_INSIDE_SCRIPT.result = window.____FUNCTION_TO_RUN_INSIDE_SCRIPT.function_to_run(window.____FUNCTION_TO_RUN_INSIDE_SCRIPT.currentScript)
+    }`
 
     // @ts-ignore
     // I use this long variable name to pass the function and result to and from the script we created
-    window.____FUNCTION_TO_RUN_INSIDE_SCRIPT = { function_to_run: fn, result: null }
-    new_script_tag.textContent = `{
-        window.____FUNCTION_TO_RUN_INSIDE_SCRIPT.result = window.____FUNCTION_TO_RUN_INSIDE_SCRIPT.function_to_run()
-    }`
+    window.____FUNCTION_TO_RUN_INSIDE_SCRIPT = { function_to_run: fn, currentScript: new_script_tag, result: null }
     // Put the script in the DOM, this will run the script
     script_element.parentNode.replaceChild(new_script_tag, script_element)
     // @ts-ignore - Get the result back
@@ -326,11 +326,11 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
                     }
 
                     const cell = root_node.closest("pluto-cell")
-                    let { node: new_node, result } = await execute_inside_script_tag_that_replaces(node, async () => {
+                    let { node: new_node, result } = await execute_inside_script_tag_that_replaces(node, async (currentScript) => {
                         return await execute_dynamic_function({
                             environment: {
                                 this: script_id ? old_result : window,
-                                currentScript: document.currentScript,
+                                currentScript: currentScript,
                                 invalidation: invalidation,
                                 getPublishedObject: (id) => cell.getPublishedObject(id),
                                 ...observablehq_for_cells,

From 29687f923b623f53464c68fa9ac77f6f476f1e0b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 00:07:10 +0100
Subject: [PATCH 182/821] make css independent on position wrt body

---
 frontend/components/Editor.js |  2 +-
 frontend/editor.css           | 46 +++++++++++++++++------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index b0e94215b3..8335592570 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1217,7 +1217,7 @@ patch: ${JSON.stringify(
                     <${PlutoJSInitializingContext.Provider} value=${this.js_init_set}>
                     <${Scroller} active=${this.state.scroller} />
                     <${ProgressBar} notebook=${this.state.notebook} binder_phase=${this.state.binder_phase} status=${status}/>
-                    <header className=${export_menu_open ? "show_export" : ""}>
+                    <header id="pluto-nav" className=${export_menu_open ? "show_export" : ""}>
                         <${ExportBanner}
                             notebookfile_url=${this.export_url("notebookfile")}
                             notebookexport_url=${this.export_url("notebookexport")}
diff --git a/frontend/editor.css b/frontend/editor.css
index 7ca1d0eb3e..7fc6909659 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -446,7 +446,7 @@ pluto-output mjx-assistive-mml {
 
 /* HEADER */
 
-body > header {
+header#pluto-nav {
     /* position: absolute;
     top: 0px; */
     width: 100%;
@@ -461,7 +461,7 @@ body > header {
     font-size: 0.75rem;
 }
 
-body > header.show_export {
+header#pluto-nav.show_export {
     position: sticky;
     top: 0;
     transform: translateY(130px);
@@ -717,10 +717,10 @@ nav#at_the_top:after {
     }
 }
 
-body.binder > header > nav#at_the_top > pluto-filepicker > * {
+body.binder header#pluto-nav > nav#at_the_top > pluto-filepicker > * {
     display: none;
 }
-body.binder > header > nav#at_the_top > pluto-filepicker > a {
+body.binder header#pluto-nav > nav#at_the_top > pluto-filepicker > a {
     display: block;
     font-size: 16px;
     font-family: var(--julia-mono-font-stack);
@@ -728,33 +728,33 @@ body.binder > header > nav#at_the_top > pluto-filepicker > a {
     text-decoration: none;
 }
 
-body.nbpkg_restart_recommended > header,
-body.nbpkg_restart_required > header,
-body.binder.loading > header,
-body.process_dead > header,
-body.disconnected > header {
+body.nbpkg_restart_recommended header#pluto-nav,
+body.nbpkg_restart_required header#pluto-nav,
+body.binder.loading header#pluto-nav,
+body.process_dead header#pluto-nav,
+body.disconnected header#pluto-nav {
     position: sticky;
     top: 0;
     backdrop-filter: blur(10px);
     -webkit-backdrop-filter: blur(10px);
 }
 
-body.nbpkg_restart_recommended > header {
+body.nbpkg_restart_recommended header#pluto-nav {
     background-color: var(--restart-recc-header-color);
 }
-body.nbpkg_restart_required > header {
+body.nbpkg_restart_required header#pluto-nav {
     background-color: var(--restart-req-header-color);
 }
-body.process_dead > header {
+body.process_dead header#pluto-nav {
     background-color: var(--dead-process-header-color);
 }
-body.loading > header {
+body.loading header#pluto-nav {
     background-color: var(--loading-header-color);
 }
-body.disconnected > header {
+body.disconnected header#pluto-nav {
     background-color: var(--disconnected-header-color);
 }
-body.binder.loading > header {
+body.binder.loading header#pluto-nav {
     background-color: var(--binder-loading-header-color);
 }
 
@@ -838,8 +838,8 @@ body.is_recording .outline-frame.recording {
     box-shadow: inset 0px 0px 20px 20px #919bff2b;
 }
 
-body.recording_waiting_to_start > header,
-body.is_recording > header {
+body.recording_waiting_to_start header#pluto-nav,
+body.is_recording header#pluto-nav {
     display: none;
 }
 
@@ -2153,7 +2153,7 @@ footer input {
     border-right: none;
 }
 
-body > header pluto-filepicker button,
+header#pluto-nav pluto-filepicker button,
 footer button {
     margin: 0px;
     background: var(--footer-filepicker-focus-color);
@@ -2509,7 +2509,7 @@ body.presentation #helpbox-wrapper {
     display: none !important;
 }
 
-body > nav#slide_controls {
+nav#slide_controls {
     display: none;
 }
 body.presentation > nav#slide_controls {
@@ -2520,23 +2520,23 @@ body.presentation > nav#slide_controls {
     z-index: 100;
 }
 
-body > nav#slide_controls > button {
+nav#slide_controls > button {
     position: static;
     padding: 5px;
 }
 
-body > nav#slide_controls > button > span::after {
+nav#slide_controls > button > span::after {
     content: " " !important;
     display: block;
     height: 30px;
     width: 30px;
     background-size: 30px 30px;
 }
-body > nav#slide_controls > button.prev > span::after {
+nav#slide_controls > button.prev > span::after {
     background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-back-outline.svg);
     filter: var(--image-filters);
 }
-body > nav#slide_controls > button.next > span::after {
+nav#slide_controls > button.next > span::after {
     background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-forward-outline.svg);
     filter: var(--image-filters);
 }

From db12cadf2b6c75cccad851fd89a5381bd66ff8c2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 00:21:48 +0100
Subject: [PATCH 183/821] Make css independent of position wrt body (#1975)

---
 frontend/components/Editor.js |  2 +-
 frontend/editor.css           | 46 +++++++++++++++++------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 5e58bf22fe..7c4d603b15 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1252,7 +1252,7 @@ patch: ${JSON.stringify(
                     <${PlutoJSInitializingContext.Provider} value=${this.js_init_set}>
                     <${Scroller} active=${this.state.scroller} />
                     <${ProgressBar} notebook=${this.state.notebook} binder_phase=${this.state.binder_phase} status=${status}/>
-                    <header className=${export_menu_open ? "show_export" : ""}>
+                    <header id="pluto-nav" className=${export_menu_open ? "show_export" : ""}>
                         <${ExportBanner}
                             notebookfile_url=${this.export_url("notebookfile")}
                             notebookexport_url=${this.export_url("notebookexport")}
diff --git a/frontend/editor.css b/frontend/editor.css
index 7ca1d0eb3e..7fc6909659 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -446,7 +446,7 @@ pluto-output mjx-assistive-mml {
 
 /* HEADER */
 
-body > header {
+header#pluto-nav {
     /* position: absolute;
     top: 0px; */
     width: 100%;
@@ -461,7 +461,7 @@ body > header {
     font-size: 0.75rem;
 }
 
-body > header.show_export {
+header#pluto-nav.show_export {
     position: sticky;
     top: 0;
     transform: translateY(130px);
@@ -717,10 +717,10 @@ nav#at_the_top:after {
     }
 }
 
-body.binder > header > nav#at_the_top > pluto-filepicker > * {
+body.binder header#pluto-nav > nav#at_the_top > pluto-filepicker > * {
     display: none;
 }
-body.binder > header > nav#at_the_top > pluto-filepicker > a {
+body.binder header#pluto-nav > nav#at_the_top > pluto-filepicker > a {
     display: block;
     font-size: 16px;
     font-family: var(--julia-mono-font-stack);
@@ -728,33 +728,33 @@ body.binder > header > nav#at_the_top > pluto-filepicker > a {
     text-decoration: none;
 }
 
-body.nbpkg_restart_recommended > header,
-body.nbpkg_restart_required > header,
-body.binder.loading > header,
-body.process_dead > header,
-body.disconnected > header {
+body.nbpkg_restart_recommended header#pluto-nav,
+body.nbpkg_restart_required header#pluto-nav,
+body.binder.loading header#pluto-nav,
+body.process_dead header#pluto-nav,
+body.disconnected header#pluto-nav {
     position: sticky;
     top: 0;
     backdrop-filter: blur(10px);
     -webkit-backdrop-filter: blur(10px);
 }
 
-body.nbpkg_restart_recommended > header {
+body.nbpkg_restart_recommended header#pluto-nav {
     background-color: var(--restart-recc-header-color);
 }
-body.nbpkg_restart_required > header {
+body.nbpkg_restart_required header#pluto-nav {
     background-color: var(--restart-req-header-color);
 }
-body.process_dead > header {
+body.process_dead header#pluto-nav {
     background-color: var(--dead-process-header-color);
 }
-body.loading > header {
+body.loading header#pluto-nav {
     background-color: var(--loading-header-color);
 }
-body.disconnected > header {
+body.disconnected header#pluto-nav {
     background-color: var(--disconnected-header-color);
 }
-body.binder.loading > header {
+body.binder.loading header#pluto-nav {
     background-color: var(--binder-loading-header-color);
 }
 
@@ -838,8 +838,8 @@ body.is_recording .outline-frame.recording {
     box-shadow: inset 0px 0px 20px 20px #919bff2b;
 }
 
-body.recording_waiting_to_start > header,
-body.is_recording > header {
+body.recording_waiting_to_start header#pluto-nav,
+body.is_recording header#pluto-nav {
     display: none;
 }
 
@@ -2153,7 +2153,7 @@ footer input {
     border-right: none;
 }
 
-body > header pluto-filepicker button,
+header#pluto-nav pluto-filepicker button,
 footer button {
     margin: 0px;
     background: var(--footer-filepicker-focus-color);
@@ -2509,7 +2509,7 @@ body.presentation #helpbox-wrapper {
     display: none !important;
 }
 
-body > nav#slide_controls {
+nav#slide_controls {
     display: none;
 }
 body.presentation > nav#slide_controls {
@@ -2520,23 +2520,23 @@ body.presentation > nav#slide_controls {
     z-index: 100;
 }
 
-body > nav#slide_controls > button {
+nav#slide_controls > button {
     position: static;
     padding: 5px;
 }
 
-body > nav#slide_controls > button > span::after {
+nav#slide_controls > button > span::after {
     content: " " !important;
     display: block;
     height: 30px;
     width: 30px;
     background-size: 30px 30px;
 }
-body > nav#slide_controls > button.prev > span::after {
+nav#slide_controls > button.prev > span::after {
     background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-back-outline.svg);
     filter: var(--image-filters);
 }
-body > nav#slide_controls > button.next > span::after {
+nav#slide_controls > button.next > span::after {
     background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-forward-outline.svg);
     filter: var(--image-filters);
 }

From 0dc7079678302857bab42d68eed5357f66a41df9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 01:05:00 +0100
Subject: [PATCH 184/821] allow footer to wrap

---
 frontend/editor.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 7fc6909659..c638e34047 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2098,7 +2098,7 @@ pluto-helpbox > section hr {
 
 footer {
     width: 100%;
-    height: 3.5rem;
+    min-height: 3.5rem;
     font-family: "Roboto Mono", monospace;
     font-size: 0.75rem;
     background-color: var(--footer-bg-color);
@@ -2107,10 +2107,11 @@ footer {
 }
 
 footer form {
-    height: 1.5rem;
+    min-height: 1.5rem;
     opacity: 1;
     transition: opacity 5s;
     display: flex;
+    flex-wrap: wrap;
 }
 
 footer form > * {

From e73c38e02a00d815eb6eaf94798560d93d68276f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 01:05:00 +0100
Subject: [PATCH 185/821] allow footer to wrap

---
 frontend/editor.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 7fc6909659..c638e34047 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2098,7 +2098,7 @@ pluto-helpbox > section hr {
 
 footer {
     width: 100%;
-    height: 3.5rem;
+    min-height: 3.5rem;
     font-family: "Roboto Mono", monospace;
     font-size: 0.75rem;
     background-color: var(--footer-bg-color);
@@ -2107,10 +2107,11 @@ footer {
 }
 
 footer form {
-    height: 1.5rem;
+    min-height: 1.5rem;
     opacity: 1;
     transition: opacity 5s;
     display: flex;
+    flex-wrap: wrap;
 }
 
 footer form > * {

From 5572aa9986469eb3eff05b93644f2175a59a8744 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 01:08:36 +0100
Subject: [PATCH 186/821] CSS tweaks for sidebar: make editor responsive to
 container, not to screen

---
 frontend/editor.css | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index c638e34047..e08cd59257 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -52,12 +52,19 @@ body {
     overflow-x: hidden;
     position: relative;
     min-height: 100vh;
-    display: flex;
     flex-direction: column;
     align-items: center;
     background-color: var(--main-bg-color);
 }
 
+pluto-editor {
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    min-width: 0;
+}
+
 main {
     flex: 1;
 
@@ -81,14 +88,15 @@ body:not(.disable_ui) {
 /* | main=25px+700px+6px=731px | pluto-helpbox=350px - 500px | */
 /* min-width: 731px+ */
 
+/* CAN WE HAVE CONTAINER QUERIES PLESSSSS */
 @media screen and (min-width: calc(700px + 25px + 6px)) and (max-width: calc(700px + 25px + 6px + 500px)) {
-    body:not(.disable_ui) main {
+    body:not(.disable_ui) pluto-editor.fullscreen main {
         margin-left: 0px;
         align-self: flex-start;
     }
 }
 @media screen and (min-width: calc(700px + 25px + 6px + 500px)) and (max-width: calc(700px + 25px + 6px + 500px + 500px)) {
-    body:not(.disable_ui) main {
+    body:not(.disable_ui) pluto-editor.fullscreen main {
         margin-right: 500px;
         align-self: flex-end;
     }

From b39acd0de083b5ad73b20a4cae05644ab039cc15 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 01:22:50 +0100
Subject: [PATCH 187/821] <pluto-editor> component!

---
 frontend/editor.html | 6 +++++-
 frontend/editor.js   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/editor.html b/frontend/editor.html
index 0a2d36b338..9bca33e6f1 100644
--- a/frontend/editor.html
+++ b/frontend/editor.html
@@ -50,5 +50,9 @@
     <script type="text/javascript" id="MathJax-script" not-the-src-yet="https://cdn.jsdelivr.net/npm/mathjax@3.1.2/es5/tex-svg-full.js" async></script>
 </head>
 
-<body class="loading no-MαθJax"></body>
+<body class="loading no-MαθJax">
+
+<pluto-editor class="fullscreen"></pluto-editor>
+
+</body>
 </html>
diff --git a/frontend/editor.js b/frontend/editor.js
index 156dd330e6..79c8b6ff9e 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -117,4 +117,4 @@ const EditorLoader = ({ launch_params }) => {
 }
 
 // it's like a Rube Goldberg machine
-render(html`<${EditorLoader} launch_params=${launch_params} />`, document.body)
+document.body.querySelectorAll("pluto-editor").forEach((el) => render(html`<${EditorLoader} launch_params=${launch_params} />`, el))

From c5dae7998e21fc70ad1c34fb8487a023bfe6cbc4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 01:23:20 +0100
Subject: [PATCH 188/821] use short celldrag shoulders if not fullscreen

---
 frontend/editor.css | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index e08cd59257..2ef2833d86 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1002,7 +1002,6 @@ pluto-output {
     padding-right: 10px;
     align-items: baseline;
     overflow-x: auto;
-
     background-color: var(--pluto-output-bg-color);
 }
 
@@ -1203,18 +1202,26 @@ pluto-shoulder {
     position: absolute;
     /* top: 0px; */
     /* bottom: 0px; */
-    left: -2000px;
-    width: 2000px;
+    --invisible-border: calc(0.5 * var(--pluto-cell-spacing));
+    --shoulder-width: calc(28px + var(--invisible-border));
+    --border-radius: calc(5px + var(--invisible-border));
+
+    left: calc(0px - var(--shoulder-width));
+    width: var(--shoulder-width);
+    border-radius: var(--border-radius) 0px 0px var(--border-radius);
     cursor: move;
     display: flex;
     flex-direction: row;
     justify-content: flex-end;
     align-items: flex-start;
-    /* Add an invisible border around the shoulder, to make it easier to click on. (The are between two cells is divided in two, each half belongs to the closest pluto-cell.) */
-    top: calc(0px - 0.5 * var(--pluto-cell-spacing));
-    bottom: calc(0px - 0.5 * var(--pluto-cell-spacing));
-    border-top: calc(0.5 * var(--pluto-cell-spacing)) solid rgba(0, 0, 0, 0);
-    border-bottom: calc(0.5 * var(--pluto-cell-spacing)) solid rgba(0, 0, 0, 0);
+    /* Add an invisible border around the shoulder, to make it easier to click on. (The area between two cells is divided in two, each half belongs to the closest pluto-cell.) */
+    top: calc(0px - var(--invisible-border));
+    bottom: calc(0px - var(--invisible-border));
+    border: var(--invisible-border) solid rgba(0, 0, 0, 0);
+    border-right: none;
+}
+pluto-editor.fullscreen pluto-shoulder {
+    --shoulder-width: 2000px;
 }
 
 pluto-shoulder:hover {

From 1e0bb411b8a38d2eed489d14a4696ddf667e1bbf Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 01:26:23 +0100
Subject: [PATCH 189/821] part 2

---
 frontend/hide-ui.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/hide-ui.css b/frontend/hide-ui.css
index 45ecd273cf..819dd32c34 100644
--- a/frontend/hide-ui.css
+++ b/frontend/hide-ui.css
@@ -3,7 +3,7 @@ main {
     cursor: auto;
 }
 
-body > header,
+body header#pluto-nav,
 preamble > button,
 pluto-cell > button,
 pluto-input > button,

From b10e473f7f341e1b9adc7c1bd86f8da7bc849e1c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 01:26:23 +0100
Subject: [PATCH 190/821] part 2

---
 frontend/hide-ui.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/hide-ui.css b/frontend/hide-ui.css
index 45ecd273cf..819dd32c34 100644
--- a/frontend/hide-ui.css
+++ b/frontend/hide-ui.css
@@ -3,7 +3,7 @@ main {
     cursor: auto;
 }
 
-body > header,
+body header#pluto-nav,
 preamble > button,
 pluto-cell > button,
 pluto-input > button,

From 2e9fcad95b64ba4e0072ae8e15630eccaa01675b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 02:02:02 +0100
Subject: [PATCH 191/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index bf03618f83..8d212b0e97 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.18.1"
+version = "0.18.2"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From d82c0bac465a6c65d14246c3347d164452009aae Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 11:12:26 +0100
Subject: [PATCH 192/821] =?UTF-8?q?=F0=9F=A7=B9=20Remove=20service=20worke?=
 =?UTF-8?q?r=20(#1948)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/editor.html |  5 ----
 frontend/index.html  |  5 ----
 frontend/sw.js       | 67 --------------------------------------------
 3 files changed, 77 deletions(-)
 delete mode 100644 frontend/sw.js

diff --git a/frontend/editor.html b/frontend/editor.html
index 0a2d36b338..69ef1b15da 100644
--- a/frontend/editor.html
+++ b/frontend/editor.html
@@ -20,11 +20,6 @@
     <link rel="pluto-logo-big" href="./img/logo.svg" />
     <link rel="pluto-logo-small" href="./img/favicon_unsaturated.svg" />
 
-    <link rel="pluto-sw" href="./sw.js" />
-    <script>
-        navigator.serviceWorker?.register(document.head.querySelector("link[rel='pluto-sw']").getAttribute("href"), { scope: "./" }).catch(console.warn)
-    </script>
-
     <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.20/lodash.min.js" defer></script>
     <script src="https://cdn.jsdelivr.net/npm/@observablehq/stdlib@3.3.1/dist/stdlib.js" defer></script>
     <script src="https://cdn.jsdelivr.net/npm/iframe-resizer@4.2.11/js/iframeResizer.min.js" defer></script>
diff --git a/frontend/index.html b/frontend/index.html
index 57192467e2..a032146059 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -17,11 +17,6 @@
     <link rel="icon" type="image/png" sizes="96x96" href="img/favicon-96x96.png">
     <meta name="description" content="Pluto.jl notebooks" />
 
-    <link rel="pluto-sw" href="./sw.js" />
-    <script>
-        navigator.serviceWorker?.register(document.head.querySelector("link[rel='pluto-sw']").getAttribute("href"), { scope: "./" }).catch(console.warn)
-    </script>
-
     <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.20/lodash.min.js" defer></script>
     <script src="https://cdn.jsdelivr.net/npm/@observablehq/stdlib@3.3.1/dist/stdlib.js" defer></script>
 
diff --git a/frontend/sw.js b/frontend/sw.js
deleted file mode 100644
index 30d90d2eb7..0000000000
--- a/frontend/sw.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// mostly based on https://developers.google.com/web/fundamentals/primers/service-workers
-
-const DEBUG = false
-const noop = () => {}
-const logger = {
-    log: DEBUG ? console.log : noop,
-    warn: DEBUG ? console.warn : noop,
-    info: DEBUG ? console.info : noop,
-}
-var CACHE_NAME = "pluto-cache-v2"
-
-self.addEventListener("install", (event) => {
-    logger.log("Hello from service worker 👋")
-    // Perform install steps
-    event.waitUntil(
-        caches.open(CACHE_NAME).then((cache) => {
-            logger.log("Opened cache")
-        })
-    )
-})
-
-const allowList = ["www.gstatic.com", "fonts.gstatic.com", "fonts.googleapis.com", "cdn.jsdelivr.net", "cdnjs.cloudflare.com", "unpkg.com"]
-
-function shouldCache(request) {
-    const url = new URL(request.url)
-    return request.method === "GET" && allowList.includes(url.host) && !url.toString().includes("skip_sw")
-}
-
-self.addEventListener("fetch", (event) => {
-    // if (navigator.userAgent.includes("Firefox")) {
-    //     return
-    // }
-    if (!shouldCache(event.request)) {
-        logger.log("skipping cache")
-        return
-    }
-    event.respondWith(
-        caches.open(CACHE_NAME).then((cache) =>
-            cache.match(event.request).then((response) => {
-                if (response != null) {
-                    logger.info("CACHE HIT", event.request)
-                    return response
-                } else {
-                    logger.warn("Cache miss", event.request.url)
-
-                    return fetch(event.request).then(function (response) {
-                        // Check if we received a valid response
-                        if (!response || response.status !== 200) {
-                            return response
-                        } else {
-                            logger.warn("FETCHED")
-
-                            // Clone the response. A response is a stream
-                            // and because we want the browser to consume the response
-                            // as well as the cache consuming the response, we need
-                            // to clone it so we have two streams.
-                            var responseToCache = response.clone()
-                            cache.put(event.request, responseToCache)
-
-                            return response
-                        }
-                    })
-                }
-            })
-        )
-    )
-})

From 255bd9b307e8ed6f87c951a5e4456b06fc1c5159 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 12:16:44 +0100
Subject: [PATCH 193/821] =?UTF-8?q?=F0=9F=A7=B9=20refactor:=20Move=20initi?=
 =?UTF-8?q?alisation=20code=20out=20of=20Editor=20component=20(#1974)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Editor.js | 131 +++++++++++++---------------------
 frontend/editor.js            | 115 ++++++++++++++++++++++++++++-
 2 files changed, 160 insertions(+), 86 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 7c4d603b15..8335592570 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -3,6 +3,7 @@ import * as preact from "../imports/Preact.js"
 import immer, { applyPatches, produceWithPatches } from "../imports/immer.js"
 import _ from "../imports/lodash.js"
 
+import { empty_notebook_state, set_disable_ui_css } from "../editor.js"
 import { create_pluto_connection } from "../common/PlutoConnection.js"
 import { init_feedback } from "../common/Feedback.js"
 import { serialize_cells, deserialize_cells, detect_deserializer } from "../common/Serialization.js"
@@ -21,13 +22,9 @@ import { Popup } from "./Popup.js"
 
 import { slice_utf8, length_utf8 } from "../common/UnicodeTools.js"
 import { has_ctrl_or_cmd_pressed, ctrl_or_cmd_name, is_mac_keyboard, in_textarea_or_input } from "../common/KeyboardShortcuts.js"
-import { handle_log } from "../common/Logging.js"
 import { PlutoContext, PlutoBondsContext, PlutoJSInitializingContext, SetWithEmptyCallback } from "../common/PlutoContext.js"
-import { unpack } from "../common/MsgPack.js"
-import { PkgTerminalView } from "./PkgTerminalView.js"
 import { start_binder, BinderPhase, count_stat } from "../common/Binder.js"
 import { setup_mathjax } from "../common/SetupMathJax.js"
-import { read_Uint8Array_with_progress, FetchProgress } from "./FetchProgress.js"
 import { BinderButton } from "./BinderButton.js"
 import { slider_server_actions, nothing_actions } from "../common/SliderServerClient.js"
 import { ProgressBar } from "./ProgressBar.js"
@@ -39,7 +36,7 @@ import { HijackExternalLinksToOpenInNewTab } from "./HackySideStuff/HijackExtern
 // This is imported asynchronously - uncomment for development
 // import environment from "../common/Environment.js"
 
-const default_path = "..."
+export const default_path = "..."
 const DEBUG_DIFFING = false
 
 // from our friends at https://stackoverflow.com/a/2117523
@@ -66,7 +63,7 @@ const ProcessStatus = {
 /**
  * Map of status => Bool. In order of decreasing prioirty.
  */
-const statusmap = (state) => ({
+const statusmap = (state, launch_params) => ({
     disconnected: !(state.connected || state.initializing || state.static_preview),
     loading:
         (state.binder_phase != null && BinderPhase.wait_for_user < state.binder_phase && state.binder_phase < BinderPhase.ready) ||
@@ -165,6 +162,22 @@ const first_true_key = (obj) => {
  * }}
  */
 
+/**
+ * @typedef LaunchParameters
+ * @type {{
+ *  notebook_id: string?,
+ *  statefile: string?,
+ *  notebookfile: string?,
+ *  disable_ui: boolean,
+ *  preamble_html: string?,
+ *  isolated_cell_ids: string[]?,
+ *  binder_url: string?,
+ *  slider_server_url: string?,
+ *  recording_url: string?,
+ *  recording_audio_url: string?,
+ * }}
+ */
+
 /**
  * @typedef NotebookData
  * @type {{
@@ -189,59 +202,20 @@ const first_true_key = (obj) => {
 const url_logo_big = document.head.querySelector("link[rel='pluto-logo-big']").getAttribute("href")
 const url_logo_small = document.head.querySelector("link[rel='pluto-logo-small']").getAttribute("href")
 
-const url_params = new URLSearchParams(window.location.search)
-const launch_params = {
-    //@ts-ignore
-    notebook_id: url_params.get("id") ?? window.pluto_notebook_id,
-    //@ts-ignore
-    statefile: url_params.get("statefile") ?? window.pluto_statefile,
-    //@ts-ignore
-    notebookfile: url_params.get("notebookfile") ?? window.pluto_notebookfile,
-    //@ts-ignore
-    disable_ui: !!(url_params.get("disable_ui") ?? window.pluto_disable_ui),
-    //@ts-ignore
-    preamble_html: url_params.get("preamble_html") ?? window.pluto_preamble_html,
-    //@ts-ignore
-    isolated_cell_ids: url_params.has("isolated_cell_id") ? url_params.getAll("isolated_cell_id") : window.pluto_isolated_cell_ids,
-    //@ts-ignore
-    binder_url: url_params.get("binder_url") ?? window.pluto_binder_url,
-    //@ts-ignore
-    slider_server_url: url_params.get("slider_server_url") ?? window.pluto_slider_server_url,
-    //@ts-ignore
-    recording_url: url_params.get("recording_url") ?? window.pluto_recording_url,
-    //@ts-ignore
-    recording_audio_url: url_params.get("recording_audio_url") ?? window.pluto_recording_audio_url,
-}
-console.log("Launch parameters: ", launch_params)
-
 /**
- *
- * @returns {NotebookData}
+ * @typedef EditorProps
+ * @type {{launch_params: LaunchParameters,initial_notebook_state: NotebookData,}}
+ * @augments Component<EditorProps,{}>
  */
-const initial_notebook = () => ({
-    notebook_id: launch_params.notebook_id,
-    path: default_path,
-    shortpath: "",
-    in_temp_dir: true,
-    process_status: "starting",
-    last_save_time: 0.0,
-    last_hot_reload_time: 0.0,
-    cell_inputs: {},
-    cell_results: {},
-    cell_dependencies: {},
-    cell_order: [],
-    cell_execution_order: [],
-    published_objects: {},
-    bonds: {},
-    nbpkg: null,
-})
-
 export class Editor extends Component {
-    constructor() {
-        super()
+    constructor(/** @type {EditorProps} */ props) {
+        super(props)
+
+        console.log(this.props)
+        const { launch_params, initial_notebook_state } = this.props
 
         this.state = {
-            notebook: /** @type {NotebookData} */ initial_notebook(),
+            notebook: /** @type {NotebookData} */ initial_notebook_state,
             cell_inputs_local: /** @type {{ [id: string]: CellInputData }} */ ({}),
             desired_doc_query: null,
             recently_deleted: /** @type {Array<{ index: number, cell: CellInputData }>} */ (null),
@@ -249,7 +223,6 @@ export class Editor extends Component {
 
             disable_ui: launch_params.disable_ui,
             static_preview: launch_params.statefile != null,
-            statefile_download_progress: null,
             offer_binder: launch_params.notebookfile != null && launch_params.binder_url != null,
             binder_phase: null,
             binder_session_url: null,
@@ -669,7 +642,10 @@ patch: ${JSON.stringify(
                         let apply_promise = Promise.resolve()
                         if (message?.response?.from_reset) {
                             console.log("Trying to reset state after failure")
-                            apply_promise = apply_notebook_patches(message.patches, initial_notebook()).catch((e) => {
+                            apply_promise = apply_notebook_patches(
+                                message.patches,
+                                empty_notebook_state({ notebook_id: this.state.notebook.notebook_id })
+                            ).catch((e) => {
                                 alert("Oopsie!! please refresh your browser and everything will be alright!")
                                 throw e
                             })
@@ -770,7 +746,7 @@ patch: ${JSON.stringify(
                       actions: this.actions,
                       launch_params: launch_params,
                       apply_notebook_patches,
-                      get_original_state: () => this.original_state,
+                      get_original_state: () => this.props.initial_notebook_state,
                       get_current_state: () => this.state.notebook,
                   })
                 : nothing_actions({
@@ -778,30 +754,18 @@ patch: ${JSON.stringify(
                   })
 
         this.on_disable_ui = () => {
-            document.body.classList.toggle("disable_ui", this.state.disable_ui)
-            document.head.querySelector("link[data-pluto-file='hide-ui']").setAttribute("media", this.state.disable_ui ? "all" : "print")
+            set_disable_ui_css(this.state.disable_ui)
+
             //@ts-ignore
             this.actions = this.state.disable_ui || (launch_params.slider_server_url != null && !this.state.connected) ? this.fake_actions : this.real_actions //heyo
         }
         this.on_disable_ui()
 
-        this.original_state = null
         if (this.state.static_preview) {
-            ;(async () => {
-                const r = await fetch(launch_params.statefile)
-                const data = await read_Uint8Array_with_progress(r, (progress) => {
-                    this.setState({
-                        statefile_download_progress: progress,
-                    })
-                })
-                const state = unpack(data)
-                this.original_state = state
-                this.setState({
-                    notebook: state,
-                    initializing: false,
-                    binder_phase: this.state.offer_binder ? BinderPhase.wait_for_user : null,
-                })
-            })()
+            this.setState({
+                initializing: false,
+                binder_phase: this.state.offer_binder ? BinderPhase.wait_for_user : null,
+            })
             // view stats on https://stats.plutojl.org/
             count_stat(`article-view`)
         } else {
@@ -1198,13 +1162,14 @@ patch: ${JSON.stringify(
     }
 
     componentWillUpdate(new_props, new_state) {
-        this.cached_status = statusmap(new_state)
+        this.cached_status = statusmap(new_state, this.props.launch_params)
     }
 
     render() {
+        const { launch_params } = this.props
         let { export_menu_open, notebook } = this.state
 
-        const status = this.cached_status ?? statusmap(this.state)
+        const status = this.cached_status ?? statusmap(this.state, launch_params)
         const statusval = first_true_key(status)
 
         if (status.isolated_cell_view) {
@@ -1338,16 +1303,16 @@ patch: ${JSON.stringify(
                         reset_notebook_state=${() =>
                             this.setStatePromise(
                                 immer((state) => {
-                                    state.notebook = this.original_state
+                                    state.notebook = this.props.initial_notebook_state
                                 })
                             )}
                     />
                     
-                    <${BinderButton} binder_phase=${this.state.binder_phase} start_binder=${() =>
-            start_binder({ setStatePromise: this.setStatePromise, connect: this.connect, launch_params: launch_params })} notebookfile=${
-            launch_params.notebookfile == null ? null : new URL(launch_params.notebookfile, window.location.href).href
-        } />
-                    <${FetchProgress} progress=${this.state.statefile_download_progress} />
+                    <${BinderButton} 
+                        binder_phase=${this.state.binder_phase} 
+                        start_binder=${() => start_binder({ setStatePromise: this.setStatePromise, connect: this.connect, launch_params: launch_params })} 
+                        notebookfile=${launch_params.notebookfile == null ? null : new URL(launch_params.notebookfile, window.location.href).href} />
+                    
                     ${launch_params.preamble_html ? html`<${RawHTMLContainer} body=${launch_params.preamble_html} className=${"preamble"} />` : null}
                     <${Main}>
                         <${Preamble}
diff --git a/frontend/editor.js b/frontend/editor.js
index 7ee766bedd..5f9d7b53d6 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -1,7 +1,116 @@
-import { html, render } from "./imports/Preact.js"
+import { html, render, useEffect, useRef, useState } from "./imports/Preact.js"
 import "./common/NodejsCompatibilityPolyfill.js"
 
-import { Editor } from "./components/Editor.js"
+import { Editor, default_path } from "./components/Editor.js"
+import { FetchProgress, read_Uint8Array_with_progress } from "./components/FetchProgress.js"
+import { BinderPhase } from "./common/Binder.js"
+import { unpack } from "./common/MsgPack.js"
+import { RawHTMLContainer } from "./components/CellOutput.js"
+
+const url_params = new URLSearchParams(window.location.search)
+
+//////////////
+// utils:
+
+const set_attribute_if_needed = (element, attr, value) => {
+    if (element.getAttribute(attr) !== value) {
+        element.setAttribute(attr, value)
+    }
+}
+export const set_disable_ui_css = (val) => {
+    document.body.classList.toggle("disable_ui", val)
+    set_attribute_if_needed(document.head.querySelector("link[data-pluto-file='hide-ui']"), "media", val ? "all" : "print")
+}
+
+/////////////
+// the rest:
+
+/**
+ *
+ * @type {import("./components/Editor.js").LaunchParameters}
+ */
+const launch_params = {
+    //@ts-ignore
+    notebook_id: url_params.get("id") ?? window.pluto_notebook_id,
+    //@ts-ignore
+    statefile: url_params.get("statefile") ?? window.pluto_statefile,
+    //@ts-ignore
+    notebookfile: url_params.get("notebookfile") ?? window.pluto_notebookfile,
+    //@ts-ignore
+    disable_ui: !!(url_params.get("disable_ui") ?? window.pluto_disable_ui),
+    //@ts-ignore
+    preamble_html: url_params.get("preamble_html") ?? window.pluto_preamble_html,
+    //@ts-ignore
+    isolated_cell_ids: url_params.has("isolated_cell_id") ? url_params.getAll("isolated_cell_id") : window.pluto_isolated_cell_ids,
+    //@ts-ignore
+    binder_url: url_params.get("binder_url") ?? window.pluto_binder_url,
+    //@ts-ignore
+    slider_server_url: url_params.get("slider_server_url") ?? window.pluto_slider_server_url,
+    //@ts-ignore
+    recording_url: url_params.get("recording_url") ?? window.pluto_recording_url,
+    //@ts-ignore
+    recording_audio_url: url_params.get("recording_audio_url") ?? window.pluto_recording_audio_url,
+}
+console.log("Launch parameters: ", launch_params)
+
+/**
+ *
+ * @returns {import("./components/Editor.js").NotebookData}
+ */
+export const empty_notebook_state = ({ notebook_id }) => ({
+    notebook_id: notebook_id,
+    path: default_path,
+    shortpath: "",
+    in_temp_dir: true,
+    process_status: "starting",
+    last_save_time: 0.0,
+    last_hot_reload_time: 0.0,
+    cell_inputs: {},
+    cell_results: {},
+    cell_dependencies: {},
+    cell_order: [],
+    cell_execution_order: [],
+    published_objects: {},
+    bonds: {},
+    nbpkg: null,
+})
+
+/**
+ *
+ * @param {{
+ *  launch_params: import("./components/Editor.js").LaunchParameters,
+ * }} props
+ */
+const EditorLoader = ({ launch_params }) => {
+    const static_preview = launch_params.statefile != null
+
+    const [statefile_download_progress, set_statefile_download_progress] = useState(null)
+
+    const initial_notebook_state_ref = useRef(empty_notebook_state(launch_params))
+    const [ready_for_editor, set_ready_for_editor] = useState(!static_preview)
+
+    useEffect(() => {
+        if (!ready_for_editor && static_preview) {
+            ;(async () => {
+                const r = await fetch(launch_params.statefile)
+                const data = await read_Uint8Array_with_progress(r, set_statefile_download_progress)
+                const state = unpack(data)
+                initial_notebook_state_ref.current = state
+                set_ready_for_editor(true)
+            })()
+        }
+    }, [ready_for_editor, static_preview, launch_params.statefile])
+
+    useEffect(() => {
+        set_disable_ui_css(launch_params.disable_ui)
+    }, [launch_params.disable_ui])
+
+    return ready_for_editor
+        ? html`<${Editor} initial_notebook_state=${initial_notebook_state_ref.current} launch_params=${launch_params} />`
+        : // todo: show preamble html while loading. the problem is that it will re-render once the editor is ready, because the `RawHTMLContainer` element goes to a different place in the vdom.
+          // ${launch_params.preamble_html ? html`<${RawHTMLContainer} body=${launch_params.preamble_html} className=${"preamble"} />` : null}
+          html`<${FetchProgress} progress=${statefile_download_progress} />`
+}
 
 // it's like a Rube Goldberg machine
-render(html`<${Editor} />`, document.body)
+render(html`<${EditorLoader} launch_params=${launch_params} />`, document.body)

From 78af9545158dac5d7e3436e809396c57682899cd Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Sat, 12 Mar 2022 12:37:08 +0100
Subject: [PATCH 194/821] Add a benchmark for compilation times (#1959)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 .gitignore           |  2 +-
 Project.toml         |  3 ++-
 test/compiletimes.jl | 19 ++++++++++++++++
 test/helpers.jl      |  9 ++++++--
 test/runtests.jl     | 52 ++++++++++++++++++++++++--------------------
 5 files changed, 57 insertions(+), 28 deletions(-)
 create mode 100644 test/compiletimes.jl

diff --git a/.gitignore b/.gitignore
index 41be10eda5..d3f6b91a7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,4 @@ node_modules
 .parcel-cache
 frontend/dist
 .net
-net
\ No newline at end of file
+net
diff --git a/Project.toml b/Project.toml
index 8d212b0e97..7ec7c0ac99 100644
--- a/Project.toml
+++ b/Project.toml
@@ -37,6 +37,7 @@ DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
 
 [targets]
-test = ["Test", "Random", "DataFrames", "OffsetArrays"]
+test = ["Test", "Random", "DataFrames", "OffsetArrays", "TimerOutputs"]
diff --git a/test/compiletimes.jl b/test/compiletimes.jl
new file mode 100644
index 0000000000..65aedc1647
--- /dev/null
+++ b/test/compiletimes.jl
@@ -0,0 +1,19 @@
+# Collect Time To Finish Task (TTFT)
+
+function wait_for_ready(notebook::Pluto.Notebook)
+    while notebook.process_status != Pluto.ProcessStatus.ready
+        sleep(0.1)
+    end
+end
+
+🍭 = Pluto.ServerSession()
+🍭.options.server.disable_writing_notebook_files = true
+🍭.options.evaluation.workspace_use_distributed = false
+
+path = joinpath(pkgdir(Pluto), "sample", "Basic.jl")
+
+@timeit TOUT "SessionActions.open" nb = Pluto.SessionActions.open(🍭, path; run_async=true)
+
+wait_for_ready(nb)
+
+@timeit TOUT "SessionActions.shutdown" Pluto.SessionActions.shutdown(🍭, nb; async=true)
diff --git a/test/helpers.jl b/test/helpers.jl
index a1ec18f830..a8a7484328 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -1,4 +1,9 @@
-import Pluto
+# Collect timing and allocations information; this is printed later.
+using TimerOutputs: TimerOutput, @timeit
+const TOUT = TimerOutput()
+macro timeit_include(path::AbstractString) :(@timeit TOUT $path include($path)) end
+
+@timeit TOUT "import Pluto" import Pluto
 import Pluto.ExpressionExplorer
 import Pluto.ExpressionExplorer: SymbolsState, compute_symbolreferences, FunctionNameSignaturePair, UsingsImports, compute_usings_imports
 using Test
@@ -208,4 +213,4 @@ function verify_no_running_processes()
     if length(Distributed.procs()) != 1
         @error "Not all notebook processes were closed during tests!" Distributed.procs()
     end
-end
\ No newline at end of file
+end
diff --git a/test/runtests.jl b/test/runtests.jl
index 62622f7e63..1e6f69bb87 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,47 +1,51 @@
-include("./helpers.jl")
+include("helpers.jl")
 
 # tests that start new processes:
 
-include("./Events.jl")
+@timeit_include("compiletimes.jl")
 verify_no_running_processes()
-include("./WorkspaceManager.jl")
+@timeit_include("Events.jl")
 verify_no_running_processes()
-include("./packages/Basic.jl")
+@timeit_include("WorkspaceManager.jl")
 verify_no_running_processes()
-include("./Bonds.jl")
+@timeit_include("packages/Basic.jl")
 verify_no_running_processes()
-include("./RichOutput.jl")
+@timeit_include("Bonds.jl")
 verify_no_running_processes()
-include("./React.jl")
+@timeit_include("RichOutput.jl")
 verify_no_running_processes()
-include("./Dynamic.jl")
+@timeit_include("React.jl")
 verify_no_running_processes()
-include("./MacroAnalysis.jl")
+@timeit_include("Dynamic.jl")
 verify_no_running_processes()
-include("./Logging.jl")
+@timeit_include("MacroAnalysis.jl")
 verify_no_running_processes()
-include("./webserver.jl")
+@timeit_include("Logging.jl")
 verify_no_running_processes()
-include("./Notebook.jl")
+@timeit_include("webserver.jl")
 verify_no_running_processes()
-include("./Configuration.jl")
+@timeit_include("Notebook.jl")
+verify_no_running_processes()
+@timeit_include("Configuration.jl")
 verify_no_running_processes()
 
 # tests that don't start new processes:
-include("./ReloadFromFile.jl")
-include("./packages/PkgCompat.jl")
-include("./ExpressionExplorer.jl")
-include("./MethodSignatures.jl")
-include("./MoreAnalysis.jl")
-include("./Analysis.jl")
-include("./webserver_utils.jl")
-include("./data structures.jl")
-include("./DependencyCache.jl")
-include("./Throttled.jl")
-include("./cell_disabling.jl")
+@timeit_include("ReloadFromFile.jl")
+@timeit_include("packages/PkgCompat.jl")
+@timeit_include("ExpressionExplorer.jl")
+@timeit_include("MethodSignatures.jl")
+@timeit_include("MoreAnalysis.jl")
+@timeit_include("Analysis.jl")
+@timeit_include("webserver_utils.jl")
+@timeit_include("data structures.jl")
+@timeit_include("DependencyCache.jl")
+@timeit_include("Throttled.jl")
+@timeit_include("cell_disabling.jl")
 
 verify_no_running_processes()
 
+show(TOUT; compact=true, sortby=:firstexec)
+
 # TODO: test PlutoRunner functions like:
 # - from_this_notebook
 

From 0fe5c390cdf65a8ad8a99ab480a285ee5cf98827 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 18:26:27 +0100
Subject: [PATCH 195/821] add precompile statements to sessionactions (#1977)

Co-authored-by: Rik Huijzer <20724914+rikhuijzer@users.noreply.github.com>
---
 src/webserver/SessionActions.jl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 2217e137dc..36e192a0b0 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -65,6 +65,7 @@ function open(session::ServerSession, path::AbstractString; run_async=true, comp
     try_event_call(session, OpenNotebookEvent(nb))
     nb
 end
+precompile(open, (ServerSession, String))
 
 function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
     session.notebooks[nb.notebook_id] = nb
@@ -150,7 +151,7 @@ function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
     
     nb
 end
-precompile(SessionActions.open, (ServerSession, String))
+precompile(add, (ServerSession, Notebook))
 
 function save_upload(content::Vector{UInt8})
     save_path = emptynotebook().path
@@ -210,6 +211,7 @@ function new(session::ServerSession; run_async=true, notebook_id::UUID=uuid1())
     try_event_call(session, OpenNotebookEvent(nb))
     nb
 end
+precompile(new, (ServerSession,))
 
 "Shut down `notebook` inside `session`. If `keep_in_session` is `false` (default), you will not be allowed to run a notebook with the same notebook_id again."
 function shutdown(session::ServerSession, notebook::Notebook; keep_in_session::Bool=false, async::Bool=false, verbose::Bool=true)
@@ -231,5 +233,6 @@ function shutdown(session::ServerSession, notebook::Notebook; keep_in_session::B
     WorkspaceManager.unmake_workspace((session, notebook); async, verbose, allow_restart=keep_in_session)
     try_event_call(session, ShutdownNotebookEvent(notebook))
 end
+precompile(shutdown, (ServerSession, Notebook))
 
 end

From a1d6f878e9b26d22d699e2183c95cf03a5b3f368 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 19:31:21 +0100
Subject: [PATCH 196/821] Fix selection area

---
 frontend/components/SelectionArea.js | 34 +++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/frontend/components/SelectionArea.js b/frontend/components/SelectionArea.js
index 4d4f0adb81..d208b3328e 100644
--- a/frontend/components/SelectionArea.js
+++ b/frontend/components/SelectionArea.js
@@ -38,16 +38,34 @@ const in_request_animation_frame = (fn) => {
 export const SelectionArea = ({ on_selection, set_scroller, cell_order }) => {
     const mouse_position_ref = useRef()
     const is_selecting_ref = useRef(false)
+    const element_ref = useRef(/** @type {HTMLElement} */ (null))
 
     const [selection_start, set_selection_start] = useState(null)
     const [selection_end, set_selection_end] = useState(null)
 
     useEffect(() => {
+        const event_target_inside_this_notebook = (e) => {
+            if (e.target == null) {
+                return false
+            }
+
+            // this should also work for notebooks inside notebooks!
+            let closest_editor = e.target.closest("pluto-editor")
+            let my_editor = element_ref.current.closest("pluto-editor")
+
+            return closest_editor === my_editor
+        }
+
         const onmousedown = (e) => {
             // @ts-ignore
-            const t = e.target.tagName
+            const t = e.target?.tagName
+
             // TODO: also allow starting the selection in one codemirror and stretching it to another cell
-            if (e.button === 0 && (t === "BODY" || t === "MAIN" || t === "PLUTO-NOTEBOOK" || t === "PREAMBLE")) {
+            if (
+                e.button === 0 &&
+                event_target_inside_this_notebook(e) &&
+                (t === "PLUTO-EDITOR" || t === "MAIN" || t === "PLUTO-NOTEBOOK" || t === "PREAMBLE")
+            ) {
                 on_selection([])
                 set_selection_start({ x: e.pageX, y: e.pageY })
                 set_selection_end({ x: e.pageX, y: e.pageY })
@@ -155,17 +173,17 @@ export const SelectionArea = ({ on_selection, set_scroller, cell_order }) => {
         }
     }, [selection_start])
 
-    if (selection_start == null) {
-        return null
-    }
-
     // let translateY = `translateY(${Math.min(selection_start.y, selection_end.y)}px)`
     // let translateX = `translateX(${Math.min(selection_start.x, selection_end.x)}px)`
     // let scaleX = `scaleX(${Math.abs(selection_start.x - selection_end.x)})`
     // let scaleY = `scaleY(${Math.abs(selection_start.y - selection_end.y)})`
 
+    if (selection_start == null) {
+        return html`<span ref=${element_ref}></span>`
+    }
     return html`
-        <selectarea
+        <pl-select-area
+            ref=${element_ref}
             style=${{
                 position: "absolute",
                 background: "rgba(40, 78, 189, 0.24)",
@@ -183,6 +201,6 @@ export const SelectionArea = ({ on_selection, set_scroller, cell_order }) => {
                 // transformOrigin: "top left",
                 // transform: `${translateX} ${translateY} ${scaleX} ${scaleY}`,
             }}
-        />
+        ></pl-select-area>
     `
 }

From 4b0920f0aa5a8f6c6404ae9d35287aa9f0225407 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 19:48:16 +0100
Subject: [PATCH 197/821] fix new notebook layout

---
 frontend/editor.css  | 2 --
 frontend/editor.html | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 2ef2833d86..2e47753b9f 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -52,8 +52,6 @@ body {
     overflow-x: hidden;
     position: relative;
     min-height: 100vh;
-    flex-direction: column;
-    align-items: center;
     background-color: var(--main-bg-color);
 }
 
diff --git a/frontend/editor.html b/frontend/editor.html
index 9bca33e6f1..f3e03379bc 100644
--- a/frontend/editor.html
+++ b/frontend/editor.html
@@ -51,8 +51,8 @@
 </head>
 
 <body class="loading no-MαθJax">
-
+<div style="display: flex; min-height: 100vh;">
 <pluto-editor class="fullscreen"></pluto-editor>
-
+</div>
 </body>
 </html>

From 3ba835e4dffbb03b27d68c4e3ee47931dbba6747 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 19:55:58 +0100
Subject: [PATCH 198/821] fix save button disappearing

---
 frontend/editor.css | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 2e47753b9f..3c6e272bd9 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -928,13 +928,15 @@ main > preamble {
 
 main > preamble #saveall-container {
     margin-left: auto;
-    right: min(0px, 700px + 25px - 100vw);
-    position: relative;
+}
+pluto-editor.fullscreen main > preamble #saveall-container {
+    transform: translateX(max(0px, 100vw - 700px - 25px));
+    /* position: relative; */
 }
 
 @media screen and (min-width: calc(700px + 25px + 6px + 500px)) {
-    main > preamble #saveall-container {
-        right: -500px;
+    pluto-editor.fullscreen main > preamble #saveall-container {
+        transform: translateX(500px);
     }
 }
 

From 1d3ae22048c2858c069e8d67d742a65e3345370b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 20:04:31 +0100
Subject: [PATCH 199/821] binder token tweak

---
 src/webserver/WebServer.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index cb00bf0f64..46fc3cf9be 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -234,7 +234,7 @@ function run(session::ServerSession, pluto_router)
 
             # If a "token" url parameter is passed in from binder, then we store it to add to every URL (so that you can share the URL to collaborate).
             params = HTTP.queryparams(HTTP.URI(request.target))
-            if haskey(params, "token") && session.binder_token === nothing 
+            if haskey(params, "token") && params["token"] ∉ ("null", "undefined", "") && session.binder_token === nothing
                 session.binder_token = params["token"]
             end
 

From d3093e96d70d657d4c249ad1faa9becd4ebc5e25 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 23:05:14 +0100
Subject: [PATCH 200/821] web component! no shadow dom yet though

---
 frontend/editor.js | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/frontend/editor.js b/frontend/editor.js
index 79c8b6ff9e..c4a9265140 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -53,6 +53,19 @@ const launch_params = {
 }
 console.log("Launch parameters: ", launch_params)
 
+const truthy = (x) => x === "" || x === "true"
+
+const from_attribute = (element, name) => {
+    const val = element.getAttribute(name)
+    if (name === "disable_ui") {
+        return truthy(val)
+    } else if (name === "isolated_cell_id") {
+        return val == null ? null : val.split(",")
+    } else {
+        return val
+    }
+}
+
 /**
  *
  * @returns {import("./components/Editor.js").NotebookData}
@@ -116,5 +129,17 @@ const EditorLoader = ({ launch_params }) => {
           `
 }
 
-// it's like a Rube Goldberg machine
-document.body.querySelectorAll("pluto-editor").forEach((el) => render(html`<${EditorLoader} launch_params=${launch_params} />`, el))
+// Create a web component for EditorLoader that takes in additional launch parameters as attributes
+// possible attribute names are `Object.keys(launch_params)`
+class PlutoEditorComponent extends HTMLElement {
+    constructor() {
+        super()
+    }
+
+    connectedCallback() {
+        const new_launch_params = Object.fromEntries(Object.entries(launch_params).map(([k, v]) => [k, from_attribute(this, k) ?? v]))
+
+        render(html`<${EditorLoader} launch_params=${new_launch_params} />`, this)
+    }
+}
+customElements.define("pluto-editor", PlutoEditorComponent)

From f008ba265f314a2a9e76975ec60f86728cfd8b92 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 23:13:10 +0100
Subject: [PATCH 201/821] comment

---
 frontend/editor.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/frontend/editor.js b/frontend/editor.js
index c4a9265140..404b90caf8 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -131,6 +131,22 @@ const EditorLoader = ({ launch_params }) => {
 
 // Create a web component for EditorLoader that takes in additional launch parameters as attributes
 // possible attribute names are `Object.keys(launch_params)`
+
+// This means that you can do stuff like:
+/* 
+<pluto-editor disable_ui notebookfile="https://juliapluto.github.io/weekly-call-notes/2022/02-10/notes.jl" statefile="https://juliapluto.github.io/weekly-call-notes/2022/02-10/notes.plutostate"  ></pluto-editor>
+        
+<pluto-editor disable_ui notebookfile="https://juliapluto.github.io/weekly-call-notes/2022/02-10/notes.jl" statefile="https://juliapluto.github.io/weekly-call-notes/2022/02-10/notes.plutostate"  ></pluto-editor> 
+*/
+
+// or:
+
+/* 
+<pluto-editor notebook_id="fcc1b498-a141-11ec-342a-593db1016648"></pluto-editor>
+
+<pluto-editor notebook_id="21ebc942-a1ed-11ec-2505-7b242b18daf3"></pluto-editor>
+*/
+
 class PlutoEditorComponent extends HTMLElement {
     constructor() {
         super()

From 9ca70c362b3b1e79f2f1714b6fc8742196c02885 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 12 Mar 2022 23:27:13 +0100
Subject: [PATCH 202/821] Update README.md

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dce18495ea..cf27ce9525 100644
--- a/README.md
+++ b/README.md
@@ -112,8 +112,7 @@ julia> ]
 (v1.7) pkg> add Pluto
 ```
 
-_Tip for new Julia users: To return to the `julia>` prompt from the Pkg REPL,
-either press backspace when the input line is empty or press Ctrl+C._
+_Press `Ctrl+C` to return to the `julia>` prompt._
 
 ### Usage
 

From ac9e70af00b6fe72766adde034a0bfd70cd8d117 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 13 Mar 2022 23:25:04 +0100
Subject: [PATCH 203/821] Add a Code of Conduct (#1980)

---
 CODE_OF_CONDUCT.md | 128 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 CODE_OF_CONDUCT.md

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000..1ef57e407d
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+fons@plutojl.org.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

From 0a76270491ecfc15ffd2889eb3126e13ff7b8b12 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <t.h.huijzer@rug.nl>
Date: Thu, 17 Mar 2022 15:23:48 +0100
Subject: [PATCH 204/821] Improve accuracy of compilation benchmarks and add
 one for `Pluto.run` (#1983)

* Add more compilation tests

* Use `fill` instead of `ExponentialBackOff`

* Improve benchmark accuracy

* Fix tests on Windows?

* Remove Pluto.run call (Fix Windows?)

* Trigger CI

* Is it the HTTP.get?

* Maybe without interruptexception?

* Cleanup

* Trigger CI

* Update compiletimes.jl
---
 src/webserver/WebServer.jl |  2 +-
 test/compiletimes.jl       | 29 +++++++++++++++++++++++++++--
 test/helpers.jl            |  1 +
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 46fc3cf9be..e3129e9eb0 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -69,7 +69,7 @@ function run(; kwargs...)
 end
 
 function run(options::Configuration.Options)
-    session = ServerSession(;options=options)
+    session = ServerSession(; options)
     run(session)
 end
 
diff --git a/test/compiletimes.jl b/test/compiletimes.jl
index 65aedc1647..699306f373 100644
--- a/test/compiletimes.jl
+++ b/test/compiletimes.jl
@@ -1,5 +1,10 @@
 # Collect Time To Finish Task (TTFT)
 
+# Using `@eval` to avoid missing compile time, see the `@time` docstring for more info.
+@timeit TOUT "Pluto.Cell" cell = @eval Pluto.Cell("1 + 1")
+
+@timeit TOUT "Pluto.Notebook" nb = @eval Pluto.Notebook([cell])
+
 function wait_for_ready(notebook::Pluto.Notebook)
     while notebook.process_status != Pluto.ProcessStatus.ready
         sleep(0.1)
@@ -12,8 +17,28 @@ end
 
 path = joinpath(pkgdir(Pluto), "sample", "Basic.jl")
 
-@timeit TOUT "SessionActions.open" nb = Pluto.SessionActions.open(🍭, path; run_async=true)
+@timeit TOUT "SessionActions.open" nb = @eval Pluto.SessionActions.open(🍭, path; run_async=true)
 
 wait_for_ready(nb)
 
-@timeit TOUT "SessionActions.shutdown" Pluto.SessionActions.shutdown(🍭, nb; async=true)
+@timeit TOUT "SessionActions.shutdown" @eval Pluto.SessionActions.shutdown(🍭, nb; async=true)
+
+# According to SnoopCompile, this is a big part of the time for `Pluto.run()`.
+# However, it's very tricky to measure this via the `Pluto.run` below.
+@timeit TOUT "Configuration.from_flat_kwargs" @eval Pluto.Configuration.from_flat_kwargs()
+
+# Precompile 
+HTTP.get("http://github.com")
+
+@timeit TOUT "Pluto.run" server_task = @eval let
+    port = 13435
+    options = Pluto.Configuration.from_flat_kwargs(; port, launch_browser=false, workspace_use_distributed=false, require_secret_for_access=false, require_secret_for_open_links=false)
+    🍭 = Pluto.ServerSession(; options)
+    server_task = @async Pluto.run(🍭)
+
+    # Give the async task time to start.
+    sleep(1)
+
+    HTTP.get("http://localhost:$port/edit").status == 200
+    server_task
+end
diff --git a/test/helpers.jl b/test/helpers.jl
index a8a7484328..b24d1e4120 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -7,6 +7,7 @@ macro timeit_include(path::AbstractString) :(@timeit TOUT $path include($path))
 import Pluto.ExpressionExplorer
 import Pluto.ExpressionExplorer: SymbolsState, compute_symbolreferences, FunctionNameSignaturePair, UsingsImports, compute_usings_imports
 using Test
+using HTTP
 import Distributed
 
 function Base.show(io::IO, s::SymbolsState)

From b1c31f522678f18b7d285d2a7eb07af821eb5ddb Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Thu, 17 Mar 2022 16:56:09 +0100
Subject: [PATCH 205/821] Optimize `maybe_macroexpand`

---
 src/analysis/ExpressionExplorer.jl | 39 ++++++++++++++++++------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index de70eb1a06..6a4fdad92d 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -9,8 +9,7 @@ import Base: union, union!, ==, push!
 # TWO STATE OBJECTS
 ###
 
-# TODO: use GlobalRef instead
-FunctionName = Array{Symbol,1}
+const FunctionName = Array{Symbol,1}
 
 struct FunctionNameSignaturePair
     name::FunctionName
@@ -192,11 +191,16 @@ uncurly!(s::Symbol, scopestate = nothing)::Tuple{Symbol,SymbolsState} = s, Symbo
 "Turn `:(Base.Submodule.f)` into `[:Base, :Submodule, :f]` and `:f` into `[:f]`."
 function split_funcname(funcname_ex::Expr)::FunctionName
     if funcname_ex.head == :(.)
-        vcat(split_funcname.(funcname_ex.args)...)
+        out = FunctionName()
+        args = funcname_ex.args
+        for arg in args
+            push!(out, split_funcname(arg)...)
+        end
+        return out
     else
         # a call to a function that's not a global, like calling an array element: `funcs[12]()`
         # TODO: explore symstate!
-        Symbol[]
+        return Symbol[]
     end
 end
 
@@ -264,13 +268,13 @@ function generate_funcnames(funccall::FunctionName)
     calls
 end
 
-"""Turn `Symbol[:Module, :func]` into Symbol("Module.func").
+"""
+Turn `Symbol[:Module, :func]` into Symbol("Module.func").
 
 This is **not** the same as the expression `:(Module.func)`, but is used to identify the function name using a single `Symbol` (like normal variables).
-This means that it is only the inverse of `ExpressionExplorer.split_funcname` iff `length(parts) ≤ 1`."""
-function join_funcname_parts(parts::FunctionName)::Symbol
-    join(parts .|> String, ".") |> Symbol
-end
+This means that it is only the inverse of `ExpressionExplorer.split_funcname` iff `length(parts) ≤ 1`.
+"""
+join_funcname_parts(parts::FunctionName) = Symbol(join(parts, '.'))
 
 # this is stupid -- désolé
 function is_joined_funcname(joined::Symbol)
@@ -968,15 +972,15 @@ maybe_untuple(es) =
 """
 If the macro is **known to Pluto**, expand or 'mock expand' it, if not, return the expression. Macros from external packages are not expanded, this is done later in the pipeline. See https://github.com/fonsp/Pluto.jl/pull/1032
 """
-function maybe_macroexpand(ex::Expr; recursive = false, expand_bind = true)
-    result = if ex.head === :macrocall
-        funcname = ex.args[1] |> split_funcname
+function maybe_macroexpand(ex::Expr; recursive::Bool=false, expand_bind::Bool=true)
+    result::Expr = if ex.head === :macrocall
+        funcname = split_funcname(ex.args[1])
         funcname_joined = join_funcname_parts(funcname)
 
         args = ex.args[3:end]
 
         if funcname_joined ∈ (expand_bind ? can_macroexpand : can_macroexpand_no_bind)
-            macroexpand(PlutoRunner, ex; recursive = false)
+            macroexpand(PlutoRunner, ex; recursive=false)::Expr
         elseif length(args) ≥ 2 && ex.args[1] != GlobalRef(Core, Symbol("@doc"))
             # for macros like @test a ≈ b atol=1e-6, read assignment in 2nd & later arg as keywords
             macro_kwargs_as_kw(ex)
@@ -988,9 +992,14 @@ function maybe_macroexpand(ex::Expr; recursive = false, expand_bind = true)
     end
 
     if recursive && (result isa Expr)
-        Expr(result.head, maybe_macroexpand.(result.args; recursive = recursive, expand_bind = expand_bind)...)
+        # Not using broadcasting because that is expensive compilation-wise for `result.args::Any`.
+        expanded = Any[]
+        for arg in result.args
+            push!(expanded, arg)
+        end
+        return Expr(result.head, expanded...)
     else
-        result
+        return result
     end
 end
 

From e565b05a5cbc98744d197e64e7a6d23590513a03 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Thu, 17 Mar 2022 17:02:44 +0100
Subject: [PATCH 206/821] Add `@inferred` tests

---
 src/analysis/ExpressionExplorer.jl | 3 ++-
 test/ExpressionExplorer.jl         | 3 +++
 test/MoreAnalysis.jl               | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 6a4fdad92d..9da27edb90 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -995,7 +995,8 @@ function maybe_macroexpand(ex::Expr; recursive::Bool=false, expand_bind::Bool=tr
         # Not using broadcasting because that is expensive compilation-wise for `result.args::Any`.
         expanded = Any[]
         for arg in result.args
-            push!(expanded, arg)
+            ex = maybe_macroexpand(arg; recursive, expand_bind)
+            push!(expanded, ex)
         end
         return Expr(result.head, expanded...)
     else
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index a0d8926901..912c4d6d47 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -17,6 +17,9 @@ Some of these @test_broken lines are commented out to prevent printing to the te
 -fons =#
 
 @testset "Explore Expressions" begin
+    @inferred Pluto.ExpressionExplorer.split_funcname(:(Base.Submodule.f))
+    @inferred Pluto.ExpressionExplorer.maybe_macroexpand(:(@time 1))
+
     @testset "Basics" begin
         @test testee(:(a), [:a], [], [], [])
         @test testee(:(1 + 1), [], [], [:+], [])
diff --git a/test/MoreAnalysis.jl b/test/MoreAnalysis.jl
index 037414888e..76d0da4f2e 100644
--- a/test/MoreAnalysis.jl
+++ b/test/MoreAnalysis.jl
@@ -74,4 +74,4 @@ using Test
 
         @test transform(connections) == transform(wanted_connections)
     end
-end
\ No newline at end of file
+end

From d2ea880ec38141f9064f09b446600dce2c4cbbbf Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 18 Mar 2022 18:43:41 +0100
Subject: [PATCH 207/821] Fix disable_ui launch param

---
 frontend/editor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/editor.js b/frontend/editor.js
index 404b90caf8..af33d23d93 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -54,11 +54,12 @@ const launch_params = {
 console.log("Launch parameters: ", launch_params)
 
 const truthy = (x) => x === "" || x === "true"
+const falsey = (x) => x === "false"
 
 const from_attribute = (element, name) => {
     const val = element.getAttribute(name)
     if (name === "disable_ui") {
-        return truthy(val)
+        return truthy(val) ? true : falsey(val) ? false : null
     } else if (name === "isolated_cell_id") {
         return val == null ? null : val.split(",")
     } else {

From 55325da672f9819c82f8c84a4c89717d7b56561e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 18 Mar 2022 18:49:46 +0100
Subject: [PATCH 208/821] tweaky

---
 frontend/components/Editor.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 8335592570..4ee25a93ad 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -211,7 +211,6 @@ export class Editor extends Component {
     constructor(/** @type {EditorProps} */ props) {
         super(props)
 
-        console.log(this.props)
         const { launch_params, initial_notebook_state } = this.props
 
         this.state = {
@@ -1130,11 +1129,7 @@ patch: ${JSON.stringify(
             document.title = "🎈 " + new_state.notebook.shortpath + " — Pluto.jl"
         }
 
-        Object.entries(this.cached_status).forEach(([k, v]) => {
-            document.body.classList.toggle(k, v === true)
-        })
-
-        // this class is used to tell our frontend tests that the updates are done
+        // this property is used to tell our frontend tests that the updates are done
         //@ts-ignore
         document.body._update_is_ongoing = this.pending_local_updates > 0
 
@@ -1163,6 +1158,10 @@ patch: ${JSON.stringify(
 
     componentWillUpdate(new_props, new_state) {
         this.cached_status = statusmap(new_state, this.props.launch_params)
+
+        Object.entries(this.cached_status).forEach(([k, v]) => {
+            document.body.classList.toggle(k, v === true)
+        })
     }
 
     render() {

From 80becba4048219f8def91e1c2096cb6c573a2f8d Mon Sep 17 00:00:00 2001
From: Connor Burns <ctrekker4@gmail.com>
Date: Fri, 18 Mar 2022 12:00:03 -0600
Subject: [PATCH 209/821] Fix #1987 and #1990 (#1993)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/common/SetupMathJax.js |  7 +++++++
 frontend/components/Editor.js   | 27 ++++++++++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/frontend/common/SetupMathJax.js b/frontend/common/SetupMathJax.js
index f0e8f8f658..c60709efe0 100644
--- a/frontend/common/SetupMathJax.js
+++ b/frontend/common/SetupMathJax.js
@@ -1,6 +1,13 @@
 import "https://cdn.jsdelivr.net/npm/requestidlecallback-polyfill@1.0.2/index.js"
 
+let setup_done = false
+
 export const setup_mathjax = () => {
+    if (setup_done) {
+        return
+    }
+    setup_done = true
+
     const deprecated = () => console.warn("Pluto uses MathJax 3, but a MathJax 2 function was called.")
 
     // @ts-ignore
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 4ee25a93ad..e1ebcf4c11 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -760,17 +760,6 @@ patch: ${JSON.stringify(
         }
         this.on_disable_ui()
 
-        if (this.state.static_preview) {
-            this.setState({
-                initializing: false,
-                binder_phase: this.state.offer_binder ? BinderPhase.wait_for_user : null,
-            })
-            // view stats on https://stats.plutojl.org/
-            count_stat(`article-view`)
-        } else {
-            this.connect()
-        }
-
         setInterval(() => {
             if (!this.state.static_preview && document.visibilityState === "visible") {
                 // view stats on https://stats.plutojl.org/
@@ -1116,6 +1105,19 @@ patch: ${JSON.stringify(
         })
     }
 
+    componentDidMount() {
+        if (this.state.static_preview) {
+            this.setState({
+                initializing: false,
+                binder_phase: this.state.offer_binder ? BinderPhase.wait_for_user : null,
+            })
+            // view stats on https://stats.plutojl.org/
+            count_stat(`article-view`)
+        } else {
+            this.connect()
+        }
+    }
+
     componentDidUpdate(old_props, old_state) {
         //@ts-ignore
         window.editor_state = this.state
@@ -1143,8 +1145,7 @@ patch: ${JSON.stringify(
         if (old_state.disable_ui !== this.state.disable_ui) {
             this.on_disable_ui()
         }
-        if (old_state.initializing && !this.state.initializing) {
-            console.info("Initialization done!")
+        if (!this.state.initializing) {
             setup_mathjax()
         }
 

From dcd8e2b72e0b7a69a3c8836ca4848d764832ad77 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 18 Mar 2022 19:13:02 +0100
Subject: [PATCH 210/821] Fix offline mode SVG icons

---
 frontend/editor.css   | 42 +++++++++++++++++++++---------------------
 frontend/treeview.css |  2 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 3c6e272bd9..66f53504b6 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -675,11 +675,11 @@ nav#at_the_top button.start_stop_recording.stop span {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/stop-circle-outline.svg");
 }
 nav#at_the_top button.toggle_export span {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/shapes-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/shapes-outline.svg");
     filter: var(--image-filters);
 }
 aside#export button.toggle_export span {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-outline.svg");
     filter: var(--image-filters);
 }
 nav#at_the_top:after {
@@ -970,7 +970,7 @@ main > preamble #saveall-container.saved > span {
 
 main > preamble span.saved-icon::after,
 .overlay-button span.saved-icon::after {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/checkmark-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/checkmark-outline.svg");
     filter: var(--image-filters);
 }
 
@@ -1248,12 +1248,12 @@ pluto-cell:focus-within > pluto-shoulder > button {
 } */
 
 pluto-shoulder > button > span::after {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/eye-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/eye-outline.svg");
     filter: var(--image-filters);
 }
 
 pluto-cell.code_folded > pluto-shoulder > button > span::after {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/eye-off-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/eye-off-outline.svg");
     filter: var(--image-filters);
 }
 
@@ -1496,8 +1496,8 @@ pluto-cell > button.add_cell.after {
 }
 
 pluto-cell > button.add_cell > span::after {
-    /* background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/add-circle-outline.svg); */
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/add-outline.svg);
+    /* background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/add-circle-outline.svg"); */
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/add-outline.svg");
     filter: var(--image-filters);
 }
 pluto-input > button.input_context_menu ul {
@@ -1579,19 +1579,19 @@ pluto-input > button.input_context_menu ul {
     filter: var(--image-filters);
 }
 .ctx_icon.show_logs {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg");
 }
 
 .ctx_icon.hide_logs {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg");
 }
 
 .ctx_icon.bandage {
     filter: var(--image-filters) opacity(0.3);
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/bandage-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/bandage-outline.svg");
 }
 .ctx_icon.enable_cell {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg");
 }
 
 .ctx_icon.disable_cell {
@@ -1600,7 +1600,7 @@ pluto-input > button.input_context_menu ul {
     background-repeat: no-repeat;
 }
 .ctx_icon.delete {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-circle-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-circle-outline.svg");
 }
 
 pluto-input > button.input_context_menu {
@@ -1615,7 +1615,7 @@ pluto-input > button.input_context_menu.open {
 }
 
 pluto-input > button.input_context_menu > span.icon::after {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/ellipsis-horizontal-circle-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/ellipsis-horizontal-circle-outline.svg");
     filter: var(--image-filters);
 }
 
@@ -1659,8 +1659,8 @@ pkg-status-mark > button > span::after {
 }
 
 pkg-status-mark.installed > button > span::after {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/checkmark-outline.svg);
-    /* background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/cloud-done-outline.svg); */
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/checkmark-outline.svg");
+    /* background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/cloud-done-outline.svg"); */
     filter: var(--image-filters);
 }
 pkg-status-mark.busy > button > span::after {
@@ -1857,21 +1857,21 @@ pluto-runarea > button.runcell {
 }
 
 pluto-runarea > button.runcell > span::after {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg");
     filter: var(--image-filters);
 }
 
 pluto-runarea.interrupt > button.runcell > span::after {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/stop-circle-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/stop-circle-outline.svg");
     filter: var(--image-filters);
 }
 
 pluto-runarea.jump > button.runcell > span::after {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-redo-circle-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-redo-circle-outline.svg");
     filter: var(--image-filters);
 }
 pluto-runarea.save > button.runcell > span::after {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/chevron-forward-circle-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/chevron-forward-circle-outline.svg");
     filter: var(--image-filters);
 }
 
@@ -2549,11 +2549,11 @@ nav#slide_controls > button > span::after {
     background-size: 30px 30px;
 }
 nav#slide_controls > button.prev > span::after {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-back-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-back-outline.svg");
     filter: var(--image-filters);
 }
 nav#slide_controls > button.next > span::after {
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-forward-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-forward-outline.svg");
     filter: var(--image-filters);
 }
 
diff --git a/frontend/treeview.css b/frontend/treeview.css
index 54487b2545..db84e598cf 100644
--- a/frontend/treeview.css
+++ b/frontend/treeview.css
@@ -49,7 +49,7 @@ pluto-tree > pluto-tree-prefix::before {
     bottom: -2px;
     opacity: 0.5;
     cursor: pointer;
-    background-image: url(https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-down-outline.svg);
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-down-outline.svg");
     filter: var(--image-filters);
 }
 

From 477f513154193450b06b8dae35727f4288ef634e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 18 Mar 2022 19:16:37 +0100
Subject: [PATCH 211/821] =?UTF-8?q?=F0=9F=8C=BA=20Fix=20#1992?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/editor.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 66f53504b6..6f72d4e219 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2528,7 +2528,7 @@ body.presentation #helpbox-wrapper {
 nav#slide_controls {
     display: none;
 }
-body.presentation > nav#slide_controls {
+body.presentation nav#slide_controls {
     display: flex;
     position: fixed;
     bottom: 0px;

From 8b8fac0eb1444cc878a09c11d72b86dc6ccaee16 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 18 Mar 2022 19:39:04 +0100
Subject: [PATCH 212/821] Improve error message for #1979

---
 frontend/components/PasteHandler.js | 11 +++++++---
 frontend/error.jl.html              |  2 +-
 src/webserver/Static.jl             | 32 +++++++++++++++++++++++------
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/frontend/components/PasteHandler.js b/frontend/components/PasteHandler.js
index 432bdca3af..689b999af4 100644
--- a/frontend/components/PasteHandler.js
+++ b/frontend/components/PasteHandler.js
@@ -72,11 +72,16 @@ const processFile = async (ev) => {
         return
     }
     document.body.classList.add("loading")
-    const reply = await fetch("./notebookupload", {
+    const response = await fetch("./notebookupload", {
         method: "POST",
         body: notebook,
-    }).then((res) => res.text())
-    window.location.href = link_edit(reply)
+    })
+    if (response.ok) {
+        window.location.href = link_edit(await response.text())
+    } else {
+        let b = await response.blob()
+        window.location.href = URL.createObjectURL(b)
+    }
 }
 
 export const PasteHandler = () => {
diff --git a/frontend/error.jl.html b/frontend/error.jl.html
index 2a17418a2a..cdbd371544 100644
--- a/frontend/error.jl.html
+++ b/frontend/error.jl.html
@@ -28,7 +28,7 @@ <h2 style="font-style: normal;">$TITLE</h2>
         <main>
             <p>$ADVICE</p>
             <br />
-            <p><a href="./">Go back</a></p>
+            <p><a href="#" onclick="history.back()">Go back</a></p>
             <br />
             <p>$BODYTITLE</p>
             <pre>$BODY</pre>
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index 31685d2770..7892aa9ac9 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -67,7 +67,8 @@ function asset_response(path; cacheable::Bool=false)
     end
 end
 
-function error_response(status_code::Integer, title, advice, body="")
+function error_response(
+    status_code::Integer, title, advice, body="")
     template = read(project_relative_path(frontend_directory(), "error.jl.html"), String)
 
     body_title = body == "" ? "" : "Error message:"
@@ -215,13 +216,25 @@ function http_router_for(session::ServerSession)
             if haskey(query, "path")
                 path = tamepath(query["path"])
                 if isfile(path)
-                    return try_launch_notebook_response(SessionActions.open, path, as_redirect=(request.method == "GET"), as_sample=as_sample, title="Failed to load notebook", advice="The file <code>$(htmlesc(path))</code> could not be loaded. Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!")
+                    return try_launch_notebook_response(
+                        SessionActions.open, path; 
+                        as_redirect=(request.method == "GET"), 
+                        as_sample, 
+                        title="Failed to load notebook", 
+                        advice="The file <code>$(htmlesc(path))</code> could not be loaded. Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!",
+                    )
                 else
                     return error_response(404, "Can't find a file here", "Please check whether <code>$(htmlesc(path))</code> exists.")
                 end
             elseif haskey(query, "url")
                 url = query["url"]
-                return try_launch_notebook_response(SessionActions.open_url, url, as_redirect=(request.method == "GET"), as_sample=as_sample, title="Failed to load notebook", advice="The notebook from <code>$(htmlesc(url))</code> could not be loaded. Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!")
+                return try_launch_notebook_response(
+                    SessionActions.open_url, url;
+                    as_redirect=(request.method == "GET"), 
+                    as_sample, 
+                    title="Failed to load notebook", 
+                    advice="The notebook from <code>$(htmlesc(url))</code> could not be loaded. Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
+                )
             else
                 # You can ask Pluto to handle CustomLaunch events
                 # and do some magic with how you open files.
@@ -248,7 +261,14 @@ function http_router_for(session::ServerSession)
         sample_filename = split(HTTP.unescapeuri(uri.path), "sample/")[2]
         sample_path = project_relative_path("sample", sample_filename)
         
-        try_launch_notebook_response(SessionActions.open, sample_path; as_redirect=(request.method == "GET"), home_url="../", as_sample=true, title="Failed to load sample", advice="Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!")
+        try_launch_notebook_response(
+            SessionActions.open, sample_path; 
+            as_redirect=(request.method == "GET"), 
+            home_url="../", 
+            as_sample=true, 
+            title="Failed to load sample", 
+            advice="Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
+        )
     end
     HTTP.@register(router, "GET", "/sample/*", serve_sample)
     HTTP.@register(router, "POST", "/sample/*", serve_sample)
@@ -314,11 +334,11 @@ function http_router_for(session::ServerSession)
         save_path = SessionActions.save_upload(request.body)
         try_launch_notebook_response(
             SessionActions.open,
-            save_path,
+            save_path;
             as_redirect=false,
             as_sample=false,
             title="Failed to load notebook",
-            advice="Make sure that you copy the entire notebook file. Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
+            advice="The contents could not be read as a Pluto notebook file. When copying contents from somewhere else, make sure that you copy the entire notebook file.  You can also <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
         )
     end
     HTTP.@register(router, "POST", "/notebookupload", serve_notebookupload)

From 86fb85b399ccfb83211f7acc679d8355628121f7 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 18 Mar 2022 20:11:59 +0100
Subject: [PATCH 213/821] secret

---
 frontend/components/ExportBanner.js | 4 ++--
 frontend/editor.css                 | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index 7877371686..56a883704e 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -27,7 +27,7 @@ const Square = ({ fill }) => html`
 `
 
 //@ts-ignore
-window.enable_secret_pluto_recording = false
+window.enable_secret_pluto_recording = true
 
 export const ExportBanner = ({ onClose, notebookfile_url, notebookexport_url, start_recording }) => {
     return html`
@@ -61,7 +61,7 @@ export const ExportBanner = ({ onClose, notebookfile_url, notebookexport_url, st
                                   }}
                                   class="export_card"
                               >
-                                  <header><${Circle} fill="#E86F51" /> Recording</header>
+                                  <header><${Circle} fill="#E86F51" /> Record <em>(preview)</em></header>
                                   <section>Capture the entire notebook, and any changes you make.</section>
                               </a>
                           `
diff --git a/frontend/editor.css b/frontend/editor.css
index 6f72d4e219..2f7ead9184 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -508,9 +508,8 @@ header.show_export aside#export div#container {
 a.export_card {
     margin: 20px 5px;
     flex: 0 0 auto;
-    width: 160px;
+    width: 169px;
     height: 90px;
-
     border: 5px solid transparent;
     background: var(--export-card-bg-color);
     border-radius: 8px;
@@ -543,6 +542,8 @@ a.export_card section {
     color: var(--export-card-text-color);
     font-weight: 500;
     /* font-family: system-ui; */
+    /* font-size: 14px; */
+    padding: 3px;
 }
 aside#export button.toggle_export {
     margin-left: auto;

From 4c31a6b51a4f40b77b729b44fec90ea86da7a839 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 18 Mar 2022 20:12:14 +0100
Subject: [PATCH 214/821] remove default HTML title and description

---
 frontend/editor.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/editor.html b/frontend/editor.html
index 7e512861d2..a5864b7309 100644
--- a/frontend/editor.html
+++ b/frontend/editor.html
@@ -2,7 +2,6 @@
 <html lang="en">
 <head>
     <meta name="viewport" content="width=device-width" />
-    <title>⚡ Pluto.jl ⚡</title>
     <meta charset="utf-8" />
     <script>
         console.log(
@@ -16,7 +15,6 @@
     <link rel="icon" type="image/png" sizes="16x16" href="./img/favicon-16x16.png" />
     <link rel="icon" type="image/png" sizes="32x32" href="./img/favicon-32x32.png" />
     <link rel="icon" type="image/png" sizes="96x96" href="./img/favicon-96x96.png" />
-    <meta name="description" content="Pluto.jl notebooks" />
     <link rel="pluto-logo-big" href="./img/logo.svg" />
     <link rel="pluto-logo-small" href="./img/favicon_unsaturated.svg" />
 

From f535a75e849c57397c4dab3447c176b3461eb2b4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 18 Mar 2022 20:13:32 +0100
Subject: [PATCH 215/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 7ec7c0ac99..8025282dd6 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.18.2"
+version = "0.18.3"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 8aedc6093cff3dd92c7a13586132a62f24c832df Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 18 Mar 2022 20:34:35 +0100
Subject: [PATCH 216/821] Bundle.yml workflow: concurrency

---
 .github/workflows/Bundle.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/Bundle.yml b/.github/workflows/Bundle.yml
index 14f4735359..85c9bcccc2 100644
--- a/.github/workflows/Bundle.yml
+++ b/.github/workflows/Bundle.yml
@@ -5,6 +5,9 @@ on:
         branches:
             - main
     workflow_dispatch:
+concurrency:
+    group: bundle
+    cancel-in-progress: true
 
 jobs:
     trigger:

From d58f7657117b5d610aa2cf2c30bbcb6d1ba81f57 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 18 Mar 2022 23:56:24 +0100
Subject: [PATCH 217/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 8025282dd6..862818a563 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.18.3"
+version = "0.18.4"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From d873da9a02d1d5f476f7ba1610c279a8d7abc61f Mon Sep 17 00:00:00 2001
From: Benjamin Lungwitz <52384612+lungben@users.noreply.github.com>
Date: Sat, 19 Mar 2022 16:00:50 +0100
Subject: [PATCH 218/821] Cell metadata and persistent cell deactivation
 (#1895)

* merge Fons' commit

* comment out disabled cells

* update deactivation status when saving

* saving cell deactivation status works now, loading next

* load disabled status of notebooks

* Update src/evaluation/Run.jl

Co-authored-by: Rik Huijzer <t.h.huijzer@rug.nl>

* sample notebook comments out disabled cells now

* keep disabling info in cell metadata dict

* remove redundant loop

* test disabling metadata

* test parsing and updating metadata

* simplify cell disabling

* publish cell metadata to frontend

* use new test macro

* disabled metadata as bool only for directly disabled cells

* use metadata in frontend for cell disabling status

* remove running_disabled from backend

* fix functional vs oop notation

* fix tests

* Factor by DEFAULT_METADATA & split memory & file repr

* Adjust frontend to follow suit

* Did anyone say saving bug?

* Nitty-gritty reacty stuff

* Destructure instead of assingment

Co-authored-by: Michiel Dral <m.c.dral@gmail.com>
Co-authored-by: Rik Huijzer <t.h.huijzer@rug.nl>
Co-authored-by: Panagiotis Georgakopoulos <panagiotis.georgakopoulos@juliacomputing.com>
---
 Project.toml                     |  1 +
 frontend/components/Cell.js      |  5 ++--
 frontend/components/CellInput.js |  6 ++--
 frontend/components/Editor.js    | 18 ++++++++----
 frontend/components/Notebook.js  |  5 ++--
 frontend/components/RunArea.js   |  2 +-
 sample/notebook_with_metadata.jl | 48 ++++++++++++++++++++++++++++++
 src/evaluation/Run.jl            |  8 +++--
 src/notebook/Cell.jl             | 12 ++++++--
 src/notebook/Notebook.jl         | 50 ++++++++++++++++++++++++++++----
 src/webserver/Dynamic.jl         |  2 +-
 test/Notebook.jl                 | 49 +++++++++++++++++++++++++++++++
 test/cell_disabling.jl           | 18 +++++++-----
 test/helpers.jl                  |  1 +
 14 files changed, 194 insertions(+), 31 deletions(-)
 create mode 100644 sample/notebook_with_metadata.jl

diff --git a/Project.toml b/Project.toml
index 862818a563..921a7484c3 100644
--- a/Project.toml
+++ b/Project.toml
@@ -21,6 +21,7 @@ REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
+TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 8fdff97bb6..6c8a4d1b91 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -42,7 +42,7 @@ const useCellApi = (node_ref, published_object_keys, pluto_actions) => {
  * }} props
  * */
 export const Cell = ({
-    cell_input: { cell_id, code, code_folded, running_disabled },
+    cell_input: { cell_id, code, code_folded, metadata },
     cell_result: { queued, running, runtime, errored, output, logs, published_object_keys, depends_on_disabled_cells },
     cell_dependencies,
     cell_input_local,
@@ -55,6 +55,7 @@ export const Cell = ({
     nbpkg,
     global_definition_locations,
 }) => {
+    const { disabled: running_disabled } = metadata
     let pluto_actions = useContext(PlutoContext)
     const on_update_doc_query = pluto_actions.set_doc_query
     const on_focus_neighbor = pluto_actions.focus_on_neighbor
@@ -212,7 +213,7 @@ export const Cell = ({
                 nbpkg=${nbpkg}
                 cell_id=${cell_id}
                 notebook_id=${notebook_id}
-                running_disabled=${running_disabled}
+                metadata=${metadata}
                 any_logs=${any_logs}
                 show_logs=${show_logs}
                 set_show_logs=${set_show_logs}
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index c5245fdc6e..9a0b1cb781 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -347,15 +347,15 @@ export const CellInput = ({
     nbpkg,
     cell_id,
     notebook_id,
-    running_disabled,
-    cell_dependencies,
     any_logs,
     show_logs,
     set_show_logs,
     cm_highlighted_line,
+    metadata,
     global_definition_locations,
 }) => {
     let pluto_actions = useContext(PlutoContext)
+    const { disabled: running_disabled } = metadata
 
     const newcm_ref = useRef(/** @type {EditorView} */ (null))
     const dom_node_ref = useRef(/** @type {HTMLElement} */ (null))
@@ -806,7 +806,7 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, running_disabled, any_
         e.preventDefault()
         e.stopPropagation()
         await pluto_actions.update_notebook((notebook) => {
-            notebook.cell_inputs[cell_id].running_disabled = new_val
+            notebook.cell_inputs[cell_id].metadata["disabled"] = new_val
         })
         // we also 'run' the cell if it is disabled, this will make the backend propage the disabled state to dependent cells
         await run_cell()
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index e1ebcf4c11..86e01e908f 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -98,7 +98,9 @@ const first_true_key = (obj) => {
  *  cell_id: string,
  *  code: string,
  *  code_folded: boolean,
- *  running_disabled: boolean,
+ *  metadata: {
+ *    disabled: boolean
+ *  },
  * }}
  */
 
@@ -124,7 +126,6 @@ const first_true_key = (obj) => {
  *  downstream_cells_map: { string: [string]},
  *  upstream_cells_map: { string: [string]},
  *  precedence_heuristic: ?number,
- *  running_disabled: boolean,
  *  depends_on_disabled_cells: boolean,
  *  output: {
  *      body: string,
@@ -291,7 +292,6 @@ export class Editor extends Component {
                     cell_id: uuidv4(),
                     code: code,
                     code_folded: false,
-                    running_disabled: false,
                 }))
 
                 let index
@@ -337,6 +337,9 @@ export class Editor extends Component {
                             ...cell,
                             // Fill the cell with empty code remotely, so it doesn't run unsafe code
                             code: "",
+                            metadata: {
+                                disabled: false,
+                            },
                         }
                     }
                     notebook.cell_order = [
@@ -374,7 +377,9 @@ export class Editor extends Component {
                         cell_id: uuidv4(),
                         code: code,
                         code_folded: false,
-                        running_disabled: false,
+                        metadata: {
+                            disabled: false,
+                        },
                     }
                 })
 
@@ -432,7 +437,7 @@ export class Editor extends Component {
                         cell_id: id,
                         code,
                         code_folded: false,
-                        running_disabled: false,
+                        metadata: { disabled: false },
                     }
                     notebook.cell_order = [...notebook.cell_order.slice(0, index), id, ...notebook.cell_order.slice(index, Infinity)]
                 })
@@ -814,7 +819,8 @@ patch: ${JSON.stringify(
                 // if the other cell depends on the variable `sym`...
                 if (deps.upstream_cells_map.hasOwnProperty(sym)) {
                     // and the cell is not disabled
-                    return !(this.state.notebook.cell_inputs[cell_id]?.running_disabled ?? true)
+                    const running_disabled = this.state.notebook.cell_inputs[cell_id].metadata.disabled
+                    return !running_disabled
                 }
             })
 
diff --git a/frontend/components/Notebook.js b/frontend/components/Notebook.js
index 7d58508b88..53e96eb6c7 100644
--- a/frontend/components/Notebook.js
+++ b/frontend/components/Notebook.js
@@ -42,7 +42,7 @@ let CellMemo = ({
 }) => {
     const { body, last_run_timestamp, mime, persist_js_state, rootassignee } = cell_result?.output || {}
     const { queued, running, runtime, errored, depends_on_disabled_cells, logs } = cell_result || {}
-    const { cell_id, code, code_folded, running_disabled } = cell_input || {}
+    const { cell_id, code, code_folded, metadata } = cell_input || {}
     return useMemo(() => {
         return html`
             <${Cell}
@@ -63,8 +63,9 @@ let CellMemo = ({
             />
         `
     }, [
+        // Object references may invalidate this faster than the optimal. To avoid this, spread out objects to primitives!
         cell_id,
-        running_disabled,
+        metadata.disabled,
         depends_on_disabled_cells,
         queued,
         running,
diff --git a/frontend/components/RunArea.js b/frontend/components/RunArea.js
index 95288a9d16..e158cddfcf 100644
--- a/frontend/components/RunArea.js
+++ b/frontend/components/RunArea.js
@@ -12,7 +12,7 @@ const all_upstreams_of = (a_cell_id, notebook) => {
     return [...upstreams, ...upstreams.flatMap((v) => all_upstreams_of(v, notebook))]
 }
 const hasBarrier = (a_cell_id, notebook) => {
-    return notebook?.cell_inputs?.[a_cell_id]?.running_disabled
+    return notebook?.cell_inputs?.[a_cell_id].metadata.disabled
 }
 
 export const RunArea = ({ runtime, running, queued, code_differs, on_run, on_interrupt, depends_on_disabled_cells, running_disabled, cell_id }) => {
diff --git a/sample/notebook_with_metadata.jl b/sample/notebook_with_metadata.jl
new file mode 100644
index 0000000000..3d111574f9
--- /dev/null
+++ b/sample/notebook_with_metadata.jl
@@ -0,0 +1,48 @@
+### A Pluto.jl notebook ###
+# v0.18.0
+
+using Markdown
+using InteractiveUtils
+
+# ╔═╡ 8399ed34-7dc4-11eb-16ec-e572834e149d
+# ╠═╡ disabled = true
+#=╠═╡
+x = 7
+  ╠═╡ =#
+
+# ╔═╡ 88c83d42-7dc4-11eb-1b5e-a1ecad4b6ff1
+# ╠═╡ disabled = true
+#=╠═╡
+x
+  ╠═╡ =#
+
+# ╔═╡ 48f7cf80-c1f6-4002-8639-a0addb8e6780
+#=╠═╡
+x + 1 
+  ╠═╡ =#
+
+# ╔═╡ 18f57a3f-3b1f-4346-9686-752438f6067f
+z = 14
+
+# ╔═╡ 00000000-0000-0000-0000-000000000001
+PLUTO_PROJECT_TOML_CONTENTS = """
+[deps]
+"""
+
+# ╔═╡ 00000000-0000-0000-0000-000000000002
+PLUTO_MANIFEST_TOML_CONTENTS = """
+# This file is machine-generated - editing it directly is not advised
+
+julia_version = "1.7.1"
+manifest_format = "2.0"
+
+[deps]
+"""
+
+# ╔═╡ Cell order:
+# ╠═88c83d42-7dc4-11eb-1b5e-a1ecad4b6ff1
+# ╠═8399ed34-7dc4-11eb-16ec-e572834e149d
+# ╠═48f7cf80-c1f6-4002-8639-a0addb8e6780
+# ╠═18f57a3f-3b1f-4346-9686-752438f6067f
+# ╟─00000000-0000-0000-0000-000000000001
+# ╟─00000000-0000-0000-0000-000000000002
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 8ab766bc76..3f6ef70c1a 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -33,7 +33,6 @@ function run_reactive!(
 
         # update cache and save notebook because the dependencies might have changed after expanding macros
         update_dependency_cache!(notebook)
-        save_notebook(session, notebook)
     end
 
     removed_cells = setdiff(keys(old_topology.nodes), keys(new_topology.nodes))
@@ -66,7 +65,7 @@ function run_reactive!(
     to_run_raw = setdiff(union(new_runnable, old_runnable), keys(new_order.errable))::Vector{Cell} # TODO: think if old error cell order matters
 
     # find (indirectly) deactivated cells and update their status
-    deactivated = filter(c -> c.running_disabled, notebook.cells)
+	deactivated = filter(c -> c.metadata["disabled"], notebook.cells)
     indirectly_deactivated = collect(topological_order(new_topology, deactivated))
     for cell in indirectly_deactivated
         cell.running = false
@@ -81,6 +80,11 @@ function run_reactive!(
         cell.queued = true
         cell.depends_on_disabled_cells = false
     end
+
+	# Move this save to after the last point the
+	# notebook serialization representation changes
+	# (currently, `depends_on_disabled_cells`)
+	save_notebook(session, notebook)
     for (cell, error) in new_order.errable
         cell.running = false
         cell.queued = false
diff --git a/src/notebook/Cell.jl b/src/notebook/Cell.jl
index f8b7212657..12de893ace 100644
--- a/src/notebook/Cell.jl
+++ b/src/notebook/Cell.jl
@@ -1,6 +1,10 @@
 import UUIDs: UUID, uuid1
 import .ExpressionExplorer: SymbolsState, UsingsImports
 
+const DEFAULT_METADATA = Dict{String, Any}(
+    "disabled" => false
+)
+
 Base.@kwdef struct CellOutput
     body::Union{Nothing,String,Vector{UInt8},Dict}=nothing
     mime::MIME=MIME("text/plain")
@@ -44,8 +48,9 @@ Base.@kwdef mutable struct Cell
     # note that this field might be moved somewhere else later. If you are interested in visualizing the cell dependencies, take a look at the cell_dependencies field in the frontend instead.
     cell_dependencies::CellDependencies{Cell}=CellDependencies{Cell}(Dict{Symbol,Vector{Cell}}(), Dict{Symbol,Vector{Cell}}(), 99)
 
-    running_disabled::Bool=false
     depends_on_disabled_cells::Bool=false
+
+    metadata::Dict{String,Any}=copy(DEFAULT_METADATA)
 end
 
 Cell(cell_id, code) = Cell(cell_id=cell_id, code=code)
@@ -58,9 +63,12 @@ function Base.convert(::Type{Cell}, cell::Dict)
         cell_id=UUID(cell["cell_id"]),
         code=cell["code"],
         code_folded=cell["code_folded"],
-        running_disabled=cell["running_disabled"],
+        metadata=cell["metadata"],
     )
 end
 function Base.convert(::Type{UUID}, string::String)
     UUID(string)
 end
+
+get_cell_metadata(cell::Cell)::Dict{String,Any} = cell.metadata
+get_cell_metadata_no_default(cell::Cell)::Dict{String,Any} = Dict{String,Any}(setdiff(pairs(cell.metadata), pairs(DEFAULT_METADATA)))
diff --git a/src/notebook/Notebook.jl b/src/notebook/Notebook.jl
index 034ff748ea..b6296a7e3e 100644
--- a/src/notebook/Notebook.jl
+++ b/src/notebook/Notebook.jl
@@ -3,6 +3,7 @@ import .ExpressionExplorer: SymbolsState, FunctionNameSignaturePair, FunctionNam
 import .Configuration
 import .PkgCompat: PkgCompat, PkgContext
 import Pkg
+import TOML
 
 mutable struct BondValue
     value::Any
@@ -92,10 +93,14 @@ const _notebook_header = "### A Pluto.jl notebook ###"
 # We use a creative delimiter to avoid accidental use in code
 # so don't get inspired to suddenly use these in your code!
 const _cell_id_delimiter = "# ╔═╡ "
+const _cell_metadata_prefix = "# ╠═╡ "
 const _order_delimiter = "# ╠═"
 const _order_delimiter_folded = "# ╟─"
 const _cell_suffix = "\n\n"
 
+const _disabled_prefix = "#=╠═╡\n"
+const _disabled_suffix = "\n  ╠═╡ =#"
+
 const _ptoml_cell_id = UUID(1)
 const _mtoml_cell_id = UUID(2)
 
@@ -127,9 +132,23 @@ function save_notebook(io, notebook::Notebook)
     
     for c in cells_ordered
         println(io, _cell_id_delimiter, string(c.cell_id))
-        # write the cell code and prevent collisions with the cell delimiter
-        print(io, replace(c.code, _cell_id_delimiter => "# "))
-        print(io, _cell_suffix)
+        metadata_toml = strip(sprint(TOML.print, get_cell_metadata_no_default(c)))
+        if metadata_toml != ""
+            for line in split(metadata_toml, "\n")
+                println(io, _cell_metadata_prefix, line)
+            end
+        end
+        cell_running_disabled = c.metadata["disabled"]
+        if cell_running_disabled || c.depends_on_disabled_cells
+            print(io, _disabled_prefix)
+            print(io, replace(c.code, _cell_id_delimiter => "# "))
+            print(io, _disabled_suffix)
+            print(io, _cell_suffix)
+        else
+            # write the cell code and prevent collisions with the cell delimiter
+            print(io, replace(c.code, _cell_id_delimiter => "# "))
+            print(io, _cell_suffix)
+        end
     end
 
     
@@ -211,13 +230,34 @@ function load_notebook_nobackup(io, path)::Notebook
             break
         else
             cell_id = UUID(cell_id_str)
-            code_raw = String(readuntil(io, _cell_id_delimiter))
+            
+            metadata_toml_lines = String[]
+            initial_code_line = ""
+            while !eof(io)
+                line = String(readline(io))
+                if startswith(line, _cell_metadata_prefix)
+                    prefix_length = ncodeunits(_cell_metadata_prefix)
+                    push!(metadata_toml_lines, line[begin+prefix_length:end])
+                else
+                    initial_code_line = line
+                    break
+                end
+            end
+
+            code_raw = initial_code_line * "\n" * String(readuntil(io, _cell_id_delimiter))
             # change Windows line endings to Linux
             code_normalised = replace(code_raw, "\r\n" => "\n")
+
+            # remove the disabled on startup comments for further processing in Julia
+            code_normalised = replace(replace(code_normalised, _disabled_prefix => ""), _disabled_suffix => "")
+
             # remove the cell suffix
             code = code_normalised[1:prevind(code_normalised, end, length(_cell_suffix))]
 
-            read_cell = Cell(cell_id, code)
+            # parse metadata
+            metadata = Dict{String, Any}(DEFAULT_METADATA..., TOML.parse(join(metadata_toml_lines, "\n"))...)
+
+            read_cell = Cell(; cell_id, code, metadata)
             collected_cells[cell_id] = read_cell
         end
     end
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index fc2aa2786c..86b4927552 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -109,7 +109,7 @@ function notebook_to_js(notebook::Notebook)
                 "cell_id" => cell.cell_id,
                 "code" => cell.code,
                 "code_folded" => cell.code_folded,
-                "running_disabled" => cell.running_disabled,
+                "metadata" => cell.metadata,
             )
         for (id, cell) in notebook.cells_dict),
         "cell_dependencies" => Dict{UUID,Dict{String,Any}}(
diff --git a/test/Notebook.jl b/test/Notebook.jl
index 5e34ed350b..a65fb41ae2 100644
--- a/test/Notebook.jl
+++ b/test/Notebook.jl
@@ -29,6 +29,22 @@ function basic_notebook()
     ]) |> init_packages!
 end
 
+function metadata_notebook()
+    Notebook([
+        Cell(
+            code="100*a + b",
+            metadata=Dict(
+                "a metadata tag" => Dict(
+                    "boolean" => true,
+                    "string" => "String",
+                    "number" => 10000,
+                ),
+                "disabled" => true,
+            ),
+        ),
+    ]) |> init_packages!
+end
+
 function shuffled_notebook()
     Notebook([
         Cell("z = y"),
@@ -141,6 +157,39 @@ end
         end
     end
 
+    @testset "Metadata" begin
+        🍭 = ServerSession()
+        🍭.options.evaluation.workspace_use_distributed = false
+        fakeclient = ClientSession(:fake, nothing)
+        🍭.connected_clients[fakeclient.id] = fakeclient
+
+        nb = metadata_notebook()
+        update_run!(🍭, nb, nb.cells)
+        cell = first(values(nb.cells_dict))
+        @test cell.metadata == Dict(
+            "a metadata tag" => Dict(
+                "boolean" => true,
+                "string" => "String",
+                "number" => 10000,
+            ),
+            "disabled" => true, # enhanced metadata because cell is disabled
+        )
+
+        save_notebook(nb)
+        @info "File" Text(read(nb.path,String))
+        result = load_notebook_nobackup(nb.path)
+        @test_notebook_inputs_equal(nb, result)
+        cell = first(values(result.cells_dict))
+        @test cell.metadata == Dict(
+            "a metadata tag" => Dict(
+                "boolean" => true,
+                "string" => "String",
+                "number" => 10000,
+            ),
+            "disabled" => true,
+        )
+    end
+
     @testset "I/O overloaded" begin
         @testset "$(name)" for (name, nb) in nbs
             let
diff --git a/test/cell_disabling.jl b/test/cell_disabling.jl
index 7e1eb83a72..7e1632404a 100644
--- a/test/cell_disabling.jl
+++ b/test/cell_disabling.jl
@@ -26,14 +26,18 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook
     id(i) = notebook.cells[i].cell_id
     get_disabled_cells(notebook) = [i for (i, c) in pairs(notebook.cells) if c.depends_on_disabled_cells]
 
-    @test !any(c.running_disabled for c in notebook.cells)
+    @test !any(get(c.metadata, "disabled", false) for c in notebook.cells)
     @test !any(c.depends_on_disabled_cells for c in notebook.cells)
 
     # disable first cell
-    notebook.cells[1].running_disabled = true
+    notebook.cells[1].metadata["disabled"] = true
     update_run!(🍭, notebook, notebook.cells)
     should_be_disabled = [1, 3, 5]
     @test get_disabled_cells(notebook) == should_be_disabled
+    @test notebook.cells[1].metadata["disabled"] == true
+
+    # metadatum will exists in memory, but not in the serialized form
+    @test all(haskey(notebook.cells[i].metadata , "disabled") for i=1:5)
 
     # change x, this change should not propagate through y
     original_y_output = notebook.cells[1].output.body
@@ -55,7 +59,7 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook
     @test notebook.cells[5].output.body == original_w_output
 
     # disable root cell
-    notebook.cells[2].running_disabled = true
+    notebook.cells[2].metadata["disabled"] = true
     update_run!(🍭, notebook, notebook.cells)
     @test get_disabled_cells(notebook) == collect(1:5)
 
@@ -68,7 +72,7 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook
     @test notebook.cells[6].output.body == original_6_output
 
     # reactivate first cell - still all cells should be running_disabled
-    notebook.cells[1].running_disabled = false
+    notebook.cells[1].metadata["disabled"] = false
     update_run!(🍭, notebook, notebook.cells)
     @test get_disabled_cells(notebook) == collect(1:6)
 
@@ -81,7 +85,7 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook
     @test notebook.cells[5].output.body == original_w_output
 
     # reactivate root cell
-    notebook.cells[2].running_disabled = false
+    notebook.cells[2].metadata["disabled"] = false
     update_run!(🍭, notebook, notebook.cells)
     @test get_disabled_cells(notebook) == []
 
@@ -92,13 +96,13 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook
     @test notebook.cells[5].output.body != original_w_output
 
     # disable first cell again
-    notebook.cells[1].running_disabled = true
+    notebook.cells[1].metadata["disabled"] = true
     update_run!(🍭, notebook, notebook.cells)
     should_be_disabled = [1, 3, 5]
     @test get_disabled_cells(notebook) == should_be_disabled
 
     # and reactivate it
-    notebook.cells[1].running_disabled = false
+    notebook.cells[1].metadata["disabled"] = false
     update_run!(🍭, notebook, notebook.cells)
     @test get_disabled_cells(notebook) == []
 
diff --git a/test/helpers.jl b/test/helpers.jl
index b24d1e4120..347fb0dac9 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -147,6 +147,7 @@ macro test_notebook_inputs_equal(nbA, nbB, check_paths_equality::Bool=true)
         @test getproperty.(nbA.cells, :cell_id) == getproperty.(nbB.cells, :cell_id)
         @test getproperty.(nbA.cells, :code_folded) == getproperty.(nbB.cells, :code_folded)
         @test getproperty.(nbA.cells, :code) == getproperty.(nbB.cells, :code)
+        @test getproperty.(nbA.cells, :metadata) == getproperty.(nbB.cells, :metadata)
         
     end |> Base.remove_linenums!
 end

From 7df969ed39415171e5883c8f886a36323d4030bf Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 20 Mar 2022 13:10:53 +0100
Subject: [PATCH 219/821] bundle: fix null filenames in resolver

---
 .../parcel-resolver-like-a-browser/https-resolver.js         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js b/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
index 07187bd706..534e6a079c 100644
--- a/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
+++ b/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
@@ -46,8 +46,9 @@ module.exports = new Resolver({
             if (url.password !== "") throw new Error(`Password in urls not supported (${specifier})`)
 
             // If no file extension is given in the URL, guess one automatically.
-            let found_extension = /\.[a-zA-Z][a-zA-Z0-9].$/.exec(url.pathname)?.[0]
-            let extension_to_add = found_extension ?? (dependency.specifierType === "esm" ? ".mjs" : null)
+            let found_extension = /\.[a-zA-Z][a-zA-Z0-9]+$/.exec(url.pathname)?.[0]
+
+            let extension_to_add = found_extension ?? (dependency.specifierType === "esm" ? ".mjs" : "")
             // If a search is given in the URL, this will search be appended to the path, so we need to repeat the extension.
             let should_add_extension = url.search !== "" || found_extension == null
             let suffix = should_add_extension ? extension_to_add : ""

From 84574a6d51561f24b659049db9f1e80c64bff13f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 20 Mar 2022 13:11:15 +0100
Subject: [PATCH 220/821] bundle: parcel manifest

---
 frontend-bundler/.parcelrc         |  4 ++++
 frontend-bundler/package-lock.json | 24 ++++++++++++++++++++++++
 frontend-bundler/package.json      |  1 +
 3 files changed, 29 insertions(+)

diff --git a/frontend-bundler/.parcelrc b/frontend-bundler/.parcelrc
index eb1a80ec89..47170b8e3b 100644
--- a/frontend-bundler/.parcelrc
+++ b/frontend-bundler/.parcelrc
@@ -3,5 +3,9 @@
     "resolvers": [
         "parcel-resolver-like-a-browser",
         "..."
+    ],
+    "reporters": [
+        "...", 
+        "parcel-reporter-bundle-manifest"
     ]
 }
diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index 691ca8b386..fc6df67665 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -15,6 +15,7 @@
                 "@parcel/config-default": "^2.0.0",
                 "mkdirp": "^1.0.4",
                 "parcel": "^2.0.0",
+                "parcel-reporter-bundle-manifest": "^1.0.0",
                 "parcel-resolver-like-a-browser": "file:../frontend-bundler/parcel-resolver-like-a-browser"
             },
             "devDependencies": {
@@ -5462,6 +5463,21 @@
                 "url": "https://opencollective.com/parcel"
             }
         },
+        "node_modules/parcel-reporter-bundle-manifest": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/parcel-reporter-bundle-manifest/-/parcel-reporter-bundle-manifest-1.0.0.tgz",
+            "integrity": "sha512-/fQDwYWT9LsXRddNikci9Jox6bJdKnfGKpnVd4++1TRUYRLXvFVGQjyGZg8Gsu/JQN6psST8ilRmpg61yN37pQ==",
+            "dependencies": {
+                "@parcel/plugin": "^2.0.0"
+            },
+            "engines": {
+                "node": ">= 12.0.0",
+                "parcel": "^2.0.0"
+            },
+            "peerDependencies": {
+                "parcel": "^2.0.0"
+            }
+        },
         "node_modules/parcel-resolver-like-a-browser": {
             "resolved": "parcel-resolver-like-a-browser",
             "link": true
@@ -11750,6 +11766,14 @@
                 }
             }
         },
+        "parcel-reporter-bundle-manifest": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/parcel-reporter-bundle-manifest/-/parcel-reporter-bundle-manifest-1.0.0.tgz",
+            "integrity": "sha512-/fQDwYWT9LsXRddNikci9Jox6bJdKnfGKpnVd4++1TRUYRLXvFVGQjyGZg8Gsu/JQN6psST8ilRmpg61yN37pQ==",
+            "requires": {
+                "@parcel/plugin": "^2.0.0"
+            }
+        },
         "parcel-resolver-like-a-browser": {
             "version": "file:parcel-resolver-like-a-browser",
             "requires": {
diff --git a/frontend-bundler/package.json b/frontend-bundler/package.json
index 0b5a3fbe21..142e61c333 100644
--- a/frontend-bundler/package.json
+++ b/frontend-bundler/package.json
@@ -16,6 +16,7 @@
         "@parcel/config-default": "^2.0.0",
         "mkdirp": "^1.0.4",
         "parcel": "^2.0.0",
+        "parcel-reporter-bundle-manifest": "^1.0.0",
         "parcel-resolver-like-a-browser": "file:../frontend-bundler/parcel-resolver-like-a-browser"
     },
     "devDependencies": {

From 07d5e50a116b5a29fdc5caaba606384ee6831046 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 21 Mar 2022 13:57:12 +0100
Subject: [PATCH 221/821] type improvements

---
 frontend/common/PlutoConnection.js         | 14 +++++---------
 frontend/common/PlutoConnectionSendFn.d.ts | 12 ++++++++++++
 frontend/components/Editor.js              |  5 +++--
 3 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 frontend/common/PlutoConnectionSendFn.d.ts

diff --git a/frontend/common/PlutoConnection.js b/frontend/common/PlutoConnection.js
index 0cf400e352..1f74f92107 100644
--- a/frontend/common/PlutoConnection.js
+++ b/frontend/common/PlutoConnection.js
@@ -239,13 +239,14 @@ const default_ws_address = () => ws_address_from_base(window.location.href)
  * @typedef PlutoConnection
  * @type {{
  *  session_options: Object,
- *  send: () => void,
+ *  send: import("./PlutoConnectionSendFn").SendFn,
  *  kill: () => void,
  *  version_info: {
  *      julia: string,
  *      pluto: string,
  *      dismiss_update_notification: boolean,
  *  },
+ *  notebook_exists: boolean,
  * }}
  */
 
@@ -284,20 +285,14 @@ export const create_pluto_connection = async ({
             pluto: "unknown",
             dismiss_update_notification: false,
         },
+        notebook_exists: true,
         kill: null,
     } // same
 
     const client_id = get_unique_short_id()
     const sent_requests = new Map()
 
-    /**
-     * Send a message to the Pluto backend, and return a promise that resolves when the backend sends a response. Not all messages receive a response.
-     * @param {string} message_type
-     * @param {Object} body
-     * @param {{notebook_id?: string, cell_id?: string}} metadata
-     * @param {boolean} no_broadcast if false, the message will be emitteed to on_update
-     * @returns {(undefined|Promise<Object>)}
-     */
+    /** @type {import("./PlutoConnectionSendFn").SendFn} */
     const send = async (message_type, body = {}, metadata = {}, no_broadcast = true) => {
         const request_id = get_unique_short_id()
 
@@ -384,6 +379,7 @@ export const create_pluto_connection = async ({
             console.log("Hello!")
             client.session_options = u.message.options
             client.version_info = u.message.version_info
+            client.notebook_exists = u.message.notebook_exists
 
             console.log("Client object: ", client)
 
diff --git a/frontend/common/PlutoConnectionSendFn.d.ts b/frontend/common/PlutoConnectionSendFn.d.ts
new file mode 100644
index 0000000000..458394bd5f
--- /dev/null
+++ b/frontend/common/PlutoConnectionSendFn.d.ts
@@ -0,0 +1,12 @@
+/** Send a message to the Pluto backend, and return a promise that resolves when the backend sends a response. Not all messages receive a response. */
+export function SendFn (
+    message_type: string,
+    body?: Object,
+    metadata?: {notebook_id?: string, cell_id?: string},
+    /** 
+     * If false, then the server response will go through the `on_unrequested_update` callback of this client. (This is useful for requests that will cause a state change, like "Run cell". We want the response (state patch) to be handled by the `on_unrequested_update` logic.)
+     * 
+     * If true (default), then the response will *only* go to you. This is useful for isolated requests, like "Please autocomplete `draw_rectang`".
+     * @default true */
+    skip_onupdate_callback?: boolean,
+    ): Promise<Record<string,any>>
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 86e01e908f..14390b5dae 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -254,7 +254,7 @@ export class Editor extends Component {
         // these are things that can be done to the local notebook
         this.actions = {
             get_notebook: () => this?.state?.notebook || {},
-            send: (...args) => this.client.send(...args),
+            send: (message_type, ...args) => this.client.send(message_type, ...args),
             get_published_object: (objectid) => this.state.notebook.published_objects[objectid],
             //@ts-ignore
             update_notebook: (...args) => this.update_notebook(...args),
@@ -731,7 +731,8 @@ patch: ${JSON.stringify(
                 ? `./${u}?id=${this.state.notebook.notebook_id}`
                 : `${this.state.binder_session_url}${u}?id=${this.state.notebook.notebook_id}&token=${this.state.binder_session_token}`
 
-        this.client = {}
+        /** @type {import('../common/PlutoConnection').PlutoConnection} */
+        this.client = /** @type {import('../common/PlutoConnection').PlutoConnection} */ ({})
 
         this.connect = (ws_address = undefined) =>
             create_pluto_connection({

From 56100e48ba0f5df2a983a74d347a7285ed69ebaf Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 21 Mar 2022 13:57:43 +0100
Subject: [PATCH 222/821] fix false warning "request without a notebook"
 message

---
 frontend/components/Editor.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 14390b5dae..a13b3b1aef 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -705,6 +705,10 @@ patch: ${JSON.stringify(
             // @ts-ignore
             window.version_info = this.client.version_info // for debugging
 
+            if (!client.notebook_exists) {
+                console.error("Notebook does not exist. Not connecting.")
+                return
+            }
             console.debug("Sending update_notebook request...")
             await this.client.send("update_notebook", { updates: [] }, { notebook_id: this.state.notebook.notebook_id }, false)
             console.debug("Received update_notebook request")

From 086c8c8f7154fcfe43a552381bb6e6fb6c030555 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 21 Mar 2022 14:51:59 +0100
Subject: [PATCH 223/821] fix confusing comment + name collision

---
 frontend/components/CellInput/pluto_autocomplete.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend/components/CellInput/pluto_autocomplete.js b/frontend/components/CellInput/pluto_autocomplete.js
index 55b6de9bf0..9c3151a1cd 100644
--- a/frontend/components/CellInput/pluto_autocomplete.js
+++ b/frontend/components/CellInput/pluto_autocomplete.js
@@ -16,11 +16,11 @@ import {
 import { get_selected_doc_from_state } from "./LiveDocsFromCursor.js"
 import { cl } from "../../common/ClassTable.js"
 
-let { autocompletion, completionKeymap } = autocomplete
+let { autocompletion, completionKeymap, acceptCompletion } = autocomplete
 
-// These should be imported from  @codemirror/autocomplete
+// These should be imported from  @codemirror/autocomplete, but they are not exported.
 let completionState = autocompletion()[0]
-let acceptCompletion = (/** @type {EditorView} */ view, option) => {
+let applyCompletion = (/** @type {EditorView} */ view, option) => {
     let apply = option.completion.apply || option.completion.label
     let result = option.source
     if (typeof apply == "string") {
@@ -63,7 +63,7 @@ const tabCompletionState = StateField.define({
 /** @param {EditorView} cm */
 const tab_completion_command = (cm) => {
     // This will return true if the autocomplete select popup is open
-    if (autocomplete.acceptCompletion(cm)) {
+    if (acceptCompletion(cm)) {
         return true
     }
 
@@ -93,7 +93,7 @@ let open_docs_if_autocomplete_is_open_command = (cm) => {
 /** @param {EditorView} cm */
 let complete_and_also_type = (cm) => {
     // Possibly autocomplete
-    autocomplete.acceptCompletion(cm)
+    acceptCompletion(cm)
     // And then do nothing, in the hopes that codemirror will add whatever we typed
     return false
 }
@@ -291,7 +291,8 @@ export let pluto_autocomplete = ({ request_autocomplete, on_update_doc_query })
             let is_tab_completion = update.state.field(tabCompletionState, false)
 
             if (autocompletion_state?.open != null && is_tab_completion && autocompletion_state.open.options.length === 1) {
-                acceptCompletion(update.view, autocompletion_state.open.options[0])
+                // We can't use `acceptCompletion` here because that function has a minimum delay of 75ms between creating the completion options and applying one.
+                applyCompletion(update.view, autocompletion_state.open.options[0])
             }
         }),
 

From 7bc699f70c7816f11dda5eccd9b8288bf0bd5c22 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Mon, 21 Mar 2022 14:56:43 +0100
Subject: [PATCH 224/821] local variable autocomplete (#1925)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 .../CellInput/pluto_autocomplete.js           | 61 +++++++++++++-
 .../CellInput/scopestate_statefield.js        | 81 +++++++++++++------
 2 files changed, 114 insertions(+), 28 deletions(-)

diff --git a/frontend/components/CellInput/pluto_autocomplete.js b/frontend/components/CellInput/pluto_autocomplete.js
index 9c3151a1cd..d08c4a962e 100644
--- a/frontend/components/CellInput/pluto_autocomplete.js
+++ b/frontend/components/CellInput/pluto_autocomplete.js
@@ -15,8 +15,9 @@ import {
 } from "../../imports/CodemirrorPlutoSetup.js"
 import { get_selected_doc_from_state } from "./LiveDocsFromCursor.js"
 import { cl } from "../../common/ClassTable.js"
+import { ScopeStateField } from "./scopestate_statefield.js"
 
-let { autocompletion, completionKeymap, acceptCompletion } = autocomplete
+let { autocompletion, completionKeymap, completionStatus, acceptCompletion } = autocomplete
 
 // These should be imported from  @codemirror/autocomplete, but they are not exported.
 let completionState = autocompletion()[0]
@@ -167,6 +168,25 @@ let override_text_to_apply_in_field_expression = (text) => {
     return !/^[@a-zA-Z_][a-zA-Z0-9!_]*\"?$/.test(text) ? (text === ":" ? `:(${text})` : `:${text}`) : null
 }
 
+/**
+ * @param {Map<String,import("./scopestate_statefield.js").Definition>} definitions
+ * @param {Set<String>} proposed
+ * @param {number} context_pos
+ */
+const generate_scopestate_completions = function* (definitions, proposed, context_pos) {
+    let i = 0
+    for (let [name, { valid_from }] of definitions.entries()) {
+        if (!proposed.has(name) && valid_from < context_pos) {
+            yield {
+                label: name,
+                type: "c_Any",
+                boost: 99 - i,
+            }
+            i += 1
+        }
+    }
+}
+
 const juliahints_cool_generator = (/** @type {PlutoRequestAutocomplete} */ request_autocomplete) => async (ctx) => {
     let to_complete = ctx.state.sliceDoc(0, ctx.pos)
 
@@ -184,6 +204,9 @@ const juliahints_cool_generator = (/** @type {PlutoRequestAutocomplete} */ reque
         stop = stop + 1
     }
 
+    const definitions = ctx.state.field(ScopeStateField).definitions
+    const proposed = new Set()
+
     let to_complete_onto = to_complete.slice(0, start)
     let is_field_expression = to_complete_onto.slice(-1) === "."
     return {
@@ -201,6 +224,9 @@ const juliahints_cool_generator = (/** @type {PlutoRequestAutocomplete} */ reque
                 // (quick) fix for identifiers that need to be escaped
                 // Ideally this is done with Meta.isoperator on the julia side
                 let text_to_apply = is_field_expression ? override_text_to_apply_in_field_expression(text) ?? text : text
+
+                if (definitions.has(text)) proposed.add(text)
+
                 return {
                     label: text,
                     apply: text_to_apply,
@@ -210,7 +236,7 @@ const juliahints_cool_generator = (/** @type {PlutoRequestAutocomplete} */ reque
                         [`completion_${completion_type}`]: completion_type != null,
                         c_from_notebook: is_from_notebook,
                     }),
-                    boost: 99 - i / results.length,
+                    boost: 50 - i / results.length,
                 }
             }),
             // This is a small thing that I really want:
@@ -232,10 +258,32 @@ const juliahints_cool_generator = (/** @type {PlutoRequestAutocomplete} */ reque
                         is_not_exported: !is_exported,
                     }
                 }),
+
+            ...Array.from(generate_scopestate_completions(definitions, proposed, ctx.pos)),
         ],
     }
 }
 
+const local_variables_completion = (ctx) => {
+    let scopestate = ctx.state.field(ScopeStateField)
+    let unicode = ctx.tokenBefore(["Identifier"])
+
+    if (unicode === null) return null
+
+    let { from, to, text } = unicode
+
+    return {
+        from,
+        to,
+        options: scopestate.locals
+            .filter(
+                ({ validity, name }) =>
+                    name.startsWith(text) /** <- NOTE: A smarter matching strategy can be used here */ && from > validity.from && to <= validity.to
+            )
+            .map(({ name }, i) => ({ label: name, type: "c_Any", boost: 99 - i })),
+    }
+}
+
 /**
  * @typedef PlutoAutocompleteResults
  * @type {{ start: number, stop: number, results: Array<[string, (string | null), boolean, boolean, (string | null)]> }}
@@ -276,7 +324,7 @@ export let pluto_autocomplete = ({ request_autocomplete, on_update_doc_query })
             override: [
                 unfiltered_julia_generator(memoize_last_request_autocomplete),
                 juliahints_cool_generator(memoize_last_request_autocomplete),
-                // TODO completion for local variables
+                local_variables_completion,
             ],
             defaultKeymap: false, // We add these manually later, so we can override them if necessary
             maxRenderedOptions: 512, // fons's magic number
@@ -290,7 +338,12 @@ export let pluto_autocomplete = ({ request_autocomplete, on_update_doc_query })
             let autocompletion_state = update.state.field(completionState, false)
             let is_tab_completion = update.state.field(tabCompletionState, false)
 
-            if (autocompletion_state?.open != null && is_tab_completion && autocompletion_state.open.options.length === 1) {
+            if (
+                autocompletion_state?.open != null &&
+                is_tab_completion &&
+                completionStatus(update.state) === "active" &&
+                autocompletion_state.open.options.length === 1
+            ) {
                 // We can't use `acceptCompletion` here because that function has a minimum delay of 75ms between creating the completion options and applying one.
                 applyCompletion(update.view, autocompletion_state.open.options[0])
             }
diff --git a/frontend/components/CellInput/scopestate_statefield.js b/frontend/components/CellInput/scopestate_statefield.js
index 270bf7ab21..ab0ad2a49b 100644
--- a/frontend/components/CellInput/scopestate_statefield.js
+++ b/frontend/components/CellInput/scopestate_statefield.js
@@ -17,13 +17,16 @@ import { child_cursors, child_nodes, create_specific_template_maker, jl, jl_dyna
  * @property {number} from
  * @property {number} to
  *
+ * @typedef {Range & {valid_from: number}} Definition
+ *
  * @typedef ScopeState
  * @property {Array<{
  *  usage: Range,
  *  definition: Range | null,
  *  name: string,
  * }>} usages
- * @property {Map<String, Range>} definitions
+ * @property {Map<String, Definition>} definitions
+ * @property {Array<{ definition: Range, validity: Range, name: string }>} locals
  */
 
 /**
@@ -39,7 +42,8 @@ let merge_scope_state = (a, b) => {
     for (let [key, value] of b.definitions) {
         definitions.set(key, value)
     }
-    return { usages, definitions }
+    let locals = [...a.locals, ...b.locals]
+    return { usages, definitions, locals }
 }
 
 /** @param {TreeCursor} cursor */
@@ -131,11 +135,11 @@ let explorer_function_definition_argument = (cursor, doc, scopestate, verbose =
         return scopestate_add_definition(scopestate, doc, cursor)
     } else if ((match = match_function_definition_argument(cursor)`${t.as("subject")}...`)) {
         // `function f(x...)` => ["x"]
-        return explore_pattern(match.subject, doc, scopestate, verbose)
+        return explore_pattern(match.subject, doc, scopestate, null, verbose)
     } else if ((match = match_function_definition_argument(cursor)`${t.as("name")} = ${t.as("value")}`)) {
         // `function f(x = 10)` => ["x"]
         let { name, value } = match
-        scopestate = explore_pattern(name, doc, scopestate, verbose)
+        scopestate = explore_pattern(name, doc, scopestate, value.to, verbose)
         scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
         return scopestate
     } else if (
@@ -145,7 +149,7 @@ let explorer_function_definition_argument = (cursor, doc, scopestate, verbose =
         (match = match_function_definition_argument(cursor)`::${t.as("type")}`)
     ) {
         let { name, type } = match
-        if (name) scopestate = explore_pattern(name, doc, scopestate, verbose)
+        if (name) scopestate = explore_pattern(name, doc, scopestate, type.to, verbose)
         if (type) scopestate = explore_variable_usage(type.cursor, doc, scopestate, verbose)
         return scopestate
     } else {
@@ -158,14 +162,15 @@ let explorer_function_definition_argument = (cursor, doc, scopestate, verbose =
  * @param {TreeCursor | SyntaxNode} node
  * @param {any} doc
  * @param {ScopeState} scopestate
+ * @param {number?} valid_from
  * @param {boolean?} verbose
  * @returns {ScopeState}
  */
-let explore_pattern = (node, doc, scopestate, verbose = false) => {
+let explore_pattern = (node, doc, scopestate, valid_from = null, verbose = false) => {
     let match = null
 
     if ((match = match_assignee(node)`${t.Identifier}`)) {
-        return scopestate_add_definition(scopestate, doc, node)
+        return scopestate_add_definition(scopestate, doc, node, valid_from)
     } else if ((match = match_assignee(node)`${t.as("object")}::${t.as("type")}`)) {
         let { object, type } = match
         scopestate = explore_variable_usage(type.cursor, doc, scopestate, verbose)
@@ -173,16 +178,16 @@ let explore_pattern = (node, doc, scopestate, verbose = false) => {
         return scopestate
     } else if ((match = match_assignee(node)`${t.as("subject")}...`)) {
         // `x... = [1,2,3]` => ["x"]
-        return explore_pattern(match.subject, doc, scopestate, verbose)
+        return explore_pattern(match.subject, doc, scopestate, valid_from, verbose)
     } else if ((match = match_function_definition_argument(node)`${t.as("name")} = ${t.as("value")}`)) {
         let { name, value } = match
-        scopestate = explore_pattern(name, doc, scopestate, verbose)
+        scopestate = explore_pattern(name, doc, scopestate, value.from, verbose)
         scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
         return scopestate
     } else if ((match = match_assignee(node)`${t.as("first")}, ${t.many("rest")}`) ?? (match = match_assignee(node)`(${t.as("first")}, ${t.many("rest")})`)) {
         // console.warn("Tuple assignment... but the bad one")
         for (let { node: name } of [{ node: match.first }, ...(match.rest ?? [])]) {
-            scopestate = explore_pattern(name.cursor, doc, scopestate, verbose)
+            scopestate = explore_pattern(name.cursor, doc, scopestate, valid_from, verbose)
         }
         return scopestate
     } else if ((match = match_julia(node)`${t.as("prefix")}${t.as("string", t.String)}`)) {
@@ -197,6 +202,7 @@ let explore_pattern = (node, doc, scopestate, verbose = false) => {
                 scopestate.definitions.set(name, {
                     from: node.from,
                     to: node.to,
+                    valid_from: node.to,
                 })
             }
         } else {
@@ -330,6 +336,7 @@ let fresh_scope = () => {
     return {
         usages: [],
         definitions: new Map(),
+        locals: [],
     }
 }
 
@@ -346,6 +353,7 @@ let lower_scope = (scopestate) => {
     return {
         usages: [],
         definitions: new Map(scopestate.definitions),
+        locals: [],
     }
 }
 
@@ -356,12 +364,29 @@ let lower_scope = (scopestate) => {
  *
  * @param {ScopeState} nested_scope
  * @param {ScopeState} scopestate
+ * @param {number} nested_scope_validity
  * @returns {ScopeState}
  */
-let raise_scope = (nested_scope, scopestate) => {
+let raise_scope = (nested_scope, scopestate, nested_scope_validity = null) => {
     return {
         usages: [...scopestate.usages, ...nested_scope.usages],
         definitions: scopestate.definitions,
+        locals: [
+            ...(nested_scope_validity === null
+                ? []
+                : Array.from(nested_scope.definitions)
+                      .filter(([name, _]) => !scopestate.definitions.has(name))
+                      .map(([name, definition]) => ({
+                          name,
+                          definition,
+                          validity: {
+                              from: definition.valid_from,
+                              to: nested_scope_validity,
+                          },
+                      }))),
+            ...nested_scope.locals,
+            ...scopestate.locals,
+        ],
     }
 }
 
@@ -369,11 +394,14 @@ let raise_scope = (nested_scope, scopestate) => {
  * @param {ScopeState} scopestate
  * @param {any} doc
  * @param {SyntaxNode | TreeCursor} node
+ * @param {number?} valid_from
  */
-let scopestate_add_definition = (scopestate, doc, node) => {
+let scopestate_add_definition = (scopestate, doc, node, valid_from = null) => {
+    valid_from = valid_from === null ? node.to : valid_from
     scopestate.definitions.set(doc.sliceString(node.from, node.to), {
         from: node.from,
         to: node.to,
+        valid_from,
     })
     return scopestate
 }
@@ -390,6 +418,7 @@ export let explore_variable_usage = (
     scopestate = {
         usages: [],
         definitions: new Map(),
+        locals: [],
     },
     verbose = false
 ) => {
@@ -482,7 +511,7 @@ export let explore_variable_usage = (
         } else if ((match = match_julia(cursor)`${t.as("assignee")} = ${t.maybe(t.as("value"))}`)) {
             let { assignee, value } = match
             if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
-            if (assignee) scopestate = explore_pattern(assignee.cursor, doc, scopestate, verbose)
+            if (assignee) scopestate = explore_pattern(assignee.cursor, doc, scopestate, value?.to ?? null, verbose)
             return scopestate
         } else if (
             (match = match_julia(cursor)`
@@ -528,7 +557,7 @@ export let explore_variable_usage = (
                 for (let { node: expression } of do_expressions) {
                     inner_scope = explore_variable_usage(expression.cursor, doc, inner_scope, verbose)
                 }
-                return raise_scope(inner_scope, scopestate)
+                return raise_scope(inner_scope, scopestate, cursor.to)
             }
 
             return scopestate
@@ -580,7 +609,7 @@ export let explore_variable_usage = (
                 }
             }
 
-            scopestate = raise_scope(inner_scope, scopestate)
+            scopestate = raise_scope(inner_scope, scopestate, cursor.to)
             scopestate = merge_scope_state(scopestate, outer_scope)
             return scopestate
         } else if ((match = match_julia(cursor)`abstract type ${t.as("name")} end`)) {
@@ -617,6 +646,7 @@ export let explore_variable_usage = (
             scopestate = merge_scope_state(scopestate, {
                 usages: Array.from(module_scope.usages).filter((x) => x.definition != null),
                 definitions: new Map(),
+                locals: [],
             })
 
             for (let { node: expression } of expressions) {
@@ -730,7 +760,7 @@ export let explore_variable_usage = (
                 ) {
                     let { name, range } = match
                     if (range) inner_scope = explore_variable_usage(range.cursor, doc, inner_scope, verbose)
-                    if (name) inner_scope = explore_pattern(name, doc, inner_scope)
+                    if (name) inner_scope = explore_pattern(name, doc, inner_scope, range?.to ?? null, verbose)
                 } else {
                     verbose && console.warn("Unrecognized for loop binding", binding.toString())
                 }
@@ -740,7 +770,7 @@ export let explore_variable_usage = (
                 inner_scope = explore_variable_usage(expression.cursor, doc, inner_scope, verbose)
             }
 
-            return raise_scope(inner_scope, scopestate)
+            return raise_scope(inner_scope, scopestate, cursor.to)
         } else if (
             (match = match_julia(cursor)`
                 ${t.as("callee")}(${t.many("args")}) ${t.maybe(jl`do ${t.maybe(t.many("do_args"))}
@@ -799,7 +829,7 @@ export let explore_variable_usage = (
 
                     nested_scope = explore_variable_usage(result.cursor, doc, nested_scope, verbose)
 
-                    return raise_scope(nested_scope, scopestate)
+                    return raise_scope(nested_scope, scopestate, cursor.to)
                 } else {
                     scopestate = explore_variable_usage(arg.cursor, doc, scopestate, verbose)
                 }
@@ -813,7 +843,7 @@ export let explore_variable_usage = (
             for (let { node: expression } of do_expressions) {
                 inner_scope = explore_variable_usage(expression.cursor, doc, inner_scope, verbose)
             }
-            return raise_scope(inner_scope, scopestate)
+            return raise_scope(inner_scope, scopestate, cursor.to)
         } else if ((match = match_julia(cursor)`(${t.many("tuple_elements")},)`)) {
             // TODO.. maybe? `(x, g = y)` is a "ParenthesizedExpression", but lezer parses it as a tuple...
             // For now I fix it here hackily by checking if there is only NamedFields
@@ -842,8 +872,8 @@ export let explore_variable_usage = (
                     if ((match = match_tuple_element(cursor)`${t.as("name")} = ${t.as("value")}`)) {
                         // 🚨 actually an assignment 🚨
                         let { name, value } = match
-                        if (name) scopestate = scopestate_add_definition(scopestate, doc, name)
                         if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+                        if (name) scopestate = scopestate_add_definition(scopestate, doc, name, value?.to ?? null)
                     } else {
                         scopestate = explore_variable_usage(element.cursor, doc, scopestate, verbose)
                     }
@@ -899,6 +929,7 @@ export let explore_variable_usage = (
                 scopestate.definitions.set(`@${doc.sliceString(macro_name.from, macro_name.to)}`, {
                     from: macro_name.from,
                     to: macro_name.to,
+                    valid_from: macro_name.to,
                 })
             }
 
@@ -937,7 +968,7 @@ export let explore_variable_usage = (
             for (let { node: expression } of body) {
                 inner_scope = explore_variable_usage(expression.cursor, doc, inner_scope, verbose)
             }
-            return raise_scope(inner_scope, scopestate)
+            return raise_scope(inner_scope, scopestate, cursor.to)
         } else if (
             (match = match_julia(cursor)`
                 let ${t.many("assignments", jl`${t.as("assignee")} = ${t.as("value")}`)}
@@ -951,7 +982,7 @@ export let explore_variable_usage = (
                 match: { assignee, value },
             } of assignments) {
                 // Explorer lefthandside in inner scope
-                if (assignee) innerscope = explore_pattern(assignee, doc, innerscope)
+                if (assignee) innerscope = explore_pattern(assignee, doc, innerscope, value?.to ?? null, verbose)
                 // Explorer righthandside in the outer scope
                 if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
             }
@@ -959,7 +990,7 @@ export let explore_variable_usage = (
             for (let { node: line } of body) {
                 innerscope = explore_variable_usage(line.cursor, doc, innerscope, verbose)
             }
-            return raise_scope(innerscope, scopestate)
+            return raise_scope(innerscope, scopestate, cursor.to)
         } else if (
             // A bit hard to see from the template, but these are array (and generator) comprehensions
             // e.g. [x for x in y]
@@ -1003,7 +1034,7 @@ export let explore_variable_usage = (
 
             nested_scope = explore_variable_usage(result.cursor, doc, nested_scope, verbose)
 
-            return raise_scope(nested_scope, scopestate)
+            return raise_scope(nested_scope, scopestate, cursor.to)
         } else {
             if (verbose) {
                 console.groupCollapsed(`Cycling through all children of`, cursor.name)
@@ -1036,6 +1067,7 @@ export let ScopeStateField = StateField.define({
             return {
                 usages: [],
                 definitions: new Map(),
+                locals: [],
             }
         }
     },
@@ -1054,6 +1086,7 @@ export let ScopeStateField = StateField.define({
             return {
                 usages: [],
                 definitions: new Map(),
+                locals: [],
             }
         }
     },

From 339d27f74ef3811e69c1afbc520b2073ca775e54 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 21 Mar 2022 15:42:09 +0100
Subject: [PATCH 225/821] update comment

---
 src/evaluation/Run.jl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 3f6ef70c1a..984387dd9a 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -81,16 +81,15 @@ function run_reactive!(
         cell.depends_on_disabled_cells = false
     end
 
-	# Move this save to after the last point the
-	# notebook serialization representation changes
-	# (currently, `depends_on_disabled_cells`)
-	save_notebook(session, notebook)
     for (cell, error) in new_order.errable
         cell.running = false
         cell.queued = false
         relay_reactivity_error!(cell, error)
     end
 
+	# Save the notebook. This is the only time that we save the notebook, so any state changes that influence the file contents (like `depends_on_disabled_cells`) should be behind this point.
+	save_notebook(session, notebook)
+
     # Send intermediate updates to the clients at most 20 times / second during a reactive run. (The effective speed of a slider is still unbounded, because the last update is not throttled.)
     # flush_send_notebook_changes_throttled, 
     send_notebook_changes_throttled, flush_notebook_changes = throttled(1.0 / 20) do

From 05a0e0533c89c486dd8b8304d94852cc0a781039 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 21 Mar 2022 22:34:12 +0100
Subject: [PATCH 226/821] comments in pluto_autocomplete

---
 .../CellInput/pluto_autocomplete.js           | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/frontend/components/CellInput/pluto_autocomplete.js b/frontend/components/CellInput/pluto_autocomplete.js
index d08c4a962e..bd11e44fe3 100644
--- a/frontend/components/CellInput/pluto_autocomplete.js
+++ b/frontend/components/CellInput/pluto_autocomplete.js
@@ -136,12 +136,16 @@ let update_docs_from_autocomplete_selection = (on_update_doc_query) => {
     })
 }
 
-let match_unicode_complete = (ctx) => ctx.matchBefore(/\\[^\s"'.`]*/)
+/** Are we matching something like `\lambd...`? */
+let match_latex_complete = (ctx) => ctx.matchBefore(/\\[^\s"'.`]*/)
+/** Are we matching something like `:writing_a_symbo...`? */
 let match_symbol_complete = (ctx) => ctx.matchBefore(/\.\:[^\s"'`()\[\].]*/)
+/** Are we matching exactly `~/`? */
 let match_expanduser_complete = (ctx) => ctx.matchBefore(/~\//)
 
-let unfiltered_julia_generator = (/** @type {PlutoRequestAutocomplete} */ request_autocomplete) => async (ctx) => {
-    let unicode_match = match_unicode_complete(ctx) || match_expanduser_complete(ctx)
+/** Use the completion results from the Julia server to create CM completion objects, but only for path completions (TODO: broken) and latex completions. */
+let julia_special_completions_to_cm = (/** @type {PlutoRequestAutocomplete} */ request_autocomplete) => async (ctx) => {
+    let unicode_match = match_latex_complete(ctx) || match_expanduser_complete(ctx)
     if (unicode_match == null) return null
 
     let to_complete = ctx.state.sliceDoc(0, ctx.pos)
@@ -187,7 +191,8 @@ const generate_scopestate_completions = function* (definitions, proposed, contex
     }
 }
 
-const juliahints_cool_generator = (/** @type {PlutoRequestAutocomplete} */ request_autocomplete) => async (ctx) => {
+/** Use the completion results from the Julia server to create CM completion objects. */
+const julia_code_completions_to_cm = (/** @type {PlutoRequestAutocomplete} */ request_autocomplete) => async (ctx) => {
     let to_complete = ctx.state.sliceDoc(0, ctx.pos)
 
     // Another rough hack... If it detects a `.:`, we want to cut out the `:` so we get all results from julia,
@@ -302,7 +307,7 @@ export let pluto_autocomplete = ({ request_autocomplete, on_update_doc_query })
     let last_result = null
     /**
      * To make stuff a bit easier, we let all the generators fetch all the time and run their logic, but just do one request.
-     * Previously I had checks to make sure when `unicode_hint_generator` matches it wouldn't fetch in `juliahints_cool_generator`..
+     * Previously I had checks to make sure when `unicode_hint_generator` matches it wouldn't fetch in `julia_code_completions_to_cm`..
      * but that became cumbersome with `expanduser` autocomplete.. also because THERE MIGHT be a case where
      * `~/` actually needs a different completion? Idk, I decided to put this "memoize last" thing here deal with it.
      * @type {PlutoRequestAutocomplete}
@@ -322,8 +327,8 @@ export let pluto_autocomplete = ({ request_autocomplete, on_update_doc_query })
         autocompletion({
             activateOnTyping: false,
             override: [
-                unfiltered_julia_generator(memoize_last_request_autocomplete),
-                juliahints_cool_generator(memoize_last_request_autocomplete),
+                julia_special_completions_to_cm(memoize_last_request_autocomplete),
+                julia_code_completions_to_cm(memoize_last_request_autocomplete),
                 local_variables_completion,
             ],
             defaultKeymap: false, // We add these manually later, so we can override them if necessary

From 0c5ce9deadbccb35c591bb2166a993dec3a98f2a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 24 Mar 2022 15:29:54 +0100
Subject: [PATCH 227/821] =?UTF-8?q?=F0=9F=A7=82=20more=20precompile=20for?=
 =?UTF-8?q?=20dynamic=20functions!=20(#1978)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Rik Huijzer <rikhuijzer@pm.me>
Co-authored-by: Rik Huijzer <20724914+rikhuijzer@users.noreply.github.com>
---
 src/Configuration.jl       | 19 ++++++++++---------
 src/webserver/Dynamic.jl   |  2 ++
 src/webserver/MsgPack.jl   |  3 ++-
 src/webserver/WebServer.jl |  2 ++
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index 6f152fe978..9cd89bdd22 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -14,16 +14,17 @@ using Configurations # https://github.com/Roger-luo/Configurations.jl
 
 import ..Pluto: tamepath
 
-# This can't be a simple `const` because this would hard-code it into the precompile image.
-const notebook_path_suggestion_ref = Ref{Union{Nothing,String}}(nothing)
+# Using a ref to avoid fixing the pwd() output during the compilation phase. We don't want this value to be baked into the sysimage, because it depends on the `pwd()`. We do want to cache it, because the pwd might change while Pluto is running.
+const pwd_ref = Ref{Union{Nothing,String}}()
 function notebook_path_suggestion()
-    if notebook_path_suggestion_ref[] === nothing
-        notebook_path_suggestion_ref[] = let
-            preferred_dir = startswith(Sys.BINDIR, pwd()) ? homedir() : pwd()
-            joinpath(preferred_dir, "") # so that it ends with / or \
-        end
-    end
-    notebook_path_suggestion_ref[]
+    pwd_val = something(pwd_ref[], pwd())
+    preferred_dir = startswith(Sys.BINDIR, pwd_val) ? homedir() : pwd_val
+    # so that it ends with / or \
+    string(joinpath(preferred_dir, ""))
+end
+
+function __init__()
+    pwd_ref[] = pwd()
 end
 
 """
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 86b4927552..9eceee0ee1 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -87,6 +87,7 @@ end
 # All of the arrays in the notebook_to_js object are 'immutable' (we write code as if they are), so we can enable this optimization:
 Firebasey.use_triple_equals_for_arrays[] = true
 
+
 # the only possible Arrays are:
 # - cell_order
 # - cell_execution_order
@@ -169,6 +170,7 @@ function notebook_to_js(notebook::Notebook)
         "cell_execution_order" => cell_id.(collect(topological_order(notebook))),
     )
 end
+precompile(notebook_to_js, (Notebook,))
 
 """
 For each connected client, we keep a copy of their current state. This way we know exactly which updates to send when the server-side state changes.
diff --git a/src/webserver/MsgPack.jl b/src/webserver/MsgPack.jl
index 7aa3bc35b1..8c1addee66 100644
--- a/src/webserver/MsgPack.jl
+++ b/src/webserver/MsgPack.jl
@@ -85,4 +85,5 @@ end
 
 function unpack(args...)
     MsgPack.unpack(args...) |> decode_extension_and_addbits
-end
\ No newline at end of file
+end
+precompile(unpack, (Vector{UInt8},))
\ No newline at end of file
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index e3129e9eb0..d15f9b3a18 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -67,6 +67,7 @@ function run(; kwargs...)
     options = Configuration.from_flat_kwargs(; kwargs...)
     run(options)
 end
+precompile(run, ())
 
 function run(options::Configuration.Options)
     session = ServerSession(; options)
@@ -323,6 +324,7 @@ function run(session::ServerSession, pluto_router)
         end
     end
 end
+precompile(run, (ServerSession, HTTP.Handlers.Router{Symbol("##001")}))
 
 get_favorite_notebook(notebook:: Nothing) = nothing
 get_favorite_notebook(notebook:: String) = notebook

From 64abaf34f0882d18461d34a317f751d2b7eea7a3 Mon Sep 17 00:00:00 2001
From: Gaspard Jankowiak <gaspard@math.janko.fr>
Date: Mon, 28 Mar 2022 19:54:01 +0200
Subject: [PATCH 228/821] Remove 'secret' option from WebServer.jl doc (#2007)

---
 src/webserver/WebServer.jl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index d15f9b3a18..f361de35e1 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -56,7 +56,6 @@ For the full list, see the [`Pluto.Configuration`](@ref) module. Some **common p
 - `host`: Optional. The default `host` is `"127.0.0.1"`. For wild setups like Docker and heroku, you might need to change this to `"0.0.0.0"`.
 - `port`: Optional. The default `port` is `1234`.
 - `auto_reload_from_file`: Reload when the `.jl` file is modified. The default is `false`.
-- `secret`: Set a fixed secret for access.
 
 ## Technobabble
 

From c6839ab00a839db3a3f6744c5e2e30c89e8ac5a3 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 28 Mar 2022 20:05:50 +0200
Subject: [PATCH 229/821] julia-actions/cache@v1

---
 .github/workflows/Test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index db5a6bf10d..f1eb922004 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -44,7 +44,8 @@ jobs:
             - uses: julia-actions/setup-julia@v1
               with:
                   version: ${{ matrix.julia-version }}
-
+            - uses: julia-actions/cache@v1
+            
             # 🚗
             - uses: julia-actions/julia-runtest@v1
               continue-on-error: ${{ matrix.julia-version == 'nightly' }}

From 8ca81ef1acda941bfc241c70ecbf26ea8a2cff33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Mar 2022 20:46:29 +0200
Subject: [PATCH 230/821] Bump minimist from 1.2.5 to 1.2.6 in
 /frontend-bundler (#2009)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend-bundler/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index fc6df67665..d421249dd0 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -5047,9 +5047,9 @@
             }
         },
         "node_modules/minimist": {
-            "version": "1.2.5",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-            "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+            "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
         },
         "node_modules/mkdirp": {
             "version": "1.0.4",
@@ -11413,9 +11413,9 @@
             }
         },
         "minimist": {
-            "version": "1.2.5",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-            "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+            "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
         },
         "mkdirp": {
             "version": "1.0.4",

From 9b6d7e2c9a29c66dd13cb0492ab3ef159c4266b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Mar 2022 20:46:38 +0200
Subject: [PATCH 231/821] Bump ansi-regex from 5.0.0 to 5.0.1 in /test/frontend
 (#2010)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/frontend/package-lock.json | 3906 +++----------------------------
 1 file changed, 352 insertions(+), 3554 deletions(-)

diff --git a/test/frontend/package-lock.json b/test/frontend/package-lock.json
index b8c21cfdbc..ec6a57d3cb 100644
--- a/test/frontend/package-lock.json
+++ b/test/frontend/package-lock.json
@@ -67,112 +67,12 @@
         "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@babel/core/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/generator": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
     "node_modules/@babel/core/node_modules/@babel/helper-validator-identifier": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
       "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
       "dev": true
     },
-    "node_modules/@babel/core/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/parser": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-      "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/core/node_modules/@babel/traverse": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
     "node_modules/@babel/core/node_modules/@babel/types": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
@@ -184,65 +84,6 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/core/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/core/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/core/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/core/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/core/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@babel/core/node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -252,18 +93,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/@babel/core/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/generator": {
       "version": "7.13.9",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
@@ -369,15 +198,6 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@babel/helper-create-class-features-plugin": {
       "version": "7.13.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz",
@@ -394,1106 +214,88 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.12.17",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz",
+      "integrity": "sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.12.13"
+        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "regexpu-core": "^4.7.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+    "node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz",
+      "integrity": "sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0-0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
+    "node_modules/@babel/helper-define-polyfill-provider/node_modules/@babel/helper-plugin-utils": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+      "dev": true
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+    "node_modules/@babel/helper-explode-assignable-expression": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz",
+      "integrity": "sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.13"
+        "@babel/types": "^7.13.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-validator-identifier": {
+    "node_modules/@babel/helper-explode-assignable-expression/node_modules/@babel/helper-validator-identifier": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
       "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
       "dev": true
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
+    "node_modules/@babel/helper-explode-assignable-expression/node_modules/@babel/types": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
+      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/parser": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-      "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/template": {
+    "node_modules/@babel/helper-function-name": {
       "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
+        "@babel/helper-get-function-arity": "^7.12.13",
+        "@babel/template": "^7.12.13",
         "@babel/types": "^7.12.13"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz",
-      "integrity": "sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "regexpu-core": "^4.7.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz",
-      "integrity": "sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/@babel/generator": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/@babel/parser": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-      "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/@babel/traverse": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz",
-      "integrity": "sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/helper-explode-assignable-expression/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-explode-assignable-expression/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-function-name/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-function-name/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-get-function-arity/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-get-function-arity/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz",
-      "integrity": "sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/generator": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/parser": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-      "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/traverse": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz",
-      "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz",
-      "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-module-imports/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-module-imports/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz",
-      "integrity": "sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-simple-access": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/generator": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/parser": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-      "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/traverse": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
-      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz",
-      "integrity": "sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "@babel/helper-wrap-function": "^7.13.0",
-        "@babel/types": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz",
-      "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/@babel/generator": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-validator-identifier": {
+    "node_modules/@babel/helper-function-name/node_modules/@babel/helper-validator-identifier": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
       "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
       "dev": true
     },
-    "node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/@babel/parser": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-      "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/@babel/types": {
+    "node_modules/@babel/helper-function-name/node_modules/@babel/types": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
       "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
@@ -1504,93 +306,22 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/helper-replace-supers/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
+    "node_modules/@babel/helper-get-function-arity": {
       "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz",
-      "integrity": "sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.12.13"
       }
     },
-    "node_modules/@babel/helper-simple-access/node_modules/@babel/helper-validator-identifier": {
+    "node_modules/@babel/helper-get-function-arity/node_modules/@babel/helper-validator-identifier": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
       "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
       "dev": true
     },
-    "node_modules/@babel/helper-simple-access/node_modules/@babel/types": {
+    "node_modules/@babel/helper-get-function-arity/node_modules/@babel/types": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
       "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
@@ -1601,48 +332,23 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz",
-      "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.1"
-      }
-    },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/types": {
+    "node_modules/@babel/helper-hoist-variables": {
       "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz",
+      "integrity": "sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.13"
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.0"
       }
     },
-    "node_modules/@babel/helper-split-export-declaration/node_modules/@babel/helper-validator-identifier": {
+    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/helper-validator-identifier": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
       "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
       "dev": true
     },
-    "node_modules/@babel/helper-split-export-declaration/node_modules/@babel/types": {
+    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/types": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
       "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
@@ -1653,137 +359,82 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
-      "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-wrap-function": {
+    "node_modules/@babel/helper-member-expression-to-functions": {
       "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz",
-      "integrity": "sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz",
+      "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
         "@babel/types": "^7.13.0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/generator": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-validator-identifier": {
+    "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/helper-validator-identifier": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
       "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
       "dev": true
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/parser": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-      "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+    "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
+      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": {
+    "node_modules/@babel/helper-module-imports": {
       "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz",
+      "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
         "@babel/types": "^7.12.13"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/traverse": {
+    "node_modules/@babel/helper-module-imports/node_modules/@babel/helper-validator-identifier": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "dev": true
+    },
+    "node_modules/@babel/helper-module-imports/node_modules/@babel/types": {
       "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
+      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-function-name": "^7.12.13",
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz",
+      "integrity": "sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-replace-supers": "^7.13.0",
+        "@babel/helper-simple-access": "^7.12.13",
         "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
         "@babel/types": "^7.13.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
         "lodash": "^4.17.19"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/types": {
+    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-validator-identifier": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "dev": true
+    },
+    "node_modules/@babel/helper-module-transforms/node_modules/@babel/types": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
       "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
@@ -1794,195 +445,163 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
+      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "@babel/types": "^7.12.13"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+    "node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/helper-validator-identifier": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "dev": true
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+    "node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
+      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
       "dev": true,
       "dependencies": {
-        "color-name": "1.1.3"
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
+      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
       "dev": true
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz",
+      "integrity": "sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==",
       "dev": true,
-      "engines": {
-        "node": ">=4"
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "@babel/helper-wrap-function": "^7.13.0",
+        "@babel/types": "^7.13.0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-validator-identifier": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "dev": true
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/types": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
+      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/helpers": {
+    "node_modules/@babel/helper-replace-supers": {
       "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.0.tgz",
-      "integrity": "sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ==",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz",
+      "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.12.13",
+        "@babel/helper-member-expression-to-functions": "^7.13.0",
+        "@babel/helper-optimise-call-expression": "^7.12.13",
         "@babel/traverse": "^7.13.0",
         "@babel/types": "^7.13.0"
       }
     },
-    "node_modules/@babel/helpers/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
+    "node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-validator-identifier": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "dev": true
     },
-    "node_modules/@babel/helpers/node_modules/@babel/generator": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
+    "node_modules/@babel/helper-replace-supers/node_modules/@babel/types": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
+      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/helpers/node_modules/@babel/helper-function-name": {
+    "node_modules/@babel/helper-simple-access": {
       "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz",
+      "integrity": "sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
         "@babel/types": "^7.12.13"
       }
     },
-    "node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+    "node_modules/@babel/helper-simple-access/node_modules/@babel/helper-validator-identifier": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "dev": true
+    },
+    "node_modules/@babel/helper-simple-access/node_modules/@babel/types": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
+      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.13"
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz",
+      "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.13"
+        "@babel/types": "^7.12.1"
       }
     },
-    "node_modules/@babel/helpers/node_modules/@babel/helper-validator-identifier": {
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/helper-validator-identifier": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
       "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
       "dev": true
     },
-    "node_modules/@babel/helpers/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/types": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
+      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/@babel/parser": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-      "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/helpers/node_modules/@babel/template": {
+    "node_modules/@babel/helper-split-export-declaration": {
       "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/@babel/traverse": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.12.13"
       }
     },
-    "node_modules/@babel/helpers/node_modules/@babel/types": {
+    "node_modules/@babel/helper-split-export-declaration/node_modules/@babel/helper-validator-identifier": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "dev": true
+    },
+    "node_modules/@babel/helper-split-export-declaration/node_modules/@babel/types": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
       "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
@@ -1993,75 +612,73 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/helpers/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+      "dev": true
     },
-    "node_modules/@babel/helpers/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.12.17",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
+      "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
+      "dev": true
     },
-    "node_modules/@babel/helpers/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz",
+      "integrity": "sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==",
       "dev": true,
       "dependencies": {
-        "color-name": "1.1.3"
+        "@babel/helper-function-name": "^7.12.13",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.0"
       }
     },
-    "node_modules/@babel/helpers/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+    "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-validator-identifier": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
       "dev": true
     },
-    "node_modules/@babel/helpers/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+    "node_modules/@babel/helper-wrap-function/node_modules/@babel/types": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
+      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
       "dev": true,
-      "engines": {
-        "node": ">=4"
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/helpers/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+    "node_modules/@babel/helpers": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.0.tgz",
+      "integrity": "sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.0"
       }
     },
-    "node_modules/@babel/helpers/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/@babel/helpers/node_modules/@babel/helper-validator-identifier": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "dev": true
+    },
+    "node_modules/@babel/helpers/node_modules/@babel/types": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
+      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
       }
     },
     "node_modules/@babel/highlight": {
@@ -2672,173 +1289,22 @@
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.12.13",
         "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "globals": "^11.1.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/parser": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-      "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
+        "@babel/helper-optimise-call-expression": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-replace-supers": "^7.13.0",
+        "@babel/helper-split-export-declaration": "^7.12.13",
+        "globals": "^11.1.0"
       },
-      "engines": {
-        "node": ">=4"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-plugin-utils": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+      "dev": true
+    },
     "node_modules/@babel/plugin-transform-computed-properties": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz",
@@ -2962,154 +1428,12 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
     "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/helper-plugin-utils": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
       "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
       "dev": true
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/parser": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-      "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/plugin-transform-literals": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz",
@@ -3568,18 +1892,6 @@
       "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
       "dev": true
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/preset-env/node_modules/@babel/types": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
@@ -3591,15 +1903,6 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@babel/preset-modules": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
@@ -4222,9 +2525,9 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -4440,15 +2743,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/babel-plugin-polyfill-corejs3": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz",
@@ -9916,178 +8210,28 @@
         "source-map": "^0.5.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-          "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.13.0",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
         "@babel/helper-validator-identifier": {
           "version": "7.12.11",
           "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
           "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
           "dev": true
         },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-          "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-          "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.13.0",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.13.0",
-            "@babel/types": "^7.13.0",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
         "@babel/types": {
           "version": "7.13.0",
           "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
           "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
+            "@babel/helper-validator-identifier": "^7.12.11",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^2.0.0"
+          }
         },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -10194,368 +8338,52 @@
         "@babel/helper-validator-option": "^7.12.17",
         "browserslist": "^4.14.5",
         "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
       }
     },
     "@babel/helper-create-class-features-plugin": {
       "version": "7.13.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz",
       "integrity": "sha512-qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-split-export-declaration": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-          "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz",
-      "integrity": "sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "regexpu-core": "^4.7.1"
-      }
-    },
-    "@babel/helper-define-polyfill-provider": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz",
-      "integrity": "sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-          "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.13.0",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-          "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-          "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.13.0",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.13.0",
-            "@babel/types": "^7.13.0",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.12.13",
+        "@babel/helper-member-expression-to-functions": "^7.13.0",
+        "@babel/helper-optimise-call-expression": "^7.12.13",
+        "@babel/helper-replace-supers": "^7.13.0",
+        "@babel/helper-split-export-declaration": "^7.12.13"
+      }
+    },
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.12.17",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz",
+      "integrity": "sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "regexpu-core": "^4.7.1"
+      }
+    },
+    "@babel/helper-define-polyfill-provider": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz",
+      "integrity": "sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      },
+      "dependencies": {
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -10655,106 +8483,12 @@
         "@babel/types": "^7.13.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-          "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.13.0",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
         "@babel/helper-validator-identifier": {
           "version": "7.12.11",
           "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
           "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
           "dev": true
         },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-          "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-          "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.13.0",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.13.0",
-            "@babel/types": "^7.13.0",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
         "@babel/types": {
           "version": "7.13.0",
           "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
@@ -10765,62 +8499,6 @@
             "lodash": "^4.17.19",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -10879,189 +8557,39 @@
           }
         }
       }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz",
-      "integrity": "sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-simple-access": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "lodash": "^4.17.19"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-          "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.13.0",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-          "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-          "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.13.0",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.13.0",
-            "@babel/types": "^7.13.0",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz",
+      "integrity": "sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-replace-supers": "^7.13.0",
+        "@babel/helper-simple-access": "^7.12.13",
+        "@babel/helper-split-export-declaration": "^7.12.13",
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.0",
+        "lodash": "^4.17.19"
+      },
+      "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.12.11",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
           "dev": true
         },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+        "@babel/types": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
+          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "@babel/helper-validator-identifier": "^7.12.11",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^2.0.0"
           }
         }
       }
@@ -11142,106 +8670,12 @@
         "@babel/types": "^7.13.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-          "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.13.0",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
         "@babel/helper-validator-identifier": {
           "version": "7.12.11",
           "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
           "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
           "dev": true
         },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-          "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-          "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.13.0",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.13.0",
-            "@babel/types": "^7.13.0",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
         "@babel/types": {
           "version": "7.13.0",
           "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
@@ -11252,62 +8686,6 @@
             "lodash": "^4.17.19",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -11419,106 +8797,12 @@
         "@babel/types": "^7.13.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-          "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.13.0",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
         "@babel/helper-validator-identifier": {
           "version": "7.12.11",
           "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
           "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
           "dev": true
         },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-          "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-          "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.13.0",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.13.0",
-            "@babel/types": "^7.13.0",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
         "@babel/types": {
           "version": "7.13.0",
           "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
@@ -11529,62 +8813,6 @@
             "lodash": "^4.17.19",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -11599,105 +8827,11 @@
         "@babel/types": "^7.13.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-          "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.13.0",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
         "@babel/helper-validator-identifier": {
           "version": "7.12.11",
           "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-          "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-          "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.13.0",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.13.0",
-            "@babel/types": "^7.13.0",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
+          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+          "dev": true
         },
         "@babel/types": {
           "version": "7.13.0",
@@ -11709,62 +8843,6 @@
             "lodash": "^4.17.19",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -12309,144 +9387,11 @@
         "globals": "^11.1.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
         "@babel/helper-plugin-utils": {
           "version": "7.13.0",
           "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
           "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-          "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -12564,135 +9509,11 @@
         "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
         "@babel/helper-plugin-utils": {
           "version": "7.13.0",
           "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
           "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.13.8",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-          "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.13.9",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-          "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -13127,15 +9948,6 @@
           "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
           "dev": true
         },
-        "@babel/plugin-syntax-class-properties": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-          "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.12.13"
-          }
-        },
         "@babel/types": {
           "version": "7.13.0",
           "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
@@ -13146,12 +9958,6 @@
             "lodash": "^4.17.19",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
         }
       }
     },
@@ -13705,9 +10511,9 @@
       }
     },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true
     },
     "ansi-styles": {
@@ -13867,14 +10673,6 @@
         "@babel/compat-data": "^7.13.0",
         "@babel/helper-define-polyfill-provider": "^0.1.5",
         "semver": "^6.1.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
       }
     },
     "babel-plugin-polyfill-corejs3": {

From 15a94f415dba4fbad753ddac5153fa9286ce0eb2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 29 Mar 2022 10:17:19 +0200
Subject: [PATCH 232/821] Use MIMEs.jl (#2004)

---
 Project.toml            |  4 +++-
 src/webserver/Static.jl | 14 +++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Project.toml b/Project.toml
index 921a7484c3..f57c57a513 100644
--- a/Project.toml
+++ b/Project.toml
@@ -14,20 +14,22 @@ FuzzyCompletions = "fb4132e2-a121-4a70-b8a1-d5b831dcdcc2"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
+MIMEs = "6c6e2e6c-3030-632d-7369-2d6c69616d65"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 MsgPack = "99f44e22-a591-53d1-9472-aa23ef4bd671"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
-Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
+Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
 Configurations = "0.15, 0.16, 0.17"
 FuzzyCompletions = "0.3,0.4,0.5"
 HTTP = "^0.9.1"
+MIMEs = "0.1"
 MsgPack = "1.1"
 RelocatableFolders = "0.1, 0.2"
 Tables = "1"
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index 7892aa9ac9..cc2c11f2af 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -2,6 +2,7 @@ import HTTP
 import Markdown: htmlesc
 import UUIDs: UUID
 import Pkg
+import MIMEs
 
 const found_is_pluto_dev = Ref{Union{Nothing,Bool}}(nothing)
 function is_pluto_dev()
@@ -35,14 +36,6 @@ end
 
 # Serve everything from `/frontend`, and create HTTP endpoints to open notebooks.
 
-"Attempts to find the MIME pair corresponding to the extension of a filename. Defaults to `text/plain`."
-function mime_fromfilename(filename)
-    # This bad boy is from: https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
-    mimepairs = Dict(".aac" => "audio/aac", ".bin" => "application/octet-stream", ".bmp" => "image/bmp", ".css" => "text/css", ".csv" => "text/csv", ".eot" => "application/vnd.ms-fontobject", ".gz" => "application/gzip", ".gif" => "image/gif", ".htm" => "text/html", ".html" => "text/html", ".ico" => "image/vnd.microsoft.icon", ".jpeg" => "image/jpeg", ".jpg" => "image/jpeg", ".js" => "text/javascript", ".json" => "application/json", ".jsonld" => "application/ld+json", ".mjs" => "text/javascript", ".mp3" => "audio/mpeg", ".mp4" => "video/mp4", ".mpeg" => "video/mpeg", ".oga" => "audio/ogg", ".ogv" => "video/ogg", ".ogx" => "application/ogg", ".opus" => "audio/opus", ".otf" => "font/otf", ".png" => "image/png", ".pdf" => "application/pdf", ".rtf" => "application/rtf", ".sh" => "application/x-sh", ".svg" => "image/svg+xml", ".tar" => "application/x-tar", ".tif" => "image/tiff", ".tiff" => "image/tiff", ".ttf" => "font/ttf", ".txt" => "text/plain", ".wav" => "audio/wav", ".weba" => "audio/webm", ".webm" => "video/webm", ".webp" => "image/webp", ".woff" => "font/woff", ".woff2" => "font/woff2", ".xhtml" => "application/xhtml+xml", ".xml" => "application/xml", ".xul" => "application/vnd.mozilla.xul+xml", ".zip" => "application/zip", ".wasm" => "application/wasm")
-    file_extension = getkey(mimepairs, '.' * split(filename, '.')[end], ".txt")
-    MIME(mimepairs[file_extension])
-end
-
 const day = let 
     second = 1
     hour = 60second
@@ -56,8 +49,7 @@ function asset_response(path; cacheable::Bool=false)
     if isfile(path)
         data = read(path)
         response = HTTP.Response(200, data)
-        m = mime_fromfilename(path)
-        push!(response.headers, "Content-Type" => Base.istextmime(m) ? "$(m); charset=UTF-8" : string(m))
+        push!(response.headers, "Content-Type" => MIMEs.contenttype_from_mime(MIMEs.mime_from_path(path)))
         push!(response.headers, "Content-Length" => string(length(data)))
         push!(response.headers, "Access-Control-Allow-Origin" => "*")
         cacheable && push!(response.headers, "Cache-Control" => "public, max-age=$(30day), immutable")
@@ -80,7 +72,7 @@ function error_response(
         "\$BODY" => htmlesc(body))
 
     response = HTTP.Response(status_code, filled_in)
-    push!(response.headers, "Content-Type" => string(mime_fromfilename(".html")))
+    push!(response.headers, "Content-Type" => MIMEs.contenttype_from_mime(MIME"text/html"()))
     response
 end
 

From 16b9befc488798f712dfb8126b4faf63c1fab7bb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 4 Apr 2022 14:28:25 +0200
Subject: [PATCH 233/821] Update CM bundle (#2021)

---
 frontend/imports/CodemirrorPlutoSetup.d.ts | 4174 ++++++++++----------
 frontend/imports/CodemirrorPlutoSetup.js   |    2 +-
 2 files changed, 2114 insertions(+), 2062 deletions(-)

diff --git a/frontend/imports/CodemirrorPlutoSetup.d.ts b/frontend/imports/CodemirrorPlutoSetup.d.ts
index 973582b992..382f4d6f18 100644
--- a/frontend/imports/CodemirrorPlutoSetup.d.ts
+++ b/frontend/imports/CodemirrorPlutoSetup.d.ts
@@ -295,7 +295,9 @@ declare class ChangeSet extends ChangeDesc {
     map(other: ChangeDesc, before?: boolean): ChangeSet;
     /**
     Iterate over the changed ranges in the document, calling `f` for
-    each.
+    each, with the range in the original document (`fromA`-`toA`)
+    and the range that replaces it in the new document
+    (`fromB`-`toB`).
     
     When `individual` is true, adjacent changes are reported
     separately.
@@ -1383,8 +1385,8 @@ declare class Tree {
     cursor(pos?: number, side?: -1 | 0 | 1): TreeCursor;
     fullCursor(): TreeCursor;
     get topNode(): SyntaxNode;
-    resolve(pos: number, side?: -1 | 0 | 1): any;
-    resolveInner(pos: number, side?: -1 | 0 | 1): any;
+    resolve(pos: number, side?: -1 | 0 | 1): SyntaxNode;
+    resolveInner(pos: number, side?: -1 | 0 | 1): SyntaxNode;
     iterate(spec: {
         enter(type: NodeType, from: number, to: number, get: () => SyntaxNode): false | void;
         leave?(type: NodeType, from: number, to: number, get: () => SyntaxNode): void;
@@ -1487,2809 +1489,2831 @@ interface NestedParse {
 }
 declare function parseMixed(nest: (node: TreeCursor, input: Input) => NestedParse | null): ParseWrapper;
 
-declare class Stack {
-    pos: number;
-    get context(): any;
-    canShift(term: number): boolean;
-    get parser(): LRParser;
-    dialectEnabled(dialectID: number): boolean;
-    private shiftContext;
-    private reduceContext;
-    private updateContext;
+declare class StyleModule {
+  constructor(spec: {[selector: string]: StyleSpec}, options?: {
+    finish?(sel: string): string
+  })
+  getRules(): string
+  static mount(root: Document | ShadowRoot | DocumentOrShadowRoot, module: StyleModule | ReadonlyArray<StyleModule>): void
+  static newName(): string
 }
 
-declare class InputStream {
-    private chunk2;
-    private chunk2Pos;
-    next: number;
-    pos: number;
-    private rangeIndex;
-    private range;
-    resolveOffset(offset: number, assoc: -1 | 1): number;
-    peek(offset: number): any;
-    acceptToken(token: number, endOffset?: number): void;
-    private getChunk;
-    private readNext;
-    advance(n?: number): number;
-    private setDone;
-}
-interface Tokenizer {
-}
-interface ExternalOptions {
-    contextual?: boolean;
-    fallback?: boolean;
-    extend?: boolean;
-}
-declare class ExternalTokenizer implements Tokenizer {
-    constructor(token: (input: InputStream, stack: Stack) => void, options?: ExternalOptions);
+type StyleSpec = {
+  [propOrSelector: string]: string | number | StyleSpec | null
 }
 
-declare class ContextTracker<T> {
-    constructor(spec: {
-        start: T;
-        shift?(context: T, term: number, stack: Stack, input: InputStream): T;
-        reduce?(context: T, term: number, stack: Stack, input: InputStream): T;
-        reuse?(context: T, node: Tree, stack: Stack, input: InputStream): T;
-        hash?(context: T): number;
-        strict?: boolean;
-    });
-}
-interface ParserConfig {
-    props?: readonly NodePropSource[];
-    top?: string;
-    dialect?: string;
-    tokenizers?: {
-        from: ExternalTokenizer;
-        to: ExternalTokenizer;
-    }[];
-    contextTracker?: ContextTracker<any>;
-    strict?: boolean;
-    wrap?: ParseWrapper;
-    bufferLength?: number;
-}
-declare class LRParser extends Parser {
-    readonly nodeSet: NodeSet;
-    createParse(input: Input, fragments: readonly TreeFragment[], ranges: readonly {
-        from: number;
-        to: number;
-    }[]): PartialParse;
-    configure(config: ParserConfig): LRParser;
-    getName(term: number): string;
-    get topNode(): NodeType;
-}
+/**
+Highlighting tags are markers that denote a highlighting category.
+They are [associated](https://codemirror.net/6/docs/ref/#highlight.styleTags) with parts of a syntax
+tree by a language mode, and then mapped to an actual CSS style by
+a [highlight style](https://codemirror.net/6/docs/ref/#highlight.HighlightStyle).
+
+Because syntax tree node types and highlight styles have to be
+able to talk the same language, CodeMirror uses a mostly _closed_
+[vocabulary](https://codemirror.net/6/docs/ref/#highlight.tags) of syntax tags (as opposed to
+traditional open string-based systems, which make it hard for
+highlighting themes to cover all the tokens produced by the
+various languages).
 
+It _is_ possible to [define](https://codemirror.net/6/docs/ref/#highlight.Tag^define) your own
+highlighting tags for system-internal use (where you control both
+the language package and the highlighter), but such tags will not
+be picked up by regular highlighters (though you can derive them
+from standard tags to allow highlighters to fall back to those).
+*/
+declare class Tag {
+    /**
+    Define a new tag. If `parent` is given, the tag is treated as a
+    sub-tag of that parent, and [highlight
+    styles](https://codemirror.net/6/docs/ref/#highlight.HighlightStyle) that don't mention this tag
+    will try to fall back to the parent tag (or grandparent tag,
+    etc).
+    */
+    static define(parent?: Tag): Tag;
+    /**
+    Define a tag _modifier_, which is a function that, given a tag,
+    will return a tag that is a subtag of the original. Applying the
+    same modifier to a twice tag will return the same value (`m1(t1)
+    == m1(t1)`) and applying multiple modifiers will, regardless or
+    order, produce the same tag (`m1(m2(t1)) == m2(m1(t1))`).
+    
+    When multiple modifiers are applied to a given base tag, each
+    smaller set of modifiers is registered as a parent, so that for
+    example `m1(m2(m3(t1)))` is a subtype of `m1(m2(t1))`,
+    `m1(m3(t1)`, and so on.
+    */
+    static defineModifier(): (tag: Tag) => Tag;
+}
 /**
-Each range is associated with a value, which must inherit from
-this class.
+A highlight style associates CSS styles with higlighting
+[tags](https://codemirror.net/6/docs/ref/#highlight.Tag).
 */
-declare abstract class RangeValue {
+declare class HighlightStyle {
     /**
-    Compare this value with another value. The default
-    implementation compares by identity.
+    Extension that registers this style with an editor. When
+    multiple highlight styles are given, they _all_ apply, assigning
+    the combination of their matching styles to tokens.
     */
-    eq(other: RangeValue): boolean;
+    readonly extension: Extension;
     /**
-    The bias value at the start of the range. Determines how the
-    range is positioned relative to other ranges starting at this
-    position. Defaults to 0.
+    An extension that installs this highlighter as a fallback
+    highlight style, which will only be used if no other highlight
+    styles are configured.
     */
-    startSide: number;
+    readonly fallback: Extension;
     /**
-    The bias value at the end of the range. Defaults to 0.
+    A style module holding the CSS rules for this highlight style.
+    When using [`highlightTree`](https://codemirror.net/6/docs/ref/#highlight.highlightTree), you may
+    want to manually mount this module to show the highlighting.
     */
-    endSide: number;
+    readonly module: StyleModule | null;
+    private map;
+    private scope;
+    private all;
+    private constructor();
     /**
-    The mode with which the location of the range should be mapped
-    when its `from` and `to` are the same, to decide whether a
-    change deletes the range. Defaults to `MapMode.TrackDel`.
+    Returns the CSS class associated with the given tag, if any.
+    This method is bound to the instance by the constructor.
     */
-    mapMode: MapMode;
+    match(tag: Tag, scope: NodeType): string | null;
     /**
-    Whether this value marks a point range, which is treated as
-    atomic and shadows the ranges contained in it.
+    Combines an array of highlight styles into a single match
+    function that returns all of the classes assigned by the styles
+    for a given tag.
     */
-    point: boolean;
+    static combinedMatch(styles: readonly HighlightStyle[]): (tag: Tag, scope: NodeType) => any;
     /**
-    Create a [range](https://codemirror.net/6/docs/ref/#rangeset.Range) with this value.
+    Create a highlighter style that associates the given styles to
+    the given tags. The spec must be objects that hold a style tag
+    or array of tags in their `tag` property, and either a single
+    `class` property providing a static CSS class (for highlighters
+    like [`classHighlightStyle`](https://codemirror.net/6/docs/ref/#highlight.classHighlightStyle)
+    that rely on external styling), or a
+    [`style-mod`](https://github.com/marijnh/style-mod#documentation)-style
+    set of CSS properties (which define the styling for those tags).
+    
+    The CSS rules created for a highlighter will be emitted in the
+    order of the spec's properties. That means that for elements that
+    have multiple tags associated with them, styles defined further
+    down in the list will have a higher CSS precedence than styles
+    defined earlier.
     */
-    range(from: number, to?: number): Range<this>;
+    static define(specs: readonly TagStyle[], options?: {
+        /**
+        By default, highlighters apply to the entire document. You can
+        scope them to a single language by providing the language's
+        [top node](https://codemirror.net/6/docs/ref/#language.Language.topNode) here.
+        */
+        scope?: NodeType;
+        /**
+        Add a style to _all_ content. Probably only useful in
+        combination with `scope`.
+        */
+        all?: string | StyleSpec;
+        /**
+        Specify that this highlight style should only be active then
+        the theme is dark or light. By default, it is active
+        regardless of theme.
+        */
+        themeType?: "dark" | "light";
+    }): HighlightStyle;
+    /**
+    Returns the CSS classes (if any) that the highlight styles
+    active in the given state would assign to the given a style
+    [tag](https://codemirror.net/6/docs/ref/#highlight.Tag) and (optional) language
+    [scope](https://codemirror.net/6/docs/ref/#highlight.HighlightStyle^define^options.scope).
+    */
+    static get(state: EditorState, tag: Tag, scope?: NodeType): string | null;
 }
 /**
-A range associates a value with a range of positions.
+The type of object used in
+[`HighlightStyle.define`](https://codemirror.net/6/docs/ref/#highlight.HighlightStyle^define).
+Assigns a style to one or more highlighting
+[tags](https://codemirror.net/6/docs/ref/#highlight.Tag), which can either be a fixed class name
+(which must be defined elsewhere), or a set of CSS properties, for
+which the library will define an anonymous class.
 */
-declare class Range<T extends RangeValue> {
+interface TagStyle {
     /**
-    The range's start position.
+    The tag or tags to target.
     */
-    readonly from: number;
+    tag: Tag | readonly Tag[];
     /**
-    Its end position.
+    If given, this maps the tags to a fixed class name.
     */
-    readonly to: number;
+    class?: string;
     /**
-    The value associated with this range.
+    Any further properties (if `class` isn't given) will be
+    interpreted as in style objects given to
+    [style-mod](https://github.com/marijnh/style-mod#documentation).
+    The type here is `any` because of TypeScript limitations.
     */
-    readonly value: T;
+    [styleProperty: string]: any;
 }
 /**
-Collection of methods used when comparing range sets.
+The default set of highlighting [tags](https://codemirror.net/6/docs/ref/#highlight.Tag^define) used
+by regular language packages and themes.
+
+This collection is heavily biased towards programming languages,
+and necessarily incomplete. A full ontology of syntactic
+constructs would fill a stack of books, and be impractical to
+write themes for. So try to make do with this set. If all else
+fails, [open an
+issue](https://github.com/codemirror/codemirror.next) to propose a
+new tag, or [define](https://codemirror.net/6/docs/ref/#highlight.Tag^define) a local custom tag for
+your use case.
+
+Note that it is not obligatory to always attach the most specific
+tag possible to an element—if your grammar can't easily
+distinguish a certain type of element (such as a local variable),
+it is okay to style it as its more general variant (a variable).
+
+For tags that extend some parent tag, the documentation links to
+the parent.
 */
-interface RangeComparator<T extends RangeValue> {
+declare const tags: {
     /**
-    Notifies the comparator that the given range has the given set
-    of values associated with it.
+    A comment.
     */
-    compareRange(from: number, to: number, activeA: T[], activeB: T[]): void;
+    comment: Tag;
     /**
-    Notification for a point range.
+    A line [comment](https://codemirror.net/6/docs/ref/#highlight.tags.comment).
     */
-    comparePoint(from: number, to: number, byA: T | null, byB: T | null): void;
-}
-/**
-Methods used when iterating over the spans created by a set of
-ranges. The entire iterated range will be covered with either
-`span` or `point` calls.
-*/
-interface SpanIterator<T extends RangeValue> {
+    lineComment: Tag;
     /**
-    Called for any ranges not covered by point decorations. `active`
-    holds the values that the range is marked with (and may be
-    empty). `openStart` indicates how many of those ranges are open
-    (continued) at the start of the span.
+    A block [comment](https://codemirror.net/6/docs/ref/#highlight.tags.comment).
     */
-    span(from: number, to: number, active: readonly T[], openStart: number): void;
+    blockComment: Tag;
     /**
-    Called when going over a point decoration. The active range
-    decorations that cover the point and have a higher precedence
-    are provided in `active`. The open count in `openStart` counts
-    the number of those ranges that started before the point and. If
-    the point started before the iterated range, `openStart` will be
-    `active.length + 1` to signal this.
+    A documentation [comment](https://codemirror.net/6/docs/ref/#highlight.tags.comment).
     */
-    point(from: number, to: number, value: T, active: readonly T[], openStart: number): void;
+    docComment: Tag;
     /**
-    When provided, this will be called for each point processed,
-    causing the ones for which it returns false to be ignored.
+    Any kind of identifier.
     */
-    filterPoint?(from: number, to: number, value: T, index: number): boolean;
-}
-/**
-A range cursor is an object that moves to the next range every
-time you call `next` on it. Note that, unlike ES6 iterators, these
-start out pointing at the first element, so you should call `next`
-only after reading the first range (if any).
-*/
-interface RangeCursor<T> {
+    name: Tag;
     /**
-    Move the iterator forward.
+    The [name](https://codemirror.net/6/docs/ref/#highlight.tags.name) of a variable.
     */
-    next: () => void;
+    variableName: Tag;
     /**
-    The next range's value. Holds `null` when the cursor has reached
-    its end.
+    A type [name](https://codemirror.net/6/docs/ref/#highlight.tags.name).
     */
-    value: T | null;
+    typeName: Tag;
     /**
-    The next range's start position.
+    A tag name (subtag of [`typeName`](https://codemirror.net/6/docs/ref/#highlight.tags.typeName)).
     */
-    from: number;
+    tagName: Tag;
     /**
-    The next end position.
+    A property or field [name](https://codemirror.net/6/docs/ref/#highlight.tags.name).
     */
-    to: number;
-}
-declare type RangeSetUpdate<T extends RangeValue> = {
+    propertyName: Tag;
     /**
-    An array of ranges to add. If given, this should be sorted by
-    `from` position and `startSide` unless
-    [`sort`](https://codemirror.net/6/docs/ref/#rangeset.RangeSet.update^updateSpec.sort) is given as
-    `true`.
+    An attribute name (subtag of [`propertyName`](https://codemirror.net/6/docs/ref/#highlight.tags.propertyName)).
     */
-    add?: readonly Range<T>[];
+    attributeName: Tag;
     /**
-    Indicates whether the library should sort the ranges in `add`.
-    Defaults to `false`.
+    The [name](https://codemirror.net/6/docs/ref/#highlight.tags.name) of a class.
     */
-    sort?: boolean;
+    className: Tag;
     /**
-    Filter the ranges already in the set. Only those for which this
-    function returns `true` are kept.
+    A label [name](https://codemirror.net/6/docs/ref/#highlight.tags.name).
     */
-    filter?: (from: number, to: number, value: T) => boolean;
+    labelName: Tag;
     /**
-    Can be used to limit the range on which the filter is
-    applied. Filtering only a small range, as opposed to the entire
-    set, can make updates cheaper.
+    A namespace [name](https://codemirror.net/6/docs/ref/#highlight.tags.name).
     */
-    filterFrom?: number;
+    namespace: Tag;
     /**
-    The end position to apply the filter to.
+    The [name](https://codemirror.net/6/docs/ref/#highlight.tags.name) of a macro.
     */
-    filterTo?: number;
-};
-/**
-A range set stores a collection of [ranges](https://codemirror.net/6/docs/ref/#rangeset.Range) in a
-way that makes them efficient to [map](https://codemirror.net/6/docs/ref/#rangeset.RangeSet.map) and
-[update](https://codemirror.net/6/docs/ref/#rangeset.RangeSet.update). This is an immutable data
-structure.
-*/
-declare class RangeSet<T extends RangeValue> {
+    macroName: Tag;
     /**
-    The number of ranges in the set.
+    A literal value.
     */
-    get size(): number;
+    literal: Tag;
     /**
-    Update the range set, optionally adding new ranges or filtering
-    out existing ones.
-    
-    (The extra type parameter is just there as a kludge to work
-    around TypeScript variance issues that prevented `RangeSet<X>`
-    from being a subtype of `RangeSet<Y>` when `X` is a subtype of
-    `Y`.)
+    A string [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
     */
-    update<U extends T>(updateSpec: RangeSetUpdate<U>): RangeSet<T>;
+    string: Tag;
     /**
-    Map this range set through a set of changes, return the new set.
+    A documentation [string](https://codemirror.net/6/docs/ref/#highlight.tags.string).
     */
-    map(changes: ChangeDesc): RangeSet<T>;
+    docString: Tag;
     /**
-    Iterate over the ranges that touch the region `from` to `to`,
-    calling `f` for each. There is no guarantee that the ranges will
-    be reported in any specific order. When the callback returns
-    `false`, iteration stops.
+    A character literal (subtag of [string](https://codemirror.net/6/docs/ref/#highlight.tags.string)).
     */
-    between(from: number, to: number, f: (from: number, to: number, value: T) => void | false): void;
+    character: Tag;
     /**
-    Iterate over the ranges in this set, in order, including all
-    ranges that end at or after `from`.
+    An attribute value (subtag of [string](https://codemirror.net/6/docs/ref/#highlight.tags.string)).
     */
-    iter(from?: number): RangeCursor<T>;
+    attributeValue: Tag;
     /**
-    Iterate over the ranges in a collection of sets, in order,
-    starting from `from`.
+    A number [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
     */
-    static iter<T extends RangeValue>(sets: readonly RangeSet<T>[], from?: number): RangeCursor<T>;
+    number: Tag;
     /**
-    Iterate over two groups of sets, calling methods on `comparator`
-    to notify it of possible differences.
+    An integer [number](https://codemirror.net/6/docs/ref/#highlight.tags.number) literal.
     */
-    static compare<T extends RangeValue>(oldSets: readonly RangeSet<T>[], newSets: readonly RangeSet<T>[], 
+    integer: Tag;
     /**
-    This indicates how the underlying data changed between these
-    ranges, and is needed to synchronize the iteration. `from` and
-    `to` are coordinates in the _new_ space, after these changes.
+    A floating-point [number](https://codemirror.net/6/docs/ref/#highlight.tags.number) literal.
     */
-    textDiff: ChangeDesc, comparator: RangeComparator<T>, 
+    float: Tag;
     /**
-    Can be used to ignore all non-point ranges, and points below
-    the given size. When -1, all ranges are compared.
+    A boolean [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
     */
-    minPointSize?: number): void;
+    bool: Tag;
     /**
-    Compare the contents of two groups of range sets, returning true
-    if they are equivalent in the given range.
+    Regular expression [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
     */
-    static eq<T extends RangeValue>(oldSets: readonly RangeSet<T>[], newSets: readonly RangeSet<T>[], from?: number, to?: number): boolean;
+    regexp: Tag;
     /**
-    Iterate over a group of range sets at the same time, notifying
-    the iterator about the ranges covering every given piece of
-    content. Returns the open count (see
-    [`SpanIterator.span`](https://codemirror.net/6/docs/ref/#rangeset.SpanIterator.span)) at the end
-    of the iteration.
+    An escape [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal), for example a
+    backslash escape in a string.
     */
-    static spans<T extends RangeValue>(sets: readonly RangeSet<T>[], from: number, to: number, iterator: SpanIterator<T>, 
+    escape: Tag;
     /**
-    When given and greater than -1, only points of at least this
-    size are taken into account.
+    A color [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
     */
-    minPointSize?: number): number;
+    color: Tag;
     /**
-    Create a range set for the given range or array of ranges. By
-    default, this expects the ranges to be _sorted_ (by start
-    position and, if two start at the same position,
-    `value.startSide`). You can pass `true` as second argument to
-    cause the method to sort them.
+    A URL [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
     */
-    static of<T extends RangeValue>(ranges: readonly Range<T>[] | Range<T>, sort?: boolean): RangeSet<T>;
+    url: Tag;
     /**
-    The empty set of ranges.
+    A language keyword.
     */
-    static empty: RangeSet<any>;
-}
-
-declare class StyleModule {
-  constructor(spec: {[selector: string]: StyleSpec}, options?: {
-    finish?(sel: string): string
-  })
-  getRules(): string
-  static mount(root: Document | ShadowRoot | DocumentOrShadowRoot, module: StyleModule | ReadonlyArray<StyleModule>): void
-  static newName(): string
-}
-
-type StyleSpec = {
-  [propOrSelector: string]: string | number | StyleSpec | null
-}
-
-declare type Attrs = {
-    [name: string]: string;
-};
-
-interface MarkDecorationSpec {
+    keyword: Tag;
     /**
-    Whether the mark covers its start and end position or not. This
-    influences whether content inserted at those positions becomes
-    part of the mark. Defaults to false.
+    The [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) for the self or this
+    object.
     */
-    inclusive?: boolean;
+    self: Tag;
     /**
-    Specify whether the start position of the marked range should be
-    inclusive. Overrides `inclusive`, when both are present.
+    The [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) for null.
     */
-    inclusiveStart?: boolean;
+    null: Tag;
     /**
-    Whether the end should be inclusive.
+    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) denoting some atomic value.
     */
-    inclusiveEnd?: boolean;
+    atom: Tag;
     /**
-    Add attributes to the DOM elements that hold the text in the
-    marked range.
+    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) that represents a unit.
     */
-    attributes?: {
-        [key: string]: string;
-    };
+    unit: Tag;
     /**
-    Shorthand for `{attributes: {class: value}}`.
+    A modifier [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword).
     */
-    class?: string;
+    modifier: Tag;
     /**
-    Add a wrapping element around the text in the marked range. Note
-    that there will not be a single element covering the entire
-    range—content is split on mark starts and ends, and each piece
-    gets its own element.
+    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) that acts as an operator.
     */
-    tagName?: string;
+    operatorKeyword: Tag;
     /**
-    Decoration specs allow extra properties, which can be retrieved
-    through the decoration's [`spec`](https://codemirror.net/6/docs/ref/#view.Decoration.spec)
-    property.
+    A control-flow related [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword).
     */
-    [other: string]: any;
-}
-interface WidgetDecorationSpec {
+    controlKeyword: Tag;
     /**
-    The type of widget to draw here.
+    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) that defines something.
     */
-    widget: WidgetType;
+    definitionKeyword: Tag;
     /**
-    Which side of the given position the widget is on. When this is
-    positive, the widget will be drawn after the cursor if the
-    cursor is on the same position. Otherwise, it'll be drawn before
-    it. When multiple widgets sit at the same position, their `side`
-    values will determine their ordering—those with a lower value
-    come first. Defaults to 0.
+    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) related to defining or
+    interfacing with modules.
     */
-    side?: number;
+    moduleKeyword: Tag;
     /**
-    Determines whether this is a block widgets, which will be drawn
-    between lines, or an inline widget (the default) which is drawn
-    between the surrounding text.
-    
-    Note that block-level decorations should not have vertical
-    margins, and if you dynamically change their height, you should
-    make sure to call
-    [`requestMeasure`](https://codemirror.net/6/docs/ref/#view.EditorView.requestMeasure), so that the
-    editor can update its information about its vertical layout.
+    An operator.
     */
-    block?: boolean;
+    operator: Tag;
     /**
-    Other properties are allowed.
+    An [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator) that defines something.
     */
-    [other: string]: any;
-}
-interface ReplaceDecorationSpec {
+    derefOperator: Tag;
     /**
-    An optional widget to drawn in the place of the replaced
-    content.
+    Arithmetic-related [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
     */
-    widget?: WidgetType;
+    arithmeticOperator: Tag;
     /**
-    Whether this range covers the positions on its sides. This
-    influences whether new content becomes part of the range and
-    whether the cursor can be drawn on its sides. Defaults to false
-    for inline replacements, and true for block replacements.
+    Logical [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
     */
-    inclusive?: boolean;
+    logicOperator: Tag;
     /**
-    Set inclusivity at the start.
+    Bit [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
     */
-    inclusiveStart?: boolean;
+    bitwiseOperator: Tag;
     /**
-    Set inclusivity at the end.
+    Comparison [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
     */
-    inclusiveEnd?: boolean;
+    compareOperator: Tag;
     /**
-    Whether this is a block-level decoration. Defaults to false.
+    [Operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator) that updates its operand.
     */
-    block?: boolean;
+    updateOperator: Tag;
     /**
-    Other properties are allowed.
+    [Operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator) that defines something.
     */
-    [other: string]: any;
-}
-interface LineDecorationSpec {
+    definitionOperator: Tag;
     /**
-    DOM attributes to add to the element wrapping the line.
+    Type-related [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
     */
-    attributes?: {
-        [key: string]: string;
-    };
+    typeOperator: Tag;
     /**
-    Shorthand for `{attributes: {class: value}}`.
+    Control-flow [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
     */
-    class?: string;
+    controlOperator: Tag;
     /**
-    Other properties are allowed.
+    Program or markup punctuation.
     */
-    [other: string]: any;
-}
-/**
-Widgets added to the content are described by subclasses of this
-class. Using a description object like that makes it possible to
-delay creating of the DOM structure for a widget until it is
-needed, and to avoid redrawing widgets even when the decorations
-that define them are recreated.
-*/
-declare abstract class WidgetType {
+    punctuation: Tag;
     /**
-    Build the DOM structure for this widget instance.
+    [Punctuation](https://codemirror.net/6/docs/ref/#highlight.tags.punctuation) that separates
+    things.
     */
-    abstract toDOM(view: EditorView): HTMLElement;
+    separator: Tag;
     /**
-    Compare this instance to another instance of the same type.
-    (TypeScript can't express this, but only instances of the same
-    specific class will be passed to this method.) This is used to
-    avoid redrawing widgets when they are replaced by a new
-    decoration of the same type. The default implementation just
-    returns `false`, which will cause new instances of the widget to
-    always be redrawn.
+    Bracket-style [punctuation](https://codemirror.net/6/docs/ref/#highlight.tags.punctuation).
     */
-    eq(_widget: WidgetType): boolean;
+    bracket: Tag;
     /**
-    Update a DOM element created by a widget of the same type (but
-    different, non-`eq` content) to reflect this widget. May return
-    true to indicate that it could update, false to indicate it
-    couldn't (in which case the widget will be redrawn). The default
-    implementation just returns false.
+    Angle [brackets](https://codemirror.net/6/docs/ref/#highlight.tags.bracket) (usually `<` and `>`
+    tokens).
     */
-    updateDOM(_dom: HTMLElement): boolean;
+    angleBracket: Tag;
     /**
-    The estimated height this widget will have, to be used when
-    estimating the height of content that hasn't been drawn. May
-    return -1 to indicate you don't know. The default implementation
-    returns -1.
+    Square [brackets](https://codemirror.net/6/docs/ref/#highlight.tags.bracket) (usually `[` and `]`
+    tokens).
     */
-    get estimatedHeight(): number;
+    squareBracket: Tag;
     /**
-    Can be used to configure which kinds of events inside the widget
-    should be ignored by the editor. The default is to ignore all
-    events.
+    Parentheses (usually `(` and `)` tokens). Subtag of
+    [bracket](https://codemirror.net/6/docs/ref/#highlight.tags.bracket).
     */
-    ignoreEvent(_event: Event): boolean;
+    paren: Tag;
     /**
-    This is called when the an instance of the widget is removed
-    from the editor view.
+    Braces (usually `{` and `}` tokens). Subtag of
+    [bracket](https://codemirror.net/6/docs/ref/#highlight.tags.bracket).
     */
-    destroy(_dom: HTMLElement): void;
-}
-/**
-A decoration set represents a collection of decorated ranges,
-organized for efficient access and mapping. See
-[`RangeSet`](https://codemirror.net/6/docs/ref/#rangeset.RangeSet) for its methods.
-*/
-declare type DecorationSet = RangeSet<Decoration>;
-/**
-The different types of blocks that can occur in an editor view.
-*/
-declare enum BlockType {
+    brace: Tag;
     /**
-    A line of text.
+    Content, for example plain text in XML or markup documents.
     */
-    Text = 0,
+    content: Tag;
     /**
-    A block widget associated with the position after it.
+    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that represents a heading.
     */
-    WidgetBefore = 1,
+    heading: Tag;
     /**
-    A block widget associated with the position before it.
+    A level 1 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
     */
-    WidgetAfter = 2,
+    heading1: Tag;
     /**
-    A block widget [replacing](https://codemirror.net/6/docs/ref/#view.Decoration^replace) a range of content.
+    A level 2 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
     */
-    WidgetRange = 3
-}
-/**
-A decoration provides information on how to draw or style a piece
-of content. You'll usually use it wrapped in a
-[`Range`](https://codemirror.net/6/docs/ref/#rangeset.Range), which adds a start and end position.
-*/
-declare abstract class Decoration extends RangeValue {
+    heading2: Tag;
     /**
-    The config object used to create this decoration. You can
-    include additional properties in there to store metadata about
-    your decoration.
+    A level 3 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
     */
-    readonly spec: any;
-    abstract eq(other: Decoration): boolean;
+    heading3: Tag;
     /**
-    Create a mark decoration, which influences the styling of the
-    content in its range. Nested mark decorations will cause nested
-    DOM elements to be created. Nesting order is determined by
-    precedence of the [facet](https://codemirror.net/6/docs/ref/#view.EditorView^decorations) or
-    (below the facet-provided decorations) [view
-    plugin](https://codemirror.net/6/docs/ref/#view.PluginSpec.decorations). Such elements are split
-    on line boundaries and on the boundaries of higher-precedence
-    decorations.
+    A level 4 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
     */
-    static mark(spec: MarkDecorationSpec): Decoration;
+    heading4: Tag;
     /**
-    Create a widget decoration, which adds an element at the given
-    position.
+    A level 5 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
     */
-    static widget(spec: WidgetDecorationSpec): Decoration;
+    heading5: Tag;
     /**
-    Create a replace decoration which replaces the given range with
-    a widget, or simply hides it.
+    A level 6 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
     */
-    static replace(spec: ReplaceDecorationSpec): Decoration;
+    heading6: Tag;
     /**
-    Create a line decoration, which can add DOM attributes to the
-    line starting at the given position.
+    A prose separator (such as a horizontal rule).
     */
-    static line(spec: LineDecorationSpec): Decoration;
+    contentSeparator: Tag;
     /**
-    Build a [`DecorationSet`](https://codemirror.net/6/docs/ref/#view.DecorationSet) from the given
-    decorated range or ranges. If the ranges aren't already sorted,
-    pass `true` for `sort` to make the library sort them for you.
+    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that represents a list.
     */
-    static set(of: Range<Decoration> | readonly Range<Decoration>[], sort?: boolean): DecorationSet;
+    list: Tag;
     /**
-    The empty set of decorations.
+    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that represents a quote.
     */
-    static none: DecorationSet;
-}
-
-/**
-Basic rectangle type.
-*/
-interface Rect {
-    readonly left: number;
-    readonly right: number;
-    readonly top: number;
-    readonly bottom: number;
-}
-declare type ScrollStrategy = "nearest" | "start" | "end" | "center";
-
-/**
-Command functions are used in key bindings and other types of user
-actions. Given an editor view, they check whether their effect can
-apply to the editor, and if it can, perform it as a side effect
-(which usually means [dispatching](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch) a
-transaction) and return `true`.
-*/
-declare type Command = (target: EditorView) => boolean;
-/**
-This is the interface plugin objects conform to.
-*/
-interface PluginValue {
+    quote: Tag;
     /**
-    Notifies the plugin of an update that happened in the view. This
-    is called _before_ the view updates its own DOM. It is
-    responsible for updating the plugin's internal state (including
-    any state that may be read by plugin fields) and _writing_ to
-    the DOM for the changes in the update. To avoid unnecessary
-    layout recomputations, it should _not_ read the DOM layout—use
-    [`requestMeasure`](https://codemirror.net/6/docs/ref/#view.EditorView.requestMeasure) to schedule
-    your code in a DOM reading phase if you need to.
+    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that is emphasized.
     */
-    update?(_update: ViewUpdate): void;
+    emphasis: Tag;
     /**
-    Called when the plugin is no longer going to be used. Should
-    revert any changes the plugin made to the DOM.
+    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that is styled strong.
     */
-    destroy?(): void;
-}
-declare const isFieldProvider: unique symbol;
-/**
-Used to [declare](https://codemirror.net/6/docs/ref/#view.PluginSpec.provide) which
-[fields](https://codemirror.net/6/docs/ref/#view.PluginValue) a [view plugin](https://codemirror.net/6/docs/ref/#view.ViewPlugin)
-provides.
-*/
-declare class PluginFieldProvider<V> {
-    private [isFieldProvider];
-}
-/**
-Plugin fields are a mechanism for allowing plugins to provide
-values that can be retrieved through the
-[`pluginField`](https://codemirror.net/6/docs/ref/#view.EditorView.pluginField) view method.
-*/
-declare class PluginField<T> {
+    strong: Tag;
     /**
-    Create a [provider](https://codemirror.net/6/docs/ref/#view.PluginFieldProvider) for this field,
-    to use with a plugin's [provide](https://codemirror.net/6/docs/ref/#view.PluginSpec.provide)
-    option.
+    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that is part of a link.
     */
-    from<V extends PluginValue>(get: (value: V) => T): PluginFieldProvider<V>;
+    link: Tag;
     /**
-    Define a new plugin field.
+    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that is styled as code or
+    monospace.
     */
-    static define<T>(): PluginField<T>;
+    monospace: Tag;
     /**
-    This field can be used by plugins to provide
-    [decorations](https://codemirror.net/6/docs/ref/#view.Decoration).
-    
-    **Note**: For reasons of data flow (plugins are only updated
-    after the viewport is computed), decorations produced by plugins
-    are _not_ taken into account when predicting the vertical layout
-    structure of the editor. They **must not** introduce block
-    widgets (that will raise an error) or replacing decorations that
-    cover line breaks (these will be ignored if they occur). Such
-    decorations, or others that cause a large amount of vertical
-    size shift compared to the undecorated content, should be
-    provided through the state-level [`decorations`
-    facet](https://codemirror.net/6/docs/ref/#view.EditorView^decorations) instead.
-    */
-    static decorations: PluginField<DecorationSet>;
-    /**
-    Used to provide ranges that should be treated as atoms as far as
-    cursor motion is concerned. This causes methods like
-    [`moveByChar`](https://codemirror.net/6/docs/ref/#view.EditorView.moveByChar) and
-    [`moveVertically`](https://codemirror.net/6/docs/ref/#view.EditorView.moveVertically) (and the
-    commands built on top of them) to skip across such regions when
-    a selection endpoint would enter them. This does _not_ prevent
-    direct programmatic [selection
-    updates](https://codemirror.net/6/docs/ref/#state.TransactionSpec.selection) from moving into such
-    regions.
+    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that has a strike-through
+    style.
     */
-    static atomicRanges: PluginField<RangeSet<any>>;
+    strikethrough: Tag;
     /**
-    Plugins can provide additional scroll margins (space around the
-    sides of the scrolling element that should be considered
-    invisible) through this field. This can be useful when the
-    plugin introduces elements that cover part of that element (for
-    example a horizontally fixed gutter).
+    Inserted text in a change-tracking format.
     */
-    static scrollMargins: PluginField<Partial<Rect> | null>;
-}
-/**
-Provides additional information when defining a [view
-plugin](https://codemirror.net/6/docs/ref/#view.ViewPlugin).
-*/
-interface PluginSpec<V extends PluginValue> {
+    inserted: Tag;
     /**
-    Register the given [event
-    handlers](https://codemirror.net/6/docs/ref/#view.EditorView^domEventHandlers) for the plugin.
-    When called, these will have their `this` bound to the plugin
-    value.
+    Deleted text.
     */
-    eventHandlers?: DOMEventHandlers<V>;
+    deleted: Tag;
     /**
-    Allow the plugin to provide decorations. When given, this should
-    a function that take the plugin value and return a [decoration
-    set](https://codemirror.net/6/docs/ref/#view.DecorationSet). See also the caveat about
-    [layout-changing decorations](https://codemirror.net/6/docs/ref/#view.PluginField^decorations)
-    from plugins.
+    Changed text.
     */
-    decorations?: (value: V) => DecorationSet;
+    changed: Tag;
     /**
-    Specify that the plugin provides [plugin
-    field](https://codemirror.net/6/docs/ref/#view.PluginField) values. Use a field's
-    [`from`](https://codemirror.net/6/docs/ref/#view.PluginField.from) method to create these
-    providers.
+    An invalid or unsyntactic element.
     */
-    provide?: PluginFieldProvider<V> | readonly PluginFieldProvider<V>[];
-}
-/**
-View plugins associate stateful values with a view. They can
-influence the way the content is drawn, and are notified of things
-that happen in the view.
-*/
-declare class ViewPlugin<V extends PluginValue> {
+    invalid: Tag;
     /**
-    Instances of this class act as extensions.
+    Metadata or meta-instruction.
     */
-    extension: Extension;
-    private constructor();
+    meta: Tag;
     /**
-    Define a plugin from a constructor function that creates the
-    plugin's value, given an editor view.
+    [Metadata](https://codemirror.net/6/docs/ref/#highlight.tags.meta) that applies to the entire
+    document.
     */
-    static define<V extends PluginValue>(create: (view: EditorView) => V, spec?: PluginSpec<V>): ViewPlugin<V>;
+    documentMeta: Tag;
     /**
-    Create a plugin for a class whose constructor takes a single
-    editor view as argument.
+    [Metadata](https://codemirror.net/6/docs/ref/#highlight.tags.meta) that annotates or adds
+    attributes to a given syntactic element.
     */
-    static fromClass<V extends PluginValue>(cls: {
-        new (view: EditorView): V;
-    }, spec?: PluginSpec<V>): ViewPlugin<V>;
-}
-interface MeasureRequest<T> {
+    annotation: Tag;
     /**
-    Called in a DOM read phase to gather information that requires
-    DOM layout. Should _not_ mutate the document.
+    Processing instruction or preprocessor directive. Subtag of
+    [meta](https://codemirror.net/6/docs/ref/#highlight.tags.meta).
     */
-    read(view: EditorView): T;
+    processingInstruction: Tag;
     /**
-    Called in a DOM write phase to update the document. Should _not_
-    do anything that triggers DOM layout.
+    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that indicates that a
+    given element is being defined. Expected to be used with the
+    various [name](https://codemirror.net/6/docs/ref/#highlight.tags.name) tags.
     */
-    write?(measure: T, view: EditorView): void;
+    definition: (tag: Tag) => Tag;
     /**
-    When multiple requests with the same key are scheduled, only the
-    last one will actually be ran.
+    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that indicates that
+    something is constant. Mostly expected to be used with
+    [variable names](https://codemirror.net/6/docs/ref/#highlight.tags.variableName).
     */
-    key?: any;
-}
-declare type AttrSource = Attrs | ((view: EditorView) => Attrs | null);
-/**
-View [plugins](https://codemirror.net/6/docs/ref/#view.ViewPlugin) are given instances of this
-class, which describe what happened, whenever the view is updated.
-*/
-declare class ViewUpdate {
+    constant: (tag: Tag) => Tag;
     /**
-    The editor view that the update is associated with.
+    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) used to indicate that
+    a [variable](https://codemirror.net/6/docs/ref/#highlight.tags.variableName) or [property
+    name](https://codemirror.net/6/docs/ref/#highlight.tags.propertyName) is being called or defined
+    as a function.
     */
-    readonly view: EditorView;
+    function: (tag: Tag) => Tag;
     /**
-    The new editor state.
+    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that can be applied to
+    [names](https://codemirror.net/6/docs/ref/#highlight.tags.name) to indicate that they belong to
+    the language's standard environment.
     */
-    readonly state: EditorState;
+    standard: (tag: Tag) => Tag;
     /**
-    The transactions involved in the update. May be empty.
+    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that indicates a given
+    [names](https://codemirror.net/6/docs/ref/#highlight.tags.name) is local to some scope.
     */
-    readonly transactions: readonly Transaction[];
+    local: (tag: Tag) => Tag;
     /**
-    The changes made to the document by this update.
+    A generic variant [modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that
+    can be used to tag language-specific alternative variants of
+    some common tag. It is recommended for themes to define special
+    forms of at least the [string](https://codemirror.net/6/docs/ref/#highlight.tags.string) and
+    [variable name](https://codemirror.net/6/docs/ref/#highlight.tags.variableName) tags, since those
+    come up a lot.
     */
-    readonly changes: ChangeSet;
+    special: (tag: Tag) => Tag;
+};
+/**
+A default highlight style (works well with light themes).
+*/
+declare const defaultHighlightStyle: HighlightStyle;
+
+declare class Stack {
+    pos: number;
+    get context(): any;
+    canShift(term: number): boolean;
+    get parser(): LRParser;
+    dialectEnabled(dialectID: number): boolean;
+    private shiftContext;
+    private reduceContext;
+    private updateContext;
+}
+
+declare class InputStream {
+    private chunk2;
+    private chunk2Pos;
+    next: number;
+    pos: number;
+    private rangeIndex;
+    private range;
+    resolveOffset(offset: number, assoc: -1 | 1): number;
+    peek(offset: number): any;
+    acceptToken(token: number, endOffset?: number): void;
+    private getChunk;
+    private readNext;
+    advance(n?: number): number;
+    private setDone;
+}
+interface Tokenizer {
+}
+interface ExternalOptions {
+    contextual?: boolean;
+    fallback?: boolean;
+    extend?: boolean;
+}
+declare class ExternalTokenizer implements Tokenizer {
+    constructor(token: (input: InputStream, stack: Stack) => void, options?: ExternalOptions);
+}
+
+declare class ContextTracker<T> {
+    constructor(spec: {
+        start: T;
+        shift?(context: T, term: number, stack: Stack, input: InputStream): T;
+        reduce?(context: T, term: number, stack: Stack, input: InputStream): T;
+        reuse?(context: T, node: Tree, stack: Stack, input: InputStream): T;
+        hash?(context: T): number;
+        strict?: boolean;
+    });
+}
+interface ParserConfig {
+    props?: readonly NodePropSource[];
+    top?: string;
+    dialect?: string;
+    tokenizers?: {
+        from: ExternalTokenizer;
+        to: ExternalTokenizer;
+    }[];
+    contextTracker?: ContextTracker<any>;
+    strict?: boolean;
+    wrap?: ParseWrapper;
+    bufferLength?: number;
+}
+declare class LRParser extends Parser {
+    readonly nodeSet: NodeSet;
+    createParse(input: Input, fragments: readonly TreeFragment[], ranges: readonly {
+        from: number;
+        to: number;
+    }[]): PartialParse;
+    configure(config: ParserConfig): LRParser;
+    getName(term: number): string;
+    get topNode(): NodeType;
+}
+
+/**
+Each range is associated with a value, which must inherit from
+this class.
+*/
+declare abstract class RangeValue {
     /**
-    The previous editor state.
+    Compare this value with another value. The default
+    implementation compares by identity.
     */
-    readonly startState: EditorState;
+    eq(other: RangeValue): boolean;
     /**
-    Tells you whether the [viewport](https://codemirror.net/6/docs/ref/#view.EditorView.viewport) or
-    [visible ranges](https://codemirror.net/6/docs/ref/#view.EditorView.visibleRanges) changed in this
-    update.
+    The bias value at the start of the range. Determines how the
+    range is positioned relative to other ranges starting at this
+    position. Defaults to 0.
     */
-    get viewportChanged(): boolean;
+    startSide: number;
     /**
-    Indicates whether the height of an element in the editor changed
-    in this update.
+    The bias value at the end of the range. Defaults to 0.
     */
-    get heightChanged(): boolean;
+    endSide: number;
     /**
-    Returns true when the document was modified or the size of the
-    editor, or elements within the editor, changed.
+    The mode with which the location of the range should be mapped
+    when its `from` and `to` are the same, to decide whether a
+    change deletes the range. Defaults to `MapMode.TrackDel`.
     */
-    get geometryChanged(): boolean;
+    mapMode: MapMode;
     /**
-    True when this update indicates a focus change.
+    Whether this value marks a point range, which is treated as
+    atomic and shadows the ranges contained in it.
     */
-    get focusChanged(): boolean;
+    point: boolean;
     /**
-    Whether the document changed in this update.
+    Create a [range](https://codemirror.net/6/docs/ref/#rangeset.Range) with this value.
     */
-    get docChanged(): boolean;
-    /**
-    Whether the selection was explicitly set in this update.
-    */
-    get selectionSet(): boolean;
+    range(from: number, to?: number): Range<this>;
 }
-
 /**
-Interface that objects registered with
-[`EditorView.mouseSelectionStyle`](https://codemirror.net/6/docs/ref/#view.EditorView^mouseSelectionStyle)
-must conform to.
+A range associates a value with a range of positions.
 */
-interface MouseSelectionStyle {
+declare class Range<T extends RangeValue> {
     /**
-    Return a new selection for the mouse gesture that starts with
-    the event that was originally given to the constructor, and ends
-    with the event passed here. In case of a plain click, those may
-    both be the `mousedown` event, in case of a drag gesture, the
-    latest `mousemove` event will be passed.
-    
-    When `extend` is true, that means the new selection should, if
-    possible, extend the start selection. If `multiple` is true, the
-    new selection should be added to the original selection.
+    The range's start position.
     */
-    get: (curEvent: MouseEvent, extend: boolean, multiple: boolean) => EditorSelection;
+    readonly from: number;
     /**
-    Called when the view is updated while the gesture is in
-    progress. When the document changes, it may be necessary to map
-    some data (like the original selection or start position)
-    through the changes.
-    
-    This may return `true` to indicate that the `get` method should
-    get queried again after the update, because something in the
-    update could change its result. Be wary of infinite loops when
-    using this (where `get` returns a new selection, which will
-    trigger `update`, which schedules another `get` in response).
+    Its end position.
     */
-    update: (update: ViewUpdate) => boolean | void;
+    readonly to: number;
+    /**
+    The value associated with this range.
+    */
+    readonly value: T;
 }
-declare type MakeSelectionStyle = (view: EditorView, event: MouseEvent) => MouseSelectionStyle | null;
-
 /**
-Used to indicate [text direction](https://codemirror.net/6/docs/ref/#view.EditorView.textDirection).
+Collection of methods used when comparing range sets.
 */
-declare enum Direction {
+interface RangeComparator<T extends RangeValue> {
     /**
-    Left-to-right.
+    Notifies the comparator that the given range has the given set
+    of values associated with it.
     */
-    LTR = 0,
+    compareRange(from: number, to: number, activeA: T[], activeB: T[]): void;
     /**
-    Right-to-left.
+    Notification for a point range.
     */
-    RTL = 1
+    comparePoint(from: number, to: number, byA: T | null, byB: T | null): void;
 }
 /**
-Represents a contiguous range of text that has a single direction
-(as in left-to-right or right-to-left).
+Methods used when iterating over the spans created by a set of
+ranges. The entire iterated range will be covered with either
+`span` or `point` calls.
 */
-declare class BidiSpan {
-    /**
-    The start of the span (relative to the start of the line).
-    */
-    readonly from: number;
+interface SpanIterator<T extends RangeValue> {
     /**
-    The end of the span.
+    Called for any ranges not covered by point decorations. `active`
+    holds the values that the range is marked with (and may be
+    empty). `openStart` indicates how many of those ranges are open
+    (continued) at the start of the span.
     */
-    readonly to: number;
+    span(from: number, to: number, active: readonly T[], openStart: number): void;
     /**
-    The ["bidi
-    level"](https://unicode.org/reports/tr9/#Basic_Display_Algorithm)
-    of the span (in this context, 0 means
-    left-to-right, 1 means right-to-left, 2 means left-to-right
-    number inside right-to-left text).
+    Called when going over a point decoration. The active range
+    decorations that cover the point and have a higher precedence
+    are provided in `active`. The open count in `openStart` counts
+    the number of those ranges that started before the point and. If
+    the point started before the iterated range, `openStart` will be
+    `active.length + 1` to signal this.
     */
-    readonly level: number;
+    point(from: number, to: number, value: T, active: readonly T[], openStart: number): void;
     /**
-    The direction of this span.
+    When provided, this will be called for each point processed,
+    causing the ones for which it returns false to be ignored.
     */
-    get dir(): Direction;
+    filterPoint?(from: number, to: number, value: T, index: number): boolean;
 }
-
 /**
-Record used to represent information about a block-level element
-in the editor view.
+A range cursor is an object that moves to the next range every
+time you call `next` on it. Note that, unlike ES6 iterators, these
+start out pointing at the first element, so you should call `next`
+only after reading the first range (if any).
 */
-declare class BlockInfo {
+interface RangeCursor<T> {
     /**
-    The start of the element in the document.
+    Move the iterator forward.
     */
-    readonly from: number;
+    next: () => void;
     /**
-    The length of the element.
+    The next range's value. Holds `null` when the cursor has reached
+    its end.
     */
-    readonly length: number;
+    value: T | null;
     /**
-    The top position of the element (relative to the top of the
-    document).
+    The next range's start position.
     */
-    readonly top: number;
+    from: number;
     /**
-    Its height.
+    The next end position.
     */
-    readonly height: number;
+    to: number;
+}
+declare type RangeSetUpdate<T extends RangeValue> = {
     /**
-    The type of element this is. When querying lines, this may be
-    an array of all the blocks that make up the line.
+    An array of ranges to add. If given, this should be sorted by
+    `from` position and `startSide` unless
+    [`sort`](https://codemirror.net/6/docs/ref/#rangeset.RangeSet.update^updateSpec.sort) is given as
+    `true`.
     */
-    readonly type: BlockType | readonly BlockInfo[];
+    add?: readonly Range<T>[];
     /**
-    The end of the element as a document position.
+    Indicates whether the library should sort the ranges in `add`.
+    Defaults to `false`.
     */
-    get to(): number;
+    sort?: boolean;
     /**
-    The bottom position of the element.
+    Filter the ranges already in the set. Only those for which this
+    function returns `true` are kept.
     */
-    get bottom(): number;
-}
-
-interface EditorConfig {
+    filter?: (from: number, to: number, value: T) => boolean;
     /**
-    The view's initial state. Defaults to an extension-less state
-    with an empty document.
+    Can be used to limit the range on which the filter is
+    applied. Filtering only a small range, as opposed to the entire
+    set, can make updates cheaper.
     */
-    state?: EditorState;
+    filterFrom?: number;
     /**
-    If the view is going to be mounted in a shadow root or document
-    other than the one held by the global variable `document` (the
-    default), you should pass it here. If you provide `parent`, but
-    not this option, the editor will automatically look up a root
-    from the parent.
+    The end position to apply the filter to.
     */
-    root?: Document | ShadowRoot;
+    filterTo?: number;
+};
+/**
+A range set stores a collection of [ranges](https://codemirror.net/6/docs/ref/#rangeset.Range) in a
+way that makes them efficient to [map](https://codemirror.net/6/docs/ref/#rangeset.RangeSet.map) and
+[update](https://codemirror.net/6/docs/ref/#rangeset.RangeSet.update). This is an immutable data
+structure.
+*/
+declare class RangeSet<T extends RangeValue> {
     /**
-    Override the transaction [dispatch
-    function](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch) for this editor view, which
-    is the way updates get routed to the view. Your implementation,
-    if provided, should probably call the view's [`update`
-    method](https://codemirror.net/6/docs/ref/#view.EditorView.update).
+    The number of ranges in the set.
     */
-    dispatch?: (tr: Transaction) => void;
+    get size(): number;
     /**
-    When given, the editor is immediately appended to the given
-    element on creation. (Otherwise, you'll have to place the view's
-    [`dom`](https://codemirror.net/6/docs/ref/#view.EditorView.dom) element in the document yourself.)
+    Update the range set, optionally adding new ranges or filtering
+    out existing ones.
+    
+    (The extra type parameter is just there as a kludge to work
+    around TypeScript variance issues that prevented `RangeSet<X>`
+    from being a subtype of `RangeSet<Y>` when `X` is a subtype of
+    `Y`.)
     */
-    parent?: Element | DocumentFragment;
-}
-/**
-An editor view represents the editor's user interface. It holds
-the editable DOM surface, and possibly other elements such as the
-line number gutter. It handles events and dispatches state
-transactions for editing actions.
-*/
-declare class EditorView {
+    update<U extends T>(updateSpec: RangeSetUpdate<U>): RangeSet<T>;
     /**
-    The current editor state.
+    Map this range set through a set of changes, return the new set.
     */
-    get state(): EditorState;
+    map(changes: ChangeDesc): RangeSet<T>;
     /**
-    To be able to display large documents without consuming too much
-    memory or overloading the browser, CodeMirror only draws the
-    code that is visible (plus a margin around it) to the DOM. This
-    property tells you the extent of the current drawn viewport, in
-    document positions.
+    Iterate over the ranges that touch the region `from` to `to`,
+    calling `f` for each. There is no guarantee that the ranges will
+    be reported in any specific order. When the callback returns
+    `false`, iteration stops.
     */
-    get viewport(): {
-        from: number;
-        to: number;
-    };
+    between(from: number, to: number, f: (from: number, to: number, value: T) => void | false): void;
     /**
-    When there are, for example, large collapsed ranges in the
-    viewport, its size can be a lot bigger than the actual visible
-    content. Thus, if you are doing something like styling the
-    content in the viewport, it is preferable to only do so for
-    these ranges, which are the subset of the viewport that is
-    actually drawn.
+    Iterate over the ranges in this set, in order, including all
+    ranges that end at or after `from`.
     */
-    get visibleRanges(): readonly {
-        from: number;
-        to: number;
-    }[];
+    iter(from?: number): RangeCursor<T>;
     /**
-    Returns false when the editor is entirely scrolled out of view
-    or otherwise hidden.
+    Iterate over the ranges in a collection of sets, in order,
+    starting from `from`.
     */
-    get inView(): boolean;
+    static iter<T extends RangeValue>(sets: readonly RangeSet<T>[], from?: number): RangeCursor<T>;
     /**
-    Indicates whether the user is currently composing text via
-    [IME](https://en.wikipedia.org/wiki/Input_method).
+    Iterate over two groups of sets, calling methods on `comparator`
+    to notify it of possible differences.
     */
-    get composing(): boolean;
-    private _dispatch;
+    static compare<T extends RangeValue>(oldSets: readonly RangeSet<T>[], newSets: readonly RangeSet<T>[], 
     /**
-    The document or shadow root that the view lives in.
+    This indicates how the underlying data changed between these
+    ranges, and is needed to synchronize the iteration. `from` and
+    `to` are coordinates in the _new_ space, after these changes.
     */
-    readonly root: DocumentOrShadowRoot;
+    textDiff: ChangeDesc, comparator: RangeComparator<T>, 
     /**
-    The DOM element that wraps the entire editor view.
+    Can be used to ignore all non-point ranges, and points below
+    the given size. When -1, all ranges are compared.
     */
-    readonly dom: HTMLElement;
+    minPointSize?: number): void;
     /**
-    The DOM element that can be styled to scroll. (Note that it may
-    not have been, so you can't assume this is scrollable.)
+    Compare the contents of two groups of range sets, returning true
+    if they are equivalent in the given range.
     */
-    readonly scrollDOM: HTMLElement;
+    static eq<T extends RangeValue>(oldSets: readonly RangeSet<T>[], newSets: readonly RangeSet<T>[], from?: number, to?: number): boolean;
     /**
-    The editable DOM element holding the editor content. You should
-    not, usually, interact with this content directly though the
-    DOM, since the editor will immediately undo most of the changes
-    you make. Instead, [dispatch](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch)
-    [transactions](https://codemirror.net/6/docs/ref/#state.Transaction) to modify content, and
-    [decorations](https://codemirror.net/6/docs/ref/#view.Decoration) to style it.
+    Iterate over a group of range sets at the same time, notifying
+    the iterator about the ranges covering every given piece of
+    content. Returns the open count (see
+    [`SpanIterator.span`](https://codemirror.net/6/docs/ref/#rangeset.SpanIterator.span)) at the end
+    of the iteration.
     */
-    readonly contentDOM: HTMLElement;
-    private announceDOM;
-    private plugins;
-    private pluginMap;
-    private editorAttrs;
-    private contentAttrs;
-    private styleModules;
-    private bidiCache;
-    private destroyed;
+    static spans<T extends RangeValue>(sets: readonly RangeSet<T>[], from: number, to: number, iterator: SpanIterator<T>, 
     /**
-    Construct a new view. You'll usually want to put `view.dom` into
-    your document after creating a view, so that the user can see
-    it.
+    When given and greater than -1, only points of at least this
+    size are taken into account.
     */
-    constructor(
+    minPointSize?: number): number;
     /**
-    Initialization options.
+    Create a range set for the given range or array of ranges. By
+    default, this expects the ranges to be _sorted_ (by start
+    position and, if two start at the same position,
+    `value.startSide`). You can pass `true` as second argument to
+    cause the method to sort them.
     */
-    config?: EditorConfig);
+    static of<T extends RangeValue>(ranges: readonly Range<T>[] | Range<T>, sort?: boolean): RangeSet<T>;
     /**
-    All regular editor state updates should go through this. It
-    takes a transaction or transaction spec and updates the view to
-    show the new state produced by that transaction. Its
-    implementation can be overridden with an
-    [option](https://codemirror.net/6/docs/ref/#view.EditorView.constructor^config.dispatch). This
-    function is bound to the view instance, so it does not have to
-    be called as a method.
+    The empty set of ranges.
     */
-    dispatch(tr: Transaction): void;
-    dispatch(...specs: TransactionSpec[]): void;
+    static empty: RangeSet<any>;
+}
+
+declare type Attrs = {
+    [name: string]: string;
+};
+
+interface MarkDecorationSpec {
     /**
-    Update the view for the given array of transactions. This will
-    update the visible document and selection to match the state
-    produced by the transactions, and notify view plugins of the
-    change. You should usually call
-    [`dispatch`](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch) instead, which uses this
-    as a primitive.
+    Whether the mark covers its start and end position or not. This
+    influences whether content inserted at those positions becomes
+    part of the mark. Defaults to false.
     */
-    update(transactions: readonly Transaction[]): void;
+    inclusive?: boolean;
     /**
-    Reset the view to the given state. (This will cause the entire
-    document to be redrawn and all view plugins to be reinitialized,
-    so you should probably only use it when the new state isn't
-    derived from the old state. Otherwise, use
-    [`dispatch`](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch) instead.)
+    Specify whether the start position of the marked range should be
+    inclusive. Overrides `inclusive`, when both are present.
     */
-    setState(newState: EditorState): void;
-    private updatePlugins;
+    inclusiveStart?: boolean;
     /**
-    Get the CSS classes for the currently active editor themes.
+    Whether the end should be inclusive.
     */
-    get themeClasses(): string;
-    private updateAttrs;
-    private showAnnouncements;
-    private mountStyles;
-    private readMeasured;
+    inclusiveEnd?: boolean;
     /**
-    Schedule a layout measurement, optionally providing callbacks to
-    do custom DOM measuring followed by a DOM write phase. Using
-    this is preferable reading DOM layout directly from, for
-    example, an event handler, because it'll make sure measuring and
-    drawing done by other components is synchronized, avoiding
-    unnecessary DOM layout computations.
+    Add attributes to the DOM elements that hold the text in the
+    marked range.
     */
-    requestMeasure<T>(request?: MeasureRequest<T>): void;
+    attributes?: {
+        [key: string]: string;
+    };
     /**
-    Collect all values provided by the active plugins for a given
-    field.
+    Shorthand for `{attributes: {class: value}}`.
     */
-    pluginField<T>(field: PluginField<T>): readonly T[];
+    class?: string;
     /**
-    Get the value of a specific plugin, if present. Note that
-    plugins that crash can be dropped from a view, so even when you
-    know you registered a given plugin, it is recommended to check
-    the return value of this method.
+    Add a wrapping element around the text in the marked range. Note
+    that there will not be a single element covering the entire
+    range—content is split on mark starts and ends, and each piece
+    gets its own element.
     */
-    plugin<T>(plugin: ViewPlugin<T>): T | null;
+    tagName?: string;
     /**
-    The top position of the document, in screen coordinates. This
-    may be negative when the editor is scrolled down. Points
-    directly to the top of the first line, not above the padding.
+    Decoration specs allow extra properties, which can be retrieved
+    through the decoration's [`spec`](https://codemirror.net/6/docs/ref/#view.Decoration.spec)
+    property.
     */
-    get documentTop(): number;
+    [other: string]: any;
+}
+interface WidgetDecorationSpec {
     /**
-    Reports the padding above and below the document.
+    The type of widget to draw here.
     */
-    get documentPadding(): {
-        top: number;
-        bottom: number;
-    };
+    widget: WidgetType;
     /**
-    Find the line or block widget at the given vertical position.
-    
-    By default, this position is interpreted as a screen position,
-    meaning `docTop` is set to the DOM top position of the editor
-    content (forcing a layout). You can pass a different `docTop`
-    value—for example 0 to interpret `height` as a document-relative
-    position, or a precomputed document top
-    (`view.contentDOM.getBoundingClientRect().top`) to limit layout
-    queries.
-    
-    *Deprecated: use `elementAtHeight` instead.*
+    Which side of the given position the widget is on. When this is
+    positive, the widget will be drawn after the cursor if the
+    cursor is on the same position. Otherwise, it'll be drawn before
+    it. When multiple widgets sit at the same position, their `side`
+    values will determine their ordering—those with a lower value
+    come first. Defaults to 0.
     */
-    blockAtHeight(height: number, docTop?: number): BlockInfo;
+    side?: number;
     /**
-    Find the text line or block widget at the given vertical
-    position (which is interpreted as relative to the [top of the
-    document](https://codemirror.net/6/docs/ref/#view.EditorView.documentTop)
+    Determines whether this is a block widgets, which will be drawn
+    between lines, or an inline widget (the default) which is drawn
+    between the surrounding text.
+    
+    Note that block-level decorations should not have vertical
+    margins, and if you dynamically change their height, you should
+    make sure to call
+    [`requestMeasure`](https://codemirror.net/6/docs/ref/#view.EditorView.requestMeasure), so that the
+    editor can update its information about its vertical layout.
     */
-    elementAtHeight(height: number): BlockInfo;
+    block?: boolean;
     /**
-    Find information for the visual line (see
-    [`visualLineAt`](https://codemirror.net/6/docs/ref/#view.EditorView.visualLineAt)) at the given
-    vertical position. The resulting block info might hold another
-    array of block info structs in its `type` field if this line
-    consists of more than one block.
-    
-    Defaults to treating `height` as a screen position. See
-    [`blockAtHeight`](https://codemirror.net/6/docs/ref/#view.EditorView.blockAtHeight) for the
-    interpretation of the `docTop` parameter.
-    
-    *Deprecated: use `lineBlockAtHeight` instead.*
+    Other properties are allowed.
     */
-    visualLineAtHeight(height: number, docTop?: number): BlockInfo;
+    [other: string]: any;
+}
+interface ReplaceDecorationSpec {
     /**
-    Find the line block (see
-    [`lineBlockAt`](https://codemirror.net/6/docs/ref/#view.EditorView.lineBlockAt) at the given
-    height.
+    An optional widget to drawn in the place of the replaced
+    content.
     */
-    lineBlockAtHeight(height: number): BlockInfo;
+    widget?: WidgetType;
     /**
-    Iterate over the height information of the visual lines in the
-    viewport. The heights of lines are reported relative to the
-    given document top, which defaults to the screen position of the
-    document (forcing a layout).
-    
-    *Deprecated: use `viewportLineBlocks` instead.*
+    Whether this range covers the positions on its sides. This
+    influences whether new content becomes part of the range and
+    whether the cursor can be drawn on its sides. Defaults to false
+    for inline replacements, and true for block replacements.
     */
-    viewportLines(f: (line: BlockInfo) => void, docTop?: number): void;
+    inclusive?: boolean;
     /**
-    Get the extent and vertical position of all [line
-    blocks](https://codemirror.net/6/docs/ref/#view.EditorView.lineBlockAt) in the viewport. Positions
-    are relative to the [top of the
-    document](https://codemirror.net/6/docs/ref/#view.EditorView.documentTop);
+    Set inclusivity at the start.
     */
-    get viewportLineBlocks(): BlockInfo[];
+    inclusiveStart?: boolean;
     /**
-    Find the extent and height of the visual line (a range delimited
-    on both sides by either non-[hidden](https://codemirror.net/6/docs/ref/#view.Decoration^range)
-    line breaks, or the start/end of the document) at the given position.
-    
-    Vertical positions are computed relative to the `docTop`
-    argument, which defaults to 0 for this method. You can pass
-    `view.contentDOM.getBoundingClientRect().top` here to get screen
-    coordinates.
-    
-    *Deprecated: use `lineBlockAt` instead.*
+    Set inclusivity at the end.
     */
-    visualLineAt(pos: number, docTop?: number): BlockInfo;
+    inclusiveEnd?: boolean;
     /**
-    Find the line block around the given document position. A line
-    block is a range delimited on both sides by either a
-    non-[hidden](https://codemirror.net/6/docs/ref/#view.Decoration^range) line breaks, or the
-    start/end of the document. It will usually just hold a line of
-    text, but may be broken into multiple textblocks by block
-    widgets.
+    Whether this is a block-level decoration. Defaults to false.
     */
-    lineBlockAt(pos: number): BlockInfo;
+    block?: boolean;
     /**
-    The editor's total content height.
+    Other properties are allowed.
     */
-    get contentHeight(): number;
+    [other: string]: any;
+}
+interface LineDecorationSpec {
     /**
-    Move a cursor position by [grapheme
-    cluster](https://codemirror.net/6/docs/ref/#text.findClusterBreak). `forward` determines whether
-    the motion is away from the line start, or towards it. Motion in
-    bidirectional text is in visual order, in the editor's [text
-    direction](https://codemirror.net/6/docs/ref/#view.EditorView.textDirection). When the start
-    position was the last one on the line, the returned position
-    will be across the line break. If there is no further line, the
-    original position is returned.
-    
-    By default, this method moves over a single cluster. The
-    optional `by` argument can be used to move across more. It will
-    be called with the first cluster as argument, and should return
-    a predicate that determines, for each subsequent cluster,
-    whether it should also be moved over.
+    DOM attributes to add to the element wrapping the line.
     */
-    moveByChar(start: SelectionRange, forward: boolean, by?: (initial: string) => (next: string) => boolean): SelectionRange;
+    attributes?: {
+        [key: string]: string;
+    };
     /**
-    Move a cursor position across the next group of either
-    [letters](https://codemirror.net/6/docs/ref/#state.EditorState.charCategorizer) or non-letter
-    non-whitespace characters.
+    Shorthand for `{attributes: {class: value}}`.
     */
-    moveByGroup(start: SelectionRange, forward: boolean): SelectionRange;
+    class?: string;
     /**
-    Move to the next line boundary in the given direction. If
-    `includeWrap` is true, line wrapping is on, and there is a
-    further wrap point on the current line, the wrap point will be
-    returned. Otherwise this function will return the start or end
-    of the line.
+    Other properties are allowed.
     */
-    moveToLineBoundary(start: SelectionRange, forward: boolean, includeWrap?: boolean): SelectionRange;
+    [other: string]: any;
+}
+/**
+Widgets added to the content are described by subclasses of this
+class. Using a description object like that makes it possible to
+delay creating of the DOM structure for a widget until it is
+needed, and to avoid redrawing widgets even when the decorations
+that define them are recreated.
+*/
+declare abstract class WidgetType {
     /**
-    Move a cursor position vertically. When `distance` isn't given,
-    it defaults to moving to the next line (including wrapped
-    lines). Otherwise, `distance` should provide a positive distance
-    in pixels.
-    
-    When `start` has a
-    [`goalColumn`](https://codemirror.net/6/docs/ref/#state.SelectionRange.goalColumn), the vertical
-    motion will use that as a target horizontal position. Otherwise,
-    the cursor's own horizontal position is used. The returned
-    cursor will have its goal column set to whichever column was
-    used.
+    Build the DOM structure for this widget instance.
     */
-    moveVertically(start: SelectionRange, forward: boolean, distance?: number): SelectionRange;
-    scrollPosIntoView(pos: number): void;
+    abstract toDOM(view: EditorView): HTMLElement;
     /**
-    Find the DOM parent node and offset (child offset if `node` is
-    an element, character offset when it is a text node) at the
-    given document position.
-    
-    Note that for positions that aren't currently in
-    `visibleRanges`, the resulting DOM position isn't necessarily
-    meaningful (it may just point before or after a placeholder
-    element).
+    Compare this instance to another instance of the same type.
+    (TypeScript can't express this, but only instances of the same
+    specific class will be passed to this method.) This is used to
+    avoid redrawing widgets when they are replaced by a new
+    decoration of the same type. The default implementation just
+    returns `false`, which will cause new instances of the widget to
+    always be redrawn.
     */
-    domAtPos(pos: number): {
-        node: Node;
-        offset: number;
-    };
+    eq(_widget: WidgetType): boolean;
     /**
-    Find the document position at the given DOM node. Can be useful
-    for associating positions with DOM events. Will raise an error
-    when `node` isn't part of the editor content.
+    Update a DOM element created by a widget of the same type (but
+    different, non-`eq` content) to reflect this widget. May return
+    true to indicate that it could update, false to indicate it
+    couldn't (in which case the widget will be redrawn). The default
+    implementation just returns false.
     */
-    posAtDOM(node: Node, offset?: number): number;
+    updateDOM(_dom: HTMLElement): boolean;
     /**
-    Get the document position at the given screen coordinates. For
-    positions not covered by the visible viewport's DOM structure,
-    this will return null, unless `false` is passed as second
-    argument, in which case it'll return an estimated position that
-    would be near the coordinates if it were rendered.
+    The estimated height this widget will have, to be used when
+    estimating the height of content that hasn't been drawn. May
+    return -1 to indicate you don't know. The default implementation
+    returns -1.
     */
-    posAtCoords(coords: {
-        x: number;
-        y: number;
-    }, precise: false): number;
-    posAtCoords(coords: {
-        x: number;
-        y: number;
-    }): number | null;
+    get estimatedHeight(): number;
     /**
-    Get the screen coordinates at the given document position.
-    `side` determines whether the coordinates are based on the
-    element before (-1) or after (1) the position (if no element is
-    available on the given side, the method will transparently use
-    another strategy to get reasonable coordinates).
+    Can be used to configure which kinds of events inside the widget
+    should be ignored by the editor. The default is to ignore all
+    events.
     */
-    coordsAtPos(pos: number, side?: -1 | 1): Rect | null;
+    ignoreEvent(_event: Event): boolean;
     /**
-    The default width of a character in the editor. May not
-    accurately reflect the width of all characters (given variable
-    width fonts or styling of invididual ranges).
+    This is called when the an instance of the widget is removed
+    from the editor view.
     */
-    get defaultCharacterWidth(): number;
+    destroy(_dom: HTMLElement): void;
+}
+/**
+A decoration set represents a collection of decorated ranges,
+organized for efficient access and mapping. See
+[`RangeSet`](https://codemirror.net/6/docs/ref/#rangeset.RangeSet) for its methods.
+*/
+declare type DecorationSet = RangeSet<Decoration>;
+/**
+The different types of blocks that can occur in an editor view.
+*/
+declare enum BlockType {
     /**
-    The default height of a line in the editor. May not be accurate
-    for all lines.
+    A line of text.
     */
-    get defaultLineHeight(): number;
+    Text = 0,
     /**
-    The text direction
-    ([`direction`](https://developer.mozilla.org/en-US/docs/Web/CSS/direction)
-    CSS property) of the editor.
+    A block widget associated with the position after it.
     */
-    get textDirection(): Direction;
+    WidgetBefore = 1,
     /**
-    Whether this editor [wraps lines](https://codemirror.net/6/docs/ref/#view.EditorView.lineWrapping)
-    (as determined by the
-    [`white-space`](https://developer.mozilla.org/en-US/docs/Web/CSS/white-space)
-    CSS property of its content element).
+    A block widget associated with the position before it.
     */
-    get lineWrapping(): boolean;
+    WidgetAfter = 2,
     /**
-    Returns the bidirectional text structure of the given line
-    (which should be in the current document) as an array of span
-    objects. The order of these spans matches the [text
-    direction](https://codemirror.net/6/docs/ref/#view.EditorView.textDirection)—if that is
-    left-to-right, the leftmost spans come first, otherwise the
-    rightmost spans come first.
+    A block widget [replacing](https://codemirror.net/6/docs/ref/#view.Decoration^replace) a range of content.
     */
-    bidiSpans(line: Line$1): readonly BidiSpan[];
+    WidgetRange = 3
+}
+/**
+A decoration provides information on how to draw or style a piece
+of content. You'll usually use it wrapped in a
+[`Range`](https://codemirror.net/6/docs/ref/#rangeset.Range), which adds a start and end position.
+*/
+declare abstract class Decoration extends RangeValue {
     /**
-    Check whether the editor has focus.
+    The config object used to create this decoration. You can
+    include additional properties in there to store metadata about
+    your decoration.
     */
-    get hasFocus(): boolean;
+    readonly spec: any;
+    abstract eq(other: Decoration): boolean;
     /**
-    Put focus on the editor.
+    Create a mark decoration, which influences the styling of the
+    content in its range. Nested mark decorations will cause nested
+    DOM elements to be created. Nesting order is determined by
+    precedence of the [facet](https://codemirror.net/6/docs/ref/#view.EditorView^decorations) or
+    (below the facet-provided decorations) [view
+    plugin](https://codemirror.net/6/docs/ref/#view.PluginSpec.decorations). Such elements are split
+    on line boundaries and on the boundaries of higher-precedence
+    decorations.
     */
-    focus(): void;
+    static mark(spec: MarkDecorationSpec): Decoration;
     /**
-    Clean up this editor view, removing its element from the
-    document, unregistering event handlers, and notifying
-    plugins. The view instance can no longer be used after
-    calling this.
+    Create a widget decoration, which adds an element at the given
+    position.
     */
-    destroy(): void;
+    static widget(spec: WidgetDecorationSpec): Decoration;
     /**
-    Effect that can be [added](https://codemirror.net/6/docs/ref/#state.TransactionSpec.effects) to a
-    transaction to make it scroll the given range into view.
-    
-    *Deprecated*. Use [`scrollIntoView`](https://codemirror.net/6/docs/ref/#view.EditorView^scrollIntoView) instead.
+    Create a replace decoration which replaces the given range with
+    a widget, or simply hides it.
     */
-    static scrollTo: StateEffectType<SelectionRange>;
+    static replace(spec: ReplaceDecorationSpec): Decoration;
     /**
-    Effect that makes the editor scroll the given range to the
-    center of the visible view.
-    
-    *Deprecated*. Use [`scrollIntoView`](https://codemirror.net/6/docs/ref/#view.EditorView^scrollIntoView) instead.
+    Create a line decoration, which can add DOM attributes to the
+    line starting at the given position.
     */
-    static centerOn: StateEffectType<SelectionRange>;
+    static line(spec: LineDecorationSpec): Decoration;
     /**
-    Returns an effect that can be
-    [added](https://codemirror.net/6/docs/ref/#state.TransactionSpec.effects) to a transaction to
-    cause it to scroll the given position or range into view.
+    Build a [`DecorationSet`](https://codemirror.net/6/docs/ref/#view.DecorationSet) from the given
+    decorated range or ranges. If the ranges aren't already sorted,
+    pass `true` for `sort` to make the library sort them for you.
     */
-    static scrollIntoView(pos: number | SelectionRange, options?: {
-        /**
-        By default (`"nearest"`) the position will be vertically
-        scrolled only the minimal amount required to move the given
-        position into view. You can set this to `"start"` to move it
-        to the top of the view, `"end"` to move it to the bottom, or
-        `"center"` to move it to the center.
-        */
-        y?: ScrollStrategy;
-        /**
-        Effect similar to
-        [`y`](https://codemirror.net/6/docs/ref/#view.EditorView^scrollIntoView^options.y), but for the
-        horizontal scroll position.
-        */
-        x?: ScrollStrategy;
-        /**
-        Extra vertical distance to add when moving something into
-        view. Not used with the `"center"` strategy. Defaults to 5.
-        */
-        yMargin?: number;
-        /**
-        Extra horizontal distance to add. Not used with the `"center"`
-        strategy. Defaults to 5.
-        */
-        xMargin?: number;
-    }): StateEffect<unknown>;
+    static set(of: Range<Decoration> | readonly Range<Decoration>[], sort?: boolean): DecorationSet;
     /**
-    Facet to add a [style
-    module](https://github.com/marijnh/style-mod#documentation) to
-    an editor view. The view will ensure that the module is
-    mounted in its [document
-    root](https://codemirror.net/6/docs/ref/#view.EditorView.constructor^config.root).
+    The empty set of decorations.
     */
-    static styleModule: Facet<StyleModule, readonly StyleModule[]>;
+    static none: DecorationSet;
+}
+
+/**
+Basic rectangle type.
+*/
+interface Rect {
+    readonly left: number;
+    readonly right: number;
+    readonly top: number;
+    readonly bottom: number;
+}
+declare type ScrollStrategy = "nearest" | "start" | "end" | "center";
+
+/**
+Command functions are used in key bindings and other types of user
+actions. Given an editor view, they check whether their effect can
+apply to the editor, and if it can, perform it as a side effect
+(which usually means [dispatching](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch) a
+transaction) and return `true`.
+*/
+declare type Command = (target: EditorView) => boolean;
+/**
+This is the interface plugin objects conform to.
+*/
+interface PluginValue {
     /**
-    Facet that can be used to add DOM event handlers. The value
-    should be an object mapping event names to handler functions. The
-    first such function to return true will be assumed to have handled
-    that event, and no other handlers or built-in behavior will be
-    activated for it.
-    These are registered on the [content
-    element](https://codemirror.net/6/docs/ref/#view.EditorView.contentDOM), except for `scroll`
-    handlers, which will be called any time the editor's [scroll
-    element](https://codemirror.net/6/docs/ref/#view.EditorView.scrollDOM) or one of its parent nodes
-    is scrolled.
+    Notifies the plugin of an update that happened in the view. This
+    is called _before_ the view updates its own DOM. It is
+    responsible for updating the plugin's internal state (including
+    any state that may be read by plugin fields) and _writing_ to
+    the DOM for the changes in the update. To avoid unnecessary
+    layout recomputations, it should _not_ read the DOM layout—use
+    [`requestMeasure`](https://codemirror.net/6/docs/ref/#view.EditorView.requestMeasure) to schedule
+    your code in a DOM reading phase if you need to.
     */
-    static domEventHandlers(handlers: DOMEventHandlers<any>): Extension;
+    update?(_update: ViewUpdate): void;
     /**
-    An input handler can override the way changes to the editable
-    DOM content are handled. Handlers are passed the document
-    positions between which the change was found, and the new
-    content. When one returns true, no further input handlers are
-    called and the default behavior is prevented.
+    Called when the plugin is no longer going to be used. Should
+    revert any changes the plugin made to the DOM.
     */
-    static inputHandler: Facet<(view: EditorView, from: number, to: number, text: string) => boolean, readonly ((view: EditorView, from: number, to: number, text: string) => boolean)[]>;
+    destroy?(): void;
+}
+declare const isFieldProvider: unique symbol;
+/**
+Used to [declare](https://codemirror.net/6/docs/ref/#view.PluginSpec.provide) which
+[fields](https://codemirror.net/6/docs/ref/#view.PluginValue) a [view plugin](https://codemirror.net/6/docs/ref/#view.ViewPlugin)
+provides.
+*/
+declare class PluginFieldProvider<V> {
+    private [isFieldProvider];
+}
+/**
+Plugin fields are a mechanism for allowing plugins to provide
+values that can be retrieved through the
+[`pluginField`](https://codemirror.net/6/docs/ref/#view.EditorView.pluginField) view method.
+*/
+declare class PluginField<T> {
     /**
-    Allows you to provide a function that should be called when the
-    library catches an exception from an extension (mostly from view
-    plugins, but may be used by other extensions to route exceptions
-    from user-code-provided callbacks). This is mostly useful for
-    debugging and logging. See [`logException`](https://codemirror.net/6/docs/ref/#view.logException).
+    Create a [provider](https://codemirror.net/6/docs/ref/#view.PluginFieldProvider) for this field,
+    to use with a plugin's [provide](https://codemirror.net/6/docs/ref/#view.PluginSpec.provide)
+    option.
     */
-    static exceptionSink: Facet<(exception: any) => void, readonly ((exception: any) => void)[]>;
+    from<V extends PluginValue>(get: (value: V) => T): PluginFieldProvider<V>;
     /**
-    A facet that can be used to register a function to be called
-    every time the view updates.
+    Define a new plugin field.
     */
-    static updateListener: Facet<(update: ViewUpdate) => void, readonly ((update: ViewUpdate) => void)[]>;
+    static define<T>(): PluginField<T>;
     /**
-    Facet that controls whether the editor content DOM is editable.
-    When its highest-precedence value is `false`, the element will
-    not longer have its `contenteditable` attribute set. (Note that
-    this doesn't affect API calls that change the editor content,
-    even when those are bound to keys or buttons. See the
-    [`readOnly`](https://codemirror.net/6/docs/ref/#state.EditorState.readOnly) facet for that.)
+    This field can be used by plugins to provide
+    [decorations](https://codemirror.net/6/docs/ref/#view.Decoration).
+    
+    **Note**: For reasons of data flow (plugins are only updated
+    after the viewport is computed), decorations produced by plugins
+    are _not_ taken into account when predicting the vertical layout
+    structure of the editor. They **must not** introduce block
+    widgets (that will raise an error) or replacing decorations that
+    cover line breaks (these will be ignored if they occur). Such
+    decorations, or others that cause a large amount of vertical
+    size shift compared to the undecorated content, should be
+    provided through the state-level [`decorations`
+    facet](https://codemirror.net/6/docs/ref/#view.EditorView^decorations) instead.
     */
-    static editable: Facet<boolean, boolean>;
+    static decorations: PluginField<DecorationSet>;
     /**
-    Allows you to influence the way mouse selection happens. The
-    functions in this facet will be called for a `mousedown` event
-    on the editor, and can return an object that overrides the way a
-    selection is computed from that mouse click or drag.
+    Used to provide ranges that should be treated as atoms as far as
+    cursor motion is concerned. This causes methods like
+    [`moveByChar`](https://codemirror.net/6/docs/ref/#view.EditorView.moveByChar) and
+    [`moveVertically`](https://codemirror.net/6/docs/ref/#view.EditorView.moveVertically) (and the
+    commands built on top of them) to skip across such regions when
+    a selection endpoint would enter them. This does _not_ prevent
+    direct programmatic [selection
+    updates](https://codemirror.net/6/docs/ref/#state.TransactionSpec.selection) from moving into such
+    regions.
     */
-    static mouseSelectionStyle: Facet<MakeSelectionStyle, readonly MakeSelectionStyle[]>;
+    static atomicRanges: PluginField<RangeSet<any>>;
     /**
-    Facet used to configure whether a given selection drag event
-    should move or copy the selection. The given predicate will be
-    called with the `mousedown` event, and can return `true` when
-    the drag should move the content.
+    Plugins can provide additional scroll margins (space around the
+    sides of the scrolling element that should be considered
+    invisible) through this field. This can be useful when the
+    plugin introduces elements that cover part of that element (for
+    example a horizontally fixed gutter).
     */
-    static dragMovesSelection: Facet<(event: MouseEvent) => boolean, readonly ((event: MouseEvent) => boolean)[]>;
+    static scrollMargins: PluginField<Partial<Rect> | null>;
+}
+/**
+Provides additional information when defining a [view
+plugin](https://codemirror.net/6/docs/ref/#view.ViewPlugin).
+*/
+interface PluginSpec<V extends PluginValue> {
     /**
-    Facet used to configure whether a given selecting click adds
-    a new range to the existing selection or replaces it entirely.
+    Register the given [event
+    handlers](https://codemirror.net/6/docs/ref/#view.EditorView^domEventHandlers) for the plugin.
+    When called, these will have their `this` bound to the plugin
+    value.
     */
-    static clickAddsSelectionRange: Facet<(event: MouseEvent) => boolean, readonly ((event: MouseEvent) => boolean)[]>;
+    eventHandlers?: DOMEventHandlers<V>;
     /**
-    A facet that determines which [decorations](https://codemirror.net/6/docs/ref/#view.Decoration)
-    are shown in the view. See also [view
-    plugins](https://codemirror.net/6/docs/ref/#view.EditorView^decorations), which have a separate
-    mechanism for providing decorations.
+    Allow the plugin to provide decorations. When given, this should
+    a function that take the plugin value and return a [decoration
+    set](https://codemirror.net/6/docs/ref/#view.DecorationSet). See also the caveat about
+    [layout-changing decorations](https://codemirror.net/6/docs/ref/#view.PluginField^decorations)
+    from plugins.
     */
-    static decorations: Facet<DecorationSet, readonly DecorationSet[]>;
+    decorations?: (value: V) => DecorationSet;
     /**
-    Create a theme extension. The first argument can be a
-    [`style-mod`](https://github.com/marijnh/style-mod#documentation)
-    style spec providing the styles for the theme. These will be
-    prefixed with a generated class for the style.
-    
-    Because the selectors will be prefixed with a scope class, rule
-    that directly match the editor's [wrapper
-    element](https://codemirror.net/6/docs/ref/#view.EditorView.dom)—to which the scope class will be
-    added—need to be explicitly differentiated by adding an `&` to
-    the selector for that element—for example
-    `&.cm-focused`.
-    
-    When `dark` is set to true, the theme will be marked as dark,
-    which will cause the `&dark` rules from [base
-    themes](https://codemirror.net/6/docs/ref/#view.EditorView^baseTheme) to be used (as opposed to
-    `&light` when a light theme is active).
+    Specify that the plugin provides [plugin
+    field](https://codemirror.net/6/docs/ref/#view.PluginField) values. Use a field's
+    [`from`](https://codemirror.net/6/docs/ref/#view.PluginField.from) method to create these
+    providers.
     */
-    static theme(spec: {
-        [selector: string]: StyleSpec;
-    }, options?: {
-        dark?: boolean;
-    }): Extension;
+    provide?: PluginFieldProvider<V> | readonly PluginFieldProvider<V>[];
+}
+/**
+View plugins associate stateful values with a view. They can
+influence the way the content is drawn, and are notified of things
+that happen in the view.
+*/
+declare class ViewPlugin<V extends PluginValue> {
     /**
-    This facet records whether a dark theme is active. The extension
-    returned by [`theme`](https://codemirror.net/6/docs/ref/#view.EditorView^theme) automatically
-    includes an instance of this when the `dark` option is set to
-    true.
+    Instances of this class act as extensions.
     */
-    static darkTheme: Facet<boolean, boolean>;
+    extension: Extension;
+    private constructor();
     /**
-    Create an extension that adds styles to the base theme. Like
-    with [`theme`](https://codemirror.net/6/docs/ref/#view.EditorView^theme), use `&` to indicate the
-    place of the editor wrapper element when directly targeting
-    that. You can also use `&dark` or `&light` instead to only
-    target editors with a dark or light theme.
+    Define a plugin from a constructor function that creates the
+    plugin's value, given an editor view.
     */
-    static baseTheme(spec: {
-        [selector: string]: StyleSpec;
-    }): Extension;
+    static define<V extends PluginValue & object>(create: (view: EditorView) => V, spec?: PluginSpec<V>): ViewPlugin<V>;
     /**
-    Facet that provides additional DOM attributes for the editor's
-    editable DOM element.
+    Create a plugin for a class whose constructor takes a single
+    editor view as argument.
     */
-    static contentAttributes: Facet<AttrSource, readonly AttrSource[]>;
+    static fromClass<V extends PluginValue & object>(cls: {
+        new (view: EditorView): V;
+    }, spec?: PluginSpec<V>): ViewPlugin<V>;
+}
+interface MeasureRequest<T> {
     /**
-    Facet that provides DOM attributes for the editor's outer
-    element.
+    Called in a DOM read phase to gather information that requires
+    DOM layout. Should _not_ mutate the document.
     */
-    static editorAttributes: Facet<AttrSource, readonly AttrSource[]>;
+    read(view: EditorView): T;
     /**
-    An extension that enables line wrapping in the editor (by
-    setting CSS `white-space` to `pre-wrap` in the content).
+    Called in a DOM write phase to update the document. Should _not_
+    do anything that triggers DOM layout.
     */
-    static lineWrapping: Extension;
+    write?(measure: T, view: EditorView): void;
     /**
-    State effect used to include screen reader announcements in a
-    transaction. These will be added to the DOM in a visually hidden
-    element with `aria-live="polite"` set, and should be used to
-    describe effects that are visually obvious but may not be
-    noticed by screen reader users (such as moving to the next
-    search match).
+    When multiple requests with the same key are scheduled, only the
+    last one will actually be ran.
     */
-    static announce: StateEffectType<string>;
-}
-/**
-Helper type that maps event names to event object types, or the
-`any` type for unknown events.
-*/
-interface DOMEventMap extends HTMLElementEventMap {
-    [other: string]: any;
+    key?: any;
 }
+declare type AttrSource = Attrs | ((view: EditorView) => Attrs | null);
 /**
-Event handlers are specified with objects like this. For event
-types known by TypeScript, this will infer the event argument type
-to hold the appropriate event object type. For unknown events, it
-is inferred to `any`, and should be explicitly set if you want type
-checking.
-*/
-declare type DOMEventHandlers<This> = {
-    [event in keyof DOMEventMap]?: (this: This, event: DOMEventMap[event], view: EditorView) => boolean | void;
-};
-
-/**
-Key bindings associate key names with
-[command](https://codemirror.net/6/docs/ref/#view.Command)-style functions.
-
-Key names may be strings like `"Shift-Ctrl-Enter"`—a key identifier
-prefixed with zero or more modifiers. Key identifiers are based on
-the strings that can appear in
-[`KeyEvent.key`](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key).
-Use lowercase letters to refer to letter keys (or uppercase letters
-if you want shift to be held). You may use `"Space"` as an alias
-for the `" "` name.
-
-Modifiers can be given in any order. `Shift-` (or `s-`), `Alt-` (or
-`a-`), `Ctrl-` (or `c-` or `Control-`) and `Cmd-` (or `m-` or
-`Meta-`) are recognized.
-
-When a key binding contains multiple key names separated by
-spaces, it represents a multi-stroke binding, which will fire when
-the user presses the given keys after each other order.
-
-You can use `Mod-` as a shorthand for `Cmd-` on Mac and `Ctrl-` on
-other platforms. So `Mod-b` is `Ctrl-b` on Linux but `Cmd-b` on
-macOS.
+View [plugins](https://codemirror.net/6/docs/ref/#view.ViewPlugin) are given instances of this
+class, which describe what happened, whenever the view is updated.
 */
-interface KeyBinding {
+declare class ViewUpdate {
     /**
-    The key name to use for this binding. If the platform-specific
-    property (`mac`, `win`, or `linux`) for the current platform is
-    used as well in the binding, that one takes precedence. If `key`
-    isn't defined and the platform-specific binding isn't either,
-    a binding is ignored.
+    The editor view that the update is associated with.
     */
-    key?: string;
+    readonly view: EditorView;
     /**
-    Key to use specifically on macOS.
+    The new editor state.
     */
-    mac?: string;
+    readonly state: EditorState;
     /**
-    Key to use specifically on Windows.
+    The transactions involved in the update. May be empty.
     */
-    win?: string;
+    readonly transactions: readonly Transaction[];
     /**
-    Key to use specifically on Linux.
+    The changes made to the document by this update.
     */
-    linux?: string;
+    readonly changes: ChangeSet;
     /**
-    The command to execute when this binding is triggered. When the
-    command function returns `false`, further bindings will be tried
-    for the key.
+    The previous editor state.
     */
-    run: Command;
+    readonly startState: EditorState;
     /**
-    When given, this defines a second binding, using the (possibly
-    platform-specific) key name prefixed with `Shift-` to activate
-    this command.
+    Tells you whether the [viewport](https://codemirror.net/6/docs/ref/#view.EditorView.viewport) or
+    [visible ranges](https://codemirror.net/6/docs/ref/#view.EditorView.visibleRanges) changed in this
+    update.
     */
-    shift?: Command;
+    get viewportChanged(): boolean;
     /**
-    By default, key bindings apply when focus is on the editor
-    content (the `"editor"` scope). Some extensions, mostly those
-    that define their own panels, might want to allow you to
-    register bindings local to that panel. Such bindings should use
-    a custom scope name. You may also set multiple scope names,
-    separated by spaces.
+    Indicates whether the height of an element in the editor changed
+    in this update.
     */
-    scope?: string;
+    get heightChanged(): boolean;
     /**
-    When set to true (the default is false), this will always
-    prevent the further handling for the bound key, even if the
-    command(s) return false. This can be useful for cases where the
-    native behavior of the key is annoying or irrelevant but the
-    command doesn't always apply (such as, Mod-u for undo selection,
-    which would cause the browser to view source instead when no
-    selection can be undone).
+    Returns true when the document was modified or the size of the
+    editor, or elements within the editor, changed.
     */
-    preventDefault?: boolean;
-}
-/**
-Facet used for registering keymaps.
-
-You can add multiple keymaps to an editor. Their priorities
-determine their precedence (the ones specified early or with high
-priority get checked first). When a handler has returned `true`
-for a given key, no further handlers are called.
-*/
-declare const keymap: Facet<readonly KeyBinding[], readonly (readonly KeyBinding[])[]>;
-
-declare type SelectionConfig = {
+    get geometryChanged(): boolean;
     /**
-    The length of a full cursor blink cycle, in milliseconds.
-    Defaults to 1200. Can be set to 0 to disable blinking.
+    True when this update indicates a focus change.
     */
-    cursorBlinkRate?: number;
+    get focusChanged(): boolean;
     /**
-    Whether to show a cursor for non-empty ranges. Defaults to
-    true.
+    Whether the document changed in this update.
     */
-    drawRangeCursor?: boolean;
-};
-/**
-Returns an extension that hides the browser's native selection and
-cursor, replacing the selection with a background behind the text
-(with the `cm-selectionBackground` class), and the
-cursors with elements overlaid over the code (using
-`cm-cursor-primary` and `cm-cursor-secondary`).
-
-This allows the editor to display secondary selection ranges, and
-tends to produce a type of selection more in line with that users
-expect in a text editor (the native selection styling will often
-leave gaps between lines and won't fill the horizontal space after
-a line when the selection continues past it).
+    get docChanged(): boolean;
+    /**
+    Whether the selection was explicitly set in this update.
+    */
+    get selectionSet(): boolean;
+}
 
-It does have a performance cost, in that it requires an extra DOM
-layout cycle for many updates (the selection is drawn based on DOM
-layout information that's only available after laying out the
-content).
+/**
+Interface that objects registered with
+[`EditorView.mouseSelectionStyle`](https://codemirror.net/6/docs/ref/#view.EditorView^mouseSelectionStyle)
+must conform to.
 */
-declare function drawSelection(config?: SelectionConfig): Extension;
-
-interface SpecialCharConfig {
+interface MouseSelectionStyle {
     /**
-    An optional function that renders the placeholder elements.
-    
-    The `description` argument will be text that clarifies what the
-    character is, which should be provided to screen readers (for
-    example with the
-    [`aria-label`](https://www.w3.org/TR/wai-aria/#aria-label)
-    attribute) and optionally shown to the user in other ways (such
-    as the
-    [`title`](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/title)
-    attribute).
+    Return a new selection for the mouse gesture that starts with
+    the event that was originally given to the constructor, and ends
+    with the event passed here. In case of a plain click, those may
+    both be the `mousedown` event, in case of a drag gesture, the
+    latest `mousemove` event will be passed.
     
-    The given placeholder string is a suggestion for how to display
-    the character visually.
-    */
-    render?: ((code: number, description: string | null, placeholder: string) => HTMLElement) | null;
-    /**
-    Regular expression that matches the special characters to
-    highlight. Must have its 'g'/global flag set.
+    When `extend` is true, that means the new selection should, if
+    possible, extend the start selection. If `multiple` is true, the
+    new selection should be added to the original selection.
     */
-    specialChars?: RegExp;
+    get: (curEvent: MouseEvent, extend: boolean, multiple: boolean) => EditorSelection;
     /**
-    Regular expression that can be used to add characters to the
-    default set of characters to highlight.
+    Called when the view is updated while the gesture is in
+    progress. When the document changes, it may be necessary to map
+    some data (like the original selection or start position)
+    through the changes.
+    
+    This may return `true` to indicate that the `get` method should
+    get queried again after the update, because something in the
+    update could change its result. Be wary of infinite loops when
+    using this (where `get` returns a new selection, which will
+    trigger `update`, which schedules another `get` in response).
     */
-    addSpecialChars?: RegExp | null;
+    update: (update: ViewUpdate) => boolean | void;
 }
-/**
-Returns an extension that installs highlighting of special
-characters.
-*/
-declare function highlightSpecialChars(
-/**
-Configuration options.
-*/
-config?: SpecialCharConfig): Extension;
+declare type MakeSelectionStyle = (view: EditorView, event: MouseEvent) => MouseSelectionStyle | null;
 
 /**
-Extension that enables a placeholder—a piece of example content
-to show when the editor is empty.
+Used to indicate [text direction](https://codemirror.net/6/docs/ref/#view.EditorView.textDirection).
 */
-declare function placeholder(content: string | HTMLElement): Extension;
-
+declare enum Direction {
+    /**
+    Left-to-right.
+    */
+    LTR = 0,
+    /**
+    Right-to-left.
+    */
+    RTL = 1
+}
 /**
-A language object manages parsing and per-language
-[metadata](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt). Parse data is
-managed as a [Lezer](https://lezer.codemirror.net) tree. You'll
-want to subclass this class for custom parsers, or use the
-[`LRLanguage`](https://codemirror.net/6/docs/ref/#language.LRLanguage) or
-[`StreamLanguage`](https://codemirror.net/6/docs/ref/#stream-parser.StreamLanguage) abstractions for
-[Lezer](https://lezer.codemirror.net/) or stream parsers.
+Represents a contiguous range of text that has a single direction
+(as in left-to-right or right-to-left).
 */
-declare class Language {
+declare class BidiSpan {
     /**
-    The [language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) data
-    facet used for this language.
+    The start of the span (relative to the start of the line).
     */
-    readonly data: Facet<{
-        [name: string]: any;
-    }>;
+    readonly from: number;
     /**
-    The node type of the top node of trees produced by this parser.
+    The end of the span.
     */
-    readonly topNode: NodeType;
+    readonly to: number;
     /**
-    The extension value to install this provider.
+    The ["bidi
+    level"](https://unicode.org/reports/tr9/#Basic_Display_Algorithm)
+    of the span (in this context, 0 means
+    left-to-right, 1 means right-to-left, 2 means left-to-right
+    number inside right-to-left text).
     */
-    readonly extension: Extension;
+    readonly level: number;
     /**
-    The parser object. Can be useful when using this as a [nested
-    parser](https://lezer.codemirror.net/docs/ref#common.Parser).
+    The direction of this span.
     */
-    parser: Parser;
+    get dir(): Direction;
+}
+
+/**
+Record used to represent information about a block-level element
+in the editor view.
+*/
+declare class BlockInfo {
     /**
-    Construct a language object. You usually don't need to invoke
-    this directly. But when you do, make sure you use
-    [`defineLanguageFacet`](https://codemirror.net/6/docs/ref/#language.defineLanguageFacet) to create
-    the first argument.
+    The start of the element in the document.
     */
-    constructor(
+    readonly from: number;
     /**
-    The [language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) data
-    facet used for this language.
+    The length of the element.
     */
-    data: Facet<{
-        [name: string]: any;
-    }>, parser: Parser, 
+    readonly length: number;
     /**
-    The node type of the top node of trees produced by this parser.
+    The top position of the element (relative to the top of the
+    document).
     */
-    topNode: NodeType, extraExtensions?: Extension[]);
+    readonly top: number;
     /**
-    Query whether this language is active at the given position.
+    Its height.
     */
-    isActiveAt(state: EditorState, pos: number, side?: -1 | 0 | 1): boolean;
+    readonly height: number;
     /**
-    Find the document regions that were parsed using this language.
-    The returned regions will _include_ any nested languages rooted
-    in this language, when those exist.
+    The type of element this is. When querying lines, this may be
+    an array of all the blocks that make up the line.
     */
-    findRegions(state: EditorState): {
-        from: number;
-        to: number;
-    }[];
+    readonly type: BlockType | readonly BlockInfo[];
     /**
-    Indicates whether this language allows nested languages. The
-    default implementation returns true.
+    The end of the element as a document position.
     */
-    get allowsNesting(): boolean;
-}
-/**
-A subclass of [`Language`](https://codemirror.net/6/docs/ref/#language.Language) for use with Lezer
-[LR parsers](https://lezer.codemirror.net/docs/ref#lr.LRParser)
-parsers.
-*/
-declare class LRLanguage extends Language {
-    readonly parser: LRParser;
-    private constructor();
+    get to(): number;
     /**
-    Define a language from a parser.
-    */
-    static define(spec: {
-        /**
-        The parser to use. Should already have added editor-relevant
-        node props (and optionally things like dialect and top rule)
-        configured.
-        */
-        parser: LRParser;
-        /**
-        [Language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt)
-        to register for this language.
-        */
-        languageData?: {
-            [name: string]: any;
-        };
-    }): LRLanguage;
-    /**
-    Create a new instance of this language with a reconfigured
-    version of its parser.
+    The bottom position of the element.
     */
-    configure(options: ParserConfig): LRLanguage;
-    get allowsNesting(): boolean;
+    get bottom(): number;
 }
-/**
-Get the syntax tree for a state, which is the current (possibly
-incomplete) parse tree of active [language](https://codemirror.net/6/docs/ref/#language.Language),
-or the empty tree if there is no language available.
-*/
-declare function syntaxTree(state: EditorState): Tree;
-/**
-Queries whether there is a full syntax tree available up to the
-given document position. If there isn't, the background parse
-process _might_ still be working and update the tree further, but
-there is no guarantee of that—the parser will [stop
-working](https://codemirror.net/6/docs/ref/#language.syntaxParserStopped) when it has spent a
-certain amount of time or has moved beyond the visible viewport.
-Always returns false if no language has been enabled.
-*/
-declare function syntaxTreeAvailable(state: EditorState, upto?: number): boolean;
-/**
-This class bundles a [language object](https://codemirror.net/6/docs/ref/#language.Language) with an
-optional set of supporting extensions. Language packages are
-encouraged to export a function that optionally takes a
-configuration object and returns a `LanguageSupport` instance, as
-the main way for client code to use the package.
-*/
-declare class LanguageSupport {
-    /**
-    The language object.
-    */
-    readonly language: Language;
-    /**
-    An optional set of supporting extensions. When nesting a
-    language in another language, the outer language is encouraged
-    to include the supporting extensions for its inner languages
-    in its own set of support extensions.
-    */
-    readonly support: Extension;
+
+interface EditorConfig {
     /**
-    An extension including both the language and its support
-    extensions. (Allowing the object to be used as an extension
-    value itself.)
+    The view's initial state. Defaults to an extension-less state
+    with an empty document.
     */
-    extension: Extension;
+    state?: EditorState;
     /**
-    Create a support object.
+    If the view is going to be mounted in a shadow root or document
+    other than the one held by the global variable `document` (the
+    default), you should pass it here. If you provide `parent`, but
+    not this option, the editor will automatically look up a root
+    from the parent.
     */
-    constructor(
+    root?: Document | ShadowRoot;
     /**
-    The language object.
+    Override the transaction [dispatch
+    function](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch) for this editor view, which
+    is the way updates get routed to the view. Your implementation,
+    if provided, should probably call the view's [`update`
+    method](https://codemirror.net/6/docs/ref/#view.EditorView.update).
     */
-    language: Language, 
+    dispatch?: (tr: Transaction) => void;
     /**
-    An optional set of supporting extensions. When nesting a
-    language in another language, the outer language is encouraged
-    to include the supporting extensions for its inner languages
-    in its own set of support extensions.
+    When given, the editor is immediately appended to the given
+    element on creation. (Otherwise, you'll have to place the view's
+    [`dom`](https://codemirror.net/6/docs/ref/#view.EditorView.dom) element in the document yourself.)
     */
-    support?: Extension);
+    parent?: Element | DocumentFragment;
 }
 /**
-Language descriptions are used to store metadata about languages
-and to dynamically load them. Their main role is finding the
-appropriate language for a filename or dynamically loading nested
-parsers.
+An editor view represents the editor's user interface. It holds
+the editable DOM surface, and possibly other elements such as the
+line number gutter. It handles events and dispatches state
+transactions for editing actions.
 */
-declare class LanguageDescription {
+declare class EditorView {
     /**
-    The name of this language.
+    The current editor state.
     */
-    readonly name: string;
+    get state(): EditorState;
     /**
-    Alternative names for the mode (lowercased, includes `this.name`).
+    To be able to display large documents without consuming too much
+    memory or overloading the browser, CodeMirror only draws the
+    code that is visible (plus a margin around it) to the DOM. This
+    property tells you the extent of the current drawn viewport, in
+    document positions.
     */
-    readonly alias: readonly string[];
+    get viewport(): {
+        from: number;
+        to: number;
+    };
     /**
-    File extensions associated with this language.
+    When there are, for example, large collapsed ranges in the
+    viewport, its size can be a lot bigger than the actual visible
+    content. Thus, if you are doing something like styling the
+    content in the viewport, it is preferable to only do so for
+    these ranges, which are the subset of the viewport that is
+    actually drawn.
     */
-    readonly extensions: readonly string[];
+    get visibleRanges(): readonly {
+        from: number;
+        to: number;
+    }[];
     /**
-    Optional filename pattern that should be associated with this
-    language.
+    Returns false when the editor is entirely scrolled out of view
+    or otherwise hidden.
     */
-    readonly filename: RegExp | undefined;
-    private loadFunc;
+    get inView(): boolean;
     /**
-    If the language has been loaded, this will hold its value.
+    Indicates whether the user is currently composing text via
+    [IME](https://en.wikipedia.org/wiki/Input_method), and at least
+    one change has been made in the current composition.
     */
-    support: LanguageSupport | undefined;
-    private loading;
-    private constructor();
+    get composing(): boolean;
     /**
-    Start loading the the language. Will return a promise that
-    resolves to a [`LanguageSupport`](https://codemirror.net/6/docs/ref/#language.LanguageSupport)
-    object when the language successfully loads.
+    Indicates whether the user is currently in composing state. Note
+    that on some platforms, like Android, this will be the case a
+    lot, since just putting the cursor on a word starts a
+    composition there.
     */
-    load(): Promise<LanguageSupport>;
+    get compositionStarted(): boolean;
+    private _dispatch;
     /**
-    Create a language description.
+    The document or shadow root that the view lives in.
     */
-    static of(spec: {
-        /**
-        The language's name.
-        */
-        name: string;
-        /**
-        An optional array of alternative names.
-        */
-        alias?: readonly string[];
-        /**
-        An optional array of filename extensions associated with this
-        language.
-        */
-        extensions?: readonly string[];
-        /**
-        An optional filename pattern associated with this language.
-        */
-        filename?: RegExp;
-        /**
-        A function that will asynchronously load the language.
-        */
-        load?: () => Promise<LanguageSupport>;
-        /**
-        Alternatively to `load`, you can provide an already loaded
-        support object. Either this or `load` should be provided.
-        */
-        support?: LanguageSupport;
-    }): LanguageDescription;
+    readonly root: DocumentOrShadowRoot;
     /**
-    Look for a language in the given array of descriptions that
-    matches the filename. Will first match
-    [`filename`](https://codemirror.net/6/docs/ref/#language.LanguageDescription.filename) patterns,
-    and then [extensions](https://codemirror.net/6/docs/ref/#language.LanguageDescription.extensions),
-    and return the first language that matches.
+    The DOM element that wraps the entire editor view.
     */
-    static matchFilename(descs: readonly LanguageDescription[], filename: string): LanguageDescription | null;
+    readonly dom: HTMLElement;
     /**
-    Look for a language whose name or alias matches the the given
-    name (case-insensitively). If `fuzzy` is true, and no direct
-    matchs is found, this'll also search for a language whose name
-    or alias occurs in the string (for names shorter than three
-    characters, only when surrounded by non-word characters).
+    The DOM element that can be styled to scroll. (Note that it may
+    not have been, so you can't assume this is scrollable.)
     */
-    static matchLanguageName(descs: readonly LanguageDescription[], name: string, fuzzy?: boolean): LanguageDescription | null;
-}
-/**
-Facet for overriding the unit by which indentation happens.
-Should be a string consisting either entirely of spaces or
-entirely of tabs. When not set, this defaults to 2 spaces.
-*/
-declare const indentUnit: Facet<string, string>;
-/**
-Indentation contexts are used when calling [indentation
-services](https://codemirror.net/6/docs/ref/#language.indentService). They provide helper utilities
-useful in indentation logic, and can selectively override the
-indentation reported for some lines.
-*/
-declare class IndentContext {
+    readonly scrollDOM: HTMLElement;
     /**
-    The editor state.
+    The editable DOM element holding the editor content. You should
+    not, usually, interact with this content directly though the
+    DOM, since the editor will immediately undo most of the changes
+    you make. Instead, [dispatch](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch)
+    [transactions](https://codemirror.net/6/docs/ref/#state.Transaction) to modify content, and
+    [decorations](https://codemirror.net/6/docs/ref/#view.Decoration) to style it.
     */
-    readonly state: EditorState;
+    readonly contentDOM: HTMLElement;
+    private announceDOM;
+    private plugins;
+    private pluginMap;
+    private editorAttrs;
+    private contentAttrs;
+    private styleModules;
+    private bidiCache;
+    private destroyed;
     /**
-    The indent unit (number of columns per indentation level).
+    Construct a new view. You'll usually want to put `view.dom` into
+    your document after creating a view, so that the user can see
+    it.
     */
-    unit: number;
+    constructor(
     /**
-    Create an indent context.
+    Initialization options.
     */
-    constructor(
+    config?: EditorConfig);
     /**
-    The editor state.
+    All regular editor state updates should go through this. It
+    takes a transaction or transaction spec and updates the view to
+    show the new state produced by that transaction. Its
+    implementation can be overridden with an
+    [option](https://codemirror.net/6/docs/ref/#view.EditorView.constructor^config.dispatch). This
+    function is bound to the view instance, so it does not have to
+    be called as a method.
     */
-    state: EditorState, 
+    dispatch(tr: Transaction): void;
+    dispatch(...specs: TransactionSpec[]): void;
     /**
-    @internal
+    Update the view for the given array of transactions. This will
+    update the visible document and selection to match the state
+    produced by the transactions, and notify view plugins of the
+    change. You should usually call
+    [`dispatch`](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch) instead, which uses this
+    as a primitive.
     */
-    options?: {
-        /**
-        Override line indentations provided to the indentation
-        helper function, which is useful when implementing region
-        indentation, where indentation for later lines needs to refer
-        to previous lines, which may have been reindented compared to
-        the original start state. If given, this function should
-        return -1 for lines (given by start position) that didn't
-        change, and an updated indentation otherwise.
-        */
-        overrideIndentation?: (pos: number) => number;
-        /**
-        Make it look, to the indent logic, like a line break was
-        added at the given position (which is mostly just useful for
-        implementing something like
-        [`insertNewlineAndIndent`](https://codemirror.net/6/docs/ref/#commands.insertNewlineAndIndent)).
-        */
-        simulateBreak?: number;
-        /**
-        When `simulateBreak` is given, this can be used to make the
-        simulate break behave like a double line break.
-        */
-        simulateDoubleBreak?: boolean;
-    });
+    update(transactions: readonly Transaction[]): void;
     /**
-    Get a description of the line at the given position, taking
-    [simulated line
-    breaks](https://codemirror.net/6/docs/ref/#language.IndentContext.constructor^options.simulateBreak)
-    into account. If there is such a break at `pos`, the `bias`
-    argument determines whether the part of the line line before or
-    after the break is used.
+    Reset the view to the given state. (This will cause the entire
+    document to be redrawn and all view plugins to be reinitialized,
+    so you should probably only use it when the new state isn't
+    derived from the old state. Otherwise, use
+    [`dispatch`](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch) instead.)
     */
-    lineAt(pos: number, bias?: -1 | 1): {
-        text: string;
-        from: number;
-    };
+    setState(newState: EditorState): void;
+    private updatePlugins;
     /**
-    Get the text directly after `pos`, either the entire line
-    or the next 100 characters, whichever is shorter.
+    Get the CSS classes for the currently active editor themes.
     */
-    textAfterPos(pos: number, bias?: -1 | 1): string;
+    get themeClasses(): string;
+    private updateAttrs;
+    private showAnnouncements;
+    private mountStyles;
+    private readMeasured;
     /**
-    Find the column for the given position.
+    Schedule a layout measurement, optionally providing callbacks to
+    do custom DOM measuring followed by a DOM write phase. Using
+    this is preferable reading DOM layout directly from, for
+    example, an event handler, because it'll make sure measuring and
+    drawing done by other components is synchronized, avoiding
+    unnecessary DOM layout computations.
     */
-    column(pos: number, bias?: -1 | 1): number;
+    requestMeasure<T>(request?: MeasureRequest<T>): void;
     /**
-    Find the column position (taking tabs into account) of the given
-    position in the given string.
+    Collect all values provided by the active plugins for a given
+    field.
     */
-    countColumn(line: string, pos?: number): number;
+    pluginField<T>(field: PluginField<T>): readonly T[];
     /**
-    Find the indentation column of the line at the given point.
+    Get the value of a specific plugin, if present. Note that
+    plugins that crash can be dropped from a view, so even when you
+    know you registered a given plugin, it is recommended to check
+    the return value of this method.
     */
-    lineIndent(pos: number, bias?: -1 | 1): number;
+    plugin<T>(plugin: ViewPlugin<T>): T | null;
     /**
-    Returns the [simulated line
-    break](https://codemirror.net/6/docs/ref/#language.IndentContext.constructor^options.simulateBreak)
-    for this context, if any.
+    The top position of the document, in screen coordinates. This
+    may be negative when the editor is scrolled down. Points
+    directly to the top of the first line, not above the padding.
     */
-    get simulatedBreak(): number | null;
-}
-/**
-Enables reindentation on input. When a language defines an
-`indentOnInput` field in its [language
-data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt), which must hold a regular
-expression, the line at the cursor will be reindented whenever new
-text is typed and the input from the start of the line up to the
-cursor matches that regexp.
-
-To avoid unneccesary reindents, it is recommended to start the
-regexp with `^` (usually followed by `\s*`), and end it with `$`.
-For example, `/^\s*\}$/` will reindent when a closing brace is
-added at the start of a line.
-*/
-declare function indentOnInput(): Extension;
-
-/**
-Encapsulates a single line of input. Given to stream syntax code,
-which uses it to tokenize the content.
-*/
-declare class StringStream {
+    get documentTop(): number;
     /**
-    The line.
+    Reports the padding above and below the document.
     */
-    string: string;
-    private tabSize;
+    get documentPadding(): {
+        top: number;
+        bottom: number;
+    };
     /**
-    The current indent unit size.
+    Find the line or block widget at the given vertical position.
+    
+    By default, this position is interpreted as a screen position,
+    meaning `docTop` is set to the DOM top position of the editor
+    content (forcing a layout). You can pass a different `docTop`
+    value—for example 0 to interpret `height` as a document-relative
+    position, or a precomputed document top
+    (`view.contentDOM.getBoundingClientRect().top`) to limit layout
+    queries.
+    
+    *Deprecated: use `elementAtHeight` instead.*
     */
-    indentUnit: number;
+    blockAtHeight(height: number, docTop?: number): BlockInfo;
     /**
-    The current position on the line.
+    Find the text line or block widget at the given vertical
+    position (which is interpreted as relative to the [top of the
+    document](https://codemirror.net/6/docs/ref/#view.EditorView.documentTop)
     */
-    pos: number;
+    elementAtHeight(height: number): BlockInfo;
     /**
-    The start position of the current token.
+    Find information for the visual line (see
+    [`visualLineAt`](https://codemirror.net/6/docs/ref/#view.EditorView.visualLineAt)) at the given
+    vertical position. The resulting block info might hold another
+    array of block info structs in its `type` field if this line
+    consists of more than one block.
+    
+    Defaults to treating `height` as a screen position. See
+    [`blockAtHeight`](https://codemirror.net/6/docs/ref/#view.EditorView.blockAtHeight) for the
+    interpretation of the `docTop` parameter.
+    
+    *Deprecated: use `lineBlockAtHeight` instead.*
     */
-    start: number;
-    private lastColumnPos;
-    private lastColumnValue;
+    visualLineAtHeight(height: number, docTop?: number): BlockInfo;
     /**
-    True if we are at the end of the line.
+    Find the line block (see
+    [`lineBlockAt`](https://codemirror.net/6/docs/ref/#view.EditorView.lineBlockAt) at the given
+    height.
     */
-    eol(): boolean;
+    lineBlockAtHeight(height: number): BlockInfo;
     /**
-    True if we are at the start of the line.
+    Iterate over the height information of the visual lines in the
+    viewport. The heights of lines are reported relative to the
+    given document top, which defaults to the screen position of the
+    document (forcing a layout).
+    
+    *Deprecated: use `viewportLineBlocks` instead.*
     */
-    sol(): boolean;
+    viewportLines(f: (line: BlockInfo) => void, docTop?: number): void;
     /**
-    Get the next code unit after the current position, or undefined
-    if we're at the end of the line.
+    Get the extent and vertical position of all [line
+    blocks](https://codemirror.net/6/docs/ref/#view.EditorView.lineBlockAt) in the viewport. Positions
+    are relative to the [top of the
+    document](https://codemirror.net/6/docs/ref/#view.EditorView.documentTop);
     */
-    peek(): string | undefined;
+    get viewportLineBlocks(): BlockInfo[];
     /**
-    Read the next code unit and advance `this.pos`.
+    Find the extent and height of the visual line (a range delimited
+    on both sides by either non-[hidden](https://codemirror.net/6/docs/ref/#view.Decoration^range)
+    line breaks, or the start/end of the document) at the given position.
+    
+    Vertical positions are computed relative to the `docTop`
+    argument, which defaults to 0 for this method. You can pass
+    `view.contentDOM.getBoundingClientRect().top` here to get screen
+    coordinates.
+    
+    *Deprecated: use `lineBlockAt` instead.*
     */
-    next(): string | void;
+    visualLineAt(pos: number, docTop?: number): BlockInfo;
     /**
-    Match the next character against the given string, regular
-    expression, or predicate. Consume and return it if it matches.
+    Find the line block around the given document position. A line
+    block is a range delimited on both sides by either a
+    non-[hidden](https://codemirror.net/6/docs/ref/#view.Decoration^range) line breaks, or the
+    start/end of the document. It will usually just hold a line of
+    text, but may be broken into multiple textblocks by block
+    widgets.
     */
-    eat(match: string | RegExp | ((ch: string) => boolean)): string | void;
+    lineBlockAt(pos: number): BlockInfo;
     /**
-    Continue matching characters that match the given string,
-    regular expression, or predicate function. Return true if any
-    characters were consumed.
+    The editor's total content height.
     */
-    eatWhile(match: string | RegExp | ((ch: string) => boolean)): boolean;
+    get contentHeight(): number;
     /**
-    Consume whitespace ahead of `this.pos`. Return true if any was
-    found.
+    Move a cursor position by [grapheme
+    cluster](https://codemirror.net/6/docs/ref/#text.findClusterBreak). `forward` determines whether
+    the motion is away from the line start, or towards it. Motion in
+    bidirectional text is in visual order, in the editor's [text
+    direction](https://codemirror.net/6/docs/ref/#view.EditorView.textDirection). When the start
+    position was the last one on the line, the returned position
+    will be across the line break. If there is no further line, the
+    original position is returned.
+    
+    By default, this method moves over a single cluster. The
+    optional `by` argument can be used to move across more. It will
+    be called with the first cluster as argument, and should return
+    a predicate that determines, for each subsequent cluster,
+    whether it should also be moved over.
     */
-    eatSpace(): boolean;
+    moveByChar(start: SelectionRange, forward: boolean, by?: (initial: string) => (next: string) => boolean): SelectionRange;
     /**
-    Move to the end of the line.
+    Move a cursor position across the next group of either
+    [letters](https://codemirror.net/6/docs/ref/#state.EditorState.charCategorizer) or non-letter
+    non-whitespace characters.
     */
-    skipToEnd(): void;
+    moveByGroup(start: SelectionRange, forward: boolean): SelectionRange;
     /**
-    Move to directly before the given character, if found on the
-    current line.
+    Move to the next line boundary in the given direction. If
+    `includeWrap` is true, line wrapping is on, and there is a
+    further wrap point on the current line, the wrap point will be
+    returned. Otherwise this function will return the start or end
+    of the line.
     */
-    skipTo(ch: string): boolean | void;
+    moveToLineBoundary(start: SelectionRange, forward: boolean, includeWrap?: boolean): SelectionRange;
     /**
-    Move back `n` characters.
+    Move a cursor position vertically. When `distance` isn't given,
+    it defaults to moving to the next line (including wrapped
+    lines). Otherwise, `distance` should provide a positive distance
+    in pixels.
+    
+    When `start` has a
+    [`goalColumn`](https://codemirror.net/6/docs/ref/#state.SelectionRange.goalColumn), the vertical
+    motion will use that as a target horizontal position. Otherwise,
+    the cursor's own horizontal position is used. The returned
+    cursor will have its goal column set to whichever column was
+    used.
     */
-    backUp(n: number): void;
+    moveVertically(start: SelectionRange, forward: boolean, distance?: number): SelectionRange;
+    scrollPosIntoView(pos: number): void;
     /**
-    Get the column position at `this.pos`.
+    Find the DOM parent node and offset (child offset if `node` is
+    an element, character offset when it is a text node) at the
+    given document position.
+    
+    Note that for positions that aren't currently in
+    `visibleRanges`, the resulting DOM position isn't necessarily
+    meaningful (it may just point before or after a placeholder
+    element).
     */
-    column(): number;
-    /**
-    Get the indentation column of the current line.
+    domAtPos(pos: number): {
+        node: Node;
+        offset: number;
+    };
+    /**
+    Find the document position at the given DOM node. Can be useful
+    for associating positions with DOM events. Will raise an error
+    when `node` isn't part of the editor content.
     */
-    indentation(): number;
+    posAtDOM(node: Node, offset?: number): number;
     /**
-    Match the input against the given string or regular expression
-    (which should start with a `^`). Return true or the regexp match
-    if it matches.
-    
-    Unless `consume` is set to `false`, this will move `this.pos`
-    past the matched text.
-    
-    When matching a string `caseInsensitive` can be set to true to
-    make the match case-insensitive.
+    Get the document position at the given screen coordinates. For
+    positions not covered by the visible viewport's DOM structure,
+    this will return null, unless `false` is passed as second
+    argument, in which case it'll return an estimated position that
+    would be near the coordinates if it were rendered.
     */
-    match(pattern: string | RegExp, consume?: boolean, caseInsensitive?: boolean): boolean | RegExpMatchArray | null;
+    posAtCoords(coords: {
+        x: number;
+        y: number;
+    }, precise: false): number;
+    posAtCoords(coords: {
+        x: number;
+        y: number;
+    }): number | null;
     /**
-    Get the current token.
+    Get the screen coordinates at the given document position.
+    `side` determines whether the coordinates are based on the
+    element before (-1) or after (1) the position (if no element is
+    available on the given side, the method will transparently use
+    another strategy to get reasonable coordinates).
     */
-    current(): string;
-}
-
-/**
-A stream parser parses or tokenizes content from start to end,
-emitting tokens as it goes over it. It keeps a mutable (but
-copyable) object with state, in which it can store information
-about the current context.
-*/
-interface StreamParser<State> {
+    coordsAtPos(pos: number, side?: -1 | 1): Rect | null;
     /**
-    Read one token, advancing the stream past it, and returning a
-    string indicating the token's style tag—either the name of one
-    of the tags in [`tags`](https://codemirror.net/6/docs/ref/#highlight.tags), or such a name
-    suffixed by one or more tag
-    [modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) names, separated by
-    spaces. For example `"keyword"` or "`variableName.constant"`.
-    
-    It is okay to return a zero-length token, but only if that
-    updates the state so that the next call will return a non-empty
-    token again.
+    The default width of a character in the editor. May not
+    accurately reflect the width of all characters (given variable
+    width fonts or styling of invididual ranges).
     */
-    token(stream: StringStream, state: State): string | null;
+    get defaultCharacterWidth(): number;
     /**
-    This notifies the parser of a blank line in the input. It can
-    update its state here if it needs to.
+    The default height of a line in the editor. May not be accurate
+    for all lines.
     */
-    blankLine?(state: State, indentUnit: number): void;
+    get defaultLineHeight(): number;
     /**
-    Produce a start state for the parser.
+    The text direction
+    ([`direction`](https://developer.mozilla.org/en-US/docs/Web/CSS/direction)
+    CSS property) of the editor.
     */
-    startState?(indentUnit: number): State;
+    get textDirection(): Direction;
     /**
-    Copy a given state. By default, a shallow object copy is done
-    which also copies arrays held at the top level of the object.
+    Whether this editor [wraps lines](https://codemirror.net/6/docs/ref/#view.EditorView.lineWrapping)
+    (as determined by the
+    [`white-space`](https://developer.mozilla.org/en-US/docs/Web/CSS/white-space)
+    CSS property of its content element).
     */
-    copyState?(state: State): State;
+    get lineWrapping(): boolean;
     /**
-    Compute automatic indentation for the line that starts with the
-    given state and text.
+    Returns the bidirectional text structure of the given line
+    (which should be in the current document) as an array of span
+    objects. The order of these spans matches the [text
+    direction](https://codemirror.net/6/docs/ref/#view.EditorView.textDirection)—if that is
+    left-to-right, the leftmost spans come first, otherwise the
+    rightmost spans come first.
     */
-    indent?(state: State, textAfter: string, context: IndentContext): number | null;
+    bidiSpans(line: Line$1): readonly BidiSpan[];
     /**
-    Default [language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) to
-    attach to this language.
+    Check whether the editor has focus.
     */
-    languageData?: {
-        [name: string]: any;
-    };
-}
-/**
-A [language](https://codemirror.net/6/docs/ref/#language.Language) class based on a streaming
-parser.
-*/
-declare class StreamLanguage<State> extends Language {
-    private constructor();
-    static define<State>(spec: StreamParser<State>): StreamLanguage<State>;
-    private getIndent;
-    get allowsNesting(): boolean;
-}
-
-declare const julia$1: StreamParser<unknown>
-
-declare type JuliaLanguageConfig = {
-    /** Enable keyword completion */
-    enableKeywordCompletion?: boolean;
-};
-declare function julia(config?: JuliaLanguageConfig): LanguageSupport;
-
-declare type Handlers = {
-    [event: string]: (view: EditorView, line: BlockInfo, event: Event) => boolean;
-};
-interface LineNumberConfig {
+    get hasFocus(): boolean;
     /**
-    How to display line numbers. Defaults to simply converting them
-    to string.
+    Put focus on the editor.
     */
-    formatNumber?: (lineNo: number, state: EditorState) => string;
+    focus(): void;
     /**
-    Supply event handlers for DOM events on this gutter.
+    Clean up this editor view, removing its element from the
+    document, unregistering event handlers, and notifying
+    plugins. The view instance can no longer be used after
+    calling this.
     */
-    domEventHandlers?: Handlers;
-}
-/**
-Create a line number gutter extension.
-*/
-declare function lineNumbers(config?: LineNumberConfig): Extension;
-
-interface HistoryConfig {
+    destroy(): void;
     /**
-    The minimum depth (amount of events) to store. Defaults to 100.
+    Effect that can be [added](https://codemirror.net/6/docs/ref/#state.TransactionSpec.effects) to a
+    transaction to make it scroll the given range into view.
+    
+    *Deprecated*. Use [`scrollIntoView`](https://codemirror.net/6/docs/ref/#view.EditorView^scrollIntoView) instead.
     */
-    minDepth?: number;
+    static scrollTo: StateEffectType<SelectionRange>;
     /**
-    The maximum time (in milliseconds) that adjacent events can be
-    apart and still be grouped together. Defaults to 500.
+    Effect that makes the editor scroll the given range to the
+    center of the visible view.
+    
+    *Deprecated*. Use [`scrollIntoView`](https://codemirror.net/6/docs/ref/#view.EditorView^scrollIntoView) instead.
     */
-    newGroupDelay?: number;
-}
-/**
-Create a history extension with the given configuration.
-*/
-declare function history(config?: HistoryConfig): Extension;
-/**
-Default key bindings for the undo history.
-
-- Mod-z: [`undo`](https://codemirror.net/6/docs/ref/#history.undo).
-- Mod-y (Mod-Shift-z on macOS): [`redo`](https://codemirror.net/6/docs/ref/#history.redo).
-- Mod-u: [`undoSelection`](https://codemirror.net/6/docs/ref/#history.undoSelection).
-- Alt-u (Mod-Shift-u on macOS): [`redoSelection`](https://codemirror.net/6/docs/ref/#history.redoSelection).
-*/
-declare const historyKeymap: readonly KeyBinding[];
-
-/**
-Add a [unit](https://codemirror.net/6/docs/ref/#language.indentUnit) of indentation to all selected
-lines.
-*/
-declare const indentMore: StateCommand;
-/**
-Remove a [unit](https://codemirror.net/6/docs/ref/#language.indentUnit) of indentation from all
-selected lines.
-*/
-declare const indentLess: StateCommand;
-/**
-The default keymap. Includes all bindings from
-[`standardKeymap`](https://codemirror.net/6/docs/ref/#commands.standardKeymap) plus the following:
-
-- Alt-ArrowLeft (Ctrl-ArrowLeft on macOS): [`cursorSyntaxLeft`](https://codemirror.net/6/docs/ref/#commands.cursorSyntaxLeft) ([`selectSyntaxLeft`](https://codemirror.net/6/docs/ref/#commands.selectSyntaxLeft) with Shift)
-- Alt-ArrowRight (Ctrl-ArrowRight on macOS): [`cursorSyntaxRight`](https://codemirror.net/6/docs/ref/#commands.cursorSyntaxRight) ([`selectSyntaxRight`](https://codemirror.net/6/docs/ref/#commands.selectSyntaxRight) with Shift)
-- Alt-ArrowUp: [`moveLineUp`](https://codemirror.net/6/docs/ref/#commands.moveLineUp)
-- Alt-ArrowDown: [`moveLineDown`](https://codemirror.net/6/docs/ref/#commands.moveLineDown)
-- Shift-Alt-ArrowUp: [`copyLineUp`](https://codemirror.net/6/docs/ref/#commands.copyLineUp)
-- Shift-Alt-ArrowDown: [`copyLineDown`](https://codemirror.net/6/docs/ref/#commands.copyLineDown)
-- Escape: [`simplifySelection`](https://codemirror.net/6/docs/ref/#commands.simplifySelection)
-- Ctrl-Enter (Comd-Enter on macOS): [`insertBlankLine`](https://codemirror.net/6/docs/ref/#commands.insertBlankLine)
-- Alt-l (Ctrl-l on macOS): [`selectLine`](https://codemirror.net/6/docs/ref/#commands.selectLine)
-- Ctrl-i (Cmd-i on macOS): [`selectParentSyntax`](https://codemirror.net/6/docs/ref/#commands.selectParentSyntax)
-- Ctrl-[ (Cmd-[ on macOS): [`indentLess`](https://codemirror.net/6/docs/ref/#commands.indentLess)
-- Ctrl-] (Cmd-] on macOS): [`indentMore`](https://codemirror.net/6/docs/ref/#commands.indentMore)
-- Ctrl-Alt-\\ (Cmd-Alt-\\ on macOS): [`indentSelection`](https://codemirror.net/6/docs/ref/#commands.indentSelection)
-- Shift-Ctrl-k (Shift-Cmd-k on macOS): [`deleteLine`](https://codemirror.net/6/docs/ref/#commands.deleteLine)
-- Shift-Ctrl-\\ (Shift-Cmd-\\ on macOS): [`cursorMatchingBracket`](https://codemirror.net/6/docs/ref/#commands.cursorMatchingBracket)
-*/
-declare const defaultKeymap: readonly KeyBinding[];
-
-/**
-Highlighting tags are markers that denote a highlighting category.
-They are [associated](https://codemirror.net/6/docs/ref/#highlight.styleTags) with parts of a syntax
-tree by a language mode, and then mapped to an actual CSS style by
-a [highlight style](https://codemirror.net/6/docs/ref/#highlight.HighlightStyle).
-
-Because syntax tree node types and highlight styles have to be
-able to talk the same language, CodeMirror uses a mostly _closed_
-[vocabulary](https://codemirror.net/6/docs/ref/#highlight.tags) of syntax tags (as opposed to
-traditional open string-based systems, which make it hard for
-highlighting themes to cover all the tokens produced by the
-various languages).
-
-It _is_ possible to [define](https://codemirror.net/6/docs/ref/#highlight.Tag^define) your own
-highlighting tags for system-internal use (where you control both
-the language package and the highlighter), but such tags will not
-be picked up by regular highlighters (though you can derive them
-from standard tags to allow highlighters to fall back to those).
-*/
-declare class Tag {
+    static centerOn: StateEffectType<SelectionRange>;
+    /**
+    Returns an effect that can be
+    [added](https://codemirror.net/6/docs/ref/#state.TransactionSpec.effects) to a transaction to
+    cause it to scroll the given position or range into view.
+    */
+    static scrollIntoView(pos: number | SelectionRange, options?: {
+        /**
+        By default (`"nearest"`) the position will be vertically
+        scrolled only the minimal amount required to move the given
+        position into view. You can set this to `"start"` to move it
+        to the top of the view, `"end"` to move it to the bottom, or
+        `"center"` to move it to the center.
+        */
+        y?: ScrollStrategy;
+        /**
+        Effect similar to
+        [`y`](https://codemirror.net/6/docs/ref/#view.EditorView^scrollIntoView^options.y), but for the
+        horizontal scroll position.
+        */
+        x?: ScrollStrategy;
+        /**
+        Extra vertical distance to add when moving something into
+        view. Not used with the `"center"` strategy. Defaults to 5.
+        */
+        yMargin?: number;
+        /**
+        Extra horizontal distance to add. Not used with the `"center"`
+        strategy. Defaults to 5.
+        */
+        xMargin?: number;
+    }): StateEffect<unknown>;
+    /**
+    Facet to add a [style
+    module](https://github.com/marijnh/style-mod#documentation) to
+    an editor view. The view will ensure that the module is
+    mounted in its [document
+    root](https://codemirror.net/6/docs/ref/#view.EditorView.constructor^config.root).
+    */
+    static styleModule: Facet<StyleModule, readonly StyleModule[]>;
+    /**
+    Facet that can be used to add DOM event handlers. The value
+    should be an object mapping event names to handler functions. The
+    first such function to return true will be assumed to have handled
+    that event, and no other handlers or built-in behavior will be
+    activated for it.
+    These are registered on the [content
+    element](https://codemirror.net/6/docs/ref/#view.EditorView.contentDOM), except for `scroll`
+    handlers, which will be called any time the editor's [scroll
+    element](https://codemirror.net/6/docs/ref/#view.EditorView.scrollDOM) or one of its parent nodes
+    is scrolled.
+    */
+    static domEventHandlers(handlers: DOMEventHandlers<any>): Extension;
+    /**
+    An input handler can override the way changes to the editable
+    DOM content are handled. Handlers are passed the document
+    positions between which the change was found, and the new
+    content. When one returns true, no further input handlers are
+    called and the default behavior is prevented.
+    */
+    static inputHandler: Facet<(view: EditorView, from: number, to: number, text: string) => boolean, readonly ((view: EditorView, from: number, to: number, text: string) => boolean)[]>;
     /**
-    Define a new tag. If `parent` is given, the tag is treated as a
-    sub-tag of that parent, and [highlight
-    styles](https://codemirror.net/6/docs/ref/#highlight.HighlightStyle) that don't mention this tag
-    will try to fall back to the parent tag (or grandparent tag,
-    etc).
+    Allows you to provide a function that should be called when the
+    library catches an exception from an extension (mostly from view
+    plugins, but may be used by other extensions to route exceptions
+    from user-code-provided callbacks). This is mostly useful for
+    debugging and logging. See [`logException`](https://codemirror.net/6/docs/ref/#view.logException).
     */
-    static define(parent?: Tag): Tag;
+    static exceptionSink: Facet<(exception: any) => void, readonly ((exception: any) => void)[]>;
     /**
-    Define a tag _modifier_, which is a function that, given a tag,
-    will return a tag that is a subtag of the original. Applying the
-    same modifier to a twice tag will return the same value (`m1(t1)
-    == m1(t1)`) and applying multiple modifiers will, regardless or
-    order, produce the same tag (`m1(m2(t1)) == m2(m1(t1))`).
-    
-    When multiple modifiers are applied to a given base tag, each
-    smaller set of modifiers is registered as a parent, so that for
-    example `m1(m2(m3(t1)))` is a subtype of `m1(m2(t1))`,
-    `m1(m3(t1)`, and so on.
+    A facet that can be used to register a function to be called
+    every time the view updates.
     */
-    static defineModifier(): (tag: Tag) => Tag;
-}
-/**
-A highlight style associates CSS styles with higlighting
-[tags](https://codemirror.net/6/docs/ref/#highlight.Tag).
-*/
-declare class HighlightStyle {
+    static updateListener: Facet<(update: ViewUpdate) => void, readonly ((update: ViewUpdate) => void)[]>;
     /**
-    Extension that registers this style with an editor. When
-    multiple highlight styles are given, they _all_ apply, assigning
-    the combination of their matching styles to tokens.
+    Facet that controls whether the editor content DOM is editable.
+    When its highest-precedence value is `false`, the element will
+    not longer have its `contenteditable` attribute set. (Note that
+    this doesn't affect API calls that change the editor content,
+    even when those are bound to keys or buttons. See the
+    [`readOnly`](https://codemirror.net/6/docs/ref/#state.EditorState.readOnly) facet for that.)
     */
-    readonly extension: Extension;
+    static editable: Facet<boolean, boolean>;
     /**
-    An extension that installs this highlighter as a fallback
-    highlight style, which will only be used if no other highlight
-    styles are configured.
+    Allows you to influence the way mouse selection happens. The
+    functions in this facet will be called for a `mousedown` event
+    on the editor, and can return an object that overrides the way a
+    selection is computed from that mouse click or drag.
     */
-    readonly fallback: Extension;
+    static mouseSelectionStyle: Facet<MakeSelectionStyle, readonly MakeSelectionStyle[]>;
     /**
-    A style module holding the CSS rules for this highlight style.
-    When using [`highlightTree`](https://codemirror.net/6/docs/ref/#highlight.highlightTree), you may
-    want to manually mount this module to show the highlighting.
+    Facet used to configure whether a given selection drag event
+    should move or copy the selection. The given predicate will be
+    called with the `mousedown` event, and can return `true` when
+    the drag should move the content.
     */
-    readonly module: StyleModule | null;
-    private map;
-    private scope;
-    private all;
-    private constructor();
+    static dragMovesSelection: Facet<(event: MouseEvent) => boolean, readonly ((event: MouseEvent) => boolean)[]>;
     /**
-    Returns the CSS class associated with the given tag, if any.
-    This method is bound to the instance by the constructor.
+    Facet used to configure whether a given selecting click adds
+    a new range to the existing selection or replaces it entirely.
     */
-    match(tag: Tag, scope: NodeType): string | null;
+    static clickAddsSelectionRange: Facet<(event: MouseEvent) => boolean, readonly ((event: MouseEvent) => boolean)[]>;
     /**
-    Combines an array of highlight styles into a single match
-    function that returns all of the classes assigned by the styles
-    for a given tag.
+    A facet that determines which [decorations](https://codemirror.net/6/docs/ref/#view.Decoration)
+    are shown in the view. See also [view
+    plugins](https://codemirror.net/6/docs/ref/#view.EditorView^decorations), which have a separate
+    mechanism for providing decorations.
     */
-    static combinedMatch(styles: readonly HighlightStyle[]): (tag: Tag, scope: NodeType) => any;
+    static decorations: Facet<DecorationSet, readonly DecorationSet[]>;
     /**
-    Create a highlighter style that associates the given styles to
-    the given tags. The spec must be objects that hold a style tag
-    or array of tags in their `tag` property, and either a single
-    `class` property providing a static CSS class (for highlighters
-    like [`classHighlightStyle`](https://codemirror.net/6/docs/ref/#highlight.classHighlightStyle)
-    that rely on external styling), or a
-    [`style-mod`](https://github.com/marijnh/style-mod#documentation)-style
-    set of CSS properties (which define the styling for those tags).
+    Create a theme extension. The first argument can be a
+    [`style-mod`](https://github.com/marijnh/style-mod#documentation)
+    style spec providing the styles for the theme. These will be
+    prefixed with a generated class for the style.
     
-    The CSS rules created for a highlighter will be emitted in the
-    order of the spec's properties. That means that for elements that
-    have multiple tags associated with them, styles defined further
-    down in the list will have a higher CSS precedence than styles
-    defined earlier.
+    Because the selectors will be prefixed with a scope class, rule
+    that directly match the editor's [wrapper
+    element](https://codemirror.net/6/docs/ref/#view.EditorView.dom)—to which the scope class will be
+    added—need to be explicitly differentiated by adding an `&` to
+    the selector for that element—for example
+    `&.cm-focused`.
+    
+    When `dark` is set to true, the theme will be marked as dark,
+    which will cause the `&dark` rules from [base
+    themes](https://codemirror.net/6/docs/ref/#view.EditorView^baseTheme) to be used (as opposed to
+    `&light` when a light theme is active).
     */
-    static define(specs: readonly TagStyle[], options?: {
-        /**
-        By default, highlighters apply to the entire document. You can
-        scope them to a single language by providing the language's
-        [top node](https://codemirror.net/6/docs/ref/#language.Language.topNode) here.
-        */
-        scope?: NodeType;
-        /**
-        Add a style to _all_ content. Probably only useful in
-        combination with `scope`.
-        */
-        all?: string | StyleSpec;
-    }): HighlightStyle;
+    static theme(spec: {
+        [selector: string]: StyleSpec;
+    }, options?: {
+        dark?: boolean;
+    }): Extension;
     /**
-    Returns the CSS classes (if any) that the highlight styles
-    active in the given state would assign to the given a style
-    [tag](https://codemirror.net/6/docs/ref/#highlight.Tag) and (optional) language
-    [scope](https://codemirror.net/6/docs/ref/#highlight.HighlightStyle^define^options.scope).
+    This facet records whether a dark theme is active. The extension
+    returned by [`theme`](https://codemirror.net/6/docs/ref/#view.EditorView^theme) automatically
+    includes an instance of this when the `dark` option is set to
+    true.
     */
-    static get(state: EditorState, tag: Tag, scope?: NodeType): string | null;
-}
-/**
-The type of object used in
-[`HighlightStyle.define`](https://codemirror.net/6/docs/ref/#highlight.HighlightStyle^define).
-Assigns a style to one or more highlighting
-[tags](https://codemirror.net/6/docs/ref/#highlight.Tag), which can either be a fixed class name
-(which must be defined elsewhere), or a set of CSS properties, for
-which the library will define an anonymous class.
-*/
-interface TagStyle {
+    static darkTheme: Facet<boolean, boolean>;
     /**
-    The tag or tags to target.
+    Create an extension that adds styles to the base theme. Like
+    with [`theme`](https://codemirror.net/6/docs/ref/#view.EditorView^theme), use `&` to indicate the
+    place of the editor wrapper element when directly targeting
+    that. You can also use `&dark` or `&light` instead to only
+    target editors with a dark or light theme.
     */
-    tag: Tag | readonly Tag[];
+    static baseTheme(spec: {
+        [selector: string]: StyleSpec;
+    }): Extension;
     /**
-    If given, this maps the tags to a fixed class name.
+    Facet that provides additional DOM attributes for the editor's
+    editable DOM element.
     */
-    class?: string;
+    static contentAttributes: Facet<AttrSource, readonly AttrSource[]>;
     /**
-    Any further properties (if `class` isn't given) will be
-    interpreted as in style objects given to
-    [style-mod](https://github.com/marijnh/style-mod#documentation).
-    The type here is `any` because of TypeScript limitations.
+    Facet that provides DOM attributes for the editor's outer
+    element.
     */
-    [styleProperty: string]: any;
+    static editorAttributes: Facet<AttrSource, readonly AttrSource[]>;
+    /**
+    An extension that enables line wrapping in the editor (by
+    setting CSS `white-space` to `pre-wrap` in the content).
+    */
+    static lineWrapping: Extension;
+    /**
+    State effect used to include screen reader announcements in a
+    transaction. These will be added to the DOM in a visually hidden
+    element with `aria-live="polite"` set, and should be used to
+    describe effects that are visually obvious but may not be
+    noticed by screen reader users (such as moving to the next
+    search match).
+    */
+    static announce: StateEffectType<string>;
 }
 /**
-The default set of highlighting [tags](https://codemirror.net/6/docs/ref/#highlight.Tag^define) used
-by regular language packages and themes.
+Helper type that maps event names to event object types, or the
+`any` type for unknown events.
+*/
+interface DOMEventMap extends HTMLElementEventMap {
+    [other: string]: any;
+}
+/**
+Event handlers are specified with objects like this. For event
+types known by TypeScript, this will infer the event argument type
+to hold the appropriate event object type. For unknown events, it
+is inferred to `any`, and should be explicitly set if you want type
+checking.
+*/
+declare type DOMEventHandlers<This> = {
+    [event in keyof DOMEventMap]?: (this: This, event: DOMEventMap[event], view: EditorView) => boolean | void;
+};
 
-This collection is heavily biased towards programming languages,
-and necessarily incomplete. A full ontology of syntactic
-constructs would fill a stack of books, and be impractical to
-write themes for. So try to make do with this set. If all else
-fails, [open an
-issue](https://github.com/codemirror/codemirror.next) to propose a
-new tag, or [define](https://codemirror.net/6/docs/ref/#highlight.Tag^define) a local custom tag for
-your use case.
+/**
+Key bindings associate key names with
+[command](https://codemirror.net/6/docs/ref/#view.Command)-style functions.
 
-Note that it is not obligatory to always attach the most specific
-tag possible to an element—if your grammar can't easily
-distinguish a certain type of element (such as a local variable),
-it is okay to style it as its more general variant (a variable).
+Key names may be strings like `"Shift-Ctrl-Enter"`—a key identifier
+prefixed with zero or more modifiers. Key identifiers are based on
+the strings that can appear in
+[`KeyEvent.key`](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key).
+Use lowercase letters to refer to letter keys (or uppercase letters
+if you want shift to be held). You may use `"Space"` as an alias
+for the `" "` name.
 
-For tags that extend some parent tag, the documentation links to
-the parent.
+Modifiers can be given in any order. `Shift-` (or `s-`), `Alt-` (or
+`a-`), `Ctrl-` (or `c-` or `Control-`) and `Cmd-` (or `m-` or
+`Meta-`) are recognized.
+
+When a key binding contains multiple key names separated by
+spaces, it represents a multi-stroke binding, which will fire when
+the user presses the given keys after each other order.
+
+You can use `Mod-` as a shorthand for `Cmd-` on Mac and `Ctrl-` on
+other platforms. So `Mod-b` is `Ctrl-b` on Linux but `Cmd-b` on
+macOS.
 */
-declare const tags: {
-    /**
-    A comment.
-    */
-    comment: Tag;
-    /**
-    A line [comment](https://codemirror.net/6/docs/ref/#highlight.tags.comment).
-    */
-    lineComment: Tag;
-    /**
-    A block [comment](https://codemirror.net/6/docs/ref/#highlight.tags.comment).
-    */
-    blockComment: Tag;
-    /**
-    A documentation [comment](https://codemirror.net/6/docs/ref/#highlight.tags.comment).
-    */
-    docComment: Tag;
+interface KeyBinding {
     /**
-    Any kind of identifier.
+    The key name to use for this binding. If the platform-specific
+    property (`mac`, `win`, or `linux`) for the current platform is
+    used as well in the binding, that one takes precedence. If `key`
+    isn't defined and the platform-specific binding isn't either,
+    a binding is ignored.
     */
-    name: Tag;
+    key?: string;
     /**
-    The [name](https://codemirror.net/6/docs/ref/#highlight.tags.name) of a variable.
+    Key to use specifically on macOS.
     */
-    variableName: Tag;
+    mac?: string;
     /**
-    A type [name](https://codemirror.net/6/docs/ref/#highlight.tags.name).
+    Key to use specifically on Windows.
     */
-    typeName: Tag;
+    win?: string;
     /**
-    A tag name (subtag of [`typeName`](https://codemirror.net/6/docs/ref/#highlight.tags.typeName)).
+    Key to use specifically on Linux.
     */
-    tagName: Tag;
+    linux?: string;
     /**
-    A property or field [name](https://codemirror.net/6/docs/ref/#highlight.tags.name).
+    The command to execute when this binding is triggered. When the
+    command function returns `false`, further bindings will be tried
+    for the key.
     */
-    propertyName: Tag;
+    run: Command;
     /**
-    An attribute name (subtag of [`propertyName`](https://codemirror.net/6/docs/ref/#highlight.tags.propertyName)).
+    When given, this defines a second binding, using the (possibly
+    platform-specific) key name prefixed with `Shift-` to activate
+    this command.
     */
-    attributeName: Tag;
+    shift?: Command;
     /**
-    The [name](https://codemirror.net/6/docs/ref/#highlight.tags.name) of a class.
+    By default, key bindings apply when focus is on the editor
+    content (the `"editor"` scope). Some extensions, mostly those
+    that define their own panels, might want to allow you to
+    register bindings local to that panel. Such bindings should use
+    a custom scope name. You may also set multiple scope names,
+    separated by spaces.
     */
-    className: Tag;
+    scope?: string;
     /**
-    A label [name](https://codemirror.net/6/docs/ref/#highlight.tags.name).
+    When set to true (the default is false), this will always
+    prevent the further handling for the bound key, even if the
+    command(s) return false. This can be useful for cases where the
+    native behavior of the key is annoying or irrelevant but the
+    command doesn't always apply (such as, Mod-u for undo selection,
+    which would cause the browser to view source instead when no
+    selection can be undone).
     */
-    labelName: Tag;
+    preventDefault?: boolean;
+}
+/**
+Facet used for registering keymaps.
+
+You can add multiple keymaps to an editor. Their priorities
+determine their precedence (the ones specified early or with high
+priority get checked first). When a handler has returned `true`
+for a given key, no further handlers are called.
+*/
+declare const keymap: Facet<readonly KeyBinding[], readonly (readonly KeyBinding[])[]>;
+
+declare type SelectionConfig = {
     /**
-    A namespace [name](https://codemirror.net/6/docs/ref/#highlight.tags.name).
+    The length of a full cursor blink cycle, in milliseconds.
+    Defaults to 1200. Can be set to 0 to disable blinking.
     */
-    namespace: Tag;
+    cursorBlinkRate?: number;
     /**
-    The [name](https://codemirror.net/6/docs/ref/#highlight.tags.name) of a macro.
+    Whether to show a cursor for non-empty ranges. Defaults to
+    true.
     */
-    macroName: Tag;
+    drawRangeCursor?: boolean;
+};
+/**
+Returns an extension that hides the browser's native selection and
+cursor, replacing the selection with a background behind the text
+(with the `cm-selectionBackground` class), and the
+cursors with elements overlaid over the code (using
+`cm-cursor-primary` and `cm-cursor-secondary`).
+
+This allows the editor to display secondary selection ranges, and
+tends to produce a type of selection more in line with that users
+expect in a text editor (the native selection styling will often
+leave gaps between lines and won't fill the horizontal space after
+a line when the selection continues past it).
+
+It does have a performance cost, in that it requires an extra DOM
+layout cycle for many updates (the selection is drawn based on DOM
+layout information that's only available after laying out the
+content).
+*/
+declare function drawSelection(config?: SelectionConfig): Extension;
+
+interface SpecialCharConfig {
     /**
-    A literal value.
+    An optional function that renders the placeholder elements.
+    
+    The `description` argument will be text that clarifies what the
+    character is, which should be provided to screen readers (for
+    example with the
+    [`aria-label`](https://www.w3.org/TR/wai-aria/#aria-label)
+    attribute) and optionally shown to the user in other ways (such
+    as the
+    [`title`](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/title)
+    attribute).
+    
+    The given placeholder string is a suggestion for how to display
+    the character visually.
     */
-    literal: Tag;
+    render?: ((code: number, description: string | null, placeholder: string) => HTMLElement) | null;
     /**
-    A string [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
+    Regular expression that matches the special characters to
+    highlight. Must have its 'g'/global flag set.
     */
-    string: Tag;
+    specialChars?: RegExp;
     /**
-    A documentation [string](https://codemirror.net/6/docs/ref/#highlight.tags.string).
+    Regular expression that can be used to add characters to the
+    default set of characters to highlight.
     */
-    docString: Tag;
+    addSpecialChars?: RegExp | null;
+}
+/**
+Returns an extension that installs highlighting of special
+characters.
+*/
+declare function highlightSpecialChars(
+/**
+Configuration options.
+*/
+config?: SpecialCharConfig): Extension;
+
+/**
+Extension that enables a placeholder—a piece of example content
+to show when the editor is empty.
+*/
+declare function placeholder(content: string | HTMLElement): Extension;
+
+/**
+A language object manages parsing and per-language
+[metadata](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt). Parse data is
+managed as a [Lezer](https://lezer.codemirror.net) tree. You'll
+want to subclass this class for custom parsers, or use the
+[`LRLanguage`](https://codemirror.net/6/docs/ref/#language.LRLanguage) or
+[`StreamLanguage`](https://codemirror.net/6/docs/ref/#stream-parser.StreamLanguage) abstractions for
+[Lezer](https://lezer.codemirror.net/) or stream parsers.
+*/
+declare class Language {
     /**
-    A character literal (subtag of [string](https://codemirror.net/6/docs/ref/#highlight.tags.string)).
+    The [language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) data
+    facet used for this language.
     */
-    character: Tag;
+    readonly data: Facet<{
+        [name: string]: any;
+    }>;
     /**
-    An attribute value (subtag of [string](https://codemirror.net/6/docs/ref/#highlight.tags.string)).
+    The node type of the top node of trees produced by this parser.
     */
-    attributeValue: Tag;
+    readonly topNode: NodeType;
     /**
-    A number [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
+    The extension value to install this provider.
     */
-    number: Tag;
+    readonly extension: Extension;
     /**
-    An integer [number](https://codemirror.net/6/docs/ref/#highlight.tags.number) literal.
+    The parser object. Can be useful when using this as a [nested
+    parser](https://lezer.codemirror.net/docs/ref#common.Parser).
     */
-    integer: Tag;
+    parser: Parser;
     /**
-    A floating-point [number](https://codemirror.net/6/docs/ref/#highlight.tags.number) literal.
+    Construct a language object. You usually don't need to invoke
+    this directly. But when you do, make sure you use
+    [`defineLanguageFacet`](https://codemirror.net/6/docs/ref/#language.defineLanguageFacet) to create
+    the first argument.
     */
-    float: Tag;
+    constructor(
     /**
-    A boolean [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
+    The [language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) data
+    facet used for this language.
     */
-    bool: Tag;
+    data: Facet<{
+        [name: string]: any;
+    }>, parser: Parser, 
     /**
-    Regular expression [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
+    The node type of the top node of trees produced by this parser.
     */
-    regexp: Tag;
+    topNode: NodeType, extraExtensions?: Extension[]);
     /**
-    An escape [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal), for example a
-    backslash escape in a string.
+    Query whether this language is active at the given position.
     */
-    escape: Tag;
+    isActiveAt(state: EditorState, pos: number, side?: -1 | 0 | 1): boolean;
     /**
-    A color [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
+    Find the document regions that were parsed using this language.
+    The returned regions will _include_ any nested languages rooted
+    in this language, when those exist.
     */
-    color: Tag;
+    findRegions(state: EditorState): {
+        from: number;
+        to: number;
+    }[];
     /**
-    A URL [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
+    Indicates whether this language allows nested languages. The
+    default implementation returns true.
     */
-    url: Tag;
+    get allowsNesting(): boolean;
+}
+/**
+A subclass of [`Language`](https://codemirror.net/6/docs/ref/#language.Language) for use with Lezer
+[LR parsers](https://lezer.codemirror.net/docs/ref#lr.LRParser)
+parsers.
+*/
+declare class LRLanguage extends Language {
+    readonly parser: LRParser;
+    private constructor();
     /**
-    A language keyword.
+    Define a language from a parser.
     */
-    keyword: Tag;
+    static define(spec: {
+        /**
+        The parser to use. Should already have added editor-relevant
+        node props (and optionally things like dialect and top rule)
+        configured.
+        */
+        parser: LRParser;
+        /**
+        [Language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt)
+        to register for this language.
+        */
+        languageData?: {
+            [name: string]: any;
+        };
+    }): LRLanguage;
     /**
-    The [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) for the self or this
-    object.
+    Create a new instance of this language with a reconfigured
+    version of its parser.
     */
-    self: Tag;
+    configure(options: ParserConfig): LRLanguage;
+    get allowsNesting(): boolean;
+}
+/**
+Get the syntax tree for a state, which is the current (possibly
+incomplete) parse tree of active [language](https://codemirror.net/6/docs/ref/#language.Language),
+or the empty tree if there is no language available.
+*/
+declare function syntaxTree(state: EditorState): Tree;
+/**
+Queries whether there is a full syntax tree available up to the
+given document position. If there isn't, the background parse
+process _might_ still be working and update the tree further, but
+there is no guarantee of that—the parser will [stop
+working](https://codemirror.net/6/docs/ref/#language.syntaxParserStopped) when it has spent a
+certain amount of time or has moved beyond the visible viewport.
+Always returns false if no language has been enabled.
+*/
+declare function syntaxTreeAvailable(state: EditorState, upto?: number): boolean;
+/**
+This class bundles a [language object](https://codemirror.net/6/docs/ref/#language.Language) with an
+optional set of supporting extensions. Language packages are
+encouraged to export a function that optionally takes a
+configuration object and returns a `LanguageSupport` instance, as
+the main way for client code to use the package.
+*/
+declare class LanguageSupport {
     /**
-    The [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) for null.
+    The language object.
     */
-    null: Tag;
+    readonly language: Language;
     /**
-    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) denoting some atomic value.
+    An optional set of supporting extensions. When nesting a
+    language in another language, the outer language is encouraged
+    to include the supporting extensions for its inner languages
+    in its own set of support extensions.
     */
-    atom: Tag;
+    readonly support: Extension;
     /**
-    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) that represents a unit.
+    An extension including both the language and its support
+    extensions. (Allowing the object to be used as an extension
+    value itself.)
     */
-    unit: Tag;
+    extension: Extension;
     /**
-    A modifier [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword).
+    Create a support object.
     */
-    modifier: Tag;
+    constructor(
     /**
-    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) that acts as an operator.
+    The language object.
     */
-    operatorKeyword: Tag;
+    language: Language, 
     /**
-    A control-flow related [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword).
+    An optional set of supporting extensions. When nesting a
+    language in another language, the outer language is encouraged
+    to include the supporting extensions for its inner languages
+    in its own set of support extensions.
     */
-    controlKeyword: Tag;
+    support?: Extension);
+}
+/**
+Language descriptions are used to store metadata about languages
+and to dynamically load them. Their main role is finding the
+appropriate language for a filename or dynamically loading nested
+parsers.
+*/
+declare class LanguageDescription {
     /**
-    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) that defines something.
+    The name of this language.
     */
-    definitionKeyword: Tag;
+    readonly name: string;
     /**
-    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) related to defining or
-    interfacing with modules.
+    Alternative names for the mode (lowercased, includes `this.name`).
     */
-    moduleKeyword: Tag;
+    readonly alias: readonly string[];
     /**
-    An operator.
+    File extensions associated with this language.
     */
-    operator: Tag;
+    readonly extensions: readonly string[];
     /**
-    An [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator) that defines something.
+    Optional filename pattern that should be associated with this
+    language.
     */
-    derefOperator: Tag;
+    readonly filename: RegExp | undefined;
+    private loadFunc;
     /**
-    Arithmetic-related [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
+    If the language has been loaded, this will hold its value.
     */
-    arithmeticOperator: Tag;
+    support: LanguageSupport | undefined;
+    private loading;
+    private constructor();
     /**
-    Logical [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
+    Start loading the the language. Will return a promise that
+    resolves to a [`LanguageSupport`](https://codemirror.net/6/docs/ref/#language.LanguageSupport)
+    object when the language successfully loads.
     */
-    logicOperator: Tag;
+    load(): Promise<LanguageSupport>;
     /**
-    Bit [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
+    Create a language description.
     */
-    bitwiseOperator: Tag;
+    static of(spec: {
+        /**
+        The language's name.
+        */
+        name: string;
+        /**
+        An optional array of alternative names.
+        */
+        alias?: readonly string[];
+        /**
+        An optional array of filename extensions associated with this
+        language.
+        */
+        extensions?: readonly string[];
+        /**
+        An optional filename pattern associated with this language.
+        */
+        filename?: RegExp;
+        /**
+        A function that will asynchronously load the language.
+        */
+        load?: () => Promise<LanguageSupport>;
+        /**
+        Alternatively to `load`, you can provide an already loaded
+        support object. Either this or `load` should be provided.
+        */
+        support?: LanguageSupport;
+    }): LanguageDescription;
     /**
-    Comparison [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
+    Look for a language in the given array of descriptions that
+    matches the filename. Will first match
+    [`filename`](https://codemirror.net/6/docs/ref/#language.LanguageDescription.filename) patterns,
+    and then [extensions](https://codemirror.net/6/docs/ref/#language.LanguageDescription.extensions),
+    and return the first language that matches.
     */
-    compareOperator: Tag;
+    static matchFilename(descs: readonly LanguageDescription[], filename: string): LanguageDescription | null;
     /**
-    [Operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator) that updates its operand.
+    Look for a language whose name or alias matches the the given
+    name (case-insensitively). If `fuzzy` is true, and no direct
+    matchs is found, this'll also search for a language whose name
+    or alias occurs in the string (for names shorter than three
+    characters, only when surrounded by non-word characters).
     */
-    updateOperator: Tag;
+    static matchLanguageName(descs: readonly LanguageDescription[], name: string, fuzzy?: boolean): LanguageDescription | null;
+}
+/**
+Facet for overriding the unit by which indentation happens.
+Should be a string consisting either entirely of spaces or
+entirely of tabs. When not set, this defaults to 2 spaces.
+*/
+declare const indentUnit: Facet<string, string>;
+/**
+Indentation contexts are used when calling [indentation
+services](https://codemirror.net/6/docs/ref/#language.indentService). They provide helper utilities
+useful in indentation logic, and can selectively override the
+indentation reported for some lines.
+*/
+declare class IndentContext {
     /**
-    [Operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator) that defines something.
+    The editor state.
     */
-    definitionOperator: Tag;
+    readonly state: EditorState;
     /**
-    Type-related [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
+    The indent unit (number of columns per indentation level).
     */
-    typeOperator: Tag;
+    unit: number;
     /**
-    Control-flow [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
+    Create an indent context.
     */
-    controlOperator: Tag;
+    constructor(
     /**
-    Program or markup punctuation.
+    The editor state.
     */
-    punctuation: Tag;
+    state: EditorState, 
     /**
-    [Punctuation](https://codemirror.net/6/docs/ref/#highlight.tags.punctuation) that separates
-    things.
+    @internal
     */
-    separator: Tag;
+    options?: {
+        /**
+        Override line indentations provided to the indentation
+        helper function, which is useful when implementing region
+        indentation, where indentation for later lines needs to refer
+        to previous lines, which may have been reindented compared to
+        the original start state. If given, this function should
+        return -1 for lines (given by start position) that didn't
+        change, and an updated indentation otherwise.
+        */
+        overrideIndentation?: (pos: number) => number;
+        /**
+        Make it look, to the indent logic, like a line break was
+        added at the given position (which is mostly just useful for
+        implementing something like
+        [`insertNewlineAndIndent`](https://codemirror.net/6/docs/ref/#commands.insertNewlineAndIndent)).
+        */
+        simulateBreak?: number;
+        /**
+        When `simulateBreak` is given, this can be used to make the
+        simulate break behave like a double line break.
+        */
+        simulateDoubleBreak?: boolean;
+    });
     /**
-    Bracket-style [punctuation](https://codemirror.net/6/docs/ref/#highlight.tags.punctuation).
+    Get a description of the line at the given position, taking
+    [simulated line
+    breaks](https://codemirror.net/6/docs/ref/#language.IndentContext.constructor^options.simulateBreak)
+    into account. If there is such a break at `pos`, the `bias`
+    argument determines whether the part of the line line before or
+    after the break is used.
     */
-    bracket: Tag;
+    lineAt(pos: number, bias?: -1 | 1): {
+        text: string;
+        from: number;
+    };
     /**
-    Angle [brackets](https://codemirror.net/6/docs/ref/#highlight.tags.bracket) (usually `<` and `>`
-    tokens).
+    Get the text directly after `pos`, either the entire line
+    or the next 100 characters, whichever is shorter.
     */
-    angleBracket: Tag;
+    textAfterPos(pos: number, bias?: -1 | 1): string;
     /**
-    Square [brackets](https://codemirror.net/6/docs/ref/#highlight.tags.bracket) (usually `[` and `]`
-    tokens).
+    Find the column for the given position.
     */
-    squareBracket: Tag;
+    column(pos: number, bias?: -1 | 1): number;
     /**
-    Parentheses (usually `(` and `)` tokens). Subtag of
-    [bracket](https://codemirror.net/6/docs/ref/#highlight.tags.bracket).
+    Find the column position (taking tabs into account) of the given
+    position in the given string.
     */
-    paren: Tag;
+    countColumn(line: string, pos?: number): number;
     /**
-    Braces (usually `{` and `}` tokens). Subtag of
-    [bracket](https://codemirror.net/6/docs/ref/#highlight.tags.bracket).
+    Find the indentation column of the line at the given point.
     */
-    brace: Tag;
+    lineIndent(pos: number, bias?: -1 | 1): number;
     /**
-    Content, for example plain text in XML or markup documents.
+    Returns the [simulated line
+    break](https://codemirror.net/6/docs/ref/#language.IndentContext.constructor^options.simulateBreak)
+    for this context, if any.
     */
-    content: Tag;
+    get simulatedBreak(): number | null;
+}
+/**
+Enables reindentation on input. When a language defines an
+`indentOnInput` field in its [language
+data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt), which must hold a regular
+expression, the line at the cursor will be reindented whenever new
+text is typed and the input from the start of the line up to the
+cursor matches that regexp.
+
+To avoid unneccesary reindents, it is recommended to start the
+regexp with `^` (usually followed by `\s*`), and end it with `$`.
+For example, `/^\s*\}$/` will reindent when a closing brace is
+added at the start of a line.
+*/
+declare function indentOnInput(): Extension;
+
+/**
+Encapsulates a single line of input. Given to stream syntax code,
+which uses it to tokenize the content.
+*/
+declare class StringStream {
     /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that represents a heading.
+    The line.
     */
-    heading: Tag;
+    string: string;
+    private tabSize;
     /**
-    A level 1 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
+    The current indent unit size.
     */
-    heading1: Tag;
+    indentUnit: number;
     /**
-    A level 2 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
+    The current position on the line.
     */
-    heading2: Tag;
+    pos: number;
     /**
-    A level 3 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
+    The start position of the current token.
     */
-    heading3: Tag;
+    start: number;
+    private lastColumnPos;
+    private lastColumnValue;
     /**
-    A level 4 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
+    True if we are at the end of the line.
     */
-    heading4: Tag;
+    eol(): boolean;
     /**
-    A level 5 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
+    True if we are at the start of the line.
     */
-    heading5: Tag;
+    sol(): boolean;
     /**
-    A level 6 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
+    Get the next code unit after the current position, or undefined
+    if we're at the end of the line.
     */
-    heading6: Tag;
+    peek(): string | undefined;
     /**
-    A prose separator (such as a horizontal rule).
+    Read the next code unit and advance `this.pos`.
     */
-    contentSeparator: Tag;
+    next(): string | void;
     /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that represents a list.
+    Match the next character against the given string, regular
+    expression, or predicate. Consume and return it if it matches.
     */
-    list: Tag;
+    eat(match: string | RegExp | ((ch: string) => boolean)): string | void;
     /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that represents a quote.
+    Continue matching characters that match the given string,
+    regular expression, or predicate function. Return true if any
+    characters were consumed.
     */
-    quote: Tag;
+    eatWhile(match: string | RegExp | ((ch: string) => boolean)): boolean;
     /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that is emphasized.
+    Consume whitespace ahead of `this.pos`. Return true if any was
+    found.
     */
-    emphasis: Tag;
+    eatSpace(): boolean;
     /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that is styled strong.
+    Move to the end of the line.
     */
-    strong: Tag;
+    skipToEnd(): void;
     /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that is part of a link.
+    Move to directly before the given character, if found on the
+    current line.
     */
-    link: Tag;
+    skipTo(ch: string): boolean | void;
     /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that is styled as code or
-    monospace.
+    Move back `n` characters.
     */
-    monospace: Tag;
+    backUp(n: number): void;
     /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that has a strike-through
-    style.
+    Get the column position at `this.pos`.
     */
-    strikethrough: Tag;
+    column(): number;
     /**
-    Inserted text in a change-tracking format.
+    Get the indentation column of the current line.
     */
-    inserted: Tag;
+    indentation(): number;
     /**
-    Deleted text.
+    Match the input against the given string or regular expression
+    (which should start with a `^`). Return true or the regexp match
+    if it matches.
+    
+    Unless `consume` is set to `false`, this will move `this.pos`
+    past the matched text.
+    
+    When matching a string `caseInsensitive` can be set to true to
+    make the match case-insensitive.
     */
-    deleted: Tag;
+    match(pattern: string | RegExp, consume?: boolean, caseInsensitive?: boolean): boolean | RegExpMatchArray | null;
     /**
-    Changed text.
+    Get the current token.
     */
-    changed: Tag;
+    current(): string;
+}
+
+/**
+A stream parser parses or tokenizes content from start to end,
+emitting tokens as it goes over it. It keeps a mutable (but
+copyable) object with state, in which it can store information
+about the current context.
+*/
+interface StreamParser<State> {
     /**
-    An invalid or unsyntactic element.
+    Read one token, advancing the stream past it, and returning a
+    string indicating the token's style tag—either the name of one
+    of the tags in [`tags`](https://codemirror.net/6/docs/ref/#highlight.tags), or such a name
+    suffixed by one or more tag
+    [modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) names, separated by
+    spaces. For example `"keyword"` or "`variableName.constant"`.
+    
+    It is okay to return a zero-length token, but only if that
+    updates the state so that the next call will return a non-empty
+    token again.
     */
-    invalid: Tag;
+    token(stream: StringStream, state: State): string | null;
     /**
-    Metadata or meta-instruction.
+    This notifies the parser of a blank line in the input. It can
+    update its state here if it needs to.
     */
-    meta: Tag;
+    blankLine?(state: State, indentUnit: number): void;
     /**
-    [Metadata](https://codemirror.net/6/docs/ref/#highlight.tags.meta) that applies to the entire
-    document.
+    Produce a start state for the parser.
     */
-    documentMeta: Tag;
+    startState?(indentUnit: number): State;
     /**
-    [Metadata](https://codemirror.net/6/docs/ref/#highlight.tags.meta) that annotates or adds
-    attributes to a given syntactic element.
+    Copy a given state. By default, a shallow object copy is done
+    which also copies arrays held at the top level of the object.
     */
-    annotation: Tag;
+    copyState?(state: State): State;
     /**
-    Processing instruction or preprocessor directive. Subtag of
-    [meta](https://codemirror.net/6/docs/ref/#highlight.tags.meta).
+    Compute automatic indentation for the line that starts with the
+    given state and text.
     */
-    processingInstruction: Tag;
+    indent?(state: State, textAfter: string, context: IndentContext): number | null;
     /**
-    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that indicates that a
-    given element is being defined. Expected to be used with the
-    various [name](https://codemirror.net/6/docs/ref/#highlight.tags.name) tags.
+    Default [language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) to
+    attach to this language.
     */
-    definition: (tag: Tag) => Tag;
+    languageData?: {
+        [name: string]: any;
+    };
     /**
-    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that indicates that
-    something is constant. Mostly expected to be used with
-    [variable names](https://codemirror.net/6/docs/ref/#highlight.tags.variableName).
+    Extra tokens to use in this parser. When the tokenizer returns a
+    token name that exists as a property in this object, the
+    corresponding tag will be assigned to the token.
     */
-    constant: (tag: Tag) => Tag;
+    tokenTable?: {
+        [name: string]: Tag;
+    };
+}
+/**
+A [language](https://codemirror.net/6/docs/ref/#language.Language) class based on a streaming
+parser.
+*/
+declare class StreamLanguage<State> extends Language {
+    private constructor();
+    static define<State>(spec: StreamParser<State>): StreamLanguage<State>;
+    private getIndent;
+    get allowsNesting(): boolean;
+}
+
+declare const julia$1: StreamParser<unknown>
+
+declare type JuliaLanguageConfig = {
+    /** Enable keyword completion */
+    enableKeywordCompletion?: boolean;
+};
+declare function julia(config?: JuliaLanguageConfig): LanguageSupport;
+
+declare type Handlers$1 = {
+    [event: string]: (view: EditorView, line: BlockInfo, event: Event) => boolean;
+};
+interface LineNumberConfig {
     /**
-    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) used to indicate that
-    a [variable](https://codemirror.net/6/docs/ref/#highlight.tags.variableName) or [property
-    name](https://codemirror.net/6/docs/ref/#highlight.tags.propertyName) is being called or defined
-    as a function.
+    How to display line numbers. Defaults to simply converting them
+    to string.
     */
-    function: (tag: Tag) => Tag;
+    formatNumber?: (lineNo: number, state: EditorState) => string;
     /**
-    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that can be applied to
-    [names](https://codemirror.net/6/docs/ref/#highlight.tags.name) to indicate that they belong to
-    the language's standard environment.
+    Supply event handlers for DOM events on this gutter.
     */
-    standard: (tag: Tag) => Tag;
+    domEventHandlers?: Handlers$1;
+}
+/**
+Create a line number gutter extension.
+*/
+declare function lineNumbers(config?: LineNumberConfig): Extension;
+
+interface HistoryConfig {
     /**
-    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that indicates a given
-    [names](https://codemirror.net/6/docs/ref/#highlight.tags.name) is local to some scope.
+    The minimum depth (amount of events) to store. Defaults to 100.
     */
-    local: (tag: Tag) => Tag;
+    minDepth?: number;
     /**
-    A generic variant [modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that
-    can be used to tag language-specific alternative variants of
-    some common tag. It is recommended for themes to define special
-    forms of at least the [string](https://codemirror.net/6/docs/ref/#highlight.tags.string) and
-    [variable name](https://codemirror.net/6/docs/ref/#highlight.tags.variableName) tags, since those
-    come up a lot.
+    The maximum time (in milliseconds) that adjacent events can be
+    apart and still be grouped together. Defaults to 500.
     */
-    special: (tag: Tag) => Tag;
-};
+    newGroupDelay?: number;
+}
 /**
-A default highlight style (works well with light themes).
+Create a history extension with the given configuration.
 */
-declare const defaultHighlightStyle: HighlightStyle;
+declare function history(config?: HistoryConfig): Extension;
+/**
+Default key bindings for the undo history.
+
+- Mod-z: [`undo`](https://codemirror.net/6/docs/ref/#history.undo).
+- Mod-y (Mod-Shift-z on macOS): [`redo`](https://codemirror.net/6/docs/ref/#history.redo).
+- Mod-u: [`undoSelection`](https://codemirror.net/6/docs/ref/#history.undoSelection).
+- Alt-u (Mod-Shift-u on macOS): [`redoSelection`](https://codemirror.net/6/docs/ref/#history.redoSelection).
+*/
+declare const historyKeymap: readonly KeyBinding[];
+
+/**
+Add a [unit](https://codemirror.net/6/docs/ref/#language.indentUnit) of indentation to all selected
+lines.
+*/
+declare const indentMore: StateCommand;
+/**
+Remove a [unit](https://codemirror.net/6/docs/ref/#language.indentUnit) of indentation from all
+selected lines.
+*/
+declare const indentLess: StateCommand;
+/**
+The default keymap. Includes all bindings from
+[`standardKeymap`](https://codemirror.net/6/docs/ref/#commands.standardKeymap) plus the following:
+
+- Alt-ArrowLeft (Ctrl-ArrowLeft on macOS): [`cursorSyntaxLeft`](https://codemirror.net/6/docs/ref/#commands.cursorSyntaxLeft) ([`selectSyntaxLeft`](https://codemirror.net/6/docs/ref/#commands.selectSyntaxLeft) with Shift)
+- Alt-ArrowRight (Ctrl-ArrowRight on macOS): [`cursorSyntaxRight`](https://codemirror.net/6/docs/ref/#commands.cursorSyntaxRight) ([`selectSyntaxRight`](https://codemirror.net/6/docs/ref/#commands.selectSyntaxRight) with Shift)
+- Alt-ArrowUp: [`moveLineUp`](https://codemirror.net/6/docs/ref/#commands.moveLineUp)
+- Alt-ArrowDown: [`moveLineDown`](https://codemirror.net/6/docs/ref/#commands.moveLineDown)
+- Shift-Alt-ArrowUp: [`copyLineUp`](https://codemirror.net/6/docs/ref/#commands.copyLineUp)
+- Shift-Alt-ArrowDown: [`copyLineDown`](https://codemirror.net/6/docs/ref/#commands.copyLineDown)
+- Escape: [`simplifySelection`](https://codemirror.net/6/docs/ref/#commands.simplifySelection)
+- Ctrl-Enter (Comd-Enter on macOS): [`insertBlankLine`](https://codemirror.net/6/docs/ref/#commands.insertBlankLine)
+- Alt-l (Ctrl-l on macOS): [`selectLine`](https://codemirror.net/6/docs/ref/#commands.selectLine)
+- Ctrl-i (Cmd-i on macOS): [`selectParentSyntax`](https://codemirror.net/6/docs/ref/#commands.selectParentSyntax)
+- Ctrl-[ (Cmd-[ on macOS): [`indentLess`](https://codemirror.net/6/docs/ref/#commands.indentLess)
+- Ctrl-] (Cmd-] on macOS): [`indentMore`](https://codemirror.net/6/docs/ref/#commands.indentMore)
+- Ctrl-Alt-\\ (Cmd-Alt-\\ on macOS): [`indentSelection`](https://codemirror.net/6/docs/ref/#commands.indentSelection)
+- Shift-Ctrl-k (Shift-Cmd-k on macOS): [`deleteLine`](https://codemirror.net/6/docs/ref/#commands.deleteLine)
+- Shift-Ctrl-\\ (Shift-Cmd-\\ on macOS): [`cursorMatchingBracket`](https://codemirror.net/6/docs/ref/#commands.cursorMatchingBracket)
+*/
+declare const defaultKeymap: readonly KeyBinding[];
 
 /**
 Create an extension that enables rectangular selections. By
@@ -4315,6 +4339,9 @@ Default fold-related key bindings.
  - Ctrl-Alt-]: [`unfoldAll`](https://codemirror.net/6/docs/ref/#fold.unfoldAll).
 */
 declare const foldKeymap: readonly KeyBinding[];
+declare type Handlers = {
+    [event: string]: (view: EditorView, line: BlockInfo, event: Event) => boolean;
+};
 interface FoldGutterConfig {
     /**
     A function that creates the DOM element used to indicate a
@@ -4332,6 +4359,10 @@ interface FoldGutterConfig {
     Defaults to `"›"`.
     */
     closedText?: string;
+    /**
+    Supply event handlers for DOM events on this gutter.
+    */
+    domEventHandlers?: Handlers;
 }
 /**
 Create an extension that registers a fold gutter, which shows a
@@ -4462,7 +4493,7 @@ interface Completion {
     a plain string or a function that'll render the DOM structure to
     show when invoked.
     */
-    info?: string | ((completion: Completion) => (Node | Promise<Node>));
+    info?: string | ((completion: Completion) => (Node | null | Promise<Node | null>));
     /**
     How to apply the completion. The default is to replace it with
     its [label](https://codemirror.net/6/docs/ref/#autocomplete.Completion.label). When this holds a
@@ -4743,6 +4774,16 @@ declare function currentCompletions(state: EditorState): readonly Completion[];
 Return the currently selected completion, if any.
 */
 declare function selectedCompletion(state: EditorState): Completion | null;
+/**
+Returns the currently selected position in the active completion
+list, or null if no completions are active.
+*/
+declare function selectedCompletionIndex(state: EditorState): number | null;
+/**
+Create an effect that can be attached to a transaction to change
+the currently selected completion.
+*/
+declare function setSelectedCompletion(index: number): StateEffect<unknown>;
 
 type index_Completion = Completion;
 type index_CompletionContext = CompletionContext;
@@ -4765,6 +4806,8 @@ declare const index_nextSnippetField: typeof nextSnippetField;
 declare const index_pickedCompletion: typeof pickedCompletion;
 declare const index_prevSnippetField: typeof prevSnippetField;
 declare const index_selectedCompletion: typeof selectedCompletion;
+declare const index_selectedCompletionIndex: typeof selectedCompletionIndex;
+declare const index_setSelectedCompletion: typeof setSelectedCompletion;
 declare const index_snippet: typeof snippet;
 declare const index_snippetCompletion: typeof snippetCompletion;
 declare const index_snippetKeymap: typeof snippetKeymap;
@@ -4791,6 +4834,8 @@ declare namespace index {
     index_pickedCompletion as pickedCompletion,
     index_prevSnippetField as prevSnippetField,
     index_selectedCompletion as selectedCompletion,
+    index_selectedCompletionIndex as selectedCompletionIndex,
+    index_setSelectedCompletion as setSelectedCompletion,
     index_snippet as snippet,
     index_snippetCompletion as snippetCompletion,
     index_snippetKeymap as snippetKeymap,
@@ -4814,6 +4859,10 @@ declare type HighlightOptions = {
     highlighting. Defaults to 100.
     */
     maxMatches?: number;
+    /**
+    Whether to only highlight whole words.
+    */
+    wholeWords?: boolean;
 };
 /**
 This extension highlights text that matches the selection. It uses
@@ -4844,6 +4893,7 @@ declare const commentKeymap: readonly KeyBinding[];
 declare class LeafBlock {
     readonly start: number;
     content: string;
+    parsers: LeafBlockParser[];
 }
 declare class Line {
     text: string;
@@ -4872,6 +4922,8 @@ declare class BlockContext implements PartialParse {
     advance(): Tree;
     stopAt(pos: number): void;
     private reuseFragment;
+    get depth(): number;
+    parentType(depth?: number): NodeType;
     nextLine(): boolean;
     private moveRangeI;
     private lineChunkAt;
@@ -4899,7 +4951,7 @@ interface BlockParser {
     name: string;
     parse?(cx: BlockContext, line: Line): BlockResult;
     leaf?(cx: BlockContext, leaf: LeafBlock): LeafBlockParser | null;
-    endLeaf?(cx: BlockContext, line: Line): boolean;
+    endLeaf?(cx: BlockContext, line: Line, leaf: LeafBlock): boolean;
     before?: string;
     after?: string;
 }
diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index b17c4ed4f6..b247463ece 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -57,7 +57,7 @@ import {
     javascript,
     python,
     Text,
-} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.26.0/dist/index.es.min.js"
+} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.27.0/dist/index.es.min.js"
 
 export {
     EditorState,

From bd4b8ac61b4506b0ec9b4596f54b723bcb441d44 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 4 Apr 2022 14:34:17 +0200
Subject: [PATCH 234/821] =?UTF-8?q?=F0=9F=92=8C=20`Pluto.frontmatter`=20(#?=
 =?UTF-8?q?2008)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Rik Huijzer <rikhuijzer@pm.me>
---
 src/Pluto.jl                |  1 +
 src/notebook/frontmatter.jl | 63 ++++++++++++++++++++++++++++++++++
 test/frontmatter.jl         | 68 +++++++++++++++++++++++++++++++++++++
 test/runtests.jl            |  1 +
 4 files changed, 133 insertions(+)
 create mode 100644 src/notebook/frontmatter.jl
 create mode 100644 test/frontmatter.jl

diff --git a/src/Pluto.jl b/src/Pluto.jl
index 90a95b6519..960ec48bf2 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -52,6 +52,7 @@ include("./analysis/Topology.jl")
 include("./analysis/Errors.jl")
 include("./analysis/TopologicalOrder.jl")
 include("./notebook/Notebook.jl")
+include("./notebook/frontmatter.jl")
 include("./notebook/Events.jl")
 include("./webserver/Session.jl")
 include("./webserver/PutUpdates.jl")
diff --git a/src/notebook/frontmatter.jl b/src/notebook/frontmatter.jl
new file mode 100644
index 0000000000..7c3c6e0f20
--- /dev/null
+++ b/src/notebook/frontmatter.jl
@@ -0,0 +1,63 @@
+
+const FrontMatter = Dict{String,Any}
+
+
+"""
+    frontmatter(nb::Notebook; raise::Bool=false)::Dict{String,Any}
+
+Extract frontmatter from a notebook, which is extra meta-information that the author attaches to the notebook, often including *title*, *description*, *tags*, *author*, and more. Search for *frontmatter* online to learn more.
+
+If `raise` is true, then parsing errors will be rethrown. If `false`, this function will always return a `Dict`.
+
+Currently, you can give frontmatter to a notebook by defining a global variable `frontmatter` anywhere in the notebook, which should be a named tuple. Like so:
+
+```julia
+frontmatter = (
+	title = "⚡️ JavaScript for widgets",
+	description = "A simple notebook demonstrating the Julia syntax essentials",
+	layout = "layout.jlhtml",
+	tags = ["docs", "advanced", "widgets"],
+);
+```
+
+This definition will be picked up (using syntax analysis) and evaluated. Note:
+- You are not allowed to use variables defined in other cells. (But you can *use* `frontmatter` in your notebook.)
+- You can use `;` to hide it from being displayed, only the definition matters.
+
+
+!!! warning
+    This will change in the future, because we might make this a GUI thing! Consider this function in the experimental phase.
+"""
+function frontmatter(nb::Notebook; raise::Bool=false)
+    top = updated_topology(nb.topology, nb, nb.cells)
+    
+	cs = where_assigned(top, Set([:frontmatter]))
+	if isempty(cs)
+		FrontMatter()
+	else
+		try
+			c = only(cs)
+			m = Module()
+			Core.eval(m, Meta.parse(c.code))
+			result = Core.eval(m, :frontmatter)
+			if result isa FrontMatter
+				result
+			else
+				FrontMatter(String(k)=>v for (k,v) in pairs(result))
+			end
+		catch e
+            if raise
+                rethrow(e)
+            else
+                @error "Error reading frontmatter. Make sure that `frontmatter` is a `NamedTuple` or a `Dict{String,Any}`, and that it does not use global variables." nb.path exception=(e,catch_backtrace())
+                FrontMatter()
+            end
+		end
+	end
+end
+
+
+function frontmatter(abs_path::String)
+	# this will load the notebook to analyse, it won't run it
+    frontmatter(load_notebook_nobackup(abs_path))
+end
\ No newline at end of file
diff --git a/test/frontmatter.jl b/test/frontmatter.jl
new file mode 100644
index 0000000000..850dce97e0
--- /dev/null
+++ b/test/frontmatter.jl
@@ -0,0 +1,68 @@
+using Test
+import Logging
+import Pluto: Configuration, Notebook, ServerSession, ClientSession, update_run!, Cell, WorkspaceManager, save_notebook
+
+
+@testset "Frontmatter" begin
+    d = Dict{String,Any}("title" => 123, "wow" => ["a", "b"])
+    e = Dict{String,Any}()
+    cases = [
+        1 => (
+            Notebook([
+                Cell("""
+                frontmatter = Dict{Any,Any}("title" => 123, "wow" => ["a", "b"])
+                """),
+            ]),
+            d,
+        ),
+        2 => (
+            Notebook([
+                Cell("""
+                frontmatter = (title = 123, wow = ["a", "b"])
+                """),
+            ]),
+            d
+        ),
+        3 => (
+            Notebook([
+                Cell("""
+                frontmatter = 123
+                """),
+            ]),
+            e
+        ),
+        4 => (
+            Notebook([
+                Cell("""
+                frontmatter = 123
+                """),
+                Cell("""
+                frontmatter = 123
+                """),
+            ]),
+            e            
+        ),
+        5 => (
+            Notebook([
+                Cell("""
+                """),
+            ]),
+            e            
+        ),
+    ]
+    
+    @testset "Notebook $i" for (i, (nb, expected)) in cases
+        save_notebook(nb)
+        
+        Logging.with_logger(Logging.NullLogger()) do
+            @test Pluto.frontmatter(nb.path) == expected
+            @test Pluto.frontmatter(nb) == expected
+            @test typeof(Pluto.frontmatter(nb)) === Dict{String,Any}
+        end
+        
+        if i ∈ (3,4)
+            @test_throws Exception Pluto.frontmatter(nb.path, raise=true)
+        end
+        
+    end
+end
diff --git a/test/runtests.jl b/test/runtests.jl
index 1e6f69bb87..af7089e151 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -30,6 +30,7 @@ verify_no_running_processes()
 verify_no_running_processes()
 
 # tests that don't start new processes:
+@timeit_include("frontmatter.jl")
 @timeit_include("ReloadFromFile.jl")
 @timeit_include("packages/PkgCompat.jl")
 @timeit_include("ExpressionExplorer.jl")

From 8cdb040c56cb3112002266dae213d5d2a33d6dc2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 4 Apr 2022 15:13:11 +0200
Subject: [PATCH 235/821] =?UTF-8?q?Disable=20local=5Fautocomplete=20?=
 =?UTF-8?q?=F0=9F=98=A2=20(#2013)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CellInput/pluto_autocomplete.js           | 26 +++++++++++++++--
 .../CellInput/scopestate_statefield.js        | 29 ++++++++++---------
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/frontend/components/CellInput/pluto_autocomplete.js b/frontend/components/CellInput/pluto_autocomplete.js
index bd11e44fe3..3596a473e0 100644
--- a/frontend/components/CellInput/pluto_autocomplete.js
+++ b/frontend/components/CellInput/pluto_autocomplete.js
@@ -269,6 +269,20 @@ const julia_code_completions_to_cm = (/** @type {PlutoRequestAutocomplete} */ re
     }
 }
 
+const complete_anyword = async (ctx) => {
+    const results_from_cm = await autocomplete.completeAnyWord(ctx)
+    return {
+        from: results_from_cm.from,
+        options: results_from_cm.options.map(({ label }, i) => ({
+            // See https://github.com/codemirror/codemirror.next/issues/788 about `type: null`
+            label,
+            apply: label,
+            type: null,
+            boost: 0 - i,
+        })),
+    }
+}
+
 const local_variables_completion = (ctx) => {
     let scopestate = ctx.state.field(ScopeStateField)
     let unicode = ctx.tokenBefore(["Identifier"])
@@ -285,7 +299,13 @@ const local_variables_completion = (ctx) => {
                 ({ validity, name }) =>
                     name.startsWith(text) /** <- NOTE: A smarter matching strategy can be used here */ && from > validity.from && to <= validity.to
             )
-            .map(({ name }, i) => ({ label: name, type: "c_Any", boost: 99 - i })),
+            .map(({ name }, i) => ({
+                // See https://github.com/codemirror/codemirror.next/issues/788 about `type: null`
+                label: name,
+                apply: name,
+                type: null,
+                boost: 99 - i,
+            })),
     }
 }
 
@@ -329,7 +349,9 @@ export let pluto_autocomplete = ({ request_autocomplete, on_update_doc_query })
             override: [
                 julia_special_completions_to_cm(memoize_last_request_autocomplete),
                 julia_code_completions_to_cm(memoize_last_request_autocomplete),
-                local_variables_completion,
+                complete_anyword,
+                // TODO: Disabled because of performance problems, see https://github.com/fonsp/Pluto.jl/pull/1925. Remove `complete_anyword` once fixed. See https://github.com/fonsp/Pluto.jl/pull/2013
+                // local_variables_completion,
             ],
             defaultKeymap: false, // We add these manually later, so we can override them if necessary
             maxRenderedOptions: 512, // fons's magic number
diff --git a/frontend/components/CellInput/scopestate_statefield.js b/frontend/components/CellInput/scopestate_statefield.js
index ab0ad2a49b..fbeeb55319 100644
--- a/frontend/components/CellInput/scopestate_statefield.js
+++ b/frontend/components/CellInput/scopestate_statefield.js
@@ -372,20 +372,21 @@ let raise_scope = (nested_scope, scopestate, nested_scope_validity = null) => {
         usages: [...scopestate.usages, ...nested_scope.usages],
         definitions: scopestate.definitions,
         locals: [
-            ...(nested_scope_validity === null
-                ? []
-                : Array.from(nested_scope.definitions)
-                      .filter(([name, _]) => !scopestate.definitions.has(name))
-                      .map(([name, definition]) => ({
-                          name,
-                          definition,
-                          validity: {
-                              from: definition.valid_from,
-                              to: nested_scope_validity,
-                          },
-                      }))),
-            ...nested_scope.locals,
-            ...scopestate.locals,
+            // TODO: Disabled because of performance problems, see https://github.com/fonsp/Pluto.jl/pull/1925
+            // ...(nested_scope_validity === null
+            //     ? []
+            //     : Array.from(nested_scope.definitions)
+            //           .filter(([name, _]) => !scopestate.definitions.has(name))
+            //           .map(([name, definition]) => ({
+            //               name,
+            //               definition,
+            //               validity: {
+            //                   from: definition.valid_from,
+            //                   to: nested_scope_validity,
+            //               },
+            //           }))),
+            // ...nested_scope.locals,
+            // ...scopestate.locals,
         ],
     }
 }

From 3abfb4bafb87b8f650146b9778495ae73ca5d9dd Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 4 Apr 2022 15:25:36 +0200
Subject: [PATCH 236/821] Use base64url instead of base64 to avoid escaping
 PlutoSliderServer requests (#1969)

---
 frontend/common/PlutoHash.js          | 24 +++++++++++++++++++-----
 frontend/common/SliderServerClient.js | 10 +++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/frontend/common/PlutoHash.js b/frontend/common/PlutoHash.js
index b64ebb6b55..2810b45ad6 100644
--- a/frontend/common/PlutoHash.js
+++ b/frontend/common/PlutoHash.js
@@ -12,20 +12,34 @@ export const base64_arraybuffer = async (/** @type {BufferSource} */ data) => {
     return base64url.split(",", 2)[1]
 }
 
-export const hash_arraybuffer = async (/** @type {BufferSource} */ data) => {
+/** Encode a buffer using the `base64url` encoding, which uses URL-safe special characters, see https://en.wikipedia.org/wiki/Base64#Variants_summary_table */
+export const base64url_arraybuffer = async (/** @type {BufferSource} */ data) => {
+    // This is roughly 0.5 as fast as `base64_arraybuffer`. See https://gist.github.com/fonsp/d2b84265012942dc40d0082b1fd405ba for benchmark and even slower alternatives.
+    let original = await base64_arraybuffer(data)
+    return original.replaceAll(/[\+\/\=]/g, (s) => {
+        const c = s.charCodeAt(0)
+        return c === 43 ? "-" : c === 47 ? "_" : ""
+    })
+}
+
+base64_arraybuffer(new Uint8Array([0, 0, 63, 0, 0, 62, 100, 200])).then((r) => console.assert(r === "AAA/AAA+ZMg=", r))
+base64url_arraybuffer(new Uint8Array([0, 0, 63, 0, 0, 62, 100, 200])).then((r) => console.assert(r === "AAA_AAA-ZMg", r))
+
+export const plutohash_arraybuffer = async (/** @type {BufferSource} */ data) => {
     const hash = sha256.create()
     hash.update(data)
     const hashed_buffer = hash.arrayBuffer()
     // const hashed_buffer = await window.crypto.subtle.digest("SHA-256", data)
-    return await base64_arraybuffer(hashed_buffer)
+    return await base64url_arraybuffer(hashed_buffer)
 }
 
-export const hash_str = async (/** @type {string} */ s) => {
+export const plutohash_str = async (/** @type {string} */ s) => {
     const data = new TextEncoder().encode(s)
-    return await hash_arraybuffer(data)
+    return await plutohash_arraybuffer(data)
 }
 
-hash_str("Hannes").then((r) => console.assert(r === "OI48wVWerxEEnz5lIj6CPPRB8NOwwba+LkFYTDp4aUU=", r))
+// hash_str("Hannes").then((r) => console.assert(r === "OI48wVWerxEEnz5lIj6CPPRB8NOwwba+LkFYTDp4aUU=", r))
+plutohash_str("Hannes").then((r) => console.assert(r === "OI48wVWerxEEnz5lIj6CPPRB8NOwwba-LkFYTDp4aUU", r))
 
 export const debounced_promises = (async_function) => {
     let currently_running = false
diff --git a/frontend/common/SliderServerClient.js b/frontend/common/SliderServerClient.js
index c25084ee29..2d72f8adfc 100644
--- a/frontend/common/SliderServerClient.js
+++ b/frontend/common/SliderServerClient.js
@@ -1,5 +1,5 @@
 import { trailingslash } from "./Binder.js"
-import { hash_arraybuffer, debounced_promises, base64_arraybuffer } from "./PlutoHash.js"
+import { plutohash_arraybuffer, debounced_promises, base64url_arraybuffer } from "./PlutoHash.js"
 import { pack, unpack } from "./MsgPack.js"
 import immer from "../imports/immer.js"
 import _ from "../imports/lodash.js"
@@ -24,12 +24,12 @@ export const slider_server_actions = ({ setStatePromise, launch_params, actions,
     const notebookfile_hash = fetch(launch_params.notebookfile)
         .then(assert_response_ok)
         .then((r) => r.arrayBuffer())
-        .then(hash_arraybuffer)
+        .then(plutohash_arraybuffer)
 
     notebookfile_hash.then((x) => console.log("Notebook file hash:", x))
 
     const bond_connections = notebookfile_hash
-        .then((hash) => fetch(trailingslash(launch_params.slider_server_url) + "bondconnections/" + encodeURIComponent(hash)))
+        .then((hash) => fetch(trailingslash(launch_params.slider_server_url) + "bondconnections/" + hash))
         .then(assert_response_ok)
         .then((r) => r.arrayBuffer())
         .then((b) => unpack(new Uint8Array(b)))
@@ -60,14 +60,14 @@ export const slider_server_actions = ({ setStatePromise, launch_params, actions,
 
             const packed = pack(mybonds_filtered)
 
-            const url = base + "staterequest/" + encodeURIComponent(hash) + "/"
+            const url = base + "staterequest/" + hash + "/"
 
             let unpacked = null
             try {
                 const use_get = url.length + (packed.length * 4) / 3 + 20 < 8000
 
                 const response = use_get
-                    ? await fetch(url + encodeURIComponent(await base64_arraybuffer(packed)), {
+                    ? await fetch(url + (await base64url_arraybuffer(packed)), {
                           method: "GET",
                       }).then(assert_response_ok)
                     : await fetch(url, {

From 5e57431f097ffa23d180a118fdfc4b3646058fd8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 4 Apr 2022 15:34:03 +0200
Subject: [PATCH 237/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index f57c57a513..343c56029a 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.18.4"
+version = "0.19.0"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From b0f6b7386140fd08c9c6961991c0e7f956ca24c6 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 4 Apr 2022 19:51:22 +0200
Subject: [PATCH 238/821] PlutoPkg install race condition (#1919)

Co-authored-by: Paul Berg <paul@plutojl.org>
---
 src/Configuration.jl     |  3 +-
 src/evaluation/Run.jl    | 76 ++++++++++++++++++++++++++--------------
 src/packages/Packages.jl | 23 ++++++------
 test/Notebook.jl         |  4 +--
 test/packages/Basic.jl   | 57 ++++++++++++++++++++++++++++--
 5 files changed, 121 insertions(+), 42 deletions(-)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index 9cd89bdd22..4927a723ef 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -47,8 +47,8 @@ The HTTP server options. See [`SecurityOptions`](@ref) for additional settings.
 - `auto_reload_from_file_ignore_pkg::Bool = false` Experimental flag, will be removed
 - `notebook::Union{Nothing,String} = nothing` Optional path of notebook to launch at start
 - `simulated_lag::Real=0.0` (internal) Extra lag to add to our server responses. Will be multiplied by `0.5 + rand()`.
+- `simulated_pkg_lag::Real=0.0` (internal) Extra lag to add to operations done by Pluto's package manager. Will be multiplied by `0.5 + rand()`.
 - `injected_javascript_data_url`::String = "data:text/javascript;base64," (internal) Optional javascript injectables to the front-end. Can be used to customize the editor, but this API is not meant for general use yet.
-
 """
 @option mutable struct ServerOptions
     root_url::Union{Nothing,String} = nothing
@@ -65,6 +65,7 @@ The HTTP server options. See [`SecurityOptions`](@ref) for additional settings.
     notebook::Union{Nothing,String,Vector{<:String}} = nothing
     init_with_file_viewer::Bool = false
     simulated_lag::Real = 0.0
+    simulated_pkg_lag::Real = 0.0
     injected_javascript_data_url::String = "data:text/javascript;base64,"
     on_event::Function = function(a) #= @info "$(typeof(a))" =# end
 end
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 984387dd9a..399bf20eca 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -5,25 +5,49 @@ import .WorkspaceManager: macroexpand_in_workspace
 
 Base.push!(x::Set{Cell}) = x
 
-"Run given cells and all the cells that depend on them, based on the topology information before and after the changes."
+"""
+Run given cells and all the cells that depend on them, based on the topology information before and after the changes.
+"""
 function run_reactive!(
-	session::ServerSession, 
-	notebook::Notebook, 
-	old_topology::NotebookTopology, new_topology::NotebookTopology, 
-	roots::Vector{Cell}; 
-	deletion_hook::Function = WorkspaceManager.move_vars, 
-	user_requested_run::Bool = true, 
-	already_in_run::Bool = false, 
-	already_run::Vector{Cell} = Cell[]
+    session::ServerSession,
+    notebook::Notebook,
+    old_topology::NotebookTopology,
+    new_topology::NotebookTopology,
+    roots::Vector{Cell};
+    deletion_hook::Function = WorkspaceManager.move_vars,
+    user_requested_run::Bool = true,
 )::TopologicalOrder
-    if !already_in_run
-        # make sure that we're the only `run_reactive!` being executed - like a semaphor
-        take!(notebook.executetoken)
-    else
-        @assert !isready(notebook.executetoken) "run_reactive!(; already_in_run=true) was called when no reactive run was launched."
+    withtoken(notebook.executetoken) do
+        run_reactive_core!(
+            session,
+            notebook,
+            old_topology,
+            new_topology,
+            roots;
+            deletion_hook,
+            user_requested_run,
+        )
     end
-	
-	@assert will_run_code(notebook)
+end
+
+"""
+Run given cells and all the cells that depend on them, based on the topology information before and after the changes.
+
+!!! warning
+    You should probably should not call this directly and use `run_reactive!` instead.
+"""
+function run_reactive_core!(
+    session::ServerSession,
+    notebook::Notebook,
+    old_topology::NotebookTopology,
+    new_topology::NotebookTopology,
+    roots::Vector{Cell};
+    deletion_hook::Function = WorkspaceManager.move_vars,
+    user_requested_run::Bool = true,
+    already_run::Vector{Cell} = Cell[]
+)::TopologicalOrder
+    @assert !isready(notebook.executetoken) "run_reactive_core!() was called with a free notebook.executetoken."
+    @assert will_run_code(notebook)
 
     old_workspace_name, _ = WorkspaceManager.bump_workspace_module((session, notebook))
 
@@ -158,7 +182,7 @@ function run_reactive!(
             update_dependency_cache!(notebook)
             save_notebook(session, notebook)
 
-            return run_reactive!(session, notebook, new_topology, new_new_topology, to_run; deletion_hook, user_requested_run, already_in_run = true, already_run = to_run[1:i])
+            return run_reactive_core!(session, notebook, new_topology, new_new_topology, to_run; deletion_hook, user_requested_run, already_run = to_run[1:i])
         elseif !isempty(implicit_usings)
             new_soft_definitions = WorkspaceManager.collect_soft_definitions((session, notebook), implicit_usings)
             notebook.topology = new_new_topology = with_new_soft_definitions(new_topology, cell, new_soft_definitions)
@@ -167,14 +191,12 @@ function run_reactive!(
             update_dependency_cache!(notebook)
             save_notebook(session, notebook)
 
-            return run_reactive!(session, notebook, new_topology, new_new_topology, to_run; deletion_hook, user_requested_run, already_in_run = true, already_run = to_run[1:i])
+            return run_reactive_core!(session, notebook, new_topology, new_new_topology, to_run; deletion_hook, user_requested_run, already_run = to_run[1:i])
         end
     end
 
     notebook.wants_to_interrupt = false
     flush_notebook_changes()
-    # allow other `run_reactive!` calls to be executed
-    put!(notebook.executetoken)
     return new_order
 end
 
@@ -510,12 +532,14 @@ function update_save_run!(
 	end
 
 	maybe_async(run_async) do
-		sync_nbpkg(session, notebook; save=(save && !session.options.server.disable_writing_notebook_files))
-		if !(isempty(to_run_online) && session.options.evaluation.lazy_workspace_creation) && will_run_code(notebook)
-			# not async because that would be double async
-			run_reactive_async!(session, notebook, old, new, to_run_online; run_async=false, kwargs...)
-			# run_reactive_async!(session, notebook, old, new, to_run_online; deletion_hook=deletion_hook, run_async=false, kwargs...)
-		end
+        withtoken(notebook.executetoken) do
+            sync_nbpkg(session, notebook, old, new; save=(save && !session.options.server.disable_writing_notebook_files), take_token=false)
+            if !(isempty(to_run_online) && session.options.evaluation.lazy_workspace_creation) && will_run_code(notebook)
+                # not async because that would be double async
+                run_reactive_core!(session, notebook, old, new, to_run_online; kwargs...)
+                # run_reactive_async!(session, notebook, old, new, to_run_online; deletion_hook=deletion_hook, run_async=false, kwargs...)
+            end
+        end
 	end
 end
 
diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 8f80168b10..26ef9dfc02 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -49,12 +49,12 @@ Update the notebook package environment to match the notebook's code. This will:
 - Make sure that the environment is instantiated.
 - Detect the use of `Pkg.activate` and enable/disabled nbpkg accordingly.
 """
-function sync_nbpkg_core(notebook::Notebook; on_terminal_output::Function=((args...) -> nothing))
+function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new_topology::NotebookTopology; on_terminal_output::Function=((args...) -> nothing), lag::Real=0)
     
     👺 = false
 
     use_plutopkg_old = notebook.nbpkg_ctx !== nothing
-    use_plutopkg_new = use_plutopkg(notebook.topology)
+    use_plutopkg_new = use_plutopkg(new_topology)
     
     if !use_plutopkg_old && use_plutopkg_new
         @debug "Started using PlutoPkg!! HELLO reproducibility!"
@@ -74,12 +74,13 @@ function sync_nbpkg_core(notebook::Notebook; on_terminal_output::Function=((args
         notebook.nbpkg_ctx = nothing
     end
     
+    (lag > 0) && sleep(lag * (0.5 + rand())) # sleep(0) would yield to the process manager which we dont want
 
     if notebook.nbpkg_ctx !== nothing
         PkgCompat.mark_original!(notebook.nbpkg_ctx)
 
         old_packages = String.(keys(PkgCompat.project(notebook.nbpkg_ctx).dependencies))
-        new_packages = String.(external_package_names(notebook.topology)) # search all cells for imports and usings
+        new_packages = String.(external_package_names(new_topology)) # search all cells for imports and usings
         
         removed = setdiff(old_packages, new_packages)
         added = setdiff(new_packages, old_packages)
@@ -111,7 +112,7 @@ function sync_nbpkg_core(notebook::Notebook; on_terminal_output::Function=((args
                                 Pkg.resolve(notebook.nbpkg_ctx)
                             catch e
                                 @warn "Failed to resolve Pkg environment. Removing Manifest and trying again..." exception=e
-                                reset_nbpkg(notebook; keep_project=true, save=false, backup=false)
+                                reset_nbpkg(notebook, new_topology; keep_project=true, save=false, backup=false)
                                 Pkg.resolve(notebook.nbpkg_ctx)
                             end
                         end
@@ -248,9 +249,9 @@ In addition to the steps performed by [`sync_nbpkg_core`](@ref):
 - Update the clients connected to `notebook`
 - `try` `catch` and reset the package environment on failure.
 """
-function sync_nbpkg(session, notebook; save::Bool=true)
+function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topology::NotebookTopology; save::Bool=true, take_token::Bool=true)
 	try
-		pkg_result = withtoken(notebook.executetoken) do
+        pkg_result = (take_token ? withtoken : (f, _) -> f())(notebook.executetoken) do
 			function iocallback(pkgs, s)
 				notebook.nbpkg_busy_packages = pkgs
 				for p in pkgs
@@ -259,7 +260,7 @@ function sync_nbpkg(session, notebook; save::Bool=true)
                 update_nbpkg_cache!(notebook)
 				send_notebook_changes!(ClientRequest(session=session, notebook=notebook))
 			end
-			sync_nbpkg_core(notebook; on_terminal_output=iocallback)
+			 sync_nbpkg_core(notebook, old_topology, new_topology; on_terminal_output=iocallback, lag = session.options.server.simulated_pkg_lag)
 		end
 
 		if pkg_result.did_something
@@ -282,7 +283,7 @@ function sync_nbpkg(session, notebook; save::Bool=true)
 	catch e
 		bt = catch_backtrace()
 		old_packages = try String.(keys(PkgCompat.project(notebook.nbpkg_ctx).dependencies)); catch; ["unknown"] end
-		new_packages = try String.(external_package_names(notebook.topology)); catch; ["unknown"] end
+		new_packages = try String.(external_package_names(new_topology)); catch; ["unknown"] end
 		@warn """
 		PlutoPkg: Failed to add/remove packages! Resetting package environment...
 		""" PLUTO_VERSION VERSION old_packages new_packages exception=(e, bt)
@@ -298,7 +299,7 @@ function sync_nbpkg(session, notebook; save::Bool=true)
 		send_notebook_changes!(ClientRequest(session=session, notebook=notebook))
 
 		# Clear the embedded Project and Manifest and require a restart from the user.
-		reset_nbpkg(notebook; keep_project=false, save=save)
+		reset_nbpkg(notebook, new_topology; keep_project=false, save=save)
 		notebook.nbpkg_restart_required_msg = "Yes, because sync_nbpkg_core failed. \n\n$(error_text)"
         notebook.nbpkg_ctx_instantiated = false
         update_nbpkg_cache!(notebook)
@@ -317,7 +318,7 @@ function writebackup(notebook::Notebook)
     backup_path
 end
 
-function reset_nbpkg(notebook::Notebook; keep_project::Bool=false, backup::Bool=true, save::Bool=true)
+function reset_nbpkg(notebook::Notebook, topology::Union{NotebookTopology,Nothing}=nothing; keep_project::Bool=false, backup::Bool=true, save::Bool=true)
     backup && save && writebackup(notebook)
 
     if notebook.nbpkg_ctx !== nothing
@@ -328,7 +329,7 @@ function reset_nbpkg(notebook::Notebook; keep_project::Bool=false, backup::Bool=
 
         notebook.nbpkg_ctx = PkgCompat.load_ctx(PkgCompat.env_dir(notebook.nbpkg_ctx))
     else
-        notebook.nbpkg_ctx = use_plutopkg(notebook.topology) ? PkgCompat.create_empty_ctx() : nothing
+        notebook.nbpkg_ctx = use_plutopkg(something(topology, notebook.topology)) ? PkgCompat.create_empty_ctx() : nothing
     end
 
     save && save_notebook(notebook)
diff --git a/test/Notebook.jl b/test/Notebook.jl
index a65fb41ae2..3f09e69107 100644
--- a/test/Notebook.jl
+++ b/test/Notebook.jl
@@ -83,7 +83,7 @@ end
 
 function init_packages!(nb::Notebook)
     nb.topology = Pluto.updated_topology(nb.topology, nb, nb.cells)
-    Pluto.sync_nbpkg_core(nb)
+    Pluto.sync_nbpkg_core(nb, nb.topology, nb.topology)
     return nb
 end
 
@@ -419,4 +419,4 @@ end
     @test without_pluto_file_extension("asdf.jl") == "asdf"
 
     # TODO: test bad dirs, filenames, permissions
-end
\ No newline at end of file
+end
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index bf61b8fc79..beb46e48b0 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -2,7 +2,7 @@
 import Pkg
 using Test
 using Pluto.Configuration: CompilerOptions
-using Pluto.WorkspaceManager: _merge_notebook_compiler_options
+using Pluto.WorkspaceManager: _merge_notebook_compiler_options, poll
 import Pluto: update_save_run!, update_run!, WorkspaceManager, ClientSession, ServerSession, Notebook, Cell, project_relative_path, SessionActions, load_notebook
 import Pluto.PkgUtils
 import Pluto.PkgCompat
@@ -596,8 +596,61 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
 
     #     save_notebook
     # end
-
     
+    @testset "Race conditions" begin
+        fakeclient = ClientSession(:fake, nothing)
+        🍭 = ServerSession()
+        🍭.connected_clients[fakeclient.id] = fakeclient
+        lag = 0.2
+        🍭.options.server.simulated_pkg_lag = lag
+
+        # See https://github.com/JuliaPluto/PlutoPkgTestRegistry
+
+        notebook = Notebook([
+            Cell("import PlutoPkgTestA"), # cell 1
+            Cell("PlutoPkgTestA.MY_VERSION |> Text"),
+            Cell("import PlutoPkgTestB"), # cell 3
+            Cell("PlutoPkgTestB.MY_VERSION |> Text"),
+            Cell("import PlutoPkgTestC"), # cell 5
+            Cell("PlutoPkgTestC.MY_VERSION |> Text"),
+            Cell("import PlutoPkgTestD"), # cell 7
+            Cell("PlutoPkgTestD.MY_VERSION |> Text"),
+            Cell("import PlutoPkgTestE"), # cell 9
+            Cell("PlutoPkgTestE.MY_VERSION |> Text"),
+        ])
+        fakeclient.connected_notebook = notebook
+
+        @test !notebook.nbpkg_ctx_instantiated
+        
+        running_tasks = Task[]
+        remember(t) = push!(running_tasks, t)
+        
+        update_save_run!(🍭, notebook, notebook.cells[[7, 8]]; run_async=false)            # import D (not async)
+        update_save_run!(🍭, notebook, notebook.cells[[1, 2]]; run_async=true) |> remember # import A
+        
+        for _ in 1:5
+            sleep(lag / 2)
+            setcode(notebook.cells[9], "import PlutoPkgTestE")
+            update_save_run!(🍭, notebook, notebook.cells[[9]]; run_async=true) |> remember # import E
+            
+            sleep(lag / 2)
+            setcode(notebook.cells[9], "")
+            update_save_run!(🍭, notebook, notebook.cells[[9]]; run_async=true) |> remember # don't import E
+        end
+        
+        while !all(istaskdone, running_tasks)
+            @test all(noerror, notebook.cells)
+            
+            sleep(lag / 3)
+        end
+        
+        @test all(istaskdone, running_tasks)
+        wait.(running_tasks)
+        empty!(running_tasks)
+
+        WorkspaceManager.unmake_workspace((🍭, notebook))
+    end
+
 
     Pkg.Registry.rm(pluto_test_registry_spec)
     # Pkg.Registry.add("General")

From 963722fe0d9ea7dbdbc88d50ad5086818a6e93fb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 5 Apr 2022 16:01:58 +0200
Subject: [PATCH 239/821] =?UTF-8?q?=E2=9C=82=EF=B8=8F=20Welcome.js=20refac?=
 =?UTF-8?q?tor:=20more=20files=20more=20fun=20(#2024)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/common/NewUpdateMessage.js        |  42 +++
 frontend/common/NotebookLocationFromURL.js |  57 +++
 frontend/common/PlutoConnection.js         |  15 +-
 frontend/components/PasteHandler.js        |   2 +-
 frontend/components/Welcome.js             | 392 ---------------------
 frontend/components/welcome/Open.js        |  57 +++
 frontend/components/welcome/Recent.js      | 217 ++++++++++++
 frontend/components/welcome/Welcome.js     |  79 +++++
 frontend/index.js                          |   2 +-
 9 files changed, 455 insertions(+), 408 deletions(-)
 create mode 100644 frontend/common/NewUpdateMessage.js
 create mode 100644 frontend/common/NotebookLocationFromURL.js
 delete mode 100644 frontend/components/Welcome.js
 create mode 100644 frontend/components/welcome/Open.js
 create mode 100644 frontend/components/welcome/Recent.js
 create mode 100644 frontend/components/welcome/Welcome.js

diff --git a/frontend/common/NewUpdateMessage.js b/frontend/common/NewUpdateMessage.js
new file mode 100644
index 0000000000..665e9c3e7c
--- /dev/null
+++ b/frontend/common/NewUpdateMessage.js
@@ -0,0 +1,42 @@
+export const new_update_message = (client) =>
+    fetch_pluto_releases()
+        .then((releases) => {
+            const local = client.version_info.pluto
+            const latest = releases[releases.length - 1].tag_name
+            console.log(`Pluto version ${local}`)
+            const local_index = releases.findIndex((r) => r.tag_name === local)
+            if (local_index !== -1) {
+                const updates = releases.slice(local_index + 1)
+                const recommended_updates = updates.filter((r) => r.body.toLowerCase().includes("recommended update"))
+                if (recommended_updates.length > 0) {
+                    console.log(`Newer version ${latest} is available`)
+                    if (!client.version_info.dismiss_update_notification) {
+                        alert(
+                            "A new version of Pluto.jl is available! 🎉\n\n    You have " +
+                                local +
+                                ", the latest is " +
+                                latest +
+                                '.\n\nYou can update Pluto.jl using the julia package manager:\n    import Pkg; Pkg.update("Pluto")\nAfterwards, exit Pluto.jl and restart julia.'
+                        )
+                    }
+                }
+            }
+        })
+        .catch(() => {
+            // Having this as a uncaught promise broke the frontend tests for me
+            // so I'm just swallowing the error explicitly - DRAL
+        })
+
+const fetch_pluto_releases = async () => {
+    let response = await fetch("https://api.github.com/repos/fonsp/Pluto.jl/releases", {
+        method: "GET",
+        mode: "cors",
+        cache: "no-cache",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        redirect: "follow",
+        referrerPolicy: "no-referrer",
+    })
+    return (await response.json()).reverse()
+}
diff --git a/frontend/common/NotebookLocationFromURL.js b/frontend/common/NotebookLocationFromURL.js
new file mode 100644
index 0000000000..1f6d67f674
--- /dev/null
+++ b/frontend/common/NotebookLocationFromURL.js
@@ -0,0 +1,57 @@
+// should strip characters similar to how github converts filenames into the #file-... URL hash.
+// test on: https://gist.github.com/fonsp/f7d230da4f067a11ad18de15bff80470
+const gist_normalizer = (str) =>
+    str
+        .toLowerCase()
+        .normalize("NFD")
+        .replace(/[^a-z1-9]/g, "")
+
+export const guess_notebook_location = async (path_or_url) => {
+    try {
+        const u = new URL(path_or_url)
+        if (!["http:", "https:", "ftp:", "ftps:"].includes(u.protocol)) {
+            throw "Not a web URL"
+        }
+        if (u.host === "gist.github.com") {
+            console.log("Gist URL detected")
+            const parts = u.pathname.substring(1).split("/")
+            const gist_id = parts[1]
+            const gist = await (
+                await fetch(`https://api.github.com/gists/${gist_id}`, {
+                    headers: { Accept: "application/vnd.github.v3+json" },
+                }).then((r) => (r.ok ? r : Promise.reject(r)))
+            ).json()
+            console.log(gist)
+            const files = Object.values(gist.files)
+
+            const selected = files.find((f) => gist_normalizer("#file-" + f.filename) === gist_normalizer(u.hash))
+            if (selected != null) {
+                return {
+                    type: "url",
+                    path_or_url: selected.raw_url,
+                }
+            }
+
+            return {
+                type: "url",
+                path_or_url: files[0].raw_url,
+            }
+        } else if (u.host === "github.com") {
+            u.searchParams.set("raw", "true")
+        }
+        return {
+            type: "url",
+            path_or_url: u.href,
+        }
+    } catch (ex) {
+        /* Remove eventual single/double quotes from the path if they surround it, see
+          https://github.com/fonsp/Pluto.jl/issues/1639 */
+        if (path_or_url[path_or_url.length - 1] === '"' && path_or_url[0] === '"') {
+            path_or_url = path_or_url.slice(1, -1) /* Remove first and last character */
+        }
+        return {
+            type: "path",
+            path_or_url: path_or_url,
+        }
+    }
+}
diff --git a/frontend/common/PlutoConnection.js b/frontend/common/PlutoConnection.js
index 1f74f92107..67d0202f4f 100644
--- a/frontend/common/PlutoConnection.js
+++ b/frontend/common/PlutoConnection.js
@@ -277,6 +277,7 @@ export const create_pluto_connection = async ({
     ws_address = default_ws_address(),
 }) => {
     var ws_connection = null // will be defined later i promise
+    /** @type {PlutoConnection} */
     const client = {
         send: null,
         session_options: null,
@@ -414,17 +415,3 @@ export const create_pluto_connection = async ({
 
     return client
 }
-
-export const fetch_pluto_releases = async () => {
-    let response = await fetch("https://api.github.com/repos/fonsp/Pluto.jl/releases", {
-        method: "GET",
-        mode: "cors",
-        cache: "no-cache",
-        headers: {
-            "Content-Type": "application/json",
-        },
-        redirect: "follow",
-        referrerPolicy: "no-referrer",
-    })
-    return (await response.json()).reverse()
-}
diff --git a/frontend/components/PasteHandler.js b/frontend/components/PasteHandler.js
index 689b999af4..eb3a81798e 100644
--- a/frontend/components/PasteHandler.js
+++ b/frontend/components/PasteHandler.js
@@ -1,5 +1,5 @@
 import { html, useEffect } from "../imports/Preact.js"
-import { link_edit } from "./Welcome.js"
+import { link_edit } from "./welcome/Open.js"
 
 const detectNotebook = (inputtext) => {
     // Add a newline in the end for the case user didn't copy it
diff --git a/frontend/components/Welcome.js b/frontend/components/Welcome.js
deleted file mode 100644
index 37511b0bf9..0000000000
--- a/frontend/components/Welcome.js
+++ /dev/null
@@ -1,392 +0,0 @@
-import _ from "../imports/lodash.js"
-import { html, Component, useEffect, useState, useMemo } from "../imports/Preact.js"
-import * as preact from "../imports/Preact.js"
-
-import { FilePicker } from "./FilePicker.js"
-import { create_pluto_connection, fetch_pluto_releases } from "../common/PlutoConnection.js"
-import { cl } from "../common/ClassTable.js"
-import { PasteHandler } from "./PasteHandler.js"
-
-// This is imported asynchronously - uncomment for development
-// import environment from "../common/Environment.js"
-
-/**
- * @typedef CombinedNotebook
- * @type {{
- *    path: String,
- *    transitioning: Boolean,
- *    notebook_id: String?,
- * }}
- */
-
-/**
- *
- * @param {string} path
- * @param {string?} notebook_id
- * @returns {CombinedNotebook}
- */
-
-const create_empty_notebook = (path, notebook_id = null) => {
-    return {
-        transitioning: false, // between running and being shut down
-        notebook_id: notebook_id, // null means that it is not running
-        path: path,
-    }
-}
-
-const split_at_level = (path, level) => path.split(/\/|\\/).slice(-level).join("/")
-
-const shortest_path = (path, allpaths) => {
-    let level = 1
-    for (const otherpath of allpaths) {
-        if (otherpath !== path) {
-            while (split_at_level(path, level) === split_at_level(otherpath, level)) {
-                level++
-            }
-        }
-    }
-    return split_at_level(path, level)
-}
-
-// should strip characters similar to how github converts filenames into the #file-... URL hash.
-// test on: https://gist.github.com/fonsp/f7d230da4f067a11ad18de15bff80470
-const gist_normalizer = (str) =>
-    str
-        .toLowerCase()
-        .normalize("NFD")
-        .replace(/[^a-z1-9]/g, "")
-
-export const process_path_or_url = async (path_or_url) => {
-    try {
-        const u = new URL(path_or_url)
-        if (!["http:", "https:", "ftp:", "ftps:"].includes(u.protocol)) {
-            throw "Not a web URL"
-        }
-        if (u.host === "gist.github.com") {
-            console.log("Gist URL detected")
-            const parts = u.pathname.substring(1).split("/")
-            const gist_id = parts[1]
-            const gist = await (
-                await fetch(`https://api.github.com/gists/${gist_id}`, {
-                    headers: { Accept: "application/vnd.github.v3+json" },
-                }).then((r) => (r.ok ? r : Promise.reject(r)))
-            ).json()
-            console.log(gist)
-            const files = Object.values(gist.files)
-
-            const selected = files.find((f) => gist_normalizer("#file-" + f.filename) === gist_normalizer(u.hash))
-            if (selected != null) {
-                return {
-                    type: "url",
-                    path_or_url: selected.raw_url,
-                }
-            }
-
-            return {
-                type: "url",
-                path_or_url: files[0].raw_url,
-            }
-        } else if (u.host === "github.com") {
-            u.searchParams.set("raw", "true")
-        }
-        return {
-            type: "url",
-            path_or_url: u.href,
-        }
-    } catch (ex) {
-        /* Remove eventual single/double quotes from the path if they surround it, see
-          https://github.com/fonsp/Pluto.jl/issues/1639 */
-        if (path_or_url[path_or_url.length - 1] === '"' && path_or_url[0] === '"') {
-            path_or_url = path_or_url.slice(1, -1) /* Remove first and last character */
-        }
-        return {
-            type: "path",
-            path_or_url: path_or_url,
-        }
-    }
-}
-
-// /open will execute a script from your hard drive, so we include a token in the URL to prevent a mean person from getting a bad file on your computer _using another hypothetical intrusion_, and executing it using Pluto
-export const link_open_path = (path) => "open?" + new URLSearchParams({ path: path }).toString()
-export const link_open_url = (url) => "open?" + new URLSearchParams({ url: url }).toString()
-export const link_edit = (notebook_id) => "edit?id=" + notebook_id
-
-export class Welcome extends Component {
-    constructor() {
-        super()
-
-        this.state = {
-            // running_notebooks: null,
-            // recent_notebooks: null,
-            combined_notebooks: /** @type {Array<CombinedNotebook>} */ (null), // will become an array
-            connected: false,
-            extended_components: {
-                show_samples: true,
-                CustomWelcome: null,
-                Picker: {},
-                Recent: ({ recents }) => html`
-                    <p>Recent sessions:</p>
-                    <ul id="recent">
-                        ${recents}
-                    </ul>
-                `,
-            },
-        }
-        const set_notebook_state = (this.set_notebook_state = (path, new_state_props) => {
-            this.setState((prevstate) => {
-                return {
-                    combined_notebooks: prevstate.combined_notebooks.map((nb) => {
-                        return nb.path == path ? { ...nb, ...new_state_props } : nb
-                    }),
-                }
-            })
-        })
-
-        const on_update = ({ message, type }) => {
-            if (type === "notebook_list") {
-                // a notebook list updates happened while the welcome screen is open, because a notebook started running for example
-                // the list has already been generated and rendered to the page. We try to maintain order as much as possible, to prevent the list order "jumping around" while you are interacting with it.
-                // You can always get a neatly sorted list by refreshing the page.
-
-                const new_running = message.notebooks
-
-                // already rendered notebooks will be added to this list:
-                const rendered_and_running = []
-
-                const new_combined_notebooks = this.state.combined_notebooks.map((nb) => {
-                    // try to find a matching notebook in the remote list
-                    let running_version = null
-
-                    if (nb.notebook_id) {
-                        // match notebook_ids to handle a path change
-                        running_version = new_running.find((rnb) => rnb.notebook_id == nb.notebook_id)
-                    } else {
-                        // match paths to handle a notebook bootup
-                        running_version = new_running.find((rnb) => rnb.path == nb.path)
-                    }
-
-                    if (running_version == null) {
-                        return create_empty_notebook(nb.path)
-                    } else {
-                        const new_notebook = create_empty_notebook(running_version.path, running_version.notebook_id)
-                        rendered_and_running.push(running_version)
-                        return new_notebook
-                    }
-                })
-
-                const not_rendered_but_running = new_running.filter((rnb) => !rendered_and_running.includes(rnb))
-                this.setState({
-                    combined_notebooks: [...not_rendered_but_running, ...new_combined_notebooks],
-                })
-            }
-        }
-
-        const on_connection_status = (val) => this.setState({ connected: val })
-
-        this.client = {}
-        this.client_promise = create_pluto_connection({
-            on_unrequested_update: on_update,
-            on_connection_status: on_connection_status,
-            on_reconnect: () => true,
-        })
-        this.client_promise.then(async (client) => {
-            Object.assign(this.client, client)
-            try {
-                const { default: environment } = await import(this.client.session_options.server.injected_javascript_data_url)
-                const { custom_welcome, custom_recent, custom_filepicker, show_samples = true } = environment({ client, editor: this, imports: { preact } })
-                this.setState({
-                    extended_components: {
-                        ...this.state.extended_components,
-                        Recent: custom_recent,
-                        Welcome: custom_welcome,
-                        Picker: custom_filepicker,
-                        show_samples,
-                    },
-                })
-            } catch (e) {}
-            this.client.send("get_all_notebooks", {}, {}).then(({ message }) => {
-                const running = message.notebooks.map((nb) => create_empty_notebook(nb.path, nb.notebook_id))
-                const recent_notebooks = get_stored_recent_notebooks()
-
-                // show running notebooks first, in the order defined by the recent notebooks, then recent notebooks
-                const combined_notebooks = [
-                    ..._.sortBy(running, [(nb) => _.findIndex([...recent_notebooks, ...running], (r) => r.path === nb.path)]),
-                    ..._.differenceBy(recent_notebooks, running, (nb) => nb.path),
-                ]
-
-                this.setState({ combined_notebooks: combined_notebooks })
-
-                document.body.classList.remove("loading")
-            })
-
-            fetch_pluto_releases()
-                .then((releases) => {
-                    const local = this.client.version_info.pluto
-                    const latest = releases[releases.length - 1].tag_name
-                    console.log(`Pluto version ${local}`)
-                    const local_index = releases.findIndex((r) => r.tag_name === local)
-                    if (local_index !== -1) {
-                        const updates = releases.slice(local_index + 1)
-                        const recommended_updates = updates.filter((r) => r.body.toLowerCase().includes("recommended update"))
-                        if (recommended_updates.length > 0) {
-                            console.log(`Newer version ${latest} is available`)
-                            if (!this.client.version_info.dismiss_update_notification) {
-                                alert(
-                                    "A new version of Pluto.jl is available! 🎉\n\n    You have " +
-                                        local +
-                                        ", the latest is " +
-                                        latest +
-                                        '.\n\nYou can update Pluto.jl using the julia package manager:\n    import Pkg; Pkg.update("Pluto")\nAfterwards, exit Pluto.jl and restart julia.'
-                                )
-                            }
-                        }
-                    }
-                })
-                .catch(() => {
-                    // Having this as a uncaught promise broke the frontend tests for me
-                    // so I'm just swallowing the error explicitly - DRAL
-                })
-
-            // to start JIT'ting
-            this.client.send(
-                "completepath",
-                {
-                    query: "nothinginparticular",
-                },
-                {}
-            )
-        })
-
-        this.on_open_path = async (new_path) => {
-            const processed = await process_path_or_url(new_path)
-            if (processed.type === "path") {
-                document.body.classList.add("loading")
-                window.location.href = link_open_path(processed.path_or_url)
-            } else {
-                if (confirm("Are you sure? This will download and run the file at\n\n" + processed.path_or_url)) {
-                    document.body.classList.add("loading")
-                    window.location.href = link_open_url(processed.path_or_url)
-                }
-            }
-        }
-
-        this.on_session_click = (nb) => {
-            if (nb.transitioning) {
-                return
-            }
-            const running = nb.notebook_id != null
-            if (running) {
-                if (confirm("Shut down notebook process?")) {
-                    set_notebook_state(nb.path, {
-                        running: false,
-                        transitioning: true,
-                    })
-                    this.client.send(
-                        "shutdown_notebook",
-                        {
-                            keep_in_session: false,
-                        },
-                        {
-                            notebook_id: nb.notebook_id,
-                        },
-                        false
-                    )
-                }
-            } else {
-                set_notebook_state(nb.path, {
-                    transitioning: true,
-                })
-                fetch(link_open_path(nb.path), {
-                    method: "GET",
-                })
-                    .then((r) => {
-                        if (!r.redirected) {
-                            throw new Error("file not found maybe? try opening the notebook directly")
-                        }
-                    })
-                    .catch((e) => {
-                        console.error("Failed to start notebook in background")
-                        console.error(e)
-                        set_notebook_state(nb.path, {
-                            transitioning: false,
-                            notebook_id: null,
-                        })
-                    })
-            }
-        }
-    }
-
-    componentDidMount() {
-        this.componentDidUpdate()
-    }
-
-    componentDidUpdate() {
-        document.body.classList.toggle("nosessions", !(this.state.combined_notebooks == null || this.state.combined_notebooks.length > 0))
-    }
-
-    render() {
-        let recents = null
-        if (this.state.combined_notebooks == null) {
-            recents = html`<li><em>Loading...</em></li>`
-        } else {
-            const all_paths = this.state.combined_notebooks.map((nb) => nb.path)
-            recents = this.state.combined_notebooks.map((nb) => {
-                const running = nb.notebook_id != null
-                return html`<li
-                    key=${nb.path}
-                    class=${cl({
-                        running: running,
-                        recent: !running,
-                        transitioning: nb.transitioning,
-                    })}
-                >
-                    <button onclick=${() => this.on_session_click(nb)} title=${running ? "Shut down notebook" : "Start notebook in background"}>
-                        <span></span>
-                    </button>
-                    <a
-                        href=${running ? link_edit(nb.notebook_id) : link_open_path(nb.path)}
-                        title=${nb.path}
-                        onClick=${(e) => {
-                            document.body.classList.add("loading")
-                            this.set_notebook_state(nb.path, {
-                                transitioning: true,
-                            })
-                        }}
-                        >${shortest_path(nb.path, all_paths)}</a
-                    >
-                </li>`
-            })
-        }
-        const {
-            show_samples,
-            Recent,
-            Picker: { text: open_file_label, placeholder },
-        } = this.state.extended_components
-
-        return html`<p>New session:</p>
-            <${PasteHandler} />
-            <ul id="new">
-                ${show_samples && html`<li>Open a <a href="sample">sample notebook</a></li>`}
-                <li>Create a <a href="new">new notebook</a></li>
-                <li>
-                    ${open_file_label || "Open from file"}:
-                    <${FilePicker}
-                        key=${placeholder}
-                        client=${this.client}
-                        value=""
-                        on_submit=${this.on_open_path}
-                        button_label="Open"
-                        placeholder=${placeholder ?? "Enter path or URL..."}
-                    />
-                </li>
-            </ul>
-            <br />
-            <${Recent} cl=${cl} combined=${this.state.combined_notebooks} client=${this.client} recents=${recents} />`
-    }
-}
-
-const get_stored_recent_notebooks = () => {
-    const storedString = localStorage.getItem("recent notebooks")
-    const storedList = storedString != null ? JSON.parse(storedString) : []
-    return storedList.map((path) => create_empty_notebook(path))
-}
diff --git a/frontend/components/welcome/Open.js b/frontend/components/welcome/Open.js
new file mode 100644
index 0000000000..bb9abdd9e8
--- /dev/null
+++ b/frontend/components/welcome/Open.js
@@ -0,0 +1,57 @@
+import _ from "../../imports/lodash.js"
+import { html, Component, useEffect, useState, useMemo } from "../../imports/Preact.js"
+
+import { FilePicker } from "../FilePicker.js"
+import { PasteHandler } from "../PasteHandler.js"
+import { guess_notebook_location } from "../../common/NotebookLocationFromURL.js"
+
+/**
+ * @param {{
+ *  client: import("../../common/PlutoConnection.js").PlutoConnection?,
+ *  connected: Boolean,
+ *  show_samples: Boolean,
+ *  CustomPicker: {text: String, placeholder: String}?,
+ * }} props
+ */
+export const Open = ({ client, connected, CustomPicker, show_samples }) => {
+    const on_open_path = async (new_path) => {
+        const processed = await guess_notebook_location(new_path)
+        if (processed.type === "path") {
+            document.body.classList.add("loading")
+            window.location.href = link_open_path(processed.path_or_url)
+        } else {
+            if (confirm("Are you sure? This will download and run the file at\n\n" + processed.path_or_url)) {
+                document.body.classList.add("loading")
+                window.location.href = link_open_url(processed.path_or_url)
+            }
+        }
+    }
+
+    const picker = CustomPicker ?? {
+        text: "Open from file",
+        placeholder: "Enter path or URL...",
+    }
+
+    return html`<p>New session:</p>
+        <${PasteHandler} />
+        <ul id="new">
+            ${show_samples && html`<li>Open a <a href="sample">sample notebook</a></li>`}
+            <li>Create a <a href="new">new notebook</a></li>
+            <li>
+                ${picker.text}:
+                <${FilePicker}
+                    key=${picker.placeholder}
+                    client=${client}
+                    value=""
+                    on_submit=${on_open_path}
+                    button_label="Open"
+                    placeholder=${picker.placeholder}
+                />
+            </li>
+        </ul>`
+}
+
+// /open will execute a script from your hard drive, so we include a token in the URL to prevent a mean person from getting a bad file on your computer _using another hypothetical intrusion_, and executing it using Pluto
+export const link_open_path = (path) => "open?" + new URLSearchParams({ path: path }).toString()
+export const link_open_url = (url) => "open?" + new URLSearchParams({ url: url }).toString()
+export const link_edit = (notebook_id) => "edit?id=" + notebook_id
diff --git a/frontend/components/welcome/Recent.js b/frontend/components/welcome/Recent.js
new file mode 100644
index 0000000000..97cfd9e456
--- /dev/null
+++ b/frontend/components/welcome/Recent.js
@@ -0,0 +1,217 @@
+import _ from "../../imports/lodash.js"
+import { html, useEffect, useState, useRef } from "../../imports/Preact.js"
+import * as preact from "../../imports/Preact.js"
+
+import { cl } from "../../common/ClassTable.js"
+import { link_edit, link_open_path } from "./Open.js"
+
+/**
+ * @typedef CombinedNotebook
+ * @type {{
+ *    path: String,
+ *    transitioning: Boolean,
+ *    notebook_id: String?,
+ * }}
+ */
+
+/**
+ *
+ * @param {string} path
+ * @param {string?} notebook_id
+ * @returns {CombinedNotebook}
+ */
+const entry = (path, notebook_id = null) => {
+    return {
+        transitioning: false, // between running and being shut down
+        notebook_id: notebook_id, // null means that it is not running
+        path: path,
+    }
+}
+
+const split_at_level = (path, level) => path.split(/\/|\\/).slice(-level).join("/")
+
+const shortest_path = (path, allpaths) => {
+    let level = 1
+    for (const otherpath of allpaths) {
+        if (otherpath !== path) {
+            while (split_at_level(path, level) === split_at_level(otherpath, level)) {
+                level++
+            }
+        }
+    }
+    return split_at_level(path, level)
+}
+
+/**
+ * @param {{
+ *  client: import("../../common/PlutoConnection.js").PlutoConnection?,
+ *  connected: Boolean,
+ *  remote_notebooks: Array<import("./Welcome.js").NotebookListEntry>,
+ *  CustomRecent: preact.ReactElement?,
+ * }} props
+ */
+export const Recent = ({ client, connected, remote_notebooks, CustomRecent }) => {
+    const [combined_notebooks, set_combined_notebooks] = useState(/** @type {Array<CombinedNotebook> | null} */ (null))
+    const combined_notebooks_ref = useRef(combined_notebooks)
+    combined_notebooks_ref.current = combined_notebooks
+
+    const set_notebook_state = (path, new_state_props) => {
+        set_combined_notebooks((prevstate) =>
+            prevstate.map((nb) => {
+                return nb.path == path ? { ...nb, ...new_state_props } : nb
+            })
+        )
+    }
+
+    useEffect(() => {
+        if (client != null && connected) {
+            client.send("get_all_notebooks", {}, {}).then(({ message }) => {
+                const running = /** @type {Array<import("./Welcome.js").NotebookListEntry>} */ (message.notebooks).map((nb) => entry(nb.path, nb.notebook_id))
+
+                const recent_notebooks = get_stored_recent_notebooks()
+
+                // show running notebooks first, in the order defined by the recent notebooks, then recent notebooks
+                const combined_notebooks = [
+                    ..._.sortBy(running, [(nb) => _.findIndex([...recent_notebooks, ...running], (r) => r.path === nb.path)]),
+                    ..._.differenceBy(recent_notebooks, running, (nb) => nb.path),
+                ]
+
+                set_combined_notebooks(combined_notebooks)
+
+                document.body.classList.remove("loading")
+            })
+        }
+    }, [client != null && connected])
+
+    useEffect(() => {
+        const new_running = remote_notebooks
+
+        if (combined_notebooks_ref.current != null) {
+            // a notebook list updates happened while the welcome screen is open, because a notebook started running for example
+            // the list has already been generated and rendered to the page. We try to maintain order as much as possible, to prevent the list order "jumping around" while you are interacting with it.
+            // You can always get a neatly sorted list by refreshing the page.
+
+            // already rendered notebooks will be added to this list:
+            const rendered_and_running = []
+
+            const new_combined_notebooks = combined_notebooks_ref.current.map((nb) => {
+                // try to find a matching notebook in the remote list
+                let running_version = null
+
+                if (nb.notebook_id) {
+                    // match notebook_ids to handle a path change
+                    running_version = new_running.find((rnb) => rnb.notebook_id == nb.notebook_id)
+                } else {
+                    // match paths to handle a notebook bootup
+                    running_version = new_running.find((rnb) => rnb.path == nb.path)
+                }
+
+                if (running_version == null) {
+                    return entry(nb.path)
+                } else {
+                    const new_notebook = entry(running_version.path, running_version.notebook_id)
+                    rendered_and_running.push(running_version)
+                    return new_notebook
+                }
+            })
+
+            const not_rendered_but_running = new_running.filter((rnb) => !rendered_and_running.includes(rnb)).map((rnb) => entry(rnb.path, rnb.notebook_id))
+
+            set_combined_notebooks([...not_rendered_but_running, ...new_combined_notebooks])
+        }
+    }, [remote_notebooks])
+
+    const on_session_click = (nb) => {
+        if (nb.transitioning) {
+            return
+        }
+        const running = nb.notebook_id != null
+        if (running) {
+            if (confirm("Shut down notebook process?")) {
+                set_notebook_state(nb.path, {
+                    running: false,
+                    transitioning: true,
+                })
+                client.send("shutdown_notebook", { keep_in_session: false }, { notebook_id: nb.notebook_id }, false)
+            }
+        } else {
+            set_notebook_state(nb.path, {
+                transitioning: true,
+            })
+            fetch(link_open_path(nb.path), {
+                method: "GET",
+            })
+                .then((r) => {
+                    if (!r.redirected) {
+                        throw new Error("file not found maybe? try opening the notebook directly")
+                    }
+                })
+                .catch((e) => {
+                    console.error("Failed to start notebook in background")
+                    console.error(e)
+                    set_notebook_state(nb.path, {
+                        transitioning: false,
+                        notebook_id: null,
+                    })
+                })
+        }
+    }
+
+    useEffect(() => {
+        document.body.classList.toggle("nosessions", !(combined_notebooks == null || combined_notebooks.length > 0))
+    }, [combined_notebooks])
+
+    /// RENDER
+
+    const all_paths = combined_notebooks?.map((nb) => nb.path)
+
+    let recents =
+        combined_notebooks == null
+            ? html`<li><em>Loading...</em></li>`
+            : combined_notebooks.map((nb) => {
+                  const running = nb.notebook_id != null
+                  return html`<li
+                      key=${nb.path}
+                      class=${cl({
+                          running: running,
+                          recent: !running,
+                          transitioning: nb.transitioning,
+                      })}
+                  >
+                      <button onclick=${() => on_session_click(nb)} title=${running ? "Shut down notebook" : "Start notebook in background"}>
+                          <span></span>
+                      </button>
+                      <a
+                          href=${running ? link_edit(nb.notebook_id) : link_open_path(nb.path)}
+                          title=${nb.path}
+                          onClick=${(e) => {
+                              if (!running) {
+                                  document.body.classList.add("loading")
+                                  set_notebook_state(nb.path, {
+                                      transitioning: true,
+                                  })
+                              }
+                          }}
+                          >${shortest_path(nb.path, all_paths)}</a
+                      >
+                  </li>`
+              })
+
+    if (CustomRecent == null) {
+        return html`
+            <p>Recent sessions:</p>
+            <ul id="recent">
+                ${recents}
+            </ul>
+        `
+    } else {
+        return html`<${CustomRecent} cl=${cl} combined=${combined_notebooks} client=${client} recents=${recents} />`
+    }
+}
+
+const get_stored_recent_notebooks = () => {
+    const storedString = localStorage.getItem("recent notebooks")
+    const storedData = storedString != null ? JSON.parse(storedString) : []
+    const storedList = storedData instanceof Array ? storedData : []
+    return storedList.map((path) => entry(path))
+}
diff --git a/frontend/components/welcome/Welcome.js b/frontend/components/welcome/Welcome.js
new file mode 100644
index 0000000000..61a1983731
--- /dev/null
+++ b/frontend/components/welcome/Welcome.js
@@ -0,0 +1,79 @@
+import _ from "../../imports/lodash.js"
+import { html, useEffect, useState, useRef } from "../../imports/Preact.js"
+import * as preact from "../../imports/Preact.js"
+
+import { create_pluto_connection } from "../../common/PlutoConnection.js"
+import { new_update_message } from "../../common/NewUpdateMessage.js"
+import { Open } from "./Open.js"
+import { Recent } from "./Recent.js"
+
+// This is imported asynchronously - uncomment for development
+// import environment from "../../common/Environment.js"
+
+/**
+ * @typedef NotebookListEntry
+ * @type {{
+ *  notebook_id: String,
+ *  path: String,
+ *  in_temp_dir: Boolean,
+ *  shortpath: String,
+ * }}
+ */
+
+export const Welcome = () => {
+    const [remote_notebooks, set_remote_notebooks] = useState(/** @type {Array<NotebookListEntry>} */ (null))
+
+    const [connected, set_connected] = useState(false)
+    const [extended_components, set_extended_components] = useState({
+        show_samples: true,
+        CustomPicker: null,
+        CustomRecent: null,
+    })
+
+    const client_ref = useRef(/** @type {import('../../common/PlutoConnection').PlutoConnection} */ ({}))
+
+    useEffect(() => {
+        const on_update = ({ message, type }) => {
+            if (type === "notebook_list") {
+                // a notebook list updates happened while the welcome screen is open, because a notebook started running for example
+                set_remote_notebooks(message.notebooks)
+            }
+        }
+
+        const on_connection_status = set_connected
+
+        const client_promise = create_pluto_connection({
+            on_unrequested_update: on_update,
+            on_connection_status: on_connection_status,
+            on_reconnect: () => true,
+        })
+        client_promise.then(async (client) => {
+            Object.assign(client_ref.current, client)
+            set_connected(true)
+
+            try {
+                const { default: environment } = await import(client.session_options.server.injected_javascript_data_url)
+                const { custom_recent, custom_filepicker, show_samples = true } = environment({ client, editor: this, imports: { preact } })
+                set_extended_components((old) => ({
+                    ...old,
+                    CustomRecent: custom_recent,
+                    CustomPicker: custom_filepicker,
+                    show_samples,
+                }))
+            } catch (e) {}
+
+            new_update_message(client)
+
+            // to start JIT'ting
+            client.send("completepath", { query: "zzz" }, {})
+        })
+    }, [])
+
+    const { show_samples, CustomRecent, CustomPicker } = extended_components
+
+    return html`
+        <${Open} client=${client_ref.current} connected=${connected} CustomPicker=${CustomPicker} show_samples=${show_samples} />
+        <br />
+        <${Recent} client=${client_ref.current} connected=${connected} remote_notebooks=${remote_notebooks} CustomRecent=${CustomRecent} />
+    `
+}
diff --git a/frontend/index.js b/frontend/index.js
index aef83726c1..15efdd148a 100644
--- a/frontend/index.js
+++ b/frontend/index.js
@@ -1,6 +1,6 @@
 import { html, render } from "./imports/Preact.js"
 import "./common/NodejsCompatibilityPolyfill.js"
 
-import { Welcome } from "./components/Welcome.js"
+import { Welcome } from "./components/welcome/Welcome.js"
 
 render(html`<${Welcome} />`, document.querySelector("main"))

From 1aaa44b798e0b9b5216ef910823cfbc5c1a95a4c Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Tue, 5 Apr 2022 18:12:57 +0200
Subject: [PATCH 240/821] Reduce time to first `from_flat_kwargs` (#2005)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 Project.toml          |   2 +-
 src/Configuration.jl  | 256 +++++++++++++++++++++++++++++-------------
 test/Configuration.jl |  28 ++++-
 3 files changed, 202 insertions(+), 84 deletions(-)

diff --git a/Project.toml b/Project.toml
index 343c56029a..6f4754af82 100644
--- a/Project.toml
+++ b/Project.toml
@@ -43,4 +43,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
 
 [targets]
-test = ["Test", "Random", "DataFrames", "OffsetArrays", "TimerOutputs"]
+test = ["DataFrames", "OffsetArrays", "Random", "Test", "TimerOutputs"]
diff --git a/src/Configuration.jl b/src/Configuration.jl
index 4927a723ef..d140f0fd2f 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -27,6 +27,23 @@ function __init__()
     pwd_ref[] = pwd()
 end
 
+const ROOT_URL_DEFAULT = nothing
+const HOST_DEFAULT = "127.0.0.1"
+const PORT_DEFAULT = nothing
+const LAUNCH_BROWSER_DEFAULT = true
+const DISMISS_UPDATE_NOTIFICATION_DEFAULT = false
+const SHOW_FILE_SYSTEM_DEFAULT = true
+const DISABLE_WRITING_NOTEBOOK_FILES_DEFAULT = false
+const AUTO_RELOAD_FROM_FILE_DEFAULT = false
+const AUTO_RELOAD_FROM_FILE_COOLDOWN_DEFAULT = 0.4
+const AUTO_RELOAD_FROM_FILE_IGNORE_PKG_DEFAULT = false
+const NOTEBOOK_DEFAULT = nothing
+const INIT_WITH_FILE_VIEWER_DEFAULT = false
+const SIMULATED_LAG_DEFAULT = 0.0
+const SIMULATED_PKG_LAG_DEFAULT = 0.0
+const INJECTED_JAVASCRIPT_DATA_URL_DEFAULT = "data:text/javascript;base64,"
+const ON_EVENT_DEFAULT = function(a) #= @info "$(typeof(a))" =# end
+
 """
     ServerOptions([; kwargs...])
 
@@ -34,42 +51,47 @@ The HTTP server options. See [`SecurityOptions`](@ref) for additional settings.
 
 # Arguments
 
-- `root_url::Union{Nothing,String} = nothing`
-- `host::String = "127.0.0.1"`
-- `port::Union{Nothing,Integer} = nothing`
-- `launch_browser::Bool = true`
-- `dismiss_update_notification::Bool = false`
-- `show_file_system::Bool = true`
+- `root_url::Union{Nothing,String} = $ROOT_URL_DEFAULT`
+- `host::String = "$HOST_DEFAULT"`
+- `port::Union{Nothing,Integer} = $PORT_DEFAULT`
+- `launch_browser::Bool = $LAUNCH_BROWSER_DEFAULT`
+- `dismiss_update_notification::Bool = $DISMISS_UPDATE_NOTIFICATION_DEFAULT`
+- `show_file_system::Bool = $SHOW_FILE_SYSTEM_DEFAULT`
 - `notebook_path_suggestion::String = notebook_path_suggestion()`
-- `disable_writing_notebook_files::Bool = false`
-- `auto_reload_from_file::Bool = false` Watch notebook files for outside changes and update running notebook state automatically
-- `auto_reload_from_file_cooldown::Real = 0.5` Experimental, will be removed
-- `auto_reload_from_file_ignore_pkg::Bool = false` Experimental flag, will be removed
-- `notebook::Union{Nothing,String} = nothing` Optional path of notebook to launch at start
-- `simulated_lag::Real=0.0` (internal) Extra lag to add to our server responses. Will be multiplied by `0.5 + rand()`.
-- `simulated_pkg_lag::Real=0.0` (internal) Extra lag to add to operations done by Pluto's package manager. Will be multiplied by `0.5 + rand()`.
-- `injected_javascript_data_url`::String = "data:text/javascript;base64," (internal) Optional javascript injectables to the front-end. Can be used to customize the editor, but this API is not meant for general use yet.
+- `disable_writing_notebook_files::Bool = $DISABLE_WRITING_NOTEBOOK_FILES_DEFAULT`
+- `auto_reload_from_file::Bool = $AUTO_RELOAD_FROM_FILE_DEFAULT` Watch notebook files for outside changes and update running notebook state automatically
+- `auto_reload_from_file_cooldown::Real = $AUTO_RELOAD_FROM_FILE_COOLDOWN_DEFAULT` Experimental, will be removed
+- `auto_reload_from_file_ignore_pkg::Bool = $AUTO_RELOAD_FROM_FILE_IGNORE_PKG_DEFAULT` Experimental flag, will be removed
+- `notebook::Union{Nothing,String} = $NOTEBOOK_DEFAULT` Optional path of notebook to launch at start
+- `init_with_file_viewer::Bool = $INIT_WITH_FILE_VIEWER_DEFAULT`
+- `simulated_lag::Real=$SIMULATED_LAG_DEFAULT` (internal) Extra lag to add to our server responses. Will be multiplied by `0.5 + rand()`.
+- `simulated_pkg_lag::Real=$SIMULATED_PKG_LAG_DEFAULT` (internal) Extra lag to add to operations done by Pluto's package manager. Will be multiplied by `0.5 + rand()`.
+- `injected_javascript_data_url::String = "$INJECTED_JAVASCRIPT_DATA_URL_DEFAULT"` (internal) Optional javascript injectables to the front-end. Can be used to customize the editor, but this API is not meant for general use yet.
+- `on_event::Function = $ON_EVENT_DEFAULT`
 """
 @option mutable struct ServerOptions
-    root_url::Union{Nothing,String} = nothing
-    host::String = "127.0.0.1"
-    port::Union{Nothing,Integer} = nothing
-    launch_browser::Bool = true
-    dismiss_update_notification::Bool = false
-    show_file_system::Bool = true
+    root_url::Union{Nothing,String} = ROOT_URL_DEFAULT
+    host::String = HOST_DEFAULT
+    port::Union{Nothing,Integer} = PORT_DEFAULT
+    launch_browser::Bool = LAUNCH_BROWSER_DEFAULT
+    dismiss_update_notification::Bool = DISMISS_UPDATE_NOTIFICATION_DEFAULT
+    show_file_system::Bool = SHOW_FILE_SYSTEM_DEFAULT
     notebook_path_suggestion::String = notebook_path_suggestion()
-    disable_writing_notebook_files::Bool = false
-    auto_reload_from_file::Bool = false
-    auto_reload_from_file_cooldown::Real = 0.4
-    auto_reload_from_file_ignore_pkg::Bool = false
-    notebook::Union{Nothing,String,Vector{<:String}} = nothing
-    init_with_file_viewer::Bool = false
-    simulated_lag::Real = 0.0
-    simulated_pkg_lag::Real = 0.0
-    injected_javascript_data_url::String = "data:text/javascript;base64,"
-    on_event::Function = function(a) #= @info "$(typeof(a))" =# end
+    disable_writing_notebook_files::Bool = DISABLE_WRITING_NOTEBOOK_FILES_DEFAULT
+    auto_reload_from_file::Bool = AUTO_RELOAD_FROM_FILE_DEFAULT
+    auto_reload_from_file_cooldown::Real = AUTO_RELOAD_FROM_FILE_COOLDOWN_DEFAULT
+    auto_reload_from_file_ignore_pkg::Bool = AUTO_RELOAD_FROM_FILE_IGNORE_PKG_DEFAULT
+    notebook::Union{Nothing,String,Vector{<:String}} = NOTEBOOK_DEFAULT
+    init_with_file_viewer::Bool = INIT_WITH_FILE_VIEWER_DEFAULT
+    simulated_lag::Real = SIMULATED_LAG_DEFAULT
+    simulated_pkg_lag::Real = SIMULATED_PKG_LAG_DEFAULT
+    injected_javascript_data_url::String = INJECTED_JAVASCRIPT_DATA_URL_DEFAULT
+    on_event::Function = ON_EVENT_DEFAULT
 end
 
+const REQUIRE_SECRET_FOR_OPEN_LINKS_DEFAULT = true
+const REQUIRE_SECRET_FOR_ACESS_DEFAULT = true
+
 """
     SecurityOptions([; kwargs...])
 
@@ -77,13 +99,13 @@ Security settings for the HTTP server.
 
 # Arguments
 
-- `require_secret_for_open_links::Bool = true`
+- `require_secret_for_open_links::Bool = $REQUIRE_SECRET_FOR_OPEN_LINKS_DEFAULT`
 
     Whether the links `http://localhost:1234/open?path=/a/b/c.jl`  and `http://localhost:1234/open?url=http://www.a.b/c.jl` should be protected. 
 
     Use `true` for almost every setup. Only use `false` if Pluto is running in a safe container (like mybinder.org), where arbitrary code execution is not a problem.
 
-- `require_secret_for_access::Bool = true`
+- `require_secret_for_access::Bool = $REQUIRE_SECRET_FOR_ACESS_DEFAULT`
 
     If false, you do not need to use a `secret` in the URL to access Pluto: you will be authenticated by visiting `http://localhost:1234/` in your browser. An authentication cookie is still used for access (to prevent XSS and deceptive links or an img src to `http://localhost:1234/open?url=badpeople.org/script.jl`), and is set automatically, but this request to `/` is protected by cross-origin policy.
 
@@ -94,23 +116,54 @@ Security settings for the HTTP server.
 Note that Pluto is quickly evolving software, maintained by designers, educators and enthusiasts — not security experts. If security is a serious concern for your application, then we recommend running Pluto inside a container and verifying the relevant security aspects of Pluto yourself.
 """
 @option mutable struct SecurityOptions
-    require_secret_for_open_links::Bool = true
-    require_secret_for_access::Bool = true
+    require_secret_for_open_links::Bool = REQUIRE_SECRET_FOR_OPEN_LINKS_DEFAULT
+    require_secret_for_access::Bool = REQUIRE_SECRET_FOR_ACESS_DEFAULT
 end
 
+const RUN_NOTEBOOK_ON_LOAD_DEFAULT = true
+const WORKSPACE_USE_DISTRIBUTED_DEFAULT = true
+const LAZY_WORKSPACE_CREATION_DEFAULT = false
+
 """
     EvaluationOptions([; kwargs...])
 
 Options to change Pluto's evaluation behaviour during internal testing. These options are not intended to be changed during normal use.
 
-- `run_notebook_on_load::Bool = true`
-- `workspace_use_distributed::Bool = true`
-- `lazy_workspace_creation::Bool = false`
+- `run_notebook_on_load::Bool = $RUN_NOTEBOOK_ON_LOAD_DEFAULT` Whether to evaluate a notebook on load.
+- `workspace_use_distributed::Bool = $WORKSPACE_USE_DISTRIBUTED_DEFAULT` Whether to start notebooks in a separate process.
+- `lazy_workspace_creation::Bool = $LAZY_WORKSPACE_CREATION_DEFAULT`
 """
 @option mutable struct EvaluationOptions
-    run_notebook_on_load::Bool = true
-    workspace_use_distributed::Bool = true
-    lazy_workspace_creation::Bool = false
+    run_notebook_on_load::Bool = RUN_NOTEBOOK_ON_LOAD_DEFAULT
+    workspace_use_distributed::Bool = WORKSPACE_USE_DISTRIBUTED_DEFAULT
+    lazy_workspace_creation::Bool = LAZY_WORKSPACE_CREATION_DEFAULT
+end
+
+const COMPILE_DEFAULT = nothing
+const SYSIMAGE_DEFAULT = nothing
+const BANNER_DEFAULT = nothing
+const OPTIMIZE_DEFAULT = nothing
+const MATH_MODE_DEFAULT = nothing
+const STARTUP_FILE_DEFAULT = "no"
+const HISTORY_FILE_DEFAULT = "no"
+
+function roughly_the_number_of_physical_cpu_cores()
+    # https://gist.github.com/fonsp/738fe244719cae820245aa479e7b4a8d
+    if Sys.CPU_THREADS == 1
+        1
+    elseif Sys.CPU_THREADS == 2 || Sys.CPU_THREADS == 3
+        2
+    else
+        Sys.CPU_THREADS ÷ 2
+    end
+end
+
+function default_number_of_threads()
+    env_value = get(ENV, "JULIA_NUM_THREADS", "")
+
+    all(isspace, env_value) ?
+        roughly_the_number_of_physical_cpu_cores() :
+        env_value
 end
 
 """
@@ -119,53 +172,31 @@ end
 These options will be passed as command line argument to newly launched processes. See [the Julia documentation on command-line options](https://docs.julialang.org/en/v1/manual/command-line-options/).
 
 # Arguments
-- `compile::Union{Nothing,String} = nothing`
-- `sysimage::Union{Nothing,String} = nothing`
-- `banner::Union{Nothing,String} = nothing`
-- `optimize::Union{Nothing,Int} = nothing`
-- `math_mode::Union{Nothing,String} = nothing`
-- `startup_file::Union{Nothing,String} = "no"`
-- `history_file::Union{Nothing,String} = "no"`
+- `compile::Union{Nothing,String} = $COMPILE_DEFAULT`
+- `sysimage::Union{Nothing,String} = $SYSIMAGE_DEFAULT`
+- `banner::Union{Nothing,String} = $BANNER_DEFAULT`
+- `optimize::Union{Nothing,Int} = $OPTIMIZE_DEFAULT`
+- `math_mode::Union{Nothing,String} = $MATH_MODE_DEFAULT`
+- `startup_file::Union{Nothing,String} = "$STARTUP_FILE_DEFAULT"` By default, the startup file isn't loaded in notebooks.
+- `history_file::Union{Nothing,String} = "$HISTORY_FILE_DEFAULT"` By default, the history isn't loaded in notebooks.
 - `threads::Union{Nothing,String,Int} = default_number_of_threads()`
 """
 @option mutable struct CompilerOptions
-    compile::Union{Nothing,String} = nothing
-    sysimage::Union{Nothing,String} = nothing
-    banner::Union{Nothing,String} = nothing
-    optimize::Union{Nothing,Int} = nothing
-    math_mode::Union{Nothing,String} = nothing
+    compile::Union{Nothing,String} = COMPILE_DEFAULT
+    sysimage::Union{Nothing,String} = SYSIMAGE_DEFAULT
+    banner::Union{Nothing,String} = BANNER_DEFAULT
+    optimize::Union{Nothing,Int} = OPTIMIZE_DEFAULT
+    math_mode::Union{Nothing,String} = MATH_MODE_DEFAULT
 
     # notebook specified options
     # the followings are different from
     # the default julia compiler options
-
-    # we don't load startup file in notebook
-    startup_file::Union{Nothing,String} = "no"
-    # we don't load history file in notebook
-    history_file::Union{Nothing,String} = "no"
+    startup_file::Union{Nothing,String} = STARTUP_FILE_DEFAULT
+    history_file::Union{Nothing,String} = HISTORY_FILE_DEFAULT
 
     threads::Union{Nothing,String,Int} = default_number_of_threads()
 end
 
-function default_number_of_threads()
-    env_value = get(ENV, "JULIA_NUM_THREADS", "")
-
-    all(isspace, env_value) ?
-        roughly_the_number_of_physical_cpu_cores() :
-        env_value
-end
-
-function roughly_the_number_of_physical_cpu_cores()
-    # https://gist.github.com/fonsp/738fe244719cae820245aa479e7b4a8d
-    if Sys.CPU_THREADS == 1
-        1
-    elseif Sys.CPU_THREADS == 2 || Sys.CPU_THREADS == 3
-        2
-    else
-        Sys.CPU_THREADS ÷ 2
-    end
-end
-
 """
 Collection of all settings that configure a Pluto session. 
 
@@ -178,7 +209,78 @@ Collection of all settings that configure a Pluto session.
     compiler::CompilerOptions = CompilerOptions()
 end
 
-from_flat_kwargs(; kwargs...) = Configurations.from_field_kwargs(Options; kwargs...)
+function from_flat_kwargs(;
+        root_url::Union{Nothing,String} = ROOT_URL_DEFAULT,
+        host::String = HOST_DEFAULT,
+        port::Union{Nothing,Integer} = PORT_DEFAULT,
+        launch_browser::Bool = LAUNCH_BROWSER_DEFAULT,
+        dismiss_update_notification::Bool = DISMISS_UPDATE_NOTIFICATION_DEFAULT,
+        show_file_system::Bool = SHOW_FILE_SYSTEM_DEFAULT,
+        notebook_path_suggestion::String = notebook_path_suggestion(),
+        disable_writing_notebook_files::Bool = DISABLE_WRITING_NOTEBOOK_FILES_DEFAULT,
+        auto_reload_from_file::Bool = AUTO_RELOAD_FROM_FILE_DEFAULT,
+        auto_reload_from_file_cooldown::Real = AUTO_RELOAD_FROM_FILE_COOLDOWN_DEFAULT,
+        auto_reload_from_file_ignore_pkg::Bool = AUTO_RELOAD_FROM_FILE_IGNORE_PKG_DEFAULT,
+        notebook::Union{Nothing,String,Vector{<:String}} = NOTEBOOK_DEFAULT,
+        init_with_file_viewer::Bool = INIT_WITH_FILE_VIEWER_DEFAULT,
+        simulated_lag::Real = SIMULATED_LAG_DEFAULT,
+        simulated_pkg_lag::Real = SIMULATED_PKG_LAG_DEFAULT,
+        injected_javascript_data_url::String = INJECTED_JAVASCRIPT_DATA_URL_DEFAULT,
+        on_event::Function = ON_EVENT_DEFAULT,
+        require_secret_for_open_links::Bool = REQUIRE_SECRET_FOR_OPEN_LINKS_DEFAULT,
+        require_secret_for_access::Bool = REQUIRE_SECRET_FOR_ACESS_DEFAULT,
+        run_notebook_on_load::Bool = RUN_NOTEBOOK_ON_LOAD_DEFAULT,
+        workspace_use_distributed::Bool = WORKSPACE_USE_DISTRIBUTED_DEFAULT,
+        lazy_workspace_creation::Bool = LAZY_WORKSPACE_CREATION_DEFAULT,
+        compile::Union{Nothing,String} = COMPILE_DEFAULT,
+        sysimage::Union{Nothing,String} = SYSIMAGE_DEFAULT,
+        banner::Union{Nothing,String} = BANNER_DEFAULT,
+        optimize::Union{Nothing,Int} = OPTIMIZE_DEFAULT,
+        math_mode::Union{Nothing,String} = MATH_MODE_DEFAULT,
+        startup_file::Union{Nothing,String} = STARTUP_FILE_DEFAULT,
+        history_file::Union{Nothing,String} = HISTORY_FILE_DEFAULT,
+        threads::Union{Nothing,String,Int} = default_number_of_threads()
+    )
+    server = ServerOptions(;
+        root_url,
+        host,
+        port,
+        launch_browser,
+        dismiss_update_notification,
+        show_file_system,
+        notebook_path_suggestion,
+        disable_writing_notebook_files,
+        auto_reload_from_file,
+        auto_reload_from_file_cooldown,
+        auto_reload_from_file_ignore_pkg,
+        notebook,
+        init_with_file_viewer,
+        simulated_lag,
+        simulated_pkg_lag,
+        injected_javascript_data_url,
+        on_event
+    )
+    security = SecurityOptions(;
+        require_secret_for_open_links,
+        require_secret_for_access
+    )
+    evaluation = EvaluationOptions(;
+        run_notebook_on_load,
+        workspace_use_distributed,
+        lazy_workspace_creation
+    )
+    compiler = CompilerOptions(;
+        compile,
+        sysimage,
+        banner,
+        optimize,
+        math_mode,
+        startup_file,
+        history_file,
+        threads
+    )
+    return Options(; server, security, evaluation, compiler)
+end
 
 function _merge_notebook_compiler_options(notebook, options::CompilerOptions)::CompilerOptions
     if notebook.compiler_options === nothing
diff --git a/test/Configuration.jl b/test/Configuration.jl
index 82cf21de94..d460f4a4a3 100644
--- a/test/Configuration.jl
+++ b/test/Configuration.jl
@@ -13,17 +13,33 @@ cd(Pluto.project_relative_path("test")) do
 end
 
 @testset "from_flat_kwargs" begin
-    opt = from_flat_kwargs(;compile="min", launch_browser=false)
+    opt = from_flat_kwargs(; compile="min", launch_browser=false)
     @test opt.compiler.compile == "min"
     @test opt.server.launch_browser == false
 
-    et = @static if isdefined(Pluto.Configuration.Configurations, :InvalidKeyError)
-        Pluto.Configuration.Configurations.InvalidKeyError
-    else
-        ArgumentError
+    @test_throws MethodError from_flat_kwargs(; asdfasdf="test")
+
+    structs_kwargs = let
+        structs = [
+            Pluto.Configuration.ServerOptions,
+            Pluto.Configuration.SecurityOptions,
+            Pluto.Configuration.EvaluationOptions,
+            Pluto.Configuration.CompilerOptions
+        ]
+        sets = [collect(fieldnames(s)) for s in structs]
+        vcat(sets...)::Vector{Symbol}
     end
 
-    @test_throws et from_flat_kwargs(;asdfasdf="test")    
+    from_flat_kwargs_kwargs = let
+        method = only(methods(Pluto.Configuration.from_flat_kwargs))
+        syms = method.slot_syms
+        names = split(syms, "\0")[2:end-1]
+        Symbol.(names)::Vector{Symbol}
+    end
+
+    # Verify that all struct fields can be set via `from_flat_kwargs`.
+    # Also verifies ordering to improve code readability.
+    @test structs_kwargs == from_flat_kwargs_kwargs
 end
 
 @testset "flag conversion" begin

From def9d0e874aa0dd23394996b51b489947d13fd46 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 6 Apr 2022 14:50:16 +0200
Subject: [PATCH 241/821] Option `capture_stdout` to enable/disable stdout
 capture (#2022)

---
 src/Configuration.jl               | 15 ++++++++++-----
 src/evaluation/Run.jl              | 22 +++++++++++++++-------
 src/evaluation/WorkspaceManager.jl |  7 ++++---
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index d140f0fd2f..a7cdd26cdb 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -123,6 +123,7 @@ end
 const RUN_NOTEBOOK_ON_LOAD_DEFAULT = true
 const WORKSPACE_USE_DISTRIBUTED_DEFAULT = true
 const LAZY_WORKSPACE_CREATION_DEFAULT = false
+const CAPTURE_STDOUT_DEFAULT = true
 
 """
     EvaluationOptions([; kwargs...])
@@ -132,11 +133,13 @@ Options to change Pluto's evaluation behaviour during internal testing. These op
 - `run_notebook_on_load::Bool = $RUN_NOTEBOOK_ON_LOAD_DEFAULT` Whether to evaluate a notebook on load.
 - `workspace_use_distributed::Bool = $WORKSPACE_USE_DISTRIBUTED_DEFAULT` Whether to start notebooks in a separate process.
 - `lazy_workspace_creation::Bool = $LAZY_WORKSPACE_CREATION_DEFAULT`
+- `capture_stdout::Bool = $CAPTURE_STDOUT_DEFAULT`
 """
 @option mutable struct EvaluationOptions
     run_notebook_on_load::Bool = RUN_NOTEBOOK_ON_LOAD_DEFAULT
     workspace_use_distributed::Bool = WORKSPACE_USE_DISTRIBUTED_DEFAULT
     lazy_workspace_creation::Bool = LAZY_WORKSPACE_CREATION_DEFAULT
+    capture_stdout::Bool = CAPTURE_STDOUT_DEFAULT
 end
 
 const COMPILE_DEFAULT = nothing
@@ -232,6 +235,7 @@ function from_flat_kwargs(;
         run_notebook_on_load::Bool = RUN_NOTEBOOK_ON_LOAD_DEFAULT,
         workspace_use_distributed::Bool = WORKSPACE_USE_DISTRIBUTED_DEFAULT,
         lazy_workspace_creation::Bool = LAZY_WORKSPACE_CREATION_DEFAULT,
+        capture_stdout::Bool = CAPTURE_STDOUT_DEFAULT,
         compile::Union{Nothing,String} = COMPILE_DEFAULT,
         sysimage::Union{Nothing,String} = SYSIMAGE_DEFAULT,
         banner::Union{Nothing,String} = BANNER_DEFAULT,
@@ -239,7 +243,7 @@ function from_flat_kwargs(;
         math_mode::Union{Nothing,String} = MATH_MODE_DEFAULT,
         startup_file::Union{Nothing,String} = STARTUP_FILE_DEFAULT,
         history_file::Union{Nothing,String} = HISTORY_FILE_DEFAULT,
-        threads::Union{Nothing,String,Int} = default_number_of_threads()
+        threads::Union{Nothing,String,Int} = default_number_of_threads(),
     )
     server = ServerOptions(;
         root_url,
@@ -258,16 +262,17 @@ function from_flat_kwargs(;
         simulated_lag,
         simulated_pkg_lag,
         injected_javascript_data_url,
-        on_event
+        on_event,
     )
     security = SecurityOptions(;
         require_secret_for_open_links,
-        require_secret_for_access
+        require_secret_for_access,
     )
     evaluation = EvaluationOptions(;
         run_notebook_on_load,
         workspace_use_distributed,
-        lazy_workspace_creation
+        lazy_workspace_creation,
+        capture_stdout,
     )
     compiler = CompilerOptions(;
         compile,
@@ -277,7 +282,7 @@ function from_flat_kwargs(;
         math_mode,
         startup_file,
         history_file,
-        threads
+        threads,
     )
     return Options(; server, security, evaluation, compiler)
 end
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 399bf20eca..3d309537bc 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -153,7 +153,8 @@ function run_reactive_core!(
             run = run_single!(
                 (session, notebook), cell,
                 new_topology.nodes[cell], new_topology.codes[cell];
-                user_requested_run = (user_requested_run && cell ∈ roots)
+                user_requested_run = (user_requested_run && cell ∈ roots),
+				capture_stdout = session.options.evaluation.capture_stdout,
             )
             any_interrupted |= run.interrupted
         end
@@ -237,17 +238,24 @@ function run_single!(
 	cell::Cell, 
 	reactive_node::ReactiveNode, 
 	expr_cache::ExprAnalysisCache; 
-	user_requested_run::Bool=true
+	user_requested_run::Bool=true,
+	capture_stdout::Bool=true,
 )
 	run = WorkspaceManager.eval_format_fetch_in_workspace(
 		session_notebook, 
 		expr_cache.parsedcode, 
-		cell.cell_id, 
-		ends_with_semicolon(cell.code), 
-		expr_cache.function_wrapped ? (filter(!is_joined_funcname, reactive_node.references), reactive_node.definitions) : nothing,
-		expr_cache.forced_expr_id,
+		cell.cell_id;
+		
+		ends_with_semicolon = 
+			ends_with_semicolon(cell.code), 
+		function_wrapped_info = 
+			expr_cache.function_wrapped ? (filter(!is_joined_funcname, reactive_node.references), reactive_node.definitions) : nothing,
+		forced_expr_id = 
+			expr_cache.forced_expr_id,
+		known_published_objects = 
+			collect(keys(cell.published_objects)),
 		user_requested_run,
-		collect(keys(cell.published_objects)),
+		capture_stdout,
 	)
 	set_output!(cell, run, expr_cache; persist_js_state=!user_requested_run)
 	if session_notebook isa Tuple && run.process_exited
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index fac1ccbaae..883f6d481b 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -357,12 +357,13 @@ end
 function eval_format_fetch_in_workspace(
     session_notebook::Union{SN,Workspace},
     expr::Expr,
-    cell_id::UUID,
+    cell_id::UUID;
     ends_with_semicolon::Bool=false,
     function_wrapped_info::Union{Nothing,Tuple}=nothing,
     forced_expr_id::Union{PlutoRunner.ObjectID,Nothing}=nothing,
-    user_requested_run::Bool=true,
     known_published_objects::Vector{String}=String[],
+    user_requested_run::Bool=true,
+    capture_stdout::Bool=true,
 )::PlutoRunner.FormattedCellResult
 
     workspace = get_workspace(session_notebook)
@@ -390,7 +391,7 @@ function eval_format_fetch_in_workspace(
             $function_wrapped_info,
             $forced_expr_id;
             user_requested_run=$user_requested_run,
-            capture_stdout=$(!is_on_this_process),
+            capture_stdout=$(capture_stdout && !is_on_this_process),
         )))
         put!(workspace.dowork_token)
         nothing

From ac6d5a10860be0d0d01afb7114fc36d01290ff73 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 6 Apr 2022 17:20:10 +0200
Subject: [PATCH 242/821] Add yield()s around logger redirect (#2026)

---
 src/runner/PlutoRunner.jl | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index d81c012ade..bd3e40ef7f 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -664,7 +664,7 @@ function move_vars(old_workspace_name::Symbol, new_workspace_name::Symbol, vars_
                 catch ex
                     if !(ex isa UndefVarError)
                         @warn "Failed to move variable $(symbol) to new workspace:"
-                        showerror(stderr, ex, stacktrace(catch_backtrace()))
+                        showerror(original_stderr, ex, stacktrace(catch_backtrace()))
                     end
                 end
             end
@@ -728,7 +728,7 @@ function try_delete_toplevel_methods(workspace::Module, (cell_id, name_parts)::T
             (val isa Function) && delete_toplevel_methods(val, cell_id)
         catch ex
             @warn "Failed to delete methods for $(name_parts)"
-            showerror(stderr, ex, stacktrace(catch_backtrace()))
+            showerror(original_stderr, ex, stacktrace(catch_backtrace()))
             false
         end
     catch
@@ -1996,6 +1996,10 @@ end
 # LOGGING
 ###
 
+const original_stdout = stdout
+const original_stderr = stderr
+
+
 const log_channel = Channel{Any}(10)
 const old_logger = Ref{Any}(nothing)
 
@@ -2022,6 +2026,9 @@ function Logging.handle_message(::PlutoLogger, level, msg, _module, group, id, f
     # println("with types: ", "_module: ", typeof(_module), ", ", "msg: ", typeof(msg), ", ", "group: ", typeof(group), ", ", "id: ", typeof(id), ", ", "file: ", typeof(file), ", ", "line: ", typeof(line), ", ", "kwargs: ", typeof(kwargs)) # thanks Copilot
 
     try
+        
+        yield()
+        
         put!(log_channel, Dict{String,Any}(
             "level" => string(level),
             "msg" => format_output_default(msg isa String ? Text(msg) : msg),
@@ -2034,11 +2041,13 @@ function Logging.handle_message(::PlutoLogger, level, msg, _module, group, id, f
             )
         )
         
+        yield()
+        
         # Also print to console (disabled)
         # Logging.handle_message(old_logger[], level, msg, _module, group, id, file, line; kwargs...)
     catch e
-        println(stderr, "Failed to relay log from PlutoRunner")
-        showerror(stderr, e, stacktrace(catch_backtrace()))
+        println(original_stderr, "Failed to relay log from PlutoRunner")
+        showerror(original_stderr, e, stacktrace(catch_backtrace()))
     end
 end
 

From b2368662891c6b4961de36b71a808119cd225471 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 6 Apr 2022 18:25:43 +0200
Subject: [PATCH 243/821] binder button cleanup

---
 frontend/binder.css                 | 29 ++++++++++++++---------------
 frontend/components/BinderButton.js | 13 ++++++-------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/frontend/binder.css b/frontend/binder.css
index ef11506ec3..09d0a96b86 100644
--- a/frontend/binder.css
+++ b/frontend/binder.css
@@ -53,7 +53,7 @@ binder-spinner {
     }
 }
 
-#launch_binder {
+.edit_or_run {
     /* position: absolute; */
     position: fixed;
     z-index: 2000;
@@ -62,7 +62,7 @@ binder-spinner {
     /* width: 153.2px; */
     /* height: 60px; */
 }
-#launch_binder button {
+.binder_help_text button {
     padding: 7px 20px;
     background: #fffdf7;
     box-shadow: 0px 0px 20px 0px #ffffff;
@@ -76,8 +76,7 @@ binder-spinner {
     display: block;
 }
 
-body.wiggle_binder button#launch_binder,
-body.wiggle_binder #binder_launch_help {
+body.wiggle_binder .edit_or_run > button {
     /* position: fixed; */
     animation: wiggle-binder-button 0.3s ease-in-out 0s 1;
 }
@@ -97,7 +96,7 @@ body.wiggle_binder #binder_launch_help {
     }
 }
 
-#launch_binder button img {
+.binder_help_text button img {
     margin: -8px;
     margin-left: 0px;
     font-style: normal;
@@ -105,7 +104,7 @@ body.wiggle_binder #binder_launch_help {
     font-weight: 900;
 }
 
-#binder_launch_help {
+.edit_or_run > button {
     width: 100%;
     display: block;
     text-align: center;
@@ -125,11 +124,11 @@ body.wiggle_binder #binder_launch_help {
     border-radius: 30px;
 }
 
-#binder_launch_help:hover {
+.edit_or_run > button:hover {
     text-decoration: underline;
 }
 
-#binder_help_text {
+.binder_help_text {
     --width: min(85vw, 570px);
     position: fixed;
     top: 5rem;
@@ -144,12 +143,12 @@ body.wiggle_binder #binder_launch_help {
     box-shadow: 0px 0px 0px 100vmax #0000004a;
     font-family: "Lato", sans-serif;
 }
-#binder_help_text a {
+.binder_help_text a {
     color: black;
 }
 
 @media (max-width: 500px) {
-    #binder_help_text {
+    .binder_help_text {
         top: 0;
         width: 100vw;
         left: 0;
@@ -157,7 +156,7 @@ body.wiggle_binder #binder_launch_help {
     }
 }
 
-#binder_help_text .close {
+.binder_help_text .close {
     position: absolute;
     top: 12px;
     right: 12px;
@@ -179,7 +178,7 @@ body.wiggle_binder #binder_launch_help {
 }
 
 .download_div,
-#launch_binder button,
+.binder_help_text button,
 .download_div,
 .copy_div {
     width: max(60%, 10rem);
@@ -274,11 +273,11 @@ body.wiggle_binder #binder_launch_help {
     font-weight: bold;
     margin-bottom: 0.75rem;
 }
-#launch_binder li {
+.edit_or_run li {
     margin-bottom: 2rem;
 }
-#launch_binder li video,
-#launch_binder li img {
+.edit_or_run li video,
+.edit_or_run li img {
     /* outline: 1px solid black; */
     border: 5px solid rgb(212, 212, 212);
     border-radius: 5px;
diff --git a/frontend/components/BinderButton.js b/frontend/components/BinderButton.js
index c5915512fa..5c725120ef 100644
--- a/frontend/components/BinderButton.js
+++ b/frontend/components/BinderButton.js
@@ -12,7 +12,7 @@ export const BinderButton = ({ binder_phase, start_binder, notebookfile }) => {
             e.key === "Escape" && setPopupOpen(false)
         }
         const handleclick = (e) => {
-            if (popupOpen && !e.composedPath().find((el) => el.id === "binder_help_text")) {
+            if (popupOpen && !e.target?.closest(".binder_help_text")) {
                 setPopupOpen(false)
                 // Avoid activating whatever was below
                 e.stopPropagation()
@@ -34,19 +34,18 @@ export const BinderButton = ({ binder_phase, start_binder, notebookfile }) => {
     if (!show) return null
     const show_binder = binder_phase != null
     const recommend_download = notebookfile_ref.current.startsWith("data:")
-    return html` <div id="launch_binder">
-        <span
-            id="binder_launch_help"
+    return html` <div class="edit_or_run">
+        <button
             onClick=${(e) => {
                 e.stopPropagation()
                 e.preventDefault()
                 setPopupOpen(!popupOpen)
             }}
-            class="explain_binder"
-            ><b>Edit</b> or <b>run</b> this notebook</span
         >
+            <b>Edit</b> or <b>run</b> this notebook
+        </button>
         ${popupOpen &&
-        html`<div id="binder_help_text">
+        html`<div class="binder_help_text">
             <span onClick=${() => setPopupOpen(false)} class="close"></span>
             ${show_binder
                 ? html`

From ea905bcf8bf82d5fec6dae49e67ee677819694b5 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 6 Apr 2022 19:44:01 +0200
Subject: [PATCH 244/821] css tweaks

---
 frontend/binder.css | 8 ++++----
 frontend/editor.css | 3 +--
 frontend/editor.js  | 1 -
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/frontend/binder.css b/frontend/binder.css
index 09d0a96b86..54b721a901 100644
--- a/frontend/binder.css
+++ b/frontend/binder.css
@@ -113,11 +113,11 @@ body.wiggle_binder .edit_or_run > button {
     cursor: pointer;
     background: unset;
     background-color: var(--overlay-button-bg);
-    border: 3px solid hsl(236deg 28% 50% / 70%);
-    font-size: 14px;
-    font-style: italic;
+    border: 3px solid hsl(236deg 28% 50% / 46%);
+    font-size: 16px;
+    /* font-style: italic; */
     font-family: "Roboto Mono";
-    letter-spacing: -0.2px;
+    font-family: var(--lato-ui-font-stack);letter-spacing: 0.1px;
     color: var(--black);
     white-space: nowrap;
     padding: 8px 16px;
diff --git a/frontend/editor.css b/frontend/editor.css
index 2f7ead9184..f467a10027 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -46,7 +46,6 @@ html {
 }
 
 body {
-    overscroll-behavior: contain;
     margin: 0px;
     overflow-anchor: none;
     overflow-x: hidden;
@@ -80,7 +79,7 @@ body:not(.disable_ui) main {
 }
 
 body:not(.disable_ui) {
-    overscroll-behavior-x: contain;
+    overscroll-behavior: contain;
 }
 
 /* | main=25px+700px+6px=731px | pluto-helpbox=350px - 500px | */
diff --git a/frontend/editor.js b/frontend/editor.js
index af33d23d93..0ce05e1a0c 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -3,7 +3,6 @@ import "./common/NodejsCompatibilityPolyfill.js"
 
 import { Editor, default_path } from "./components/Editor.js"
 import { FetchProgress, read_Uint8Array_with_progress } from "./components/FetchProgress.js"
-import { BinderPhase } from "./common/Binder.js"
 import { unpack } from "./common/MsgPack.js"
 import { RawHTMLContainer } from "./components/CellOutput.js"
 

From 52cbf3b561e5ca7155a659689f152e2a364ea32b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 6 Apr 2022 19:51:47 +0200
Subject: [PATCH 245/821] Generalize binder to other backends (#2029)

---
 frontend/common/Binder.js           |  9 ++---
 frontend/components/BinderButton.js | 25 +++++++-----
 frontend/components/Editor.js       | 59 +++++++++++++++++++----------
 frontend/components/ProgressBar.js  |  4 +-
 4 files changed, 59 insertions(+), 38 deletions(-)

diff --git a/frontend/common/Binder.js b/frontend/common/Binder.js
index b76a69e794..313a7781e9 100644
--- a/frontend/common/Binder.js
+++ b/frontend/common/Binder.js
@@ -1,7 +1,7 @@
 import immer from "../imports/immer.js"
 import { timeout_promise, ws_address_from_base } from "./PlutoConnection.js"
 
-export const BinderPhase = {
+export const BackendLaunchPhase = {
     wait_for_user: 0,
     requesting: 0.4,
     created: 0.6,
@@ -88,8 +88,7 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
         count_stat(`binder-start`)
         await setStatePromise(
             immer((state) => {
-                state.binder_phase = BinderPhase.requesting
-                state.loading = true
+                state.backend_launch_phase = BackendLaunchPhase.requesting
                 state.disable_ui = false
             })
         )
@@ -108,7 +107,7 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
 
         await setStatePromise(
             immer((state) => {
-                state.binder_phase = BinderPhase.created
+                state.backend_launch_phase = BackendLaunchPhase.created
                 state.binder_session_url = binder_session_url
                 state.binder_session_token = binder_session_token
             })
@@ -148,7 +147,7 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
         await setStatePromise(
             immer((state) => {
                 state.notebook.notebook_id = new_notebook_id
-                state.binder_phase = BinderPhase.notebook_running
+                state.backend_launch_phase = BackendLaunchPhase.notebook_running
             })
         )
         console.log("Connecting WebSocket")
diff --git a/frontend/components/BinderButton.js b/frontend/components/BinderButton.js
index 5c725120ef..02276f0a55 100644
--- a/frontend/components/BinderButton.js
+++ b/frontend/components/BinderButton.js
@@ -1,7 +1,7 @@
-import { BinderPhase } from "../common/Binder.js"
+import { BackendLaunchPhase } from "../common/Binder.js"
 import { html, useEffect, useState, useRef } from "../imports/Preact.js"
 
-export const BinderButton = ({ binder_phase, start_binder, notebookfile }) => {
+export const BinderButton = ({ offer_binder, start_binder, notebookfile }) => {
     const [popupOpen, setPopupOpen] = useState(false)
     const [showCopyPopup, setShowCopyPopup] = useState(false)
     const notebookfile_ref = useRef("")
@@ -27,14 +27,19 @@ export const BinderButton = ({ binder_phase, start_binder, notebookfile }) => {
             document.body.removeEventListener("click", handleclick)
         }
     }, [popupOpen])
-    const show = binder_phase === BinderPhase.wait_for_user
-    //@ts-ignore
-    // allow user-written JS to start the binder
-    window.start_binder = show ? start_binder : () => {}
-    if (!show) return null
-    const show_binder = binder_phase != null
+
+    useEffect(() => {
+        //@ts-ignore
+        // allow user-written JS to start the binder
+        window.start_binder = offer_binder ? start_binder : null
+        return () => {
+            //@ts-ignore
+            window.start_binder = null
+        }
+    }, [start_binder, offer_binder])
+
     const recommend_download = notebookfile_ref.current.startsWith("data:")
-    return html` <div class="edit_or_run">
+    return html`<div class="edit_or_run">
         <button
             onClick=${(e) => {
                 e.stopPropagation()
@@ -47,7 +52,7 @@ export const BinderButton = ({ binder_phase, start_binder, notebookfile }) => {
         ${popupOpen &&
         html`<div class="binder_help_text">
             <span onClick=${() => setPopupOpen(false)} class="close"></span>
-            ${show_binder
+            ${offer_binder
                 ? html`
                       <p style="text-align: center;">
                           ${`To be able to edit code and run cells, you need to run the notebook yourself. `}
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index a13b3b1aef..14dece72f2 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -23,7 +23,7 @@ import { Popup } from "./Popup.js"
 import { slice_utf8, length_utf8 } from "../common/UnicodeTools.js"
 import { has_ctrl_or_cmd_pressed, ctrl_or_cmd_name, is_mac_keyboard, in_textarea_or_input } from "../common/KeyboardShortcuts.js"
 import { PlutoContext, PlutoBondsContext, PlutoJSInitializingContext, SetWithEmptyCallback } from "../common/PlutoContext.js"
-import { start_binder, BinderPhase, count_stat } from "../common/Binder.js"
+import { start_binder, BackendLaunchPhase, count_stat } from "../common/Binder.js"
 import { setup_mathjax } from "../common/SetupMathJax.js"
 import { BinderButton } from "./BinderButton.js"
 import { slider_server_actions, nothing_actions } from "../common/SliderServerClient.js"
@@ -66,7 +66,9 @@ const ProcessStatus = {
 const statusmap = (state, launch_params) => ({
     disconnected: !(state.connected || state.initializing || state.static_preview),
     loading:
-        (state.binder_phase != null && BinderPhase.wait_for_user < state.binder_phase && state.binder_phase < BinderPhase.ready) ||
+        (state.backend_launch_phase != null &&
+            BackendLaunchPhase.wait_for_user < state.backend_launch_phase &&
+            state.backend_launch_phase < BackendLaunchPhase.ready) ||
         state.initializing ||
         state.moving_file,
     process_restarting: state.notebook.process_status === ProcessStatus.waiting_to_restart,
@@ -75,7 +77,7 @@ const statusmap = (state, launch_params) => ({
     nbpkg_restart_recommended: state.notebook.nbpkg?.restart_recommended_msg != null,
     nbpkg_disabled: state.notebook.nbpkg?.enabled === false,
     static_preview: state.static_preview,
-    binder: state.offer_binder || state.binder_phase != null,
+    binder: launch_params.binder_url != null && state.backend_launch_phase != null,
     code_differs: state.notebook.cell_order.some(
         (cell_id) => state.cell_inputs_local[cell_id] != null && state.notebook.cell_inputs[cell_id].code !== state.cell_inputs_local[cell_id].code
     ),
@@ -223,8 +225,7 @@ export class Editor extends Component {
 
             disable_ui: launch_params.disable_ui,
             static_preview: launch_params.statefile != null,
-            offer_binder: launch_params.notebookfile != null && launch_params.binder_url != null,
-            binder_phase: null,
+            backend_launch_phase: launch_params.notebookfile != null && launch_params.binder_url != null ? BackendLaunchPhase.wait_for_user : null,
             binder_session_url: null,
             binder_session_token: null,
             connected: false,
@@ -639,7 +640,8 @@ patch: ${JSON.stringify(
         // these are update message that are _not_ a response to a `send(*, *, {create_promise: true})`
         const on_update = (update, by_me) => {
             if (this.state.notebook.notebook_id === update.notebook_id) {
-                if (this.state.binder_phase != null) console.debug("on_update", update, by_me)
+                const show_debugs = launch_params.binder_url != null
+                if (show_debugs) console.debug("on_update", update, by_me)
                 const message = update.message
                 switch (update.type) {
                     case "notebook_diff":
@@ -682,7 +684,7 @@ patch: ${JSON.stringify(
                         // alert("Something went wrong 🙈\n Try clearing your browser cache and refreshing the page")
                         break
                 }
-                if (this.state.binder_phase != null) console.debug("on_update done")
+                if (show_debugs) console.debug("on_update done")
             } else {
                 // Update for a different notebook, TODO maybe log this as it shouldn't happen
             }
@@ -713,7 +715,11 @@ patch: ${JSON.stringify(
             await this.client.send("update_notebook", { updates: [] }, { notebook_id: this.state.notebook.notebook_id }, false)
             console.debug("Received update_notebook request")
 
-            this.setState({ initializing: false, static_preview: false, binder_phase: this.state.binder_phase == null ? null : BinderPhase.ready })
+            this.setState({
+                initializing: false,
+                static_preview: false,
+                backend_launch_phase: this.state.backend_launch_phase == null ? null : BackendLaunchPhase.ready,
+            })
 
             // do one autocomplete to trigger its precompilation
             // TODO Do this from julia itself
@@ -1039,7 +1045,7 @@ patch: ${JSON.stringify(
                 })
             }
 
-            if (this.state.disable_ui && this.state.offer_binder) {
+            if (this.state.disable_ui && this.state.backend_launch_phase === BackendLaunchPhase.wait_for_user) {
                 // const code = e.key.charCodeAt(0)
                 if (e.key === "Enter" || e.key.length === 1) {
                     if (!document.body.classList.contains("wiggle_binder")) {
@@ -1120,7 +1126,6 @@ patch: ${JSON.stringify(
         if (this.state.static_preview) {
             this.setState({
                 initializing: false,
-                binder_phase: this.state.offer_binder ? BinderPhase.wait_for_user : null,
             })
             // view stats on https://stats.plutojl.org/
             count_stat(`article-view`)
@@ -1148,8 +1153,8 @@ patch: ${JSON.stringify(
 
         this.send_queued_bond_changes()
 
-        if (old_state.binder_phase !== this.state.binder_phase && this.state.binder_phase != null) {
-            const phase = Object.entries(BinderPhase).find(([k, v]) => v == this.state.binder_phase)[0]
+        if (old_state.backend_launch_phase !== this.state.backend_launch_phase && this.state.backend_launch_phase != null) {
+            const phase = Object.entries(BackendLaunchPhase).find(([k, v]) => v == this.state.backend_launch_phase)[0]
             console.info(`Binder phase: ${phase} at ${new Date().toLocaleTimeString()}`)
         }
 
@@ -1188,7 +1193,7 @@ patch: ${JSON.stringify(
                 <${PlutoContext.Provider} value=${this.actions}>
                     <${PlutoBondsContext.Provider} value=${this.state.notebook.bonds}>
                         <${PlutoJSInitializingContext.Provider} value=${this.js_init_set}>
-                            <${ProgressBar} notebook=${this.state.notebook} binder_phase=${this.state.binder_phase} status=${status}/>
+                            <${ProgressBar} notebook=${this.state.notebook} backend_launch_phase=${this.state.backend_launch_phase} status=${status}/>
                             <div style="width: 100%">
                                 ${this.state.notebook.cell_order.map(
                                     (cell_id, i) => html`
@@ -1220,6 +1225,9 @@ patch: ${JSON.stringify(
             >${text}</a
         >`
 
+        const wfu = this.state.backend_launch_phase === BackendLaunchPhase.wait_for_user
+        const offer_binder = wfu && launch_params.binder_url != null
+
         return html`
             ${this.state.disable_ui === false && html`<${HijackExternalLinksToOpenInNewTab} />`}
             
@@ -1227,7 +1235,7 @@ patch: ${JSON.stringify(
                 <${PlutoBondsContext.Provider} value=${this.state.notebook.bonds}>
                     <${PlutoJSInitializingContext.Provider} value=${this.js_init_set}>
                     <${Scroller} active=${this.state.scroller} />
-                    <${ProgressBar} notebook=${this.state.notebook} binder_phase=${this.state.binder_phase} status=${status}/>
+                    <${ProgressBar} notebook=${this.state.notebook} backend_launch_phase=${this.state.backend_launch_phase} status=${status}/>
                     <header id="pluto-nav" className=${export_menu_open ? "show_export" : ""}>
                         <${ExportBanner}
                             notebookfile_url=${this.export_url("notebookfile")}
@@ -1247,7 +1255,7 @@ patch: ${JSON.stringify(
                         }
                         <nav id="at_the_top">
                             <a href=${
-                                this.state.static_preview || this.state.binder_phase != null
+                                this.state.static_preview || this.state.binder_session_url != null
                                     ? `${this.state.binder_session_url}?token=${this.state.binder_session_token}`
                                     : "./"
                             }>
@@ -1319,11 +1327,20 @@ patch: ${JSON.stringify(
                             )}
                     />
                     
-                    <${BinderButton} 
-                        binder_phase=${this.state.binder_phase} 
-                        start_binder=${() => start_binder({ setStatePromise: this.setStatePromise, connect: this.connect, launch_params: launch_params })} 
-                        notebookfile=${launch_params.notebookfile == null ? null : new URL(launch_params.notebookfile, window.location.href).href} />
-                    
+                    ${
+                        offer_binder
+                            ? html`<${BinderButton}
+                                  offer_binder=${offer_binder}
+                                  start_binder=${() =>
+                                      start_binder({
+                                          setStatePromise: this.setStatePromise,
+                                          connect: this.connect,
+                                          launch_params: launch_params,
+                                      })}
+                                  notebookfile=${launch_params.notebookfile == null ? null : new URL(launch_params.notebookfile, window.location.href).href}
+                              />`
+                            : null
+                    }
                     ${launch_params.preamble_html ? html`<${RawHTMLContainer} body=${launch_params.preamble_html} className=${"preamble"} />` : null}
                     <${Main}>
                         <${Preamble}
@@ -1335,7 +1352,7 @@ patch: ${JSON.stringify(
                         <${Notebook}
                             notebook=${this.state.notebook}
                             cell_inputs_local=${this.state.cell_inputs_local}
-                            disable_input=${this.state.disable_ui || !this.state.connected /* && this.state.binder_phase == null*/}
+                            disable_input=${this.state.disable_ui || !this.state.connected /* && this.state.backend_launch_phase == null*/}
                             show_logs=${this.state.show_logs}
                             set_show_logs=${(enabled) => this.setState({ show_logs: enabled })}
                             last_created_cell=${this.state.last_created_cell}
diff --git a/frontend/components/ProgressBar.js b/frontend/components/ProgressBar.js
index ca3c48eff4..1001b97c36 100644
--- a/frontend/components/ProgressBar.js
+++ b/frontend/components/ProgressBar.js
@@ -14,7 +14,7 @@ export const useDelayed = (value, delay = 500) => {
     return current
 }
 
-export const ProgressBar = ({ notebook, binder_phase, status }) => {
+export const ProgressBar = ({ notebook, backend_launch_phase, status }) => {
     const [recently_running, set_recently_running] = useState([])
     const [currently_running, set_currently_running] = useState([])
 
@@ -40,7 +40,7 @@ export const ProgressBar = ({ notebook, binder_phase, status }) => {
     let cell_progress = recently_running.length === 0 ? 0 : 1 - Math.max(0, currently_running.length - 0.3) / recently_running.length
 
     let binder_loading = status.loading && status.binder
-    let progress = binder_loading ? binder_phase : cell_progress
+    let progress = binder_loading ? backend_launch_phase : cell_progress
 
     const anything = (binder_loading || recently_running.length !== 0) && progress !== 1
     const anything_for_a_short_while = useDelayed(anything, 500) ?? false

From 53019c48ab9c1f3d42f44b4e74e98ed567485a61 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 6 Apr 2022 21:37:26 +0200
Subject: [PATCH 246/821] FilePicker.js scroll tweak

---
 frontend/components/FilePicker.js | 34 +++++++++++++++++++------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/frontend/components/FilePicker.js b/frontend/components/FilePicker.js
index d20b354db9..566a7c9e64 100644
--- a/frontend/components/FilePicker.js
+++ b/frontend/components/FilePicker.js
@@ -15,6 +15,7 @@ export class FilePicker extends Component {
     constructor() {
         super()
         this.forced_value = ""
+        /** @type {EditorView} */
         this.cm = null
 
         this.suggest_not_tmp = () => {
@@ -58,10 +59,17 @@ export class FilePicker extends Component {
                 selection: EditorSelection.cursor(this.props.value.length),
             })
             this.forced_value = this.props.value
+
+            // a long path like /Users/fons/Documents/article-test-1/asdfasdfasdfsadf.jl does not fit in the little box, so we scroll it to the left so that you can see the filename easily.
+            this.cm.scrollDOM.scrollLeft = 100000
+            setTimeout(() => {
+                // TODO: do we need this?
+                this.cm.scrollDOM.scrollLeft = 100000
+            }, 100)
         }
     }
     componentDidMount() {
-        const usesDarkTheme = window.matchMedia('(prefers-color-scheme: dark)').matches;
+        const usesDarkTheme = window.matchMedia("(prefers-color-scheme: dark)").matches
         this.cm = new EditorView({
             state: EditorState.create({
                 doc: "",
@@ -90,16 +98,19 @@ export class FilePicker extends Component {
                             }, 200)
                         },
                     }),
-                    EditorView.theme({
-                        "&": {
-                            fontSize: "inherit",
-                        },
-                        ".cm-scroller": {
-                            fontFamily: "inherit",
-                            overflowY: "hidden",
-                            overflowX: "auto",
+                    EditorView.theme(
+                        {
+                            "&": {
+                                fontSize: "inherit",
+                            },
+                            ".cm-scroller": {
+                                fontFamily: "inherit",
+                                overflowY: "hidden",
+                                overflowX: "auto",
+                            },
                         },
-                    }, {dark : usesDarkTheme}),
+                        { dark: usesDarkTheme }
+                    ),
                     // EditorView.updateListener.of(onCM6Update),
                     history(),
                     autocompletion({
@@ -168,9 +179,6 @@ export class FilePicker extends Component {
         })
         this.base.insertBefore(this.cm.dom, this.base.firstElementChild)
 
-        setTimeout(() => {
-            this.cm.scrollPosIntoView(this.props.value.length)
-        }, 100)
         // window.addEventListener("resize", () => {
         //     if (!this.cm.hasFocus()) {
         //         deselect(this.cm)

From a07df4031cebf3ae7f5c2ee980f3f2be8eea3348 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Thu, 7 Apr 2022 18:27:29 +0200
Subject: [PATCH 247/821] Option to hide logs per cell persistently (#2023)

* Option hide logs per cell persistently

* add show_logs to default values in the frontend

* only show/hide when there are logs

* little commenty
---
 frontend/components/Cell.js     | 13 +++-----
 frontend/components/Editor.js   | 18 +++++++----
 frontend/components/Notebook.js | 20 ++----------
 src/notebook/Cell.jl            |  9 +++++-
 test/Notebook.jl                | 57 +++++++++++++++++----------------
 test/helpers.jl                 |  2 +-
 6 files changed, 57 insertions(+), 62 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 6c8a4d1b91..169c54025f 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -55,7 +55,7 @@ export const Cell = ({
     nbpkg,
     global_definition_locations,
 }) => {
-    const { disabled: running_disabled } = metadata
+    const { show_logs, disabled: running_disabled } = metadata
     let pluto_actions = useContext(PlutoContext)
     const on_update_doc_query = pluto_actions.set_doc_query
     const on_focus_neighbor = pluto_actions.focus_on_neighbor
@@ -64,15 +64,12 @@ export const Cell = ({
     // cm_forced_focus is null, except when a line needs to be highlighted because it is part of a stack trace
     const [cm_forced_focus, set_cm_forced_focus] = useState(null)
     const [cm_highlighted_line, set_cm_highlighted_line] = useState(null)
-    const [show_logs, set_show_logs] = useState(true)
 
     const any_logs = useMemo(() => !_.isEmpty(logs), [logs])
-
-    useEffect(() => {
-        if (!any_logs) {
-            set_show_logs(true)
-        }
-    }, [any_logs])
+    const set_show_logs = (show_logs) =>
+        pluto_actions.update_notebook((notebook) => {
+            notebook.cell_inputs[cell_id].metadata.show_logs = show_logs
+        })
 
     useEffect(() => {
         const focusListener = (e) => {
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 14dece72f2..bcd9f3e3bb 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -39,6 +39,12 @@ import { HijackExternalLinksToOpenInNewTab } from "./HackySideStuff/HijackExtern
 export const default_path = "..."
 const DEBUG_DIFFING = false
 
+// Be sure to keep this in sync with DEFAULT_METADATA in Cell.jl
+const DEFAULT_METADATA = {
+    disabled: false,
+    show_logs: true,
+}
+
 // from our friends at https://stackoverflow.com/a/2117523
 // i checked it and it generates Julia-legal UUIDs and that's all we need -SNOF
 const uuidv4 = () =>
@@ -101,7 +107,8 @@ const first_true_key = (obj) => {
  *  code: string,
  *  code_folded: boolean,
  *  metadata: {
- *    disabled: boolean
+ *    disabled: boolean,
+ *    show_logs: boolean,
  *  },
  * }}
  */
@@ -237,7 +244,6 @@ export class Editor extends Component {
                 down: false,
             },
             export_menu_open: false,
-            show_logs: true,
 
             last_created_cell: null,
             selected_cells: [],
@@ -339,7 +345,7 @@ export class Editor extends Component {
                             // Fill the cell with empty code remotely, so it doesn't run unsafe code
                             code: "",
                             metadata: {
-                                disabled: false,
+                                ...DEFAULT_METADATA,
                             },
                         }
                     }
@@ -379,7 +385,7 @@ export class Editor extends Component {
                         code: code,
                         code_folded: false,
                         metadata: {
-                            disabled: false,
+                            ...DEFAULT_METADATA,
                         },
                     }
                 })
@@ -438,7 +444,7 @@ export class Editor extends Component {
                         cell_id: id,
                         code,
                         code_folded: false,
-                        metadata: { disabled: false },
+                        metadata: { ...DEFAULT_METADATA },
                     }
                     notebook.cell_order = [...notebook.cell_order.slice(0, index), id, ...notebook.cell_order.slice(index, Infinity)]
                 })
@@ -1353,8 +1359,6 @@ patch: ${JSON.stringify(
                             notebook=${this.state.notebook}
                             cell_inputs_local=${this.state.cell_inputs_local}
                             disable_input=${this.state.disable_ui || !this.state.connected /* && this.state.backend_launch_phase == null*/}
-                            show_logs=${this.state.show_logs}
-                            set_show_logs=${(enabled) => this.setState({ show_logs: enabled })}
                             last_created_cell=${this.state.last_created_cell}
                             selected_cells=${this.state.selected_cells}
                             is_initializing=${this.state.initializing}
diff --git a/frontend/components/Notebook.js b/frontend/components/Notebook.js
index 53e96eb6c7..ea2aedc6ee 100644
--- a/frontend/components/Notebook.js
+++ b/frontend/components/Notebook.js
@@ -56,8 +56,6 @@ let CellMemo = ({
                 focus_after_creation=${focus_after_creation}
                 is_process_ready=${is_process_ready}
                 disable_input=${disable_input}
-                show_logs=${show_logs}
-                set_show_logs=${set_show_logs}
                 nbpkg=${nbpkg}
                 global_definition_locations=${global_definition_locations}
             />
@@ -66,6 +64,7 @@ let CellMemo = ({
         // Object references may invalidate this faster than the optimal. To avoid this, spread out objects to primitives!
         cell_id,
         metadata.disabled,
+        metadata.show_logs,
         depends_on_disabled_cells,
         queued,
         running,
@@ -87,7 +86,6 @@ let CellMemo = ({
         focus_after_creation,
         is_process_ready,
         disable_input,
-        show_logs,
         ...nbpkg_fingerprint(nbpkg),
         global_definition_locations,
     ])
@@ -115,21 +113,9 @@ const render_cell_outputs_minimum = 20
  *  is_initializing: boolean,
  *  is_process_ready: boolean,
  *  disable_input: any,
- *  show_logs: boolean,
- *  set_show_logs: any,
  * }} props
  * */
-export const Notebook = ({
-    notebook,
-    cell_inputs_local,
-    last_created_cell,
-    selected_cells,
-    is_initializing,
-    is_process_ready,
-    disable_input,
-    show_logs,
-    set_show_logs,
-}) => {
+export const Notebook = ({ notebook, cell_inputs_local, last_created_cell, selected_cells, is_initializing, is_process_ready, disable_input }) => {
     let pluto_actions = useContext(PlutoContext)
 
     // Add new cell when the last cell gets deleted
@@ -183,8 +169,6 @@ export const Notebook = ({
                         force_hide_input=${false}
                         is_process_ready=${is_process_ready}
                         disable_input=${disable_input}
-                        show_logs=${show_logs}
-                        set_show_logs=${set_show_logs}
                         nbpkg=${notebook.nbpkg}
                         global_definition_locations=${global_definition_locations}
                     />`
diff --git a/src/notebook/Cell.jl b/src/notebook/Cell.jl
index 12de893ace..bf76176355 100644
--- a/src/notebook/Cell.jl
+++ b/src/notebook/Cell.jl
@@ -1,8 +1,10 @@
 import UUIDs: UUID, uuid1
 import .ExpressionExplorer: SymbolsState, UsingsImports
 
+# Make sure to keep this in sync with DEFAULT_METADATA in ../frontend/components/Editor.js
 const DEFAULT_METADATA = Dict{String, Any}(
-    "disabled" => false
+    "disabled" => false,
+    "show_logs" => true,
 )
 
 Base.@kwdef struct CellOutput
@@ -70,5 +72,10 @@ function Base.convert(::Type{UUID}, string::String)
     UUID(string)
 end
 
+create_metadata(metadata::Dict{String,<:Any}) = merge(DEFAULT_METADATA, metadata)
 get_cell_metadata(cell::Cell)::Dict{String,Any} = cell.metadata
 get_cell_metadata_no_default(cell::Cell)::Dict{String,Any} = Dict{String,Any}(setdiff(pairs(cell.metadata), pairs(DEFAULT_METADATA)))
+
+"Returns whether or not the cell is **explicitely** disabled."
+is_disabled(c::Cell) = get(c.metadata, "disabled", false)
+can_show_logs(c::Cell) = get(c.metadata, "show_logs", true)
diff --git a/test/Notebook.jl b/test/Notebook.jl
index 3f09e69107..16993701ee 100644
--- a/test/Notebook.jl
+++ b/test/Notebook.jl
@@ -1,5 +1,6 @@
 using Test
-import Pluto: Notebook, ServerSession, ClientSession, Cell, load_notebook, load_notebook_nobackup, save_notebook, WorkspaceManager, cutename, numbered_until_new, readwrite, without_pluto_file_extension
+import Pluto: Notebook, ServerSession, ClientSession, Cell, load_notebook, load_notebook_nobackup, save_notebook, WorkspaceManager, cutename, numbered_until_new, readwrite, without_pluto_file_extension, update_run!, get_cell_metadata_no_default, is_disabled, create_metadata
+import Pluto.WorkspaceManager: poll, WorkspaceManager
 import Random
 import Pkg
 import UUIDs: UUID
@@ -40,7 +41,7 @@ function metadata_notebook()
                     "number" => 10000,
                 ),
                 "disabled" => true,
-            ),
+            ) |> create_metadata,
         ),
     ]) |> init_packages!
 end
@@ -163,31 +164,33 @@ end
         fakeclient = ClientSession(:fake, nothing)
         🍭.connected_clients[fakeclient.id] = fakeclient
 
-        nb = metadata_notebook()
-        update_run!(🍭, nb, nb.cells)
-        cell = first(values(nb.cells_dict))
-        @test cell.metadata == Dict(
-            "a metadata tag" => Dict(
-                "boolean" => true,
-                "string" => "String",
-                "number" => 10000,
-            ),
-            "disabled" => true, # enhanced metadata because cell is disabled
-        )
-
-        save_notebook(nb)
-        @info "File" Text(read(nb.path,String))
-        result = load_notebook_nobackup(nb.path)
-        @test_notebook_inputs_equal(nb, result)
-        cell = first(values(result.cells_dict))
-        @test cell.metadata == Dict(
-            "a metadata tag" => Dict(
-                "boolean" => true,
-                "string" => "String",
-                "number" => 10000,
-            ),
-            "disabled" => true,
-        )
+        @testset "Disabling & Metadata" begin
+            nb = metadata_notebook()
+            update_run!(🍭, nb, nb.cells)
+            cell = first(values(nb.cells_dict))
+            @test get_cell_metadata_no_default(cell) == Dict(
+                "a metadata tag" => Dict(
+                    "boolean" => true,
+                    "string" => "String",
+                    "number" => 10000,
+                ),
+                "disabled" => true, # enhanced metadata because cell is disabled
+            )
+
+            save_notebook(nb)
+            result = load_notebook_nobackup(nb.path)
+            @test_notebook_inputs_equal(nb, result)
+            cell = first(nb.cells)
+            @test is_disabled(cell)
+            @test get_cell_metadata_no_default(cell) == Dict(
+                "a metadata tag" => Dict(
+                    "boolean" => true,
+                    "string" => "String",
+                    "number" => 10000,
+                ),
+                "disabled" => true,
+            )
+        end
     end
 
     @testset "I/O overloaded" begin
diff --git a/test/helpers.jl b/test/helpers.jl
index 347fb0dac9..5d649e7e58 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -147,7 +147,7 @@ macro test_notebook_inputs_equal(nbA, nbB, check_paths_equality::Bool=true)
         @test getproperty.(nbA.cells, :cell_id) == getproperty.(nbB.cells, :cell_id)
         @test getproperty.(nbA.cells, :code_folded) == getproperty.(nbB.cells, :code_folded)
         @test getproperty.(nbA.cells, :code) == getproperty.(nbB.cells, :code)
-        @test getproperty.(nbA.cells, :metadata) == getproperty.(nbB.cells, :metadata)
+        @test get_cell_metadata_no_default.(nbA.cells) ==  get_cell_metadata_no_default.(nbB.cells)
         
     end |> Base.remove_linenums!
 end

From 4d9ab63f75cadf038d66bfbf0f2be4fca1f93588 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Thu, 7 Apr 2022 20:22:55 +0200
Subject: [PATCH 248/821] Improve readability and inferability inside
 `Pluto.run(session, router)` (#2028)

Co-authored-by: Paul Berg <paul@plutojl.org>
---
 Project.toml               |  3 ++-
 src/webserver/WebServer.jl | 33 +++++++++++++++++++--------------
 test/helpers.jl            |  1 +
 test/runtests.jl           |  4 ++++
 test/webserver.jl          |  2 ++
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/Project.toml b/Project.toml
index 6f4754af82..2c65b7013a 100644
--- a/Project.toml
+++ b/Project.toml
@@ -39,8 +39,9 @@ julia = "^1.6"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
 
 [targets]
-test = ["DataFrames", "OffsetArrays", "Random", "Test", "TimerOutputs"]
+test = ["DataFrames", "OffsetArrays", "Random", "Sockets", "Test", "TimerOutputs"]
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index f361de35e1..1e4cbd6a4a 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -119,6 +119,22 @@ end
 
 const is_first_run = Ref(true)
 
+"Return a port and serversocket to use while taking into account the `favourite_port`."
+function port_serversocket(hostIP::Sockets.IPAddr, favourite_port)
+    local port, serversocket
+    if favourite_port === nothing
+        port, serversocket = Sockets.listenany(hostIP, UInt16(1234))
+    else
+        port = UInt16(favourite_port)
+        try
+            serversocket = Sockets.listen(hostIP, port)
+        catch e
+            error("Port with number $port is already in use. Use Pluto.run() to automatically select an available port.")
+        end
+    end
+    return port, serversocket
+end
+
 function run(session::ServerSession, pluto_router)
     if is_first_run[]
         is_first_run[] = false
@@ -135,23 +151,12 @@ function run(session::ServerSession, pluto_router)
     host = session.options.server.host
     hostIP = parse(Sockets.IPAddr, host)
     favourite_port = session.options.server.port
-    
-    local port, serversocket
-    if favourite_port === nothing
-        port, serversocket = Sockets.listenany(hostIP, UInt16(1234))
-    else
-        port = UInt16(favourite_port)
-        try
-            serversocket = Sockets.listen(hostIP, port)
-        catch e
-            @error "Port with number $port is already in use. Use Pluto.run() to automatically select an available port."
-            return
-        end
-    end
+
+    local port, serversocket = port_serversocket(hostIP, favourite_port)
 
     shutdown_server = Ref{Function}(() -> ())
 
-    servertask = @async HTTP.serve(hostIP, port, stream=true, server=serversocket) do http::HTTP.Stream
+    servertask = @async HTTP.serve(hostIP, port; stream=true, server=serversocket) do http::HTTP.Stream
         # messy messy code so that we can use the websocket on the same port as the HTTP server
         if HTTP.WebSockets.is_upgrade(http.message)
             secret_required = let
diff --git a/test/helpers.jl b/test/helpers.jl
index 5d649e7e58..e736bad07b 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -6,6 +6,7 @@ macro timeit_include(path::AbstractString) :(@timeit TOUT $path include($path))
 @timeit TOUT "import Pluto" import Pluto
 import Pluto.ExpressionExplorer
 import Pluto.ExpressionExplorer: SymbolsState, compute_symbolreferences, FunctionNameSignaturePair, UsingsImports, compute_usings_imports
+using Sockets
 using Test
 using HTTP
 import Distributed
diff --git a/test/runtests.jl b/test/runtests.jl
index af7089e151..0617d148db 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -4,6 +4,10 @@ include("helpers.jl")
 
 @timeit_include("compiletimes.jl")
 verify_no_running_processes()
+if get(ENV, "PLUTO_TEST_ONLY_COMPILETIMES", nothing) == "true"
+    show(TOUT; compact=true, sortby=:firstexec)
+    exit(0)
+end
 @timeit_include("Events.jl")
 verify_no_running_processes()
 @timeit_include("WorkspaceManager.jl")
diff --git a/test/webserver.jl b/test/webserver.jl
index 4e0a68a3ca..7ff4777212 100644
--- a/test/webserver.jl
+++ b/test/webserver.jl
@@ -10,6 +10,8 @@ using Pluto.WorkspaceManager: WorkspaceManager, poll
 
 
 @testset "Exports" begin
+    @inferred Pluto.port_serversocket(Sockets.ip"0.0.0.0", nothing)
+
     port = 13432
     host = "localhost"
     local_url(suffix) = "http://$host:$port/$suffix"

From dca5ebe0d8aec588a4ac906bbac14f222b1bc614 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 19 Apr 2022 16:28:31 +0200
Subject: [PATCH 249/821] File picker: open autocomplete on focus (#2037)

---
 frontend/components/FilePicker.js      | 24 ++++++++++++++++++++----
 frontend/components/welcome/Welcome.js |  2 +-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/frontend/components/FilePicker.js b/frontend/components/FilePicker.js
index 566a7c9e64..2f6350f581 100644
--- a/frontend/components/FilePicker.js
+++ b/frontend/components/FilePicker.js
@@ -11,9 +11,21 @@ let start_autocomplete_command = completionKeymap.find((keybinding) => keybindin
 let accept_autocomplete_command = completionKeymap.find((keybinding) => keybinding.key === "Enter")
 let close_autocomplete_command = completionKeymap.find((keybinding) => keybinding.key === "Escape")
 
+/**
+ * @typedef FilePickerProps
+ * @type {{
+ *  value: String,
+ *  suggest_new_file: {base: String},
+ *  button_label: String,
+ *  placeholder: String,
+ *  on_submit: (new_path: String) => Promise<void>,
+ *  client: import("../common/PlutoConnection.js").PlutoConnection,
+ * }}
+ * @augments Component<FilePickerProps,{}>
+ */
 export class FilePicker extends Component {
-    constructor() {
-        super()
+    constructor(/** @type {FilePickerProps} */ props) {
+        super(props)
         this.forced_value = ""
         /** @type {EditorView} */
         this.cm = null
@@ -45,7 +57,7 @@ export class FilePicker extends Component {
                 } catch (error) {
                     this.cm.dispatch({
                         changes: { from: 0, to: this.cm.state.doc.length, insert: this.props.value },
-                        selection: EditorSelection.cursor(this.props.value),
+                        selection: EditorSelection.cursor(this.props.value.length),
                     })
                 }
             })
@@ -78,7 +90,11 @@ export class FilePicker extends Component {
                     EditorView.domEventHandlers({
                         focus: (event, cm) => {
                             setTimeout(() => {
-                                this.suggest_not_tmp()
+                                if (this.props.suggest_new_file) {
+                                    this.suggest_not_tmp()
+                                } else if (cm.state.doc.length === 0) {
+                                    this.request_path_completions()
+                                }
                             }, 0)
                             return true
                         },
diff --git a/frontend/components/welcome/Welcome.js b/frontend/components/welcome/Welcome.js
index 61a1983731..49d75055ab 100644
--- a/frontend/components/welcome/Welcome.js
+++ b/frontend/components/welcome/Welcome.js
@@ -65,7 +65,7 @@ export const Welcome = () => {
             new_update_message(client)
 
             // to start JIT'ting
-            client.send("completepath", { query: "zzz" }, {})
+            client.send("completepath", { query: "" }, {})
         })
     }, [])
 

From 98037ed21025e84ebc504231bf06c436c60fec11 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 19 Apr 2022 19:30:27 +0200
Subject: [PATCH 250/821] File picker: autocomplete tweaks

---
 frontend/components/FilePicker.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/frontend/components/FilePicker.js b/frontend/components/FilePicker.js
index 2f6350f581..dfc63587a9 100644
--- a/frontend/components/FilePicker.js
+++ b/frontend/components/FilePicker.js
@@ -141,6 +141,15 @@ export class FilePicker extends Component {
                         maxRenderedOptions: 512, // fons's magic number
                         optionClass: (c) => c.type,
                     }),
+                    // When a completion is picked, immediately start autocompleting again
+                    EditorView.updateListener.of((update) => {
+                        update.transactions.forEach((transaction) => {
+                            const completion = transaction.annotation(autocomplete.pickedCompletion)
+                            if (completion != null) {
+                                this.request_path_completions()
+                            }
+                        })
+                    }),
                     keymap.of([
                         {
                             key: "Enter",
@@ -148,8 +157,6 @@ export class FilePicker extends Component {
                                 // If there is autocomplete open, accept that
                                 if (accept_autocomplete_command.run(cm)) {
                                     cm.scrollPosIntoView(cm.state.doc.length)
-                                    // and request the next ones
-                                    this.request_path_completions()
                                     return true
                                 }
                                 // Else, fall down

From 549e172c60d47e99090ffbb024ec82926a647bc8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 19 Apr 2022 19:42:27 +0200
Subject: [PATCH 251/821] File picker: more autocomplete tweaks

---
 frontend/components/FilePicker.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/frontend/components/FilePicker.js b/frontend/components/FilePicker.js
index dfc63587a9..a71b597b86 100644
--- a/frontend/components/FilePicker.js
+++ b/frontend/components/FilePicker.js
@@ -146,6 +146,8 @@ export class FilePicker extends Component {
                         update.transactions.forEach((transaction) => {
                             const completion = transaction.annotation(autocomplete.pickedCompletion)
                             if (completion != null) {
+                                update.view.scrollPosIntoView(update.state.doc.length)
+
                                 this.request_path_completions()
                             }
                         })
@@ -154,13 +156,8 @@ export class FilePicker extends Component {
                         {
                             key: "Enter",
                             run: (cm) => {
-                                // If there is autocomplete open, accept that
-                                if (accept_autocomplete_command.run(cm)) {
-                                    cm.scrollPosIntoView(cm.state.doc.length)
-                                    return true
-                                }
-                                // Else, fall down
-                                return false
+                                // If there is autocomplete open, accept that. It will return `true`
+                                return accept_autocomplete_command.run(cm)
                             },
                         },
                         { key: "Enter", run: this.on_submit },
@@ -246,16 +243,20 @@ const pathhints =
                     return null
                 }
 
-                var styledResults = results.map((r) => ({
-                    label: r,
-                    type: r.endsWith("/") || r.endsWith("\\") ? "dir" : "file",
-                }))
+                let styledResults = results.map((r) => {
+                    let dir = r.endsWith("/") || r.endsWith("\\")
+                    return {
+                        label: r,
+                        type: dir ? "dir" : "file",
+                        boost: dir ? 1 : 0,
+                    }
+                })
 
                 if (suggest_new_file != null) {
-                    for (var initLength = 3; initLength >= 0; initLength--) {
+                    for (let initLength = 3; initLength >= 0; initLength--) {
                         const init = ".jl".substring(0, initLength)
                         if (queryFileName.endsWith(init)) {
-                            var suggestedFileName = queryFileName + ".jl".substring(initLength)
+                            let suggestedFileName = queryFileName + ".jl".substring(initLength)
 
                             if (suggestedFileName == ".jl") {
                                 suggestedFileName = "notebook.jl"
@@ -269,6 +270,7 @@ const pathhints =
                                     label: suggestedFileName + " (new)",
                                     apply: suggestedFileName,
                                     type: "file new",
+                                    boost: -99,
                                 })
                             }
                             break

From 77f686f3b6b2ada5341d8279f34271fda136e0e2 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Tue, 19 Apr 2022 22:43:04 +0200
Subject: [PATCH 252/821] =?UTF-8?q?=F0=9F=A7=B9=20Remove=20code=20and=20ha?=
 =?UTF-8?q?ndle=20type=20assertion=20assignees=20(#2041)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🧹 Remove dead code

* handle type assertions with complex assignees
---
 src/analysis/ExpressionExplorer.jl | 50 ++----------------------------
 test/ExpressionExplorer.jl         |  5 ++-
 2 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 9da27edb90..13c1b233c3 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -152,7 +152,7 @@ function get_assignees(ex::Expr)::FunctionName
         # filter(s->s isa Symbol, ex.args)
     elseif ex.head == :(::)
         # TODO: type is referenced
-        Symbol[ex.args[1]]
+        get_assignees(ex.args[1])
     elseif ex.head == :ref || ex.head == :(.)
         Symbol[]
     else
@@ -281,22 +281,6 @@ function is_joined_funcname(joined::Symbol)
     joined !== :.. #= .. is a valid identifier 😐 =# && occursin('.', String(joined))
 end
 
-assign_to_kw(e::Expr) = e.head == :(=) ? Expr(:kw, e.args...) : e
-assign_to_kw(x::Any) = x
-
-"Turn `A[i] * B[j,K[l+m]]` into `A[0] * B[0,K[0+0]]` to hide loop indices"
-function strip_indexing(x, inside::Bool = false)
-    if Meta.isexpr(x, :ref)
-        Expr(:ref, strip_indexing(x.args[1]), strip_indexing.(x.args[2:end], true)...)
-    elseif Meta.isexpr(x, :call)
-        Expr(x.head, x.args[1], strip_indexing.(x.args[2:end], inside)...)
-    elseif x isa Symbol && inside
-        0
-    else
-        x
-    end
-end
-
 "Module so I don't pollute the whole ExpressionExplorer scope"
 module MacroHasSpecialHeuristicInside
 import ...Pluto
@@ -944,31 +928,6 @@ end
 const can_macroexpand_no_bind = Set(Symbol.(["@md_str", "Markdown.@md_str", "@gensym", "Base.@gensym", "@enum", "Base.@enum", "@assert", "Base.@assert", "@cmd"]))
 const can_macroexpand = can_macroexpand_no_bind ∪ Set(Symbol.(["@bind", "PlutoRunner.@bind"]))
 
-macro_kwargs_as_kw(ex::Expr) = Expr(:macrocall, ex.args[1:3]..., assign_to_kw.(ex.args[4:end])...)
-
-function symbolics_mockexpand(s::Any)
-    # goofy implementation of the syntax described in https://symbolics.juliasymbolics.org/dev/manual/variables/
-    if Meta.isexpr(s, :ref, 2)
-        :($(s.args[1]) = $(s.args[2]))
-    elseif Meta.isexpr(s, :call, 2)
-        second = s.args[2] === Symbol("..") ? 123 : s.args[2]
-        :($(symbolics_mockexpand(s.args[1])); $(second) = 123)
-    elseif s isa Symbol
-        :($(s) = 123)
-    else
-        nothing
-    end
-end
-
-is_symbolics_arg(s) = symbolics_mockexpand(s) !== nothing
-
-maybe_untuple(es) =
-    if length(es) == 1 && Meta.isexpr(first(es), :tuple)
-        first(es).args
-    else
-        es
-    end
-
 """
 If the macro is **known to Pluto**, expand or 'mock expand' it, if not, return the expression. Macros from external packages are not expanded, this is done later in the pipeline. See https://github.com/fonsp/Pluto.jl/pull/1032
 """
@@ -977,13 +936,8 @@ function maybe_macroexpand(ex::Expr; recursive::Bool=false, expand_bind::Bool=tr
         funcname = split_funcname(ex.args[1])
         funcname_joined = join_funcname_parts(funcname)
 
-        args = ex.args[3:end]
-
         if funcname_joined ∈ (expand_bind ? can_macroexpand : can_macroexpand_no_bind)
             macroexpand(PlutoRunner, ex; recursive=false)::Expr
-        elseif length(args) ≥ 2 && ex.args[1] != GlobalRef(Core, Symbol("@doc"))
-            # for macros like @test a ≈ b atol=1e-6, read assignment in 2nd & later arg as keywords
-            macro_kwargs_as_kw(ex)
         else
             ex
         end
@@ -991,7 +945,7 @@ function maybe_macroexpand(ex::Expr; recursive::Bool=false, expand_bind::Bool=tr
         ex
     end
 
-    if recursive && (result isa Expr)
+    if recursive
         # Not using broadcasting because that is expensive compilation-wise for `result.args::Any`.
         expanded = Any[]
         for arg in result.args
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index 912c4d6d47..fd441e27fa 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -63,6 +63,9 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(:(Foo[]), [:Foo], [], [], [])
         @test testee(:(x isa Foo), [:x, :Foo], [], [:isa], [])
 
+        @test testee(:((x[])::Int = 1), [:Int, :x], [], [], [])
+        @test testee(:((x[])::Int, y = 1, 2), [:Int, :x], [:y], [], [])
+
         @test testee(:(A{B} = B), [], [:A], [], [])
         @test testee(:(A{T} = Union{T,Int}), [:Int, :Union], [:A], [], [])
 
@@ -74,7 +77,7 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(:(abstract type a{T} <: b end), [], [:a], [], [:a => ([:b], [], [], [])])
         @test testee(:(abstract type a{T} <: b{T} end), [], [:a], [], [:a => ([:b], [], [], [])])
         @test_nowarn testee(macroexpand(Main, :(@enum a b c)), [], [], [], []; verbose=false)
-        
+
         e = :(struct a end) # needs to be on its own line to create LineNumberNode
         @test testee(e, [], [:a], [], [:a => ([], [], [], [])])
         @test testee(:(struct a <: b; c; d::Foo; end), [], [:a], [], [:a => ([:b, :Foo], [], [], [])])

From 1de1d195bbb72eed56de7654a9c0fe7b99ad693a Mon Sep 17 00:00:00 2001
From: Hirumal Priyashan <57571152+HirumalPriyashan@users.noreply.github.com>
Date: Wed, 20 Apr 2022 21:50:45 +0530
Subject: [PATCH 253/821] Disable "Open" button on main menu when nothing is
 typed (#2020)

Co-authored-by: Hirumal Priyashan <57571152+HirumalPriyashan@users.noreply.github.com>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/FilePicker.js | 22 ++++++++++++++++++++--
 frontend/editor.css               |  7 ++++++-
 frontend/index.css                |  5 +++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/frontend/components/FilePicker.js b/frontend/components/FilePicker.js
index a71b597b86..0ca1bb3406 100644
--- a/frontend/components/FilePicker.js
+++ b/frontend/components/FilePicker.js
@@ -3,7 +3,17 @@ import { html, Component } from "../imports/Preact.js"
 import { utf8index_to_ut16index } from "../common/UnicodeTools.js"
 import { map_cmd_to_ctrl_on_mac } from "../common/KeyboardShortcuts.js"
 
-import { EditorState, EditorSelection, EditorView, placeholder, keymap, history, autocomplete, drawSelection } from "../imports/CodemirrorPlutoSetup.js"
+import {
+    EditorState,
+    EditorSelection,
+    EditorView,
+    placeholder,
+    keymap,
+    history,
+    autocomplete,
+    drawSelection,
+    Compartment,
+} from "../imports/CodemirrorPlutoSetup.js"
 
 let { autocompletion, completionKeymap } = autocomplete
 
@@ -26,6 +36,9 @@ let close_autocomplete_command = completionKeymap.find((keybinding) => keybindin
 export class FilePicker extends Component {
     constructor(/** @type {FilePickerProps} */ props) {
         super(props)
+        this.state = {
+            is_button_disabled: true,
+        }
         this.forced_value = ""
         /** @type {EditorView} */
         this.cm = null
@@ -114,6 +127,11 @@ export class FilePicker extends Component {
                             }, 200)
                         },
                     }),
+                    EditorView.updateListener.of((update) => {
+                        if (update.docChanged) {
+                            this.setState({ is_button_disabled: update.state.doc.length === 0 })
+                        }
+                    }),
                     EditorView.theme(
                         {
                             "&": {
@@ -208,7 +226,7 @@ export class FilePicker extends Component {
     render() {
         return html`
             <pluto-filepicker>
-                <button onClick=${this.on_submit}>${this.props.button_label}</button>
+                <button onClick=${this.on_submit} disabled=${this.state.is_button_disabled}>${this.props.button_label}</button>
             </pluto-filepicker>
         `
     }
diff --git a/frontend/editor.css b/frontend/editor.css
index f467a10027..04f4e8a6f8 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -647,11 +647,16 @@ pluto-filepicker .cm-scroller::-webkit-scrollbar {
     display: none; /* Safari and Chrome */
 }
 
-nav#at_the_top > pluto-filepicker button {
+pluto-filepicker button {
     cursor: pointer;
     height: auto;
 }
 
+pluto-filepicker button:disabled {
+    cursor: not-allowed;
+}
+
+
 button.start_stop_recording,
 button.toggle_export {
     border: none;
diff --git a/frontend/index.css b/frontend/index.css
index be60eb9b71..1c6d688103 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -155,6 +155,11 @@ pluto-filepicker button {
     border-bottom-left-radius: 0;
 }
 
+pluto-filepicker button:disabled {
+    cursor: not-allowed;
+    opacity: .7;
+}
+
 .cm-editor .cm-tooltip {
     border: 1px solid var(--cm-editor-tooltip-border-color);
     box-shadow: 3px 3px 4px rgb(0 0 0 / 20%);

From f82f1de64599217d3eec9c93a65a5608b8206264 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Wed, 20 Apr 2022 19:47:33 +0200
Subject: [PATCH 254/821] Add a precompile statement to `PlutoRunner` and some
 minor refactorings (#2039)

Co-authored-by: Paul Berg <paul@plutojl.org>
---
 src/runner/PlutoRunner.jl | 70 ++++++++++++++++++++++-----------------
 test/compiletimes.jl      |  5 ++-
 2 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index bd3e40ef7f..d0c2aeb56b 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -28,12 +28,12 @@ MimedOutput = Tuple{Union{String,Vector{UInt8},Dict{Symbol,Any}},MIME}
 const ObjectID = typeof(objectid("hello computer"))
 const ObjectDimPair = Tuple{ObjectID,Int64}
 
-Base.@kwdef struct CachedMacroExpansion
+struct CachedMacroExpansion
     original_expr_hash::UInt64
     expanded_expr::Expr
     expansion_duration::UInt64
     has_pluto_hook_features::Bool
-    did_mention_expansion_time::Bool=false
+    did_mention_expansion_time::Bool
 end
 const cell_expanded_exprs = Dict{UUID,CachedMacroExpansion}()
 
@@ -176,7 +176,7 @@ replace_pluto_properties_in_expr(other; kwargs...) = other
 "Similar to [`replace_pluto_properties_in_expr`](@ref), but just checks for existance and doesn't check for [`GiveMeCellID`](@ref)"
 has_hook_style_pluto_properties_in_expr(::GiveMeRerunCellFunction) = true
 has_hook_style_pluto_properties_in_expr(::GiveMeRegisterCleanupFunction) = true
-has_hook_style_pluto_properties_in_expr(expr::Expr) = any(has_hook_style_pluto_properties_in_expr, expr.args)
+has_hook_style_pluto_properties_in_expr(expr::Expr)::Bool = any(has_hook_style_pluto_properties_in_expr, expr.args)
 has_hook_style_pluto_properties_in_expr(other) = false
 
 
@@ -216,7 +216,7 @@ module CantReturnInPluto
     We do macro expansion now, so we can also check for `return` statements "statically".
     This method goes through an expression and replaces all `return` statements with `throw(CantReturnInPlutoException())`
     """
-    function replace_returns_with_error(expr::Expr)
+    function replace_returns_with_error(expr::Expr)::Expr
         if expr.head == :return
             :(throw($(CantReturnInPlutoException())))
         elseif expr.head == :quote
@@ -259,12 +259,12 @@ function try_macroexpand(mod, cell_uuid, expr)
     end
 
     elapsed_ns = time_ns()
-    expanded_expr = macroexpand(mod, expr_not_toplevel)
+    expanded_expr = macroexpand(mod, expr_not_toplevel)::Expr
     elapsed_ns = time_ns() - elapsed_ns
 
     # Removes baked in references to the module this was macroexpanded in.
     # Fix for https://github.com/fonsp/Pluto.jl/issues/1112
-    expr_without_return = CantReturnInPluto.replace_returns_with_error(expanded_expr)
+    expr_without_return = CantReturnInPluto.replace_returns_with_error(expanded_expr)::Expr
     expr_without_globalrefs = globalref_to_workspaceref(expr_without_return)
 
     has_pluto_hook_features = has_hook_style_pluto_properties_in_expr(expr_without_globalrefs)
@@ -274,11 +274,13 @@ function try_macroexpand(mod, cell_uuid, expr)
         register_cleanup_function=(fn) -> UseEffectCleanups.register_cleanup(fn, cell_uuid),
     )
 
+    did_mention_expansion_time = false
     cell_expanded_exprs[cell_uuid] = CachedMacroExpansion(
-        original_expr_hash=expr_hash(expr),
-        expanded_expr=expr_to_save,
-        expansion_duration=elapsed_ns,
-        has_pluto_hook_features=has_pluto_hook_features,
+        expr_hash(expr),
+        expr_to_save,
+        elapsed_ns,
+        has_pluto_hook_features,
+        did_mention_expansion_time
     )
 
     return (sanitize_expr(expr_to_save), expr_hash(expr_to_save))
@@ -461,14 +463,14 @@ If the third argument is a `Tuple{Set{Symbol}, Set{Symbol}}` containing the refe
 This function is memoized: running the same expression a second time will simply call the same generated function again. This is much faster than evaluating the expression, because the function only needs to be Julia-compiled once. See https://github.com/fonsp/Pluto.jl/pull/720
 """
 function run_expression(
-    m::Module, 
-    expr::Any, 
-    cell_id::UUID, 
-    function_wrapped_info::Union{Nothing,Tuple{Set{Symbol},Set{Symbol}}}=nothing, 
-    forced_expr_id::Union{ObjectID,Nothing}=nothing; 
-    user_requested_run::Bool=true,
-    capture_stdout::Bool=true,
-)
+        m::Module,
+        expr::Any,
+        cell_id::UUID,
+        function_wrapped_info::Union{Nothing,Tuple{Set{Symbol},Set{Symbol}}}=nothing,
+        forced_expr_id::Union{ObjectID,Nothing}=nothing;
+        user_requested_run::Bool=true,
+        capture_stdout::Bool=true,
+    )
     if user_requested_run
         # TODO Time elapsed? Possibly relays errors in cleanup function?
         UseEffectCleanups.trigger_cleanup(cell_id)
@@ -512,13 +514,13 @@ function run_expression(
     # We add the time it took to macroexpand to the time for the first call,
     # but we make sure we don't mention it on subsequent calls
     expansion_runtime = if expanded_cache.did_mention_expansion_time === false
-        # Is this really the easiest way to clone a struct with some changes? Pfffft
+        did_mention_expansion_time = true
         cell_expanded_exprs[cell_id] = CachedMacroExpansion(
-            original_expr_hash=expanded_cache.original_expr_hash,
-            expanded_expr=expanded_cache.expanded_expr,
-            expansion_duration=expanded_cache.expansion_duration,
-            did_mention_expansion_time=true,
-            has_pluto_hook_features=expanded_cache.has_pluto_hook_features,
+            expanded_cache.original_expr_hash,
+            expanded_cache.expanded_expr,
+            expanded_cache.expansion_duration,
+            expanded_cache.has_pluto_hook_features,
+            did_mention_expansion_time
         )
         expanded_cache.expansion_duration
     else
@@ -568,6 +570,7 @@ function run_expression(
     
     cell_results[cell_id], cell_runtimes[cell_id] = result, runtime
 end
+precompile(run_expression, (Module, Expr, UUID, Nothing))
 
 # Channel to trigger implicits run
 const run_channel = Channel{UUID}(10)
@@ -582,7 +585,6 @@ function rerun_cell_from_notebook(cell_id::UUID)
             push!(new_uuids, uuid)
         end
     end
-    size = length(new_uuids)
     for uuid in new_uuids
         put!(run_channel, uuid)
     end
@@ -594,8 +596,6 @@ end
 
 
 
-
-
 ###
 # DELETING GLOBALS
 ###
@@ -618,7 +618,13 @@ The trick boils down to two things:
 1. When we create a new workspace module, we move over some of the global from the old workspace. (But not the ones that we want to 'delete'!)
 2. If a function used to be defined, but now we want to delete it, then we go through the method table of that function and snoop out all methods that we defined by us, and not by another package. This is how we reverse extending external functions. For example, if you run a cell with `Base.sqrt(s::String) = "the square root of" * s`, and then delete that cell, then you can still call `sqrt(1)` but `sqrt("one")` will err. Cool right!
 """
-function move_vars(old_workspace_name::Symbol, new_workspace_name::Symbol, vars_to_delete::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,Vector{Symbol}}}, module_imports_to_move::Set{Expr})
+function move_vars(
+        old_workspace_name::Symbol,
+        new_workspace_name::Symbol,
+        vars_to_delete::Set{Symbol},
+        methods_to_delete::Set{Tuple{UUID,Vector{Symbol}}},
+        module_imports_to_move::Set{Expr}
+    )
     old_workspace = getfield(Main, old_workspace_name)
     new_workspace = getfield(Main, new_workspace_name)
 
@@ -677,9 +683,11 @@ end
 "Return whether the `method` was defined inside this notebook, and not in external code."
 isfromcell(method::Method, cell_id::UUID) = endswith(String(method.file), string(cell_id))
 
-"Delete all methods of `f` that were defined in this notebook, and leave the ones defined in other packages, base, etc. ✂
+"""
+Delete all methods of `f` that were defined in this notebook, and leave the ones defined in other packages, base, etc. ✂
 
-Return whether the function has any methods left after deletion."
+Return whether the function has any methods left after deletion.
+"""
 function delete_toplevel_methods(f::Function, cell_id::UUID)::Bool
     # we can delete methods of functions!
     # instead of deleting all methods, we only delete methods that were defined in this notebook. This is necessary when the notebook code extends a function from remote code
@@ -2001,7 +2009,7 @@ const original_stderr = stderr
 
 
 const log_channel = Channel{Any}(10)
-const old_logger = Ref{Any}(nothing)
+const old_logger = Ref{Union{Logging.AbstractLogger,Nothing}}(nothing)
 
 struct PlutoLogger <: Logging.AbstractLogger
     stream
diff --git a/test/compiletimes.jl b/test/compiletimes.jl
index 699306f373..606f1ce969 100644
--- a/test/compiletimes.jl
+++ b/test/compiletimes.jl
@@ -5,6 +5,9 @@
 
 @timeit TOUT "Pluto.Notebook" nb = @eval Pluto.Notebook([cell])
 
+module Foo end
+@timeit TOUT "PlutoRunner.run_expression" @eval Pluto.PlutoRunner.run_expression(Foo, :(1 + 1), Pluto.uuid1(), nothing);
+
 function wait_for_ready(notebook::Pluto.Notebook)
     while notebook.process_status != Pluto.ProcessStatus.ready
         sleep(0.1)
@@ -27,7 +30,7 @@ wait_for_ready(nb)
 # However, it's very tricky to measure this via the `Pluto.run` below.
 @timeit TOUT "Configuration.from_flat_kwargs" @eval Pluto.Configuration.from_flat_kwargs()
 
-# Precompile 
+# Compile HTTP get.
 HTTP.get("http://github.com")
 
 @timeit TOUT "Pluto.run" server_task = @eval let

From e169ca34c41a20b3ffa1920480c3a1d99b1875c5 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 20 Apr 2022 23:20:50 +0200
Subject: [PATCH 255/821] =?UTF-8?q?=F0=9F=90=9D=20Fix=20sliderserver-binde?=
 =?UTF-8?q?r=20combination=20(#2043)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/common/SliderServerClient.js | 4 +++-
 frontend/components/Editor.js         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/common/SliderServerClient.js b/frontend/common/SliderServerClient.js
index 2d72f8adfc..8a0ec0a852 100644
--- a/frontend/common/SliderServerClient.js
+++ b/frontend/common/SliderServerClient.js
@@ -16,7 +16,9 @@ export const nothing_actions = ({ actions }) =>
                 ? // the original action
                   v
                 : // a no-op action
-                  () => {},
+                  (...args) => {
+                      console.info("Ignoring action", k, { args })
+                  },
         ])
     )
 
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index bcd9f3e3bb..e6a22d3c0b 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1164,7 +1164,7 @@ patch: ${JSON.stringify(
             console.info(`Binder phase: ${phase} at ${new Date().toLocaleTimeString()}`)
         }
 
-        if (old_state.disable_ui !== this.state.disable_ui) {
+        if (old_state.disable_ui !== this.state.disable_ui || old_state.connected !== this.state.connected) {
             this.on_disable_ui()
         }
         if (!this.state.initializing) {

From acca20eba4dfda1e9bf8c1eb53978ad21a41b6d8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 20 Apr 2022 23:41:13 +0200
Subject: [PATCH 256/821] comments

---
 frontend/common/Binder.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/frontend/common/Binder.js b/frontend/common/Binder.js
index 313a7781e9..4728b93f97 100644
--- a/frontend/common/Binder.js
+++ b/frontend/common/Binder.js
@@ -82,6 +82,9 @@ export const request_binder = (build_url) =>
 export const count_stat = (page) =>
     fetch(`https://stats.plutojl.org/count?p=/${page}&s=${screen.width},${screen.height},${devicePixelRatio}#skip_sw`, { cache: "no-cache" }).catch(() => {})
 
+/**
+ * Start a 'headless' binder session, open our notebook in it, and connect to it.
+ */
 export const start_binder = async ({ setStatePromise, connect, launch_params }) => {
     try {
         // view stats on https://stats.plutojl.org/
@@ -92,6 +95,8 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
                 state.disable_ui = false
             })
         )
+
+        /// PART 1: Creating a binder session..
         const { binder_session_url, binder_session_token } = await request_binder(launch_params.binder_url.replace("mybinder.org/v2/", "mybinder.org/build/"))
         const with_token = (u) => {
             const new_url = new URL(u)
@@ -116,6 +121,8 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
         // fetch index to say hello
         await fetch(with_token(binder_session_url))
 
+        /// PART 2: Using Pluto's REST API to open the notebook file. We either upload the notebook with a POST request, or we let the server open by giving it the filename/URL.
+
         let open_response
 
         if (launch_params.notebookfile.startsWith("data:")) {
@@ -141,6 +148,8 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
             }
         }
 
+        // Opening a notebook gives us the notebook ID, which means that we have a running session! Time to connect.
+
         const new_notebook_id = await open_response.text()
         console.info("notebook_id:", new_notebook_id)
 
@@ -150,6 +159,9 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
                 state.backend_launch_phase = BackendLaunchPhase.notebook_running
             })
         )
+
+        /// PART 3: We open the WebSocket connection to the Pluto server, connecting to the notebook ID that was created for us. If this fails, or after a 20 second timeout, we give up on hot-swapping a live backend into this static view, and instead we just redirect to the binder URL.
+
         console.log("Connecting WebSocket")
 
         const connect_promise = connect(with_token(ws_address_from_base(binder_session_url) + "channels"))

From 9af9e01bdc7a90626f6f5e705bb616c0bc428943 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 20 Apr 2022 23:43:26 +0200
Subject: [PATCH 257/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 2c65b7013a..5f27ce109c 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.0"
+version = "0.19.1"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From c1cbf6e3430c8146bd02b9120c7d6d2097ab378a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 21 Apr 2022 18:41:39 +0200
Subject: [PATCH 258/821] Editor.js state types

---
 frontend/components/Editor.js | 41 ++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index e6a22d3c0b..5e1ad1b3e1 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -69,7 +69,7 @@ const ProcessStatus = {
 /**
  * Map of status => Bool. In order of decreasing prioirty.
  */
-const statusmap = (state, launch_params) => ({
+const statusmap = (/** @type {EditorState} */ state, /** @type {LaunchParameters} */ launch_params) => ({
     disconnected: !(state.connected || state.initializing || state.static_preview),
     loading:
         (state.backend_launch_phase != null &&
@@ -214,8 +214,43 @@ const url_logo_small = document.head.querySelector("link[rel='pluto-logo-small']
 
 /**
  * @typedef EditorProps
- * @type {{launch_params: LaunchParameters,initial_notebook_state: NotebookData,}}
- * @augments Component<EditorProps,{}>
+ * @type {{
+ * launch_params: LaunchParameters,
+ * initial_notebook_state: NotebookData,
+ * }}
+ */
+
+/**
+ * @typedef EditorState
+ * @type {{
+ * notebook: NotebookData,
+ * cell_inputs_local: { [uuid: string]: CellInputData },
+ * desired_doc_query: ?String,
+ * recently_deleted: ?Array<{ index: number, cell: CellInputData }>,
+ * last_update_time: number,
+ * disable_ui: boolean,
+ * static_preview: boolean,
+ * backend_launch_phase: ?number,
+ * binder_session_url: ?string,
+ * binder_session_token: ?string,
+ * connected: boolean,
+ * initializing: boolean,
+ * moving_file: boolean,
+ * scroller: {
+ * up: boolean,
+ * down: boolean,
+ * },
+ * export_menu_open: boolean,
+ * last_created_cell: ?string,
+ * selected_cells: Array<string>,
+ * extended_components: any,
+ * is_recording: boolean,
+ * recording_waiting_to_start: boolean,
+ * }}
+ */
+
+/**
+ * @augments Component<EditorProps,EditorState>
  */
 export class Editor extends Component {
     constructor(/** @type {EditorProps} */ props) {

From d3927add9fc8455f6b0e03b64899205ae125aeed Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 21 Apr 2022 19:34:26 +0200
Subject: [PATCH 259/821] css tweaks

---
 frontend/binder.css | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/binder.css b/frontend/binder.css
index 54b721a901..5fedf6591b 100644
--- a/frontend/binder.css
+++ b/frontend/binder.css
@@ -117,7 +117,8 @@ body.wiggle_binder .edit_or_run > button {
     font-size: 16px;
     /* font-style: italic; */
     font-family: "Roboto Mono";
-    font-family: var(--lato-ui-font-stack);letter-spacing: 0.1px;
+    font-family: var(--lato-ui-font-stack);
+    letter-spacing: 0.1px;
     color: var(--black);
     white-space: nowrap;
     padding: 8px 16px;
@@ -140,8 +141,9 @@ body.wiggle_binder .edit_or_run > button {
     left: calc(50vw - var(--width) / 2);
     background-color: white;
     color: black;
+    color-scheme: light;
     box-shadow: 0px 0px 0px 100vmax #0000004a;
-    font-family: "Lato", sans-serif;
+    font-family: var(--lato-ui-font-stack);
 }
 .binder_help_text a {
     color: black;

From b9af09ccd43dcee137aca11661d8e18c77162312 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 21 Apr 2022 19:47:42 +0200
Subject: [PATCH 260/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 5f27ce109c..09d9a53e6c 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.1"
+version = "0.19.2"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 05eac27349a6b28d043bd28f372aa1a995c5ef6f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 21 Apr 2022 20:53:27 +0200
Subject: [PATCH 261/821] Show bonds "greyed out" when not connected (#2047)

---
 frontend/common/Bond.js             | 62 ++++++++++++++++++++++++-----
 frontend/components/BinderButton.js |  5 +++
 frontend/components/CellOutput.js   | 11 ++---
 frontend/components/Editor.js       |  9 ++---
 frontend/editor.css                 |  6 ++-
 5 files changed, 72 insertions(+), 21 deletions(-)

diff --git a/frontend/common/Bond.js b/frontend/common/Bond.js
index 626ca85d39..1ecfd7554f 100644
--- a/frontend/common/Bond.js
+++ b/frontend/common/Bond.js
@@ -2,6 +2,7 @@
 // import Generators_input from "https://unpkg.com/@observablehq/stdlib@3.3.1/src/generators/input.js"
 
 import _ from "../imports/lodash.js"
+import { html } from "../imports/Preact.js"
 import observablehq from "./SetupCellEnvironment.js"
 
 /**
@@ -125,8 +126,12 @@ const set_input_value = (input, new_value) => {
     }
 }
 
-export const set_bound_elements_to_their_value = (node, bond_values) => {
-    for (let bond_node of node.querySelectorAll("bond")) {
+/**
+ * @param {NodeListOf<Element>} bond_nodes
+ * @param {{[name: string]: any}} bond_values
+ */
+export const set_bound_elements_to_their_value = (bond_nodes, bond_values) => {
+    bond_nodes.forEach((bond_node) => {
         let bond_name = bond_node.getAttribute("def")
         if (bond_node.firstElementChild != null && bond_values[bond_name] != null) {
             let val = bond_values[bond_name].value
@@ -136,19 +141,60 @@ export const set_bound_elements_to_their_value = (node, bond_values) => {
                 console.error(`Error while setting input value`, bond_node.firstElementChild, `to value`, val, `: `, error)
             }
         }
-    }
+    })
+}
+
+/**
+ * @param {NodeListOf<Element>} bond_nodes
+ * @param {Promise<void>} invalidation
+ */
+export const add_bonds_disabled_message_handler = (bond_nodes, invalidation) => {
+    bond_nodes.forEach((bond_node) => {
+        const listener = (e) => {
+            if (e.target.closest(".bonds_disabled.offer_binder")) {
+                window.dispatchEvent(
+                    new CustomEvent("open pluto popup", {
+                        detail: {
+                            type: "info",
+                            source_element: e.target,
+                            body: html`${`You are viewing a static document. `}
+                                <a
+                                    href="#"
+                                    onClick=${(e) => {
+                                        //@ts-ignore
+                                        window.open_edit_or_run_popup()
+                                        e.preventDefault()
+                                    }}
+                                    >Run this notebook</a
+                                >
+                                ${` to enable interactivity.`}`,
+                        },
+                    })
+                )
+            }
+        }
+        bond_node.addEventListener("click", listener)
+        invalidation.then(() => {
+            bond_node.removeEventListener("click", listener)
+        })
+    })
 }
 
 /**
- * @param {Element} node
+ * @param {NodeListOf<Element>} bond_nodes
  * @param {(name: string, value: any) => Promise} on_bond_change
  * @param {{[name: string]: any}} known_values Object of variable names that already have a value in the state, which we may not want to send the initial bond value for. When reloading the page, bonds are set to their values from the state, and we don't want to trigger a change event for those.
+ * @param {Promise<void>} invalidation
  */
-export const add_bonds_listener = (node, on_bond_change, known_values) => {
+export const add_bonds_listener = (bond_nodes, on_bond_change, known_values, invalidation) => {
     // the <bond> node will be invalidated when the cell re-evaluates. when this happens, we need to stop processing input events
     let node_is_invalidated = false
 
-    node.querySelectorAll("bond").forEach(async (bond_node) => {
+    invalidation.then(() => {
+        node_is_invalidated = true
+    })
+
+    bond_nodes.forEach(async (bond_node) => {
         const name = bond_node.getAttribute("def")
         const initial_value = get_input_value(bond_node.firstElementChild)
 
@@ -176,10 +222,6 @@ export const add_bonds_listener = (node, on_bond_change, known_values) => {
             await on_bond_change(name, to_send).catch(console.error)
         }
     })
-
-    return function dispose_bond_listener() {
-        node_is_invalidated = true
-    }
 }
 
 /**
diff --git a/frontend/components/BinderButton.js b/frontend/components/BinderButton.js
index 02276f0a55..725ec61122 100644
--- a/frontend/components/BinderButton.js
+++ b/frontend/components/BinderButton.js
@@ -7,6 +7,11 @@ export const BinderButton = ({ offer_binder, start_binder, notebookfile }) => {
     const notebookfile_ref = useRef("")
     notebookfile_ref.current = notebookfile
 
+    //@ts-ignore
+    window.open_edit_or_run_popup = () => {
+        setPopupOpen(true)
+    }
+
     useEffect(() => {
         const handlekeyup = (e) => {
             e.key === "Escape" && setPopupOpen(false)
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 72142b74fc..24f85851f6 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -3,7 +3,7 @@ import { html, Component, useRef, useLayoutEffect, useContext, useEffect, useMem
 import { ErrorMessage } from "./ErrorMessage.js"
 import { TreeView, TableView, DivElement } from "./TreeView.js"
 
-import { add_bonds_listener, set_bound_elements_to_their_value } from "../common/Bond.js"
+import { add_bonds_disabled_message_handler, add_bonds_listener, set_bound_elements_to_their_value } from "../common/Bond.js"
 import { cl } from "../common/ClassTable.js"
 
 import { observablehq_for_cells } from "../common/SetupCellEnvironment.js"
@@ -412,7 +412,7 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
     let container = useRef(/** @type {HTMLElement} */ (null))
 
     useLayoutEffect(() => {
-        set_bound_elements_to_their_value(container.current, pluto_bonds)
+        set_bound_elements_to_their_value(container.current.querySelectorAll("bond"), pluto_bonds)
     }, [body, persist_js_state, pluto_actions, pluto_bonds])
 
     useLayoutEffect(() => {
@@ -449,9 +449,10 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
                 })
 
                 if (pluto_actions != null) {
-                    set_bound_elements_to_their_value(container.current, pluto_bonds)
-                    let remove_bonds_listener = add_bonds_listener(container.current, pluto_actions.set_bond, pluto_bonds)
-                    invalidation.then(remove_bonds_listener)
+                    const bond_nodes = container.current.querySelectorAll("bond")
+                    set_bound_elements_to_their_value(bond_nodes, pluto_bonds)
+                    add_bonds_listener(bond_nodes, pluto_actions.set_bond, pluto_bonds, invalidation)
+                    add_bonds_disabled_message_handler(bond_nodes, invalidation)
                 }
 
                 // Convert LaTeX to svg
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 5e1ad1b3e1..1462d1b60a 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -83,6 +83,8 @@ const statusmap = (/** @type {EditorState} */ state, /** @type {LaunchParameters
     nbpkg_restart_recommended: state.notebook.nbpkg?.restart_recommended_msg != null,
     nbpkg_disabled: state.notebook.nbpkg?.enabled === false,
     static_preview: state.static_preview,
+    bonds_disabled: !(state.connected || state.initializing || launch_params.slider_server_url != null),
+    offer_binder: state.backend_launch_phase === BackendLaunchPhase.wait_for_user && launch_params.binder_url != null,
     binder: launch_params.binder_url != null && state.backend_launch_phase != null,
     code_differs: state.notebook.cell_order.some(
         (cell_id) => state.cell_inputs_local[cell_id] != null && state.notebook.cell_inputs[cell_id].code !== state.cell_inputs_local[cell_id].code
@@ -1266,9 +1268,6 @@ patch: ${JSON.stringify(
             >${text}</a
         >`
 
-        const wfu = this.state.backend_launch_phase === BackendLaunchPhase.wait_for_user
-        const offer_binder = wfu && launch_params.binder_url != null
-
         return html`
             ${this.state.disable_ui === false && html`<${HijackExternalLinksToOpenInNewTab} />`}
             
@@ -1369,9 +1368,9 @@ patch: ${JSON.stringify(
                     />
                     
                     ${
-                        offer_binder
+                        status.offer_binder
                             ? html`<${BinderButton}
-                                  offer_binder=${offer_binder}
+                                  offer_binder=${status.offer_binder}
                                   start_binder=${() =>
                                       start_binder({
                                           setStatePromise: this.setStatePromise,
diff --git a/frontend/editor.css b/frontend/editor.css
index 04f4e8a6f8..c147f0f656 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -656,7 +656,6 @@ pluto-filepicker button:disabled {
     cursor: not-allowed;
 }
 
-
 button.start_stop_recording,
 button.toggle_export {
     border: none;
@@ -1054,6 +1053,11 @@ pluto-output:not(.rich_output) > div > pre {
     display: flex;
 }
 
+.bonds_disabled.offer_binder bond {
+    opacity: 0.6;
+    filter: grayscale(1);
+}
+
 /* as embedded display: */
 
 pluto-display {

From dc5c325c2924db802039629cc091b874080db6b8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 22 Apr 2022 13:30:59 +0200
Subject: [PATCH 262/821] URLTools.js

---
 frontend/common/Binder.js   | 16 ++++++----------
 frontend/common/URLTools.js | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 frontend/common/URLTools.js

diff --git a/frontend/common/Binder.js b/frontend/common/Binder.js
index 4728b93f97..7e7069fb91 100644
--- a/frontend/common/Binder.js
+++ b/frontend/common/Binder.js
@@ -1,5 +1,6 @@
 import immer from "../imports/immer.js"
 import { timeout_promise, ws_address_from_base } from "./PlutoConnection.js"
+import { with_query_params } from "./URLTools.js"
 
 export const BackendLaunchPhase = {
     wait_for_user: 0,
@@ -98,11 +99,8 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
 
         /// PART 1: Creating a binder session..
         const { binder_session_url, binder_session_token } = await request_binder(launch_params.binder_url.replace("mybinder.org/v2/", "mybinder.org/build/"))
-        const with_token = (u) => {
-            const new_url = new URL(u)
-            new_url.searchParams.set("token", binder_session_token)
-            return String(new_url)
-        }
+        const with_token = (u) => with_query_params(u, { token: binder_session_token })
+
         console.log("Binder URL:", with_token(binder_session_url))
 
         //@ts-ignore
@@ -135,10 +133,9 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
                 ["path", launch_params.notebookfile],
                 ["url", new URL(launch_params.notebookfile, window.location.href).href],
             ]) {
-                const open_url = new URL("open", binder_session_url)
-                open_url.searchParams.set(p1, p2)
+                const open_url = with_query_params(new URL("open", binder_session_url), { [p1]: p2 })
 
-                console.log(`open ${p1}:`, String(open_url))
+                console.log(`open ${p1}:`, open_url)
                 open_response = await fetch(with_token(open_url), {
                     method: "POST",
                 })
@@ -167,8 +164,7 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
         const connect_promise = connect(with_token(ws_address_from_base(binder_session_url) + "channels"))
         await timeout_promise(connect_promise, 20_000).catch((e) => {
             console.error("Failed to establish connection within 20 seconds. Navigating to the edit URL directly.", e)
-            const edit_url = new URL("edit", binder_session_url)
-            edit_url.searchParams.set("id", new_notebook_id)
+            const edit_url = with_query_params(new URL("edit", binder_session_url), { id: new_notebook_id })
             window.parent.location.href = with_token(edit_url)
         })
     } catch (err) {
diff --git a/frontend/common/URLTools.js b/frontend/common/URLTools.js
new file mode 100644
index 0000000000..aa91b5bb22
--- /dev/null
+++ b/frontend/common/URLTools.js
@@ -0,0 +1,15 @@
+export const with_query_params = (/** @type {String | URL} */ url_str, /** @type {Record<String,any>} */ params) => {
+    const fake_base = "http://delete-me.com/"
+    const url = new URL(url_str, fake_base)
+    Object.entries(params)
+        .filter(([_, v]) => v != null)
+        .forEach(([key, val]) => url.searchParams.append(key, val))
+    return url.toString().replace(fake_base, "")
+}
+
+console.assert(with_query_params("https://example.com/", { a: "b c" }) === "https://example.com/?a=b+c")
+console.assert(with_query_params(new URL("https://example.com/"), { a: "b c" }) === "https://example.com/?a=b+c")
+console.assert(with_query_params(new URL("https://example.com/"), { a: "b c", asdf: null, xx: 123 }) === "https://example.com/?a=b+c&xx=123")
+console.assert(with_query_params("index.html", { a: "b c" }) === "index.html?a=b+c")
+console.assert(with_query_params("index.html?x=123", { a: "b c" }) === "index.html?x=123&a=b+c")
+console.assert(with_query_params("index.html?x=123#asdf", { a: "b c" }) === "index.html?x=123&a=b+c#asdf")

From 2b24efb64c6bc473be8bee1128286ec53f4daed5 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 22 Apr 2022 13:31:56 +0200
Subject: [PATCH 263/821] =?UTF-8?q?=F0=9F=90=9D=20=20Use=20filename=20from?=
 =?UTF-8?q?=20URL,=20fix=20#1027=20(#2050)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/webserver/SessionActions.jl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 36e192a0b0..3a227c5f11 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -1,8 +1,9 @@
 module SessionActions
 
-import ..Pluto: ServerSession, Notebook, Cell, emptynotebook, tamepath, new_notebooks_directory, without_pluto_file_extension, numbered_until_new, readwrite, update_save_run!, update_from_file, wait_until_file_unchanged, putnotebookupdates!, putplutoupdates!, load_notebook, clientupdate_notebook_list, WorkspaceManager, try_event_call, NewNotebookEvent, OpenNotebookEvent, ShutdownNotebookEvent, @asynclog, ProcessStatus
+import ..Pluto: ServerSession, Notebook, Cell, emptynotebook, tamepath, new_notebooks_directory, without_pluto_file_extension, numbered_until_new, cutename, readwrite, update_save_run!, update_from_file, wait_until_file_unchanged, putnotebookupdates!, putplutoupdates!, load_notebook, clientupdate_notebook_list, WorkspaceManager, try_event_call, NewNotebookEvent, OpenNotebookEvent, ShutdownNotebookEvent, @asynclog, ProcessStatus
 using FileWatching
 import ..Pluto.DownloadCool: download_cool
+import HTTP
 
 import UUIDs: UUID, uuid1
 
@@ -19,7 +20,16 @@ function Base.showerror(io::IO, e::UserError)
 end
 
 function open_url(session::ServerSession, url::AbstractString; kwargs...)
+    name_from_url = startswith(url, r"https?://") ? strip(HTTP.unescapeuri(splitext(basename(HTTP.URI(url).path))[1])) : ""
+    new_name = isempty(name_from_url) ? cutename() : name_from_url
+    
     random_notebook = emptynotebook()
+    random_notebook.path = numbered_until_new(
+        joinpath(
+            new_notebooks_directory(), 
+            new_name
+        ); suffix=".jl")
+    
     path = download_cool(url, random_notebook.path)
     result = try_event_call(session, NewNotebookEvent(random_notebook))
     nb = if result isa UUID

From 4c32c5535c64add57b8dc54f1fb97fadfc882a37 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 22 Apr 2022 13:32:23 +0200
Subject: [PATCH 264/821] Use logging for instructions by Pluto.run (#2042)

---
 src/webserver/WebServer.jl | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 1e4cbd6a4a..a3b4ac4315 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -142,7 +142,7 @@ function run(session::ServerSession, pluto_router)
     end
     
     if VERSION < v"1.6.2"
-        @info "Pluto is running on an old version of Julia ($(VERSION)) that is no longer supported. Visit https://julialang.org/downloads/ for more information about upgrading Julia."
+        @warn("\nPluto is running on an old version of Julia ($(VERSION)) that is no longer supported. Visit https://julialang.org/downloads/ for more information about upgrading Julia.")
     end
 
     notebook_at_startup = session.options.server.notebook
@@ -276,21 +276,18 @@ function run(session::ServerSession, pluto_router)
     WorkspaceManager.poll(server_running, 5.0, 1.0)
     
     address = pretty_address(session, hostIP, port)
-    println()
     if session.options.server.launch_browser && open_in_default_browser(address)
-        println("Opening $address in your default browser... ~ have fun!")
+        @info("\nOpening $address in your default browser... ~ have fun!")
     else
-        println("Go to $address in your browser to start writing ~ have fun!")
+        @info("\nGo to $address in your browser to start writing ~ have fun!")
     end
-    println()
-    println("Press Ctrl+C in this terminal to stop Pluto")
-    println()
+    @info("\nPress Ctrl+C in this terminal to stop Pluto\n\n")
     
     # Trigger ServerStartEvent with server details
     try_event_call(session, ServerStartEvent(address, port))
 
     if PLUTO_VERSION >= v"0.17.6" && frontend_directory() == "frontend"
-        @info "It looks like you are developing the Pluto package, using the unbundled frontend..."
+        @info("It looks like you are developing the Pluto package, using the unbundled frontend...")
     end
 
     # Start this in the background, so that the first notebook launch (which will trigger registry update) will be faster
@@ -300,7 +297,7 @@ function run(session::ServerSession, pluto_router)
     end
 
     shutdown_server[] = () -> @sync begin
-        println("\n\nClosing Pluto... Restart Julia for a fresh session. \n\nHave a nice day! 🎈")
+        @info("\n\nClosing Pluto... Restart Julia for a fresh session. \n\nHave a nice day! 🎈\n\n")
         @async swallow_exception(() -> close(serversocket), Base.IOError)
         # TODO: HTTP has a kill signal?
         # TODO: put do_work tokens back 
@@ -311,8 +308,6 @@ function run(session::ServerSession, pluto_router)
         for nb in values(session.notebooks)
             @asynclog SessionActions.shutdown(session, nb; keep_in_session=false, async=false, verbose=false)
         end
-        for (notebook_id, ws) in WorkspaceManager.workspaces
-        end
     end
 
     try

From b0e6a2689cc9d3d828e36b783ba431c1db5115d9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 22 Apr 2022 13:33:02 +0200
Subject: [PATCH 265/821] `POST /notebookupload`: allow specifying a filename
 (#2051)

---
 src/notebook/PathHelpers.jl     |  3 +++
 src/webserver/SessionActions.jl | 19 ++++++++++++++-----
 src/webserver/Static.jl         |  5 ++++-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/notebook/PathHelpers.jl b/src/notebook/PathHelpers.jl
index aa52212c8e..b49b88596d 100644
--- a/src/notebook/PathHelpers.jl
+++ b/src/notebook/PathHelpers.jl
@@ -44,6 +44,9 @@ const nouns = [
 	"conjecture"
 ]
 
+"""
+Generate a filename like `"Cute discovery"`. Does not end with `.jl`.
+"""
 function cutename()
     titlecase(rand(adjectives)) * " " * rand(nouns)
 end
diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 3a227c5f11..8620d91e89 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -163,12 +163,21 @@ function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
 end
 precompile(add, (ServerSession, Notebook))
 
-function save_upload(content::Vector{UInt8})
-    save_path = emptynotebook().path
-    Base.open(save_path, "w") do io
-        write(io, content)
-    end
+"""
+Generate a non-existing new notebook filename, and write `contents` to that file. Return the generated filename.
 
+# Example
+```julia
+save_upload(some_notebook_data; filename_base="hello") == "~/.julia/pluto_notebooks/hello 5.jl"
+```
+"""
+function save_upload(contents::Union{String,Vector{UInt8}}; filename_base::Union{Nothing,AbstractString}=nothing)
+    save_path = numbered_until_new(
+        joinpath(
+            new_notebooks_directory(), 
+            something(filename_base, cutename())
+        ); suffix=".jl")
+    write(save_path, contents)
     save_path
 end
 
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index cc2c11f2af..9955ee4f36 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -323,7 +323,10 @@ function http_router_for(session::ServerSession)
         required=security.require_secret_for_access || 
         security.require_secret_for_open_links
     ) do request::HTTP.Request
-        save_path = SessionActions.save_upload(request.body)
+        uri = HTTP.URI(request.target)
+        query = HTTP.queryparams(uri)
+        
+        save_path = SessionActions.save_upload(request.body; filename_base=get(query, "name", nothing))
         try_launch_notebook_response(
             SessionActions.open,
             save_path;

From 0a15c604f7bc8c97fd5696364558e46f3d7c9105 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 22 Apr 2022 14:54:24 +0200
Subject: [PATCH 266/821] launch_params: allow specific `integrity` for
 notebookfile and statefile urls (#2052)

---
 frontend/common/Binder.js             |  2 +-
 frontend/common/PlutoHash.js          |  1 +
 frontend/common/SliderServerClient.js |  2 +-
 frontend/components/Editor.js         |  6 ++++--
 frontend/components/RecordingUI.js    | 21 ++++++++++++++++++---
 frontend/editor.js                    |  8 +++++++-
 6 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/frontend/common/Binder.js b/frontend/common/Binder.js
index 7e7069fb91..fb4247d00e 100644
--- a/frontend/common/Binder.js
+++ b/frontend/common/Binder.js
@@ -126,7 +126,7 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
         if (launch_params.notebookfile.startsWith("data:")) {
             open_response = await fetch(with_token(new URL("notebookupload", binder_session_url)), {
                 method: "POST",
-                body: await (await fetch(launch_params.notebookfile)).arrayBuffer(),
+                body: await (await fetch(new Request(launch_params.notebookfile, { integrity: launch_params.notebookfile_integrity }))).arrayBuffer(),
             })
         } else {
             for (const [p1, p2] of [
diff --git a/frontend/common/PlutoHash.js b/frontend/common/PlutoHash.js
index 2810b45ad6..a070af2606 100644
--- a/frontend/common/PlutoHash.js
+++ b/frontend/common/PlutoHash.js
@@ -1,3 +1,4 @@
+//@ts-ignore
 import { sha256 } from "https://cdn.jsdelivr.net/gh/JuliaPluto/js-sha256@v0.9.0-es6/src/sha256.mjs"
 
 export const base64_arraybuffer = async (/** @type {BufferSource} */ data) => {
diff --git a/frontend/common/SliderServerClient.js b/frontend/common/SliderServerClient.js
index 8a0ec0a852..d2ad32c7d5 100644
--- a/frontend/common/SliderServerClient.js
+++ b/frontend/common/SliderServerClient.js
@@ -23,7 +23,7 @@ export const nothing_actions = ({ actions }) =>
     )
 
 export const slider_server_actions = ({ setStatePromise, launch_params, actions, get_original_state, get_current_state, apply_notebook_patches }) => {
-    const notebookfile_hash = fetch(launch_params.notebookfile)
+    const notebookfile_hash = fetch(new Request(launch_params.notebookfile, { integrity: launch_params.notebookfile_integrity }))
         .then(assert_response_ok)
         .then((r) => r.arrayBuffer())
         .then(plutohash_arraybuffer)
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 1462d1b60a..c9fd8797f9 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -179,13 +179,16 @@ const first_true_key = (obj) => {
  * @type {{
  *  notebook_id: string?,
  *  statefile: string?,
+ *  statefile_integrity: string?,
  *  notebookfile: string?,
+ *  notebookfile_integrity: string?,
  *  disable_ui: boolean,
  *  preamble_html: string?,
  *  isolated_cell_ids: string[]?,
  *  binder_url: string?,
  *  slider_server_url: string?,
  *  recording_url: string?,
+ *  recording_url_integrity: string?,
  *  recording_audio_url: string?,
  * }}
  */
@@ -1355,8 +1358,7 @@ patch: ${JSON.stringify(
                         export_url=${this.export_url}
                     />
                     <${RecordingPlaybackUI} 
-                        recording_url=${launch_params.recording_url}
-                        audio_src=${launch_params.recording_audio_url}
+                        launch_params=${launch_params}
                         initializing=${this.state.initializing}
                         apply_notebook_patches=${this.apply_notebook_patches}
                         reset_notebook_state=${() =>
diff --git a/frontend/components/RecordingUI.js b/frontend/components/RecordingUI.js
index 846dd41b13..434659eb1e 100644
--- a/frontend/components/RecordingUI.js
+++ b/frontend/components/RecordingUI.js
@@ -201,12 +201,27 @@ let get_scroll_top = ({ cell_id, relative_distance }) => {
     return cell.offsetTop + relative_distance * cell.offsetHeight - window.innerHeight / 2
 }
 
-export const RecordingPlaybackUI = ({ recording_url, audio_src, initializing, apply_notebook_patches, reset_notebook_state }) => {
+/**
+ *
+ * @param {{
+ *  launch_params: import("./Editor.js").LaunchParameters,
+ *  initializing: boolean,
+ *  [key: string]: any,
+ * }} props
+ * @returns
+ */
+export const RecordingPlaybackUI = ({ launch_params, initializing, apply_notebook_patches, reset_notebook_state }) => {
+    const { recording_url, recording_url_integrity, recording_audio_url } = launch_params
+
     let loaded_recording = useMemo(
         () =>
             Promise.resolve().then(async () => {
                 if (recording_url) {
-                    return unpack(new Uint8Array(await (await fetch(recording_url).then(assert_response_ok)).arrayBuffer()))
+                    return unpack(
+                        new Uint8Array(
+                            await (await fetch(new Request(recording_url, { integrity: recording_url_integrity })).then(assert_response_ok)).arrayBuffer()
+                        )
+                    )
                 } else {
                     return null
                 }
@@ -416,7 +431,7 @@ export const RecordingPlaybackUI = ({ recording_url, audio_src, initializing, ap
                             </div>
                         </div>`
                       : null}
-                  ${frame} <${AudioPlayer} audio_element_ref=${audio_element_ref} src=${audio_src} loaded_recording=${loaded_recording} />`
+                  ${frame} <${AudioPlayer} audio_element_ref=${audio_element_ref} src=${recording_audio_url} loaded_recording=${loaded_recording} />`
             : null}
     `
 }
diff --git a/frontend/editor.js b/frontend/editor.js
index 0ce05e1a0c..84c6259392 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -34,8 +34,12 @@ const launch_params = {
     //@ts-ignore
     statefile: url_params.get("statefile") ?? window.pluto_statefile,
     //@ts-ignore
+    statefile_integrity: url_params.get("statefile_integrity") ?? window.pluto_statefile_integrity,
+    //@ts-ignore
     notebookfile: url_params.get("notebookfile") ?? window.pluto_notebookfile,
     //@ts-ignore
+    notebookfile_integrity: url_params.get("notebookfile_integrity") ?? window.pluto_notebookfile_integrity,
+    //@ts-ignore
     disable_ui: !!(url_params.get("disable_ui") ?? window.pluto_disable_ui),
     //@ts-ignore
     preamble_html: url_params.get("preamble_html") ?? window.pluto_preamble_html,
@@ -48,6 +52,8 @@ const launch_params = {
     //@ts-ignore
     recording_url: url_params.get("recording_url") ?? window.pluto_recording_url,
     //@ts-ignore
+    recording_url_integrity: url_params.get("recording_url_integrity") ?? window.pluto_recording_url_integrity,
+    //@ts-ignore
     recording_audio_url: url_params.get("recording_audio_url") ?? window.pluto_recording_audio_url,
 }
 console.log("Launch parameters: ", launch_params)
@@ -105,7 +111,7 @@ const EditorLoader = ({ launch_params }) => {
     useEffect(() => {
         if (!ready_for_editor && static_preview) {
             ;(async () => {
-                const r = await fetch(launch_params.statefile)
+                const r = await fetch(new Request(launch_params.statefile, { integrity: launch_params.statefile_integrity }))
                 const data = await read_Uint8Array_with_progress(r, set_statefile_download_progress)
                 const state = unpack(data)
                 initial_notebook_state_ref.current = state

From 317f63085a53ced9dc35dc88d9cfa53185777205 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 22 Apr 2022 15:29:41 +0200
Subject: [PATCH 267/821] Some base64url utils

---
 frontend/common/PlutoHash.js | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/frontend/common/PlutoHash.js b/frontend/common/PlutoHash.js
index a070af2606..e1baef501b 100644
--- a/frontend/common/PlutoHash.js
+++ b/frontend/common/PlutoHash.js
@@ -17,14 +17,34 @@ export const base64_arraybuffer = async (/** @type {BufferSource} */ data) => {
 export const base64url_arraybuffer = async (/** @type {BufferSource} */ data) => {
     // This is roughly 0.5 as fast as `base64_arraybuffer`. See https://gist.github.com/fonsp/d2b84265012942dc40d0082b1fd405ba for benchmark and even slower alternatives.
     let original = await base64_arraybuffer(data)
+    return base64_to_base64url(original)
+}
+
+/** Turn a base64-encoded string into a base64url-encoded string containing the same data. Do not apply on a `data://` URL. */
+export const base64_to_base64url = (/** @type {string} */ original) => {
     return original.replaceAll(/[\+\/\=]/g, (s) => {
         const c = s.charCodeAt(0)
         return c === 43 ? "-" : c === 47 ? "_" : ""
     })
 }
 
-base64_arraybuffer(new Uint8Array([0, 0, 63, 0, 0, 62, 100, 200])).then((r) => console.assert(r === "AAA/AAA+ZMg=", r))
-base64url_arraybuffer(new Uint8Array([0, 0, 63, 0, 0, 62, 100, 200])).then((r) => console.assert(r === "AAA_AAA-ZMg", r))
+/** Turn a base64url-encoded string into a base64-encoded string containing the same data. Do not apply on a `data://` URL. */
+export const base64url_to_base64 = (/** @type {string} */ original) => {
+    const result_before_padding = original.replaceAll(/[-_]/g, (s) => {
+        const c = s.charCodeAt(0)
+        return c === 45 ? "+" : c === 95 ? "/" : ""
+    })
+    return result_before_padding + "=".repeat((4 - (result_before_padding.length % 4)) % 4)
+}
+
+const t1 = "AAA/AAA+ZMg="
+const t2 = "AAA_AAA-ZMg"
+
+console.assert(base64_to_base64url(t1) === t2)
+console.assert(base64url_to_base64(t2) === t1)
+
+base64_arraybuffer(new Uint8Array([0, 0, 63, 0, 0, 62, 100, 200])).then((r) => console.assert(r === t1, r))
+base64url_arraybuffer(new Uint8Array([0, 0, 63, 0, 0, 62, 100, 200])).then((r) => console.assert(r === t2, r))
 
 export const plutohash_arraybuffer = async (/** @type {BufferSource} */ data) => {
     const hash = sha256.create()

From 53c6138e875fc568bf80d10f236e26f68863281a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 22 Apr 2022 16:23:03 +0200
Subject: [PATCH 268/821] ES2020 compat

---
 frontend/components/Editor.js |  6 +++---
 frontend/warn_old_browsers.js | 20 +++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index c9fd8797f9..a9b76d5bd4 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -921,9 +921,9 @@ patch: ${JSON.stringify(
                     return
                 }
                 if (is_idle) {
-                    this.waiting_for_bond_to_trigger_execution ||= changes_involving_bonds.some(
-                        (x) => x.path.length >= 1 && bond_will_trigger_evaluation(x.path[1])
-                    )
+                    this.waiting_for_bond_to_trigger_execution =
+                        this.waiting_for_bond_to_trigger_execution ||
+                        changes_involving_bonds.some((x) => x.path.length >= 1 && bond_will_trigger_evaluation(x.path[1]))
                 }
                 this.pending_local_updates++
                 this.on_patches_hook(changes)
diff --git a/frontend/warn_old_browsers.js b/frontend/warn_old_browsers.js
index 0cf3f484b8..2210694be7 100644
--- a/frontend/warn_old_browsers.js
+++ b/frontend/warn_old_browsers.js
@@ -1,13 +1,19 @@
-function ismodern(){
-    try{
+function ismodern() {
+    try {
+        // See: https://kangax.github.io/compat-table/es2016plus/
+
+        // 2020 check:
         return eval("let {a, ...r} = {a:1,b:1}; r?.a != r.b; 1 ?? 2")
-    } catch(ex) {
+        // 2021 check:
+        // return eval("let {a, ...r} = {a:1,b:1}; r?.a != r.b; 1 ?? 2; a ||= false")
+    } catch (ex) {
         return false
     }
 }
 
-window.addEventListener("DOMContentLoaded", function(){
-    if(!ismodern()){
-        document.body.innerHTML = "<div style='width: 100%; height: 100%; font-family: sans-serif;'><div style='top: 0;right: 0;left: 0;bottom: 50%;width: 300px;height: 300px;margin: auto;position: absolute;background: white; z-index: 100;'><h1>You need a shiny new browser to use Pluto!</h1><p>The latest versions of Firefox and Chrome will work best.</p></div></div>"
+window.addEventListener("DOMContentLoaded", function () {
+    if (!ismodern()) {
+        document.body.innerHTML =
+            "<div style='width: 100%; height: 100%; font-family: sans-serif;'><div style='top: 0;right: 0;left: 0;bottom: 50%;width: 300px;height: 300px;margin: auto;position: absolute;background: white; z-index: 100;'><h1>You need a shiny new browser to use Pluto!</h1><p>The latest versions of Firefox and Chrome will work best.</p></div></div>"
     }
-})
\ No newline at end of file
+})

From a96a4c0085ad41491d6f04dc0cc4133bc32869ea Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Sat, 23 Apr 2022 12:25:12 +0200
Subject: [PATCH 269/821] Invalidate expanded exprs when dependent macros gets
 removed (#1778)

* invlidate expanded exprs when dependent macros gets removed

* don't use notebook

* remove will_run_code() condition in run_reactive!

(there is an assert at the start of the function)

* whitespace
---
 src/evaluation/Run.jl              | 88 ++++++++++++++++--------------
 src/evaluation/RunBonds.jl         |  4 +-
 src/evaluation/WorkspaceManager.jl |  8 +--
 src/runner/PlutoRunner.jl          | 17 ++++--
 test/MacroAnalysis.jl              | 21 +++++++
 5 files changed, 86 insertions(+), 52 deletions(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 3d309537bc..7b94d39590 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -130,10 +130,12 @@ function run_reactive_core!(
     to_delete_vars = union!(to_delete_vars, defined_variables(new_topology, new_errable)...)
     to_delete_funcs = union!(to_delete_funcs, defined_functions(new_topology, new_errable)...)
 
+    cells_to_macro_invalidate = map(c -> c.cell_id, cells_with_deleted_macros(old_topology, new_topology)) |> Set{UUID}
+
     to_reimport = union!(Set{Expr}(), map(c -> new_topology.codes[c].module_usings_imports.usings, setdiff(notebook.cells, to_run))...)
     if will_run_code(notebook)
-		deletion_hook((session, notebook), old_workspace_name, nothing, to_delete_vars, to_delete_funcs, to_reimport; to_run) # `deletion_hook` defaults to `WorkspaceManager.move_vars`
-	end
+        deletion_hook((session, notebook), old_workspace_name, nothing, to_delete_vars, to_delete_funcs, to_reimport, cells_to_macro_invalidate; to_run = to_run) # `deletion_hook` defaults to `WorkspaceManager.move_vars`
+    end
 
     delete!.([notebook.bonds], to_delete_vars)
 
@@ -169,9 +171,7 @@ function run_reactive_core!(
         end
 
         implicit_usings = collect_implicit_usings(new_topology, cell)
-		if !will_run_code(notebook)
-			# then skip these special cases.
-        elseif !is_resolved(new_topology) && can_help_resolve_cells(new_topology, cell)
+        if !is_resolved(new_topology) && can_help_resolve_cells(new_topology, cell)
             notebook.topology = new_new_topology = resolve_topology(session, notebook, new_topology, old_workspace_name)
 
             if !isempty(implicit_usings)
@@ -242,17 +242,17 @@ function run_single!(
 	capture_stdout::Bool=true,
 )
 	run = WorkspaceManager.eval_format_fetch_in_workspace(
-		session_notebook, 
-		expr_cache.parsedcode, 
+		session_notebook,
+		expr_cache.parsedcode,
 		cell.cell_id;
 		
-		ends_with_semicolon = 
-			ends_with_semicolon(cell.code), 
-		function_wrapped_info = 
+		ends_with_semicolon =
+			ends_with_semicolon(cell.code),
+		function_wrapped_info =
 			expr_cache.function_wrapped ? (filter(!is_joined_funcname, reactive_node.references), reactive_node.definitions) : nothing,
-		forced_expr_id = 
+		forced_expr_id =
 			expr_cache.forced_expr_id,
-		known_published_objects = 
+		known_published_objects =
 			collect(keys(cell.published_objects)),
 		user_requested_run,
 		capture_stdout,
@@ -315,9 +315,17 @@ end
 
 collect_implicit_usings(topology::NotebookTopology, cell::Cell) = ExpressionExplorer.collect_implicit_usings(topology.codes[cell].module_usings_imports)
 
+function cells_with_deleted_macros(old_topology::NotebookTopology, new_topology::NotebookTopology)
+    old_macros = mapreduce(c -> defined_macros(old_topology, c), union!, all_cells(old_topology); init=Set{Symbol}())
+    new_macros = mapreduce(c -> defined_macros(new_topology, c), union!, all_cells(new_topology); init=Set{Symbol}())
+    removed_macros = setdiff(old_macros, new_macros)
+
+    where_referenced(old_topology, removed_macros)
+end
+
 "Returns the set of macros names defined by this cell"
 defined_macros(topology::NotebookTopology, cell::Cell) = defined_macros(topology.nodes[cell])
-defined_macros(node::ReactiveNode) = filter(is_macro_identifier, node.funcdefs_without_signatures) ∪ filter(is_macro_identifier, node.definitions) # macro definitions can come from imports
+defined_macros(node::ReactiveNode) = union!(filter(is_macro_identifier, node.funcdefs_without_signatures), filter(is_macro_identifier, node.definitions)) # macro definitions can come from imports
 
 "Tells whether or not a cell can 'unlock' the resolution of other cells"
 function can_help_resolve_cells(topology::NotebookTopology, cell::Cell)
@@ -403,36 +411,36 @@ function resolve_topology(
 	still_unresolved_nodes = Set{Cell}()
 
 	for cell in unresolved_topology.unresolved_cells
-			if unresolved_topology.nodes[cell].macrocalls ⊆ run_defined_macros
-				# Do not try to expand if a newer version of the macro is also scheduled to run in the
-				# current run. The recursive reactive runs will take care of it.
-				push!(still_unresolved_nodes, cell)
-			end
+		if unresolved_topology.nodes[cell].macrocalls ⊆ run_defined_macros
+			# Do not try to expand if a newer version of the macro is also scheduled to run in the
+			# current run. The recursive reactive runs will take care of it.
+			push!(still_unresolved_nodes, cell)
+		end
 
-			result = try
-				if will_run_code(notebook)
-					analyze_macrocell(cell)
-				else
-					Failure(ErrorException("shutdown"))
-				end
-			catch error
-				@error "Macro call expansion failed with a non-macroexpand error" error
-				Failure(error)
-			end
-			if result isa Success
-				(new_node, function_wrapped, forced_expr_id) = result.result
-				union!(new_node.macrocalls, unresolved_topology.nodes[cell].macrocalls)
-				union!(new_node.references, new_node.macrocalls)
-				new_nodes[cell] = new_node
-
-				# set function_wrapped to the function wrapped analysis of the expanded expression.
-				new_codes[cell] = ExprAnalysisCache(unresolved_topology.codes[cell]; forced_expr_id, function_wrapped)
+		result = try
+			if will_run_code(notebook)
+				analyze_macrocell(cell)
 			else
-				if result isa Failure
-					@debug "Expansion failed" err=result.error
-				end
-				push!(still_unresolved_nodes, cell)
+				Failure(ErrorException("shutdown"))
 			end
+		catch error
+			@error "Macro call expansion failed with a non-macroexpand error" error
+			Failure(error)
+		end
+		if result isa Success
+			(new_node, function_wrapped, forced_expr_id) = result.result
+			union!(new_node.macrocalls, unresolved_topology.nodes[cell].macrocalls)
+			union!(new_node.references, new_node.macrocalls)
+			new_nodes[cell] = new_node
+
+			# set function_wrapped to the function wrapped analysis of the expanded expression.
+			new_codes[cell] = ExprAnalysisCache(unresolved_topology.codes[cell]; forced_expr_id, function_wrapped)
+		else
+			if result isa Failure
+				@debug "Expansion failed" err=result.error
+			end
+			push!(still_unresolved_nodes, cell)
+		end
 	end
 
 	all_nodes = merge(unresolved_topology.nodes, new_nodes)
diff --git a/src/evaluation/RunBonds.jl b/src/evaluation/RunBonds.jl
index ce53d1ffb0..ea8143c6a3 100644
--- a/src/evaluation/RunBonds.jl
+++ b/src/evaluation/RunBonds.jl
@@ -37,9 +37,9 @@ function set_bond_values_reactive(;
 
     new_values = [notebook.bonds[bound_sym].value for bound_sym in to_set]
     
-    function custom_deletion_hook((session, notebook)::Tuple{ServerSession,Notebook}, old_workspace_name, new_workspace_name, to_delete_vars::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, to_reimport::Set{Expr}; to_run::AbstractVector{Cell})
+    function custom_deletion_hook((session, notebook)::Tuple{ServerSession,Notebook}, old_workspace_name, new_workspace_name, to_delete_vars::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, to_reimport::Set{Expr}, invalidated_cell_uuids::Set{UUID}; to_run::AbstractVector{Cell})
         to_delete_vars = Set([to_delete_vars..., to_set...]) # also delete the bound symbols
-        WorkspaceManager.move_vars((session, notebook), old_workspace_name, new_workspace_name, to_delete_vars, methods_to_delete, to_reimport)
+        WorkspaceManager.move_vars((session, notebook), old_workspace_name, new_workspace_name, to_delete_vars, methods_to_delete, to_reimport, invalidated_cell_uuids)
         for (bound_sym, new_value) in zip(to_set, new_values)
             WorkspaceManager.eval_in_workspace((session, notebook), :($(bound_sym) = Main.PlutoRunner.transform_bond_value($(QuoteNode(bound_sym)), $(new_value))))
         end
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 883f6d481b..a3a5e5752c 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -485,15 +485,15 @@ function do_reimports(session_notebook::Union{SN,Workspace}, module_imports_to_m
 end
 
 "Move variables to a new module. A given set of variables to be 'deleted' will not be moved to the new module, making them unavailable. "
-function move_vars(session_notebook::Union{SN,Workspace}, old_workspace_name::Symbol, new_workspace_name::Union{Nothing,Symbol}, to_delete::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, module_imports_to_move::Set{Expr}; kwargs...)
+function move_vars(session_notebook::Union{SN,Workspace}, old_workspace_name::Symbol, new_workspace_name::Union{Nothing,Symbol}, to_delete::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, module_imports_to_move::Set{Expr}, invalidated_cell_uuids::Set{UUID}; kwargs...)
     workspace = get_workspace(session_notebook)
     new_workspace_name = something(new_workspace_name, workspace.module_name)
     
-    Distributed.remotecall_eval(Main, [workspace.pid], :(PlutoRunner.move_vars($(old_workspace_name |> QuoteNode), $(new_workspace_name |> QuoteNode), $to_delete, $methods_to_delete, $module_imports_to_move)))
+    Distributed.remotecall_eval(Main, [workspace.pid], :(PlutoRunner.move_vars($(old_workspace_name |> QuoteNode), $(new_workspace_name |> QuoteNode), $to_delete, $methods_to_delete, $module_imports_to_move, $invalidated_cell_uuids)))
 end
 
-move_vars(session_notebook::Union{SN,Workspace}, to_delete::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, module_imports_to_move::Set{Expr}; kwargs...) =
-move_vars(session_notebook, bump_workspace_module(session_notebook)..., to_delete, methods_to_delete, module_imports_to_move; kwargs...)
+move_vars(session_notebook::Union{SN,Workspace}, to_delete::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, module_imports_to_move::Set{Expr}, invalidated_cell_uuids::Set{UUID}; kwargs...) =
+move_vars(session_notebook, bump_workspace_module(session_notebook)..., to_delete, methods_to_delete, module_imports_to_move, invalidated_cell_uuids; kwargs...)
 
 # TODO: delete me
 @deprecate(
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index d0c2aeb56b..e768a331e1 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -619,17 +619,22 @@ The trick boils down to two things:
 2. If a function used to be defined, but now we want to delete it, then we go through the method table of that function and snoop out all methods that we defined by us, and not by another package. This is how we reverse extending external functions. For example, if you run a cell with `Base.sqrt(s::String) = "the square root of" * s`, and then delete that cell, then you can still call `sqrt(1)` but `sqrt("one")` will err. Cool right!
 """
 function move_vars(
-        old_workspace_name::Symbol,
-        new_workspace_name::Symbol,
-        vars_to_delete::Set{Symbol},
-        methods_to_delete::Set{Tuple{UUID,Vector{Symbol}}},
-        module_imports_to_move::Set{Expr}
-    )
+    old_workspace_name::Symbol,
+    new_workspace_name::Symbol,
+    vars_to_delete::Set{Symbol},
+    methods_to_delete::Set{Tuple{UUID,Vector{Symbol}}},
+    module_imports_to_move::Set{Expr},
+    invalidated_cell_uuids::Set{UUID},
+)
     old_workspace = getfield(Main, old_workspace_name)
     new_workspace = getfield(Main, new_workspace_name)
 
     do_reimports(new_workspace, module_imports_to_move)
 
+    for uuid in invalidated_cell_uuids
+        pop!(cell_expanded_exprs, uuid, nothing)
+    end
+
     # TODO: delete
     Core.eval(new_workspace, :(import ..($(old_workspace_name))))
 
diff --git a/test/MacroAnalysis.jl b/test/MacroAnalysis.jl
index b10d3b9cc0..2233adc8ff 100644
--- a/test/MacroAnalysis.jl
+++ b/test/MacroAnalysis.jl
@@ -276,6 +276,27 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         @test cell(1).output.body == "42"
     end
 
+    @testset "Removing macros undefvar errors dependent cells" begin
+        notebook = Notebook(Cell.([
+            """macro m()
+                :(1 + 1)
+            end""",
+            "@m()",
+        ]))
+
+        update_run!(🍭, notebook, notebook.cells)
+
+        @test all(noerror, notebook.cells)
+
+        setcode(notebook.cells[begin], "") # remove definition of m
+        update_run!(🍭, notebook, notebook.cells[begin])
+
+        @test notebook.cells[begin] |> noerror
+        @test notebook.cells[end].errored
+
+        @test occursinerror("UndefVarError: @m", notebook.cells[end])
+    end
+
     @testset "Redefines macro with new SymbolsState" begin
         notebook = Notebook(Cell.([
             "@b x",

From c9f3b9ca6406737a6a7fb2d68ea221606d093d9f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 24 Apr 2022 22:30:18 +0200
Subject: [PATCH 270/821] (technically api breaking) Remove the `notebook`
 field of `NewNotebookEvent` (#2049)

---
 src/notebook/Events.jl          | 1 -
 src/webserver/SessionActions.jl | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/notebook/Events.jl b/src/notebook/Events.jl
index 26df8e1f95..f4ca537373 100644
--- a/src/notebook/Events.jl
+++ b/src/notebook/Events.jl
@@ -85,7 +85,6 @@ end
 
 # Triggered when we open a new notebook
 struct NewNotebookEvent <: PlutoEvent
-    notebook::Notebook
 end
 
 # Triggered when a user opens a notebook
diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 8620d91e89..490af060d1 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -31,7 +31,7 @@ function open_url(session::ServerSession, url::AbstractString; kwargs...)
         ); suffix=".jl")
     
     path = download_cool(url, random_notebook.path)
-    result = try_event_call(session, NewNotebookEvent(random_notebook))
+    result = try_event_call(session, NewNotebookEvent())
     nb = if result isa UUID
         open(session, path; notebook_id=result, kwargs...)
     else
@@ -221,7 +221,7 @@ function new(session::ServerSession; run_async=true, notebook_id::UUID=uuid1())
         end
     end
     # Run NewNotebookEvent handler before assigning ID
-    isid = try_event_call(session, NewNotebookEvent(nb))
+    isid = try_event_call(session, NewNotebookEvent())
     nb.notebook_id = isnothing(isid) ? notebook_id : isid
 
     update_save_run!(session, nb, nb.cells; run_async=run_async, prerender_text=true)

From c5bd9f447d940b99607806383ec5e12cafa9594e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 27 Apr 2022 13:01:50 +0200
Subject: [PATCH 271/821] Frontend tests: improve offline tests

---
 test/frontend/helpers/common.js | 33 ++++++++++++++++++++++++++++-----
 test/frontend/helpers/pluto.js  |  8 ++++----
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/test/frontend/helpers/common.js b/test/frontend/helpers/common.js
index 6b0b229300..77e2259c20 100644
--- a/test/frontend/helpers/common.js
+++ b/test/frontend/helpers/common.js
@@ -14,8 +14,26 @@ class InflightRequests {
     this._page.on('requestfailed', this._onFinished);
   }
 
-  _onStarted(request) { this._requests.set(request, 1 + (this._requests.get(request) ?? 0)); }
-  _onFinished(request) { this._requests.set(request, -1 + (this._requests.get(request) ?? 0)); }
+  _onStarted(request) { 
+    // if(request.url().includes("data")) {
+    //   console.log('Start', request.url())
+    // }; 
+    this._requests.set(
+      request.url(), 
+      1 + (this._requests.get(request.url()) ?? 0)
+    ); 
+  }
+  _onFinished(request) { 
+    // if(request.url().includes("data")) {
+    //   console.log('Finish', request.url())
+    // }; 
+    this._requests.set(
+      request.url(), 
+      -1 + 
+        /* Multiple requests starts can have a single finish event. */
+        Math.min(1, this._requests.get(request.url()) ?? 0)
+    ); 
+  }
  
   inflightRequests() { return Array.from([...this._requests.entries()].flatMap(([k,v]) => v > 0 ? [k] : [])); }  
 
@@ -32,7 +50,8 @@ const with_connections_debug = (page, action) => {
     tracker.dispose();
     const inflight = tracker.inflightRequests();
     if(inflight.length > 0) {
-      console.warn("Open connections: ", inflight.map(request => request.url()));
+      console.warn("Open connections: ", inflight);
+      // console.warn([...tracker._requests.entries()])
     }
   }).catch(e => {
     
@@ -161,6 +180,9 @@ let should_be_offline_input = process.env["PLUTO_TEST_OFFLINE"]?.toLowerCase() ?
 let should_be_offline = [true, 1, "true", "1"].includes(should_be_offline_input)
 console.log(`Offline mode enabled: ${should_be_offline}`)
 
+const blocked_domains = ["cdn.jsdelivr.net", "unpkg.com", "cdn.skypack.dev", "esm.sh", "firebase.google.com"]
+const hide_warning = url => url.includes("mathjax")
+
 export const setupPage = (page) => {
   failOnError(page);
   dismissBeforeUnloadDialogs(page);
@@ -169,8 +191,9 @@ export const setupPage = (page) => {
   if(should_be_offline) {
     page.setRequestInterception(true);
     page.on("request", (request) => {
-      if(["cdn.jsdelivr.net", "unpkg.com", "cdn.skypack.dev", "esm.sh", "firebase.google.com"].some(domain => request.url().includes(domain))) {
-        console.error(`Blocking request to ${request.url()}`)
+      if(blocked_domains.some(domain => request.url().includes(domain))) {
+        if(!hide_warning(request.url()))
+          console.error(`Blocking request to ${request.url()}`)
         request.abort();
       } else {
         request.continue();
diff --git a/test/frontend/helpers/pluto.js b/test/frontend/helpers/pluto.js
index 9552b0d281..589d5d9034 100644
--- a/test/frontend/helpers/pluto.js
+++ b/test/frontend/helpers/pluto.js
@@ -54,11 +54,11 @@ export const createNewNotebook = async (page) => {
 export const importNotebook = async (page, notebookName) => {
     // Copy notebook before using it, so we don't mess it up with test changes
     const notebookPath = getFixtureNotebookPath(notebookName)
-    // const artifactsPath = getTemporaryNotebookPath()
-    // fs.copyFileSync(notebookPath, artifactsPath)
+    const artifactsPath = getTemporaryNotebookPath()
+    fs.copyFileSync(notebookPath, artifactsPath)
     const openFileInputSelector = "pluto-filepicker"
-    // writeSingleLineInPlutoInput(page, openFileInputSelector, artifactsPath)
-    await writeSingleLineInPlutoInput(page, openFileInputSelector, notebookPath)
+    await writeSingleLineInPlutoInput(page, openFileInputSelector, artifactsPath)
+    // await writeSingleLineInPlutoInput(page, openFileInputSelector, notebookPath)
 
     const openFileButton = "pluto-filepicker button"
     await clickAndWaitForNavigation(page, openFileButton)

From 85e50a48a591a4667115cb6a633a11456a07fccb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 27 Apr 2022 13:14:57 +0200
Subject: [PATCH 272/821] Frontend tests: more offline requests debug

---
 test/frontend/helpers/common.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/frontend/helpers/common.js b/test/frontend/helpers/common.js
index 77e2259c20..5a0f3ce946 100644
--- a/test/frontend/helpers/common.js
+++ b/test/frontend/helpers/common.js
@@ -7,6 +7,7 @@ class InflightRequests {
   constructor(page) {
     this._page = page;
     this._requests = new Map();
+    this._history = [];
     this._onStarted = this._onStarted.bind(this);
     this._onFinished = this._onFinished.bind(this);
     this._page.on('request', this._onStarted);
@@ -18,6 +19,7 @@ class InflightRequests {
     // if(request.url().includes("data")) {
     //   console.log('Start', request.url())
     // }; 
+    this._history.push(["started", request.url()]);
     this._requests.set(
       request.url(), 
       1 + (this._requests.get(request.url()) ?? 0)
@@ -27,6 +29,7 @@ class InflightRequests {
     // if(request.url().includes("data")) {
     //   console.log('Finish', request.url())
     // }; 
+    this._history.push(["finished", request.url()]);
     this._requests.set(
       request.url(), 
       -1 + 
@@ -50,7 +53,7 @@ const with_connections_debug = (page, action) => {
     tracker.dispose();
     const inflight = tracker.inflightRequests();
     if(inflight.length > 0) {
-      console.warn("Open connections: ", inflight);
+      console.warn("Open connections: ", inflight, tracker._history.filter(([n,u]) => inflight.includes(u)));
       // console.warn([...tracker._requests.entries()])
     }
   }).catch(e => {

From 04cbfb3c392a9f36ea7183fc6b300b5ba23042a6 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 27 Apr 2022 16:28:36 +0200
Subject: [PATCH 273/821] bundler: don't allow empty response (#2065)

---
 .../https-resolver.js                               | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js b/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
index 534e6a079c..95108953f1 100644
--- a/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
+++ b/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
@@ -68,8 +68,19 @@ module.exports = new Resolver({
                 // and converting binary assets into strings and then passing them doesn't work 🤷‍♀️.
                 let buffer = await response.buffer()
 
+                const response_length = buffer.length
+
+                if (response_length === 0) {
+                    throw new Error(`${specifier} returned an empty reponse.`)
+                }
+
                 await mkdirp(folder)
-                await fs.writeFile(fullpath, buffer)
+                const write_result = await fs.writeFile(fullpath, buffer)
+
+                // Verify that the file was written correctly:
+                if (write_result !== undefined || (await fs.readFile(fullpath)).length !== response_length) {
+                    throw new Error(`Failed to write file ${fullpath}`)
+                }
             }
 
             return { filePath: fullpath }

From f9a6e6426752cf2ce188f5ad6e3a3cbd76aeaee2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 27 Apr 2022 16:29:14 +0200
Subject: [PATCH 274/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 09d9a53e6c..33c384b4c0 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.2"
+version = "0.19.3"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 1b924ea9258e493b8c543878011f6c4fc31e7e89 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 27 Apr 2022 17:43:35 +0200
Subject: [PATCH 275/821] Update TagBot.yml

---
 .github/workflows/TagBot.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/TagBot.yml b/.github/workflows/TagBot.yml
index ae92fce49f..a86d626b9c 100644
--- a/.github/workflows/TagBot.yml
+++ b/.github/workflows/TagBot.yml
@@ -52,3 +52,15 @@ jobs:
                     - {{ issue.title }} (#{{ issue.number }})
                     {% endfor %}
                     {% endif %}
+                    
+                    # New features
+                    *(TODO)*
+
+                    # Performance improvements
+                    *(TODO)*
+
+                    # Fixes
+                    *(TODO)*
+
+                    # Internal changes
+                    *(TODO)*

From dcd5101da5dffe9c350468ff613c50a8756cebb3 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Wed, 27 Apr 2022 20:27:52 +0200
Subject: [PATCH 276/821] Set Base.Experimental.@max_methods 1 (#2068)

---
 src/Pluto.jl         |  4 ++++
 test/compiletimes.jl | 21 +++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/Pluto.jl b/src/Pluto.jl
index 960ec48bf2..88ce54e040 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -10,6 +10,10 @@ https://github.com/fonsp/Pluto.jl/wiki
 """
 module Pluto
 
+if isdefined(Base, :Experimental) && isdefined(Base.Experimental, Symbol("@max_methods"))
+    @eval Base.Experimental.@max_methods 1
+end
+
 import RelocatableFolders: @path
 const ROOT_DIR = normpath(joinpath(@__DIR__, ".."))
 const FRONTEND_DIR = @path(joinpath(ROOT_DIR, "frontend"))
diff --git a/test/compiletimes.jl b/test/compiletimes.jl
index 606f1ce969..0d73beef31 100644
--- a/test/compiletimes.jl
+++ b/test/compiletimes.jl
@@ -1,9 +1,10 @@
-# Collect Time To Finish Task (TTFT)
-
-# Using `@eval` to avoid missing compile time, see the `@time` docstring for more info.
-@timeit TOUT "Pluto.Cell" cell = @eval Pluto.Cell("1 + 1")
-
-@timeit TOUT "Pluto.Notebook" nb = @eval Pluto.Notebook([cell])
+# Collect Time To First X (TTFX)
+#
+# A few notes about these compile times benchmarks.
+#   1. These benchmarks are meant to show where the biggest problems are and to be able to trace back where some regression was introduced.
+#   2. The benchmarks use `@eval` to avoid missing compile time, see the `@time` docstring for more info.
+#   3. Only add benchmarks for methods which take more than 1 seconds on the first run to reduce noise.
+#   4. Note that some benchmarks depend on disk and network speeds too, so focus on the number of allocations since those are more robust.
 
 module Foo end
 @timeit TOUT "PlutoRunner.run_expression" @eval Pluto.PlutoRunner.run_expression(Foo, :(1 + 1), Pluto.uuid1(), nothing);
@@ -20,15 +21,11 @@ end
 
 path = joinpath(pkgdir(Pluto), "sample", "Basic.jl")
 
-@timeit TOUT "SessionActions.open" nb = @eval Pluto.SessionActions.open(🍭, path; run_async=true)
+@timeit TOUT "SessionActions.open" nb = @eval Pluto.SessionActions.open(🍭, path; run_async=false)
 
 wait_for_ready(nb)
 
-@timeit TOUT "SessionActions.shutdown" @eval Pluto.SessionActions.shutdown(🍭, nb; async=true)
-
-# According to SnoopCompile, this is a big part of the time for `Pluto.run()`.
-# However, it's very tricky to measure this via the `Pluto.run` below.
-@timeit TOUT "Configuration.from_flat_kwargs" @eval Pluto.Configuration.from_flat_kwargs()
+Pluto.SessionActions.shutdown(🍭, nb; async=false)
 
 # Compile HTTP get.
 HTTP.get("http://github.com")

From b3599edeed6280ec785331a9b9697e101a868eba Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 27 Apr 2022 21:04:22 +0200
Subject: [PATCH 277/821] bundler: Retry on failure

---
 .../https-resolver.js                         | 56 ++++++++++++-------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js b/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
index 95108953f1..864687547d 100644
--- a/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
+++ b/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
@@ -9,6 +9,18 @@ let DONT_INCLUDE = { isExcluded: true }
 
 const fileExists = async (path) => !!(await fs.stat(path).catch((e) => false))
 
+async function keep_trying(fn, max_tries = 10) {
+    try {
+        return await fn()
+    } catch (e) {
+        if (max_tries === 0) {
+            throw e
+        } else {
+            return await keep_trying(fn, max_tries - 1)
+        }
+    }
+}
+
 module.exports = new Resolver({
     async resolve({ specifier, dependency, options }) {
         let my_temp_cave = path.join(options.cacheDir, ".net")
@@ -60,27 +72,29 @@ module.exports = new Resolver({
             let folder = path.dirname(fullpath)
 
             if (!(await fileExists(fullpath))) {
-                let response = await fetch(specifier)
-                if (response.status !== 200) {
-                    throw new Error(`${specifier} returned ${response.status}`)
-                }
-                // Can't directly use the value from the request, as parcel really wants a string,
-                // and converting binary assets into strings and then passing them doesn't work 🤷‍♀️.
-                let buffer = await response.buffer()
-
-                const response_length = buffer.length
-
-                if (response_length === 0) {
-                    throw new Error(`${specifier} returned an empty reponse.`)
-                }
-
-                await mkdirp(folder)
-                const write_result = await fs.writeFile(fullpath, buffer)
-
-                // Verify that the file was written correctly:
-                if (write_result !== undefined || (await fs.readFile(fullpath)).length !== response_length) {
-                    throw new Error(`Failed to write file ${fullpath}`)
-                }
+                await keep_trying(async () => {
+                    let response = await fetch(specifier)
+                    if (response.status !== 200) {
+                        throw new Error(`${specifier} returned ${response.status}`)
+                    }
+                    // Can't directly use the value from the request, as parcel really wants a string,
+                    // and converting binary assets into strings and then passing them doesn't work 🤷‍♀️.
+                    let buffer = await response.buffer()
+
+                    const response_length = buffer.length
+
+                    if (response_length === 0) {
+                        throw new Error(`${specifier} returned an empty reponse.`)
+                    }
+
+                    await mkdirp(folder)
+                    const write_result = await fs.writeFile(fullpath, buffer)
+
+                    // Verify that the file was written correctly:
+                    if (write_result !== undefined || (await fs.readFile(fullpath)).length !== response_length) {
+                        throw new Error(`Failed to write file ${fullpath}`)
+                    }
+                })
             }
 
             return { filePath: fullpath }

From 02560adf137c9959ee5c844116dad77f7978bcf7 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 27 Apr 2022 22:54:29 +0200
Subject: [PATCH 278/821] refactor error page

---
 frontend/error.css      | 71 +++++++++++++++++++++++++++++++++++++++++
 frontend/error.jl.html  | 24 +++++++-------
 frontend/index.css      | 15 +--------
 src/webserver/Static.jl |  2 +-
 4 files changed, 84 insertions(+), 28 deletions(-)
 create mode 100644 frontend/error.css

diff --git a/frontend/error.css b/frontend/error.css
new file mode 100644
index 0000000000..26b5fee8c6
--- /dev/null
+++ b/frontend/error.css
@@ -0,0 +1,71 @@
+* {
+    box-sizing: border-box;
+}
+
+:root {
+    --inter-ui-font-stack: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, Helvetica, Arial, "Apple Color Emoji",
+        "Segoe UI Emoji", "Segoe UI Symbol", system-ui, sans-serif;
+    --system-fonts-mono: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+
+    color-scheme: light dark;
+    font-family: var(--inter-ui-font-stack);
+    font-size: 17px;
+
+    --black: black;
+    --gray1: gray;
+    --white: white;
+}
+
+@media (prefers-color-scheme: dark) {
+    :root {
+        --black: white;
+        --gray1: #c7c7c7;
+        --white: black;
+    }
+}
+
+body {
+    max-width: 700px;
+    margin: 0 auto;
+    margin-top: 3rem;
+    padding: 1rem;
+}
+
+code,
+pre {
+    font-family: var(--system-fonts-mono);
+    color: var(--gray1);
+}
+pre code {
+    color: inherit;
+}
+code {
+    font-size: 0.9rem;
+}
+
+pre {
+    /* white-space: pre-wrap; */
+    overflow: auto;
+
+    border-left: 8px solid #ff002d42;
+    padding-left: 1rem;
+}
+
+pre:first-line {
+    font-weight: bolder;
+    line-height: 2em;
+    /* font-style: italic; */
+    color: var(--black);
+
+    /* padding: 6em; */
+    /* display: block; */
+}
+
+a {
+    font-weight: bolder;
+    color: unset;
+}
+
+a:visited {
+    /* color: red; */
+}
diff --git a/frontend/error.jl.html b/frontend/error.jl.html
index cdbd371544..e10761a7df 100644
--- a/frontend/error.jl.html
+++ b/frontend/error.jl.html
@@ -18,22 +18,20 @@
     <meta name="description" content="Pluto.jl notebooks" />
 
     <!-- The following import will be inserted inline to not depend on the URL path -->
-    <!-- <link rel="stylesheet" href="./index.css"> -->
+    <!-- <link rel="stylesheet" href="./error.css"> -->
     $STYLE
 </head>
 
-<body class="error">
-    <div id="title">
-        <h2 style="font-style: normal;">$TITLE</h2>
-        <main>
-            <p>$ADVICE</p>
-            <br />
-            <p><a href="#" onclick="history.back()">Go back</a></p>
-            <br />
-            <p>$BODYTITLE</p>
-            <pre>$BODY</pre>
-        </main>
-    </div>
+<body>
+    <h2>$TITLE</h2>
+    <main>
+        <p>$ADVICE</p>
+        <br />
+        <p><a href="#" onclick="history.back()">Go back</a></p>
+        <br />
+        <p>$BODYTITLE</p>
+        <pre><code>$BODY</code></pre>
+    </main>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/frontend/index.css b/frontend/index.css
index 1c6d688103..007a7028a9 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -23,11 +23,6 @@
     text-align: center;
 }
 
-body.error #title {
-    margin-top: 10vh;
-    /* text-align: left; */
-}
-
 #title h1,
 #title h2 {
     font-style: italic;
@@ -69,14 +64,6 @@ main {
     color: var(--index-text-color);
 }
 
-body.error main {
-    width: unset;
-    max-width: 40em;
-    padding: 0.5em;
-    margin-top: 5vh;
-    font-size: 14px;
-}
-
 p {
     color: var(--index-clickable-text-color);
 }
@@ -157,7 +144,7 @@ pluto-filepicker button {
 
 pluto-filepicker button:disabled {
     cursor: not-allowed;
-    opacity: .7;
+    opacity: 0.7;
 }
 
 .cm-editor .cm-tooltip {
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index 9955ee4f36..e96efa16e8 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -65,7 +65,7 @@ function error_response(
 
     body_title = body == "" ? "" : "Error message:"
     filled_in = replace(replace(replace(replace(replace(template, 
-        "\$STYLE" => """<style>$(read(project_relative_path("frontend", "index.css"), String))</style>"""), 
+        "\$STYLE" => """<style>$(read(project_relative_path("frontend", "error.css"), String))</style>"""), 
         "\$TITLE" => title), 
         "\$ADVICE" => advice), 
         "\$BODYTITLE" => body_title), 

From 8a6e145f983d25a68bded8bbcecf8792331a2502 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Thu, 28 Apr 2022 21:10:14 +0200
Subject: [PATCH 279/821] Benchmark tools in inner scope (#2070)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* remove warning in compiletimes.jl

* explore benchmark tools in its own scope

* 🤔
---
 src/analysis/ExpressionExplorer.jl | 14 ++++++++++----
 test/ExpressionExplorer.jl         |  8 ++++++--
 test/compiletimes.jl               |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 13c1b233c3..1ac38ffdf9 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -479,10 +479,16 @@ function explore!(ex::Expr, scopestate::ScopeState)::SymbolsState
                 union!(symstate, SymbolsState(macrocalls = Set{FunctionName}([expanded_macro])))
             elseif all_iters_eq((:BenchmarkTools, :generate_benchmark_definition), funcname) &&
                 length(ex.args) == 10
-                for child in ex.args[7:9]
-                    (Meta.isexpr(child, :copyast, 1) && child.args[1] isa QuoteNode && child.args[1].value isa Expr) || continue
-                    union!(symstate, explore!(child.args[1].value, scopestate))
-                end
+                block = Expr(:block,
+                     map(ex.args[[8,7,9]]) do child
+                        if (Meta.isexpr(child, :copyast, 1) && child.args[1] isa QuoteNode && child.args[1].value isa Expr)
+                            child.args[1].value
+                        else
+                            nothing
+                        end
+                    end...
+                )
+                union!(symstate, explore_inner_scoped(block, scopestate))
             end
 
             return symstate
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index fd441e27fa..9c750e2321 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -596,8 +596,12 @@ Some of these @test_broken lines are commented out to prevent printing to the te
     end
     @testset "Special reactivity rules" begin
         @test testee(
-            :(BenchmarkTools.generate_benchmark_definition(Main, Symbol[], Any[], Symbol[], (), $(Expr(:copyast, QuoteNode(:(f(x, y, z))))), $(Expr(:copyast, QuoteNode(:(A + B)))), $(Expr(:copyast, QuoteNode(nothing))), BenchmarkTools.parameters())),
-            [:Main, :BenchmarkTools, :Any, :Symbol, :x, :y, :z, :A, :B], [], [[:BenchmarkTools, :generate_benchmark_definition], [:BenchmarkTools, :parameters], :f, :+], []
+            :(BenchmarkTools.generate_benchmark_definition(Main, Symbol[], Any[], Symbol[], (), $(Expr(:copyast, QuoteNode(:(f(x, y, z))))), $(Expr(:copyast, QuoteNode(:()))), $(Expr(:copyast, QuoteNode(nothing))), BenchmarkTools.parameters())),
+            [:Main, :BenchmarkTools, :Any, :Symbol, :x, :y, :z], [], [[:BenchmarkTools, :generate_benchmark_definition], [:BenchmarkTools, :parameters], :f], []
+        )
+        @test testee(
+            :(BenchmarkTools.generate_benchmark_definition(Main, Symbol[], Any[], Symbol[], (), $(Expr(:copyast, QuoteNode(:(f(x, y, z))))), $(Expr(:copyast, QuoteNode(:(x = A + B)))), $(Expr(:copyast, QuoteNode(nothing))), BenchmarkTools.parameters())),
+            [:Main, :BenchmarkTools, :Any, :Symbol, :y, :z, :A, :B], [], [[:BenchmarkTools, :generate_benchmark_definition], [:BenchmarkTools, :parameters], :f, :+], []
         )
         @test testee(
             :(Base.macroexpand(Main, $(QuoteNode(:(@enum a b c))))),
diff --git a/test/compiletimes.jl b/test/compiletimes.jl
index 0d73beef31..1466b1cacd 100644
--- a/test/compiletimes.jl
+++ b/test/compiletimes.jl
@@ -7,7 +7,7 @@
 #   4. Note that some benchmarks depend on disk and network speeds too, so focus on the number of allocations since those are more robust.
 
 module Foo end
-@timeit TOUT "PlutoRunner.run_expression" @eval Pluto.PlutoRunner.run_expression(Foo, :(1 + 1), Pluto.uuid1(), nothing);
+@timeit TOUT "PlutoRunner.run_expression" @eval Pluto.PlutoRunner.run_expression(Foo, Expr(:toplevel, :(1 + 1)), Pluto.uuid1(), nothing);
 
 function wait_for_ready(notebook::Pluto.Notebook)
     while notebook.process_status != Pluto.ProcessStatus.ready

From caf7326b58a1aef5b8f3ecc4b1cf6bfd4f0dfce7 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 29 Apr 2022 12:39:37 +0200
Subject: [PATCH 280/821] notebook_to_js: improve runtime type checks (#2072)

---
 src/webserver/Dynamic.jl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 9eceee0ee1..ae2e65bf7c 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -131,7 +131,7 @@ function notebook_to_js(notebook::Notebook)
             id => Dict{String,Any}(
                 "cell_id" => cell.cell_id,
                 "depends_on_disabled_cells" => cell.depends_on_disabled_cells,
-                "output" => Dict(                
+                "output" => Dict{String,Any}(
                     "body" => cell.output.body,
                     "mime" => cell.output.mime,
                     "rootassignee" => cell.output.rootassignee,
@@ -150,7 +150,7 @@ function notebook_to_js(notebook::Notebook)
         "cell_order" => notebook.cell_order,
         "published_objects" => merge!(Dict{String,Any}(), (c.published_objects for c in values(notebook.cells_dict))...),
         "bonds" => Dict{String,Dict{String,Any}}(
-            String(key) => Dict(
+            String(key) => Dict{String,Any}(
                 "value" => bondvalue.value, 
             )
         for (key, bondvalue) in notebook.bonds),

From f03f73ca2e345dfb3138521bcf48ac8c06250390 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 1 May 2022 14:43:02 +0200
Subject: [PATCH 281/821] unresolved_cells: handle Skipped correctly (#2077)

* unresolved_cells: handle Skipped correctly

* add test and skip resolution when not needed

Co-authored-by: Paul <paul@plutojl.org>
---
 src/evaluation/Run.jl |  7 ++++---
 test/MacroAnalysis.jl | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 7b94d39590..e1b792868b 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -415,6 +415,7 @@ function resolve_topology(
 			# Do not try to expand if a newer version of the macro is also scheduled to run in the
 			# current run. The recursive reactive runs will take care of it.
 			push!(still_unresolved_nodes, cell)
+			continue
 		end
 
 		result = try
@@ -435,10 +436,10 @@ function resolve_topology(
 
 			# set function_wrapped to the function wrapped analysis of the expanded expression.
 			new_codes[cell] = ExprAnalysisCache(unresolved_topology.codes[cell]; forced_expr_id, function_wrapped)
+		elseif result isa Skipped
+			# Skipped because it has already been resolved during ExpressionExplorer.
 		else
-			if result isa Failure
-				@debug "Expansion failed" err=result.error
-			end
+			@debug "Could not resolve" result cell.code
 			push!(still_unresolved_nodes, cell)
 		end
 	end
diff --git a/test/MacroAnalysis.jl b/test/MacroAnalysis.jl
index 2233adc8ff..f1f86c624e 100644
--- a/test/MacroAnalysis.jl
+++ b/test/MacroAnalysis.jl
@@ -729,6 +729,20 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         @test ":world" == cell(4).output.body
     end
 
+    @testset "Is just text macros" begin
+        notebook = Notebook(Cell.([
+            """
+            md"# Hello world!"
+            """,
+            """
+            "no julia value here"
+            """,
+        ]))
+        update_run!(🍭, notebook, notebook.cells)
+
+        @test isempty(notebook.topology.unresolved_cells)
+    end
+
     @testset "Macros using import" begin
         notebook = Notebook(Cell.([
             """

From 2a3515e0168add771c46c694752b7396f7477a69 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 2 May 2022 14:23:09 +0200
Subject: [PATCH 282/821] `resolve_topology`: maintain identity when nothing
 changed (#2079)

---
 src/analysis/data structures.jl | 4 ++--
 src/evaluation/Run.jl           | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/analysis/data structures.jl b/src/analysis/data structures.jl
index 6f0c2cb89b..0ecb292ef0 100644
--- a/src/analysis/data structures.jl	
+++ b/src/analysis/data structures.jl	
@@ -77,10 +77,10 @@ begin
         get!(aid.default, aid.container, key)
     end
     function Base.merge(a1::ImmutableDefaultDict{K,V}, a2::ImmutableDefaultDict{K,V}) where {K,V}
-        ImmutableDefaultDict{K,V}(a1.default, merge(a1.container, a2.container))
+        isempty(a2) ? a1 : ImmutableDefaultDict{K,V}(a1.default, merge(a1.container, a2.container))
     end
     function Base.merge(a1::ImmutableDefaultDict{K,V}, a2::AbstractDict) where {K,V}
-        ImmutableDefaultDict{K,V}(a1.default, merge(a1.container, a2))
+        isempty(a2) ? a1 : ImmutableDefaultDict{K,V}(a1.default, merge(a1.container, a2))
     end
     # disabled because it's immutable!
     # Base.setindex!(aid::ImmutableDefaultDict{K,V}, args...) where {K,V} = Base.setindex!(aid.container, args...)
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index e1b792868b..0179550198 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -446,11 +446,18 @@ function resolve_topology(
 
 	all_nodes = merge(unresolved_topology.nodes, new_nodes)
 	all_codes = merge(unresolved_topology.codes, new_codes)
+	
+	new_unresolved_cells = if length(still_unresolved_nodes) == length(unresolved_topology.unresolved_cells)
+		# then they must equal, and we can skip creating a new one to preserve identity:
+		unresolved_topology.unresolved_cells
+	else
+		ImmutableSet(still_unresolved_nodes; skip_copy=true)
+	end
 
 	NotebookTopology(
 		nodes=all_nodes, 
 		codes=all_codes, 
-		unresolved_cells=ImmutableSet(still_unresolved_nodes; skip_copy=true),
+		unresolved_cells=new_unresolved_cells,
 		cell_order=unresolved_topology.cell_order,
 	)
 end

From 3e52767fd49e19b153f4372d0e327e58519e2c24 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 2 May 2022 14:30:07 +0200
Subject: [PATCH 283/821] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=205x`@bind`=20speedu?=
 =?UTF-8?q?p!=20Caching=20for=20`update=5Fdependency=5Fcache!`=20(#2080)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/analysis/DependencyCache.jl | 10 +++++++---
 src/notebook/Notebook.jl        |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/analysis/DependencyCache.jl b/src/analysis/DependencyCache.jl
index 750144142e..55ce3725d5 100644
--- a/src/analysis/DependencyCache.jl
+++ b/src/analysis/DependencyCache.jl
@@ -40,9 +40,13 @@ function update_dependency_cache!(cell::Cell, topology::NotebookTopology)
 end
 
 "Fills dependency information on notebook and cell level."
-function update_dependency_cache!(notebook::Notebook)
+function update_dependency_cache!(notebook::Notebook, topology::NotebookTopology=notebook.topology)
     notebook._cached_topological_order = topological_order(notebook)
-    for cell in values(notebook.cells_dict)
-        update_dependency_cache!(cell, notebook.topology)
+    
+    if notebook._cached_cell_dependencies_source !== topology
+        notebook._cached_cell_dependencies_source = topology
+        for cell in all_cells(topology)
+            update_dependency_cache!(cell, topology)
+        end
     end
 end
diff --git a/src/notebook/Notebook.jl b/src/notebook/Notebook.jl
index b6296a7e3e..db3b9cb598 100644
--- a/src/notebook/Notebook.jl
+++ b/src/notebook/Notebook.jl
@@ -29,6 +29,7 @@ Base.@kwdef mutable struct Notebook
     notebook_id::UUID=uuid1()
     topology::NotebookTopology
     _cached_topological_order::Union{Nothing,TopologicalOrder}=nothing
+    _cached_cell_dependencies_source::Union{Nothing,NotebookTopology}=nothing
 
     # buffer will contain all unfetched updates - must be big enough
     # We can keep 1024 updates pending. After this, any put! calls (i.e. calls that push an update to the notebook) will simply block, which is fine.

From a306cb79c8648f341bf8a6a63b6b31108f64ef8c Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Mon, 2 May 2022 14:37:13 +0200
Subject: [PATCH 284/821] Continue CI on error (#2081)

---
 .github/workflows/Test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index f1eb922004..6eefa4d63e 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -28,9 +28,10 @@ jobs:
     test:
         runs-on: ${{ matrix.os }}
         timeout-minutes: 40
-        # Uncomment if you want to see all results for all OSses. Otherwise, the first failed test cancels all others
-        # continue-on-error: true
+        
         strategy:
+            # Without setting this, a failing test cancels all others
+            fail-fast: false
             matrix:
                 # We test quite a lot of versions because we do some OS and version specific things unfortunately
                 julia-version: ["1.6", "1.7", "~1.8.0-0"] #, "nightly"]
@@ -48,4 +49,3 @@ jobs:
             
             # 🚗
             - uses: julia-actions/julia-runtest@v1
-              continue-on-error: ${{ matrix.julia-version == 'nightly' }}

From b435722312f286f8120bec1bab1f9b07dadae851 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Mon, 2 May 2022 14:43:50 +0200
Subject: [PATCH 285/821] Generate precompile directives via
 PrecompileSignatures.jl (#2054)

* Generate precompile directives via PrecompileSignatures.jl

* Pkg.add(url)

* How about this

* Let CI fail

* Set compat entry

* Add 2 precompile directives back

* Move to newer version

* Move to PrecompileSignatures version 2

* Move to version 3
---
 .github/workflows/Test.yml      | 2 +-
 Project.toml                    | 4 +++-
 src/Pluto.jl                    | 6 ++++++
 src/webserver/Dynamic.jl        | 1 -
 src/webserver/SessionActions.jl | 4 ----
 src/webserver/WebServer.jl      | 1 -
 test/helpers.jl                 | 7 +++++++
 test/runtests.jl                | 4 ++--
 8 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 6eefa4d63e..03cd2cc9d4 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -46,6 +46,6 @@ jobs:
               with:
                   version: ${{ matrix.julia-version }}
             - uses: julia-actions/cache@v1
-            
+
             # 🚗
             - uses: julia-actions/julia-runtest@v1
diff --git a/Project.toml b/Project.toml
index 33c384b4c0..df6ac547ae 100644
--- a/Project.toml
+++ b/Project.toml
@@ -18,6 +18,7 @@ MIMEs = "6c6e2e6c-3030-632d-7369-2d6c69616d65"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 MsgPack = "99f44e22-a591-53d1-9472-aa23ef4bd671"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+PrecompileSignatures = "91cefc8d-f054-46dc-8f8c-26e11d7c5411"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
@@ -27,10 +28,11 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
 Configurations = "0.15, 0.16, 0.17"
-FuzzyCompletions = "0.3,0.4,0.5"
+FuzzyCompletions = "0.3, 0.4, 0.5"
 HTTP = "^0.9.1"
 MIMEs = "0.1"
 MsgPack = "1.1"
+PrecompileSignatures = "3"
 RelocatableFolders = "0.1, 0.2"
 Tables = "1"
 julia = "^1.6"
diff --git a/src/Pluto.jl b/src/Pluto.jl
index 88ce54e040..654fa0e777 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -14,6 +14,7 @@ if isdefined(Base, :Experimental) && isdefined(Base.Experimental, Symbol("@max_m
     @eval Base.Experimental.@max_methods 1
 end
 
+import FuzzyCompletions
 import RelocatableFolders: @path
 const ROOT_DIR = normpath(joinpath(@__DIR__, ".."))
 const FRONTEND_DIR = @path(joinpath(ROOT_DIR, "frontend"))
@@ -101,4 +102,9 @@ if get(ENV, "JULIA_PLUTO_SHOW_BANNER", "1") != "0" && get(ENV, "CI", "🍄") !=
 \n"""
 end
 
+# Generate and include `precompile` directives during the precompilation phase.
+# This aims to reduce the time to first X (time to first running notebook in this case).
+using PrecompileSignatures: @precompile_signatures
+@precompile_signatures(Pluto)
+
 end
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index ae2e65bf7c..b9e84607ce 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -170,7 +170,6 @@ function notebook_to_js(notebook::Notebook)
         "cell_execution_order" => cell_id.(collect(topological_order(notebook))),
     )
 end
-precompile(notebook_to_js, (Notebook,))
 
 """
 For each connected client, we keep a copy of their current state. This way we know exactly which updates to send when the server-side state changes.
diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 490af060d1..ddd8c1cfe4 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -75,7 +75,6 @@ function open(session::ServerSession, path::AbstractString; run_async=true, comp
     try_event_call(session, OpenNotebookEvent(nb))
     nb
 end
-precompile(open, (ServerSession, String))
 
 function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
     session.notebooks[nb.notebook_id] = nb
@@ -161,7 +160,6 @@ function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
     
     nb
 end
-precompile(add, (ServerSession, Notebook))
 
 """
 Generate a non-existing new notebook filename, and write `contents` to that file. Return the generated filename.
@@ -230,7 +228,6 @@ function new(session::ServerSession; run_async=true, notebook_id::UUID=uuid1())
     try_event_call(session, OpenNotebookEvent(nb))
     nb
 end
-precompile(new, (ServerSession,))
 
 "Shut down `notebook` inside `session`. If `keep_in_session` is `false` (default), you will not be allowed to run a notebook with the same notebook_id again."
 function shutdown(session::ServerSession, notebook::Notebook; keep_in_session::Bool=false, async::Bool=false, verbose::Bool=true)
@@ -252,6 +249,5 @@ function shutdown(session::ServerSession, notebook::Notebook; keep_in_session::B
     WorkspaceManager.unmake_workspace((session, notebook); async, verbose, allow_restart=keep_in_session)
     try_event_call(session, ShutdownNotebookEvent(notebook))
 end
-precompile(shutdown, (ServerSession, Notebook))
 
 end
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index a3b4ac4315..4d2e7b2ad7 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -66,7 +66,6 @@ function run(; kwargs...)
     options = Configuration.from_flat_kwargs(; kwargs...)
     run(options)
 end
-precompile(run, ())
 
 function run(options::Configuration.Options)
     session = ServerSession(; options)
diff --git a/test/helpers.jl b/test/helpers.jl
index e736bad07b..175f31cfe6 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -2,6 +2,13 @@
 using TimerOutputs: TimerOutput, @timeit
 const TOUT = TimerOutput()
 macro timeit_include(path::AbstractString) :(@timeit TOUT $path include($path)) end
+function print_timeroutput()
+    # Sleep to avoid old logs getting tangled up in the output.
+    sleep(6)
+    println()
+    show(TOUT; compact=true, sortby=:firstexec)
+    println()
+end
 
 @timeit TOUT "import Pluto" import Pluto
 import Pluto.ExpressionExplorer
diff --git a/test/runtests.jl b/test/runtests.jl
index 0617d148db..8fcebffe43 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -5,7 +5,7 @@ include("helpers.jl")
 @timeit_include("compiletimes.jl")
 verify_no_running_processes()
 if get(ENV, "PLUTO_TEST_ONLY_COMPILETIMES", nothing) == "true"
-    show(TOUT; compact=true, sortby=:firstexec)
+    print_timeroutput()
     exit(0)
 end
 @timeit_include("Events.jl")
@@ -49,7 +49,7 @@ verify_no_running_processes()
 
 verify_no_running_processes()
 
-show(TOUT; compact=true, sortby=:firstexec)
+print_timeroutput()
 
 # TODO: test PlutoRunner functions like:
 # - from_this_notebook

From ad6e53ba65d5eb6ef62546dd4eecc68531e6a68f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 2 May 2022 14:45:02 +0200
Subject: [PATCH 286/821] Prevent registry update if it is fresh (#2075)

---
 src/packages/PkgCompat.jl  | 24 ++++++++++++++++++++++++
 src/webserver/WebServer.jl |  3 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index 8223586a8b..000cb3a8f6 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -194,6 +194,30 @@ function update_registries(; force::Bool=false)
 	end
 end
 
+# ✅ Public API
+"""
+Check when the registries were last updated. If it is recent (max 7 days), `Pkg.UPDATED_REGISTRY_THIS_SESSION` is set to `true`, which will prevent Pkg from doing an automatic registry update.
+
+Returns the new value of `Pkg.UPDATED_REGISTRY_THIS_SESSION`.
+"""
+function check_registry_age(max_age_ms = 1000.0 * 60 * 60 * 24 * 7)::Bool
+	paths = _get_registry_paths()
+	isempty(paths) && return _updated_registries_compat[]
+	
+	ages = map(paths) do p
+		try
+			mtime(p)
+		catch
+			zero(time())
+		end
+	end
+	
+	if all(ages .> time() - max_age_ms)
+		_updated_registries_compat[] = true
+	end
+	_updated_registries_compat[]
+end
+
 
 ###
 # Instantiate
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 4d2e7b2ad7..1bbd8e81ba 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -291,8 +291,9 @@ function run(session::ServerSession, pluto_router)
 
     # Start this in the background, so that the first notebook launch (which will trigger registry update) will be faster
     @asynclog withtoken(pkg_token) do
+        will_update = !PkgCompat.check_registry_age()
         PkgCompat.update_registries(; force=false)
-        println("    Updating registry done ✓")
+        will_update && println("    Updating registry done ✓")
     end
 
     shutdown_server[] = () -> @sync begin

From 96d3021ba1958834e683f4be6ddb46a5860b76df Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 2 May 2022 15:17:32 +0200
Subject: [PATCH 287/821] Update Bundle.yml

---
 .github/workflows/Bundle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Bundle.yml b/.github/workflows/Bundle.yml
index 85c9bcccc2..5c3dc847d2 100644
--- a/.github/workflows/Bundle.yml
+++ b/.github/workflows/Bundle.yml
@@ -7,7 +7,7 @@ on:
     workflow_dispatch:
 concurrency:
     group: bundle
-    cancel-in-progress: true
+    cancel-in-progress: false
 
 jobs:
     trigger:

From 6f5876228671f9d89d6f01cedc10221d83f012d6 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Mon, 2 May 2022 16:55:22 +0200
Subject: [PATCH 288/821] Reduce overspecializations in
 PlutoRunner.format_output (#2062)

---
 src/runner/PlutoRunner.jl | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index e768a331e1..c42499372c 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -570,7 +570,6 @@ function run_expression(
     
     cell_results[cell_id], cell_runtimes[cell_id] = result, runtime
 end
-precompile(run_expression, (Module, Expr, UUID, Nothing))
 
 # Channel to trigger implicits run
 const run_channel = Channel{UUID}(10)
@@ -1085,7 +1084,7 @@ pluto_showable(::MIME"application/vnd.pluto.tree+object", ::Any) = false
 # in the next functions you see a `context` argument
 # this is really only used for the circular reference tracking
 
-function tree_data_array_elements(@nospecialize(x::AbstractArray{<:Any,1}), indices::AbstractVector{I}, context::IOContext)::Vector{Tuple{I,Any}} where {I<:Integer}
+function tree_data_array_elements(@nospecialize(x::AbstractVector{<:Any}), indices::AbstractVector{I}, context::IOContext)::Vector{Tuple{I,Any}} where {I<:Integer}
     Tuple{I,Any}[
         if isassigned(x, i)
             i, format_output_default(x[i], context)
@@ -1157,14 +1156,14 @@ function tree_data(@nospecialize(x::AbstractSet{<:Any}), context::IOContext)
     end
 end
 
-function tree_data(@nospecialize(x::AbstractArray{<:Any,1}), context::IOContext)
+function tree_data(@nospecialize(x::AbstractVector{<:Any}), context::IOContext)
     if Base.show_circular(context, x)
         Dict{Symbol,Any}(
             :objectid => string(objectid(x), base=16),
             :type => :circular,
         )
     else
-        depth = get(context, :tree_viewer_depth, 0)
+        depth = get(context, :tree_viewer_depth, 0)::Int
         recur_io = IOContext(context, Pair{Symbol,Any}(:SHOWN_SET, x), Pair{Symbol,Any}(:tree_viewer_depth, depth + 1))
 
         indices = eachindex(x)
@@ -1177,9 +1176,9 @@ function tree_data(@nospecialize(x::AbstractArray{<:Any,1}), context::IOContext)
             firsti = firstindex(x)
             from_end = my_limit > 20 ? 10 : my_limit > 1 ? 1 : 0
             Any[
-                tree_data_array_elements(x, indices[firsti:firsti-1+my_limit-from_end], recur_io)...,
-                "more",
-                tree_data_array_elements(x, indices[end+1-from_end:end], recur_io)...,
+                tree_data_array_elements(x, indices[firsti:firsti-1+my_limit-from_end], recur_io);
+                "more";
+                tree_data_array_elements(x, indices[end+1-from_end:end], recur_io)
             ]
         end
 
@@ -1198,10 +1197,15 @@ function tree_data(@nospecialize(x::Tuple), context::IOContext)
     depth = get(context, :tree_viewer_depth, 0)
     recur_io = IOContext(context, Pair{Symbol,Any}(:tree_viewer_depth, depth + 1))
 
+    elements = Tuple[]
+    for val in x
+        out = format_output_default(val, recur_io)
+        push!(elements, out)
+    end
     Dict{Symbol,Any}(
         :objectid => string(objectid(x), base=16),
         :type => :Tuple,
-        :elements => collect(enumerate(format_output_default.(x, [recur_io]))),
+        :elements => collect(enumerate(elements)),
     )
 end
 
@@ -1240,7 +1244,7 @@ function tree_data(@nospecialize(x::AbstractDict{<:Any,<:Any}), context::IOConte
     end
 end
 
-function tree_data_nt_row(pair::Tuple, context::IOContext)
+function tree_data_nt_row(@nospecialize(pair::Tuple), context::IOContext)
     # this is an entry of a NamedTuple, the first element of the Tuple is a Symbol, which we want to print as `x` instead of `:x`
     k, element = pair
     string(k), format_output_default(element, context)
@@ -1251,10 +1255,16 @@ function tree_data(@nospecialize(x::NamedTuple), context::IOContext)
     depth = get(context, :tree_viewer_depth, 0)
     recur_io = IOContext(context, Pair{Symbol,Any}(:tree_viewer_depth, depth + 1))
 
+    elements = Tuple[]
+    for key in eachindex(x)
+        val = x[key]
+        data = tree_data_nt_row((key, val), recur_io)
+        push!(elements, data)
+    end
     Dict{Symbol,Any}(
         :objectid => string(objectid(x), base=16),
         :type => :NamedTuple,
-        :elements => tree_data_nt_row.(zip(eachindex(x), x), (recur_io,))
+        :elements => elements
     )
 end
 

From 66bc5b1741d554e2d86e85cc56f02be0ab1b1da0 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Sun, 8 May 2022 11:12:01 +0200
Subject: [PATCH 289/821] Delete method docs with method (#2096)

* setcode -> setcode!

* delete method docs
---
 src/runner/PlutoRunner.jl |  23 ++++++
 test/Dynamic.jl           |   2 +-
 test/MacroAnalysis.jl     | 111 ++++++++++++++++++++++-------
 test/React.jl             | 144 +++++++++++++++++++-------------------
 test/WorkspaceManager.jl  |   4 +-
 test/cell_disabling.jl    |   8 +--
 test/helpers.jl           |   2 +-
 test/packages/Basic.jl    |  26 +++----
 8 files changed, 203 insertions(+), 117 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index c42499372c..4dc5171352 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -687,6 +687,28 @@ end
 "Return whether the `method` was defined inside this notebook, and not in external code."
 isfromcell(method::Method, cell_id::UUID) = endswith(String(method.file), string(cell_id))
 
+"""
+    delete_method_doc(m::Method)
+
+Tries to delete the documentation for this method, this is used when methods are removed.
+"""
+function delete_method_doc(m::Method)
+    binding = Docs.Binding(m.module, m.name)
+    meta = Docs.meta(m.module)
+    if haskey(meta, binding)
+        method_sig = Tuple{m.sig.parameters[2:end]...}
+        multidoc = meta[binding]
+        filter!(multidoc.order) do msig
+            if method_sig == msig
+                pop!(multidoc.docs, msig)
+                false
+            else
+                true
+            end
+        end
+    end
+end
+
 """
 Delete all methods of `f` that were defined in this notebook, and leave the ones defined in other packages, base, etc. ✂
 
@@ -700,6 +722,7 @@ function delete_toplevel_methods(f::Function, cell_id::UUID)::Bool
     Base.visit(methods_table) do method # iterates through all methods of `f`, including overridden ones
         if isfromcell(method, cell_id) && getfield(method, deleted_world) == alive_world_val
             Base.delete_method(method)
+            delete_method_doc(method)
             push!(deleted_sigs, method.sig)
         end
     end
diff --git a/test/Dynamic.jl b/test/Dynamic.jl
index 7a1e199c1b..b3bc9d4b44 100644
--- a/test/Dynamic.jl
+++ b/test/Dynamic.jl
@@ -230,7 +230,7 @@ end
         
         @test !isempty(notebook.cells[2].published_objects)
         
-        setcode(notebook.cells[2], "2")
+        setcode!(notebook.cells[2], "2")
         update_save_run!(🍭, notebook, notebook.cells)
         @test isempty(notebook.cells[2].published_objects)
 
diff --git a/test/MacroAnalysis.jl b/test/MacroAnalysis.jl
index f1f86c624e..96c925dc69 100644
--- a/test/MacroAnalysis.jl
+++ b/test/MacroAnalysis.jl
@@ -62,12 +62,12 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
 
         update_run!(🍭, notebook, notebook.cells)
         
-        setcode(cell(2), """macro my_identity(expr)
+        setcode!(cell(2), """macro my_identity(expr)
             esc(expr)
         end""")
         update_run!(🍭, notebook, cell(2))
         
-        setcode(cell(3), "f(x) = x")
+        setcode!(cell(3), "f(x) = x")
         update_run!(🍭, notebook, cell(3))
         
         @test cell(1) |> noerror
@@ -200,15 +200,15 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
 
         @test all(noerror, notebook.cells)
 
-        setcode(cell(1), raw"""
+        setcode!(cell(1), raw"""
             macro test(sym)
                 esc(:($sym = true))
             end
         """)
         update_run!(🍭, notebook, cell(1))
 
-        setcode(cell(2), "x")
-        setcode(cell(3), "@test x")
+        setcode!(cell(2), "x")
+        setcode!(cell(3), "@test x")
         update_run!(🍭, notebook, notebook.cells[2:3])
 
         @test cell(2).output.body == "true"
@@ -220,18 +220,18 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         cell(idx) = notebook.cells[idx]
         update_run!(🍭, notebook, notebook.cells)
 
-        setcode(cell(1), "x")
+        setcode!(cell(1), "x")
         update_run!(🍭, notebook, cell(1))
 
         @test cell(1).errored == true
 
-        setcode(cell(2), "@bar x")
+        setcode!(cell(2), "@bar x")
         update_run!(🍭, notebook, cell(2))
 
         @test cell(1).errored == true
         @test cell(2).errored == true
 
-        setcode(cell(3), raw"""macro bar(sym)
+        setcode!(cell(3), raw"""macro bar(sym)
             esc(:($sym = "yay"))
         end""")
         update_run!(🍭, notebook, cell(3))
@@ -247,13 +247,13 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         cell(idx) = notebook.cells[idx]
         update_run!(🍭, notebook, notebook.cells)
 
-        setcode(cell(1), "x")
+        setcode!(cell(1), "x")
         update_run!(🍭, notebook, cell(1))
 
         @test cell(1).errored == true
 
-        setcode(cell(3), "@a()")
-        setcode(cell(2), raw"""macro a()
+        setcode!(cell(3), "@a()")
+        setcode!(cell(2), raw"""macro a()
             quote
                 macro b(sym)
                     esc(:($sym = 42))
@@ -266,7 +266,7 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         @test cell(2) |> noerror
         @test cell(3) |> noerror
 
-        setcode(cell(4), "@b x")
+        setcode!(cell(4), "@b x")
         update_run!(🍭, notebook, cell(4))
 
         @test cell(1) |> noerror
@@ -288,7 +288,7 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
 
         @test all(noerror, notebook.cells)
 
-        setcode(notebook.cells[begin], "") # remove definition of m
+        setcode!(notebook.cells[begin], "") # remove definition of m
         update_run!(🍭, notebook, notebook.cells[begin])
 
         @test notebook.cells[begin] |> noerror
@@ -312,7 +312,7 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         @test cell(3).output.body == "42"
         @test cell(4).errored == true
 
-        setcode(cell(2), """macro b(_)
+        setcode!(cell(2), """macro b(_)
             esc(:(y = 42))
         end""")
         update_run!(🍭, notebook, cell(2))
@@ -333,7 +333,7 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         @test cell(3).output.body == "42"
         @test cell(4).errored == true
 
-        setcode(cell(2), """macro b(_)
+        setcode!(cell(2), """macro b(_)
             esc(:(y = 42))
         end""")
         update_run!(🍭, notebook, [cell(1), cell(2)])
@@ -369,7 +369,7 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         @test cell(4) |> noerror        
         @test cell(5).errored == true
 
-        setcode(cell(2), "z = 39")
+        setcode!(cell(2), "z = 39")
 
         # running only 2, running all cells here works however
         update_run!(🍭, notebook, cell(2))
@@ -441,7 +441,7 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         @test cell(5).errored == true
         @test cell(6) |> noerror
 
-        setcode(cell(6), "updater = 2")
+        setcode!(cell(6), "updater = 2")
         update_run!(🍭, notebook, cell(6))
 
         # the output of cell 4 has not changed since the underlying computer
@@ -465,13 +465,13 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
 
         @test cell(3).errored == true
 
-        setcode(cell(3), "huh(z)")
+        setcode!(cell(3), "huh(z)")
         update_run!(🍭, notebook, cell(3))
 
         @test cell(3) |> noerror
         @test cell(3).output.body == "101010"
 
-        setcode(cell(4), "z = 1234")
+        setcode!(cell(4), "z = 1234")
         update_run!(🍭, notebook, cell(4))
 
         @test cell(3) |> noerror
@@ -539,7 +539,7 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         output_1 = cell(1).output.body
         @test sleep_time <= runtime
 
-        setcode(cell(3), "updater = :fast")
+        setcode!(cell(3), "updater = :fast")
         update_run!(🍭, notebook, cell(3))
 
         @test noerror(cell(1))
@@ -556,7 +556,7 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         @test output_1 != cell(1).output.body
         output_3 = cell(1).output.body
 
-        setcode(cell(1), "@b()") # changing code generates a new 💻
+        setcode!(cell(1), "@b()") # changing code generates a new 💻
         update_run!(🍭, notebook, cell(1))
 
         @test cell(1) |> noerror
@@ -663,13 +663,13 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         @test cell(1) |> noerror
         @test cell(2) |> noerror
 
-        setcode(cell(2), "@variables 🐰 y")
+        setcode!(cell(2), "@variables 🐰 y")
         update_run!(🍭, notebook, cell(2))
 
         @test cell(1).errored
         @test cell(2) |> noerror
 
-        setcode(cell(1), "z = 🐰^2 + y")
+        setcode!(cell(1), "z = 🐰^2 + y")
         update_run!(🍭, notebook, cell(1))
 
         @test cell(1) |> noerror
@@ -722,7 +722,7 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         @test :b ∈ notebook.topology.nodes[cell(3)].definitions
         @test [:c, Symbol("@my_assign")] ⊆ notebook.topology.nodes[cell(3)].references
 
-        setcode(notebook.cells[2], "c = :world")
+        setcode!(notebook.cells[2], "c = :world")
         update_run!(🍭, notebook, cell(2))
 
         @test ":world" == cell(3).output.body
@@ -809,4 +809,67 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         @test all(cell.([1,2]) .|> noerror)
         @test cell(2).output.body == ":this_should_be_returned"
     end
+
+    @testset "Doc strings" begin
+        notebook = Notebook(Cell.([
+            "x = 1",
+            raw"""
+            "::Bool"
+            f(::Bool) = x
+            """,
+            raw"""
+            "::Int"
+            f(::Int) = 1
+            """,
+        ]))
+
+        trigger, bool, int = notebook.cells
+
+        update_run!(🍭, notebook, notebook.cells)
+        @test all(noerror, notebook.cells)
+        @test occursin("::Bool", bool.output.body)
+        @test !occursin("::Int", bool.output.body)
+        @test occursin("::Bool", int.output.body)
+        @test occursin("::Int", int.output.body)
+
+        setcode!(int, raw"""
+        "::Int new docstring"
+        f(::Int) = 1
+        """)
+        update_run!(🍭, notebook, int)
+
+        @test occursin("::Bool", int.output.body)
+        @test occursin("::Int new docstring", int.output.body)
+
+        update_run!(🍭, notebook, trigger)
+
+        @test occursin("::Bool", bool.output.body)
+        @test occursin("::Int new docstring", bool.output.body)
+        @test length(eachmatch(r"Bool", bool.output.body) |> collect) == 1
+        @test length(eachmatch(r"Int", bool.output.body) |> collect) == 1
+
+        update_run!(🍭, notebook, trigger)
+
+        @test length(eachmatch(r"Bool", bool.output.body) |> collect) == 1
+
+        setcode!(int, "")
+        update_run!(🍭, notebook, [bool, int])
+        @test !occursin("::Int", bool.output.body)
+
+        setcode!(bool, """
+        "An empty conjugate"
+        Base.conj() = x
+        """)
+
+        update_run!(🍭, notebook, bool)
+        @test noerror(bool)
+        @test noerror(trigger)
+        @test occursin("An empty conjugate", bool.output.body)
+        @test occursin("complex conjugate", bool.output.body)
+
+        setcode!(bool, "Docs.doc(conj)")
+        update_run!(🍭, notebook, bool)
+        @test !occursin("An empty conjugate", bool.output.body)
+        @test occursin("complex conjugate", bool.output.body)
+    end
 end
diff --git a/test/React.jl b/test/React.jl
index d4f61539d1..3034b5feeb 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -36,7 +36,7 @@ import Distributed
         @test notebook.cells[1].output.body == notebook.cells[2].output.body
         @test notebook.cells[1].output.rootassignee == :x
         @test notebook.cells[1].runtime !== nothing
-        setcode(notebook.cells[1], "x = 12")
+        setcode!(notebook.cells[1], "x = 12")
         update_run!(🍭, notebook, notebook.cells[1])
         @test notebook.cells[1].output.body == notebook.cells[2].output.body
         @test notebook.cells[2].runtime !== nothing
@@ -50,26 +50,26 @@ import Distributed
         @test notebook.cells[4] |> noerror
         @test notebook.cells[4].output.rootassignee === nothing
 
-        setcode(notebook.cells[1], "x = 912")
+        setcode!(notebook.cells[1], "x = 912")
         update_run!(🍭, notebook, notebook.cells[1])
         @test notebook.cells[4].output.body == "916"
 
-        setcode(notebook.cells[3], "f(x) = x")
+        setcode!(notebook.cells[3], "f(x) = x")
         update_run!(🍭, notebook, notebook.cells[3])
         @test notebook.cells[4].output.body == "4"
 
-        setcode(notebook.cells[1], "x = 1")
-        setcode(notebook.cells[2], "y = 2")
+        setcode!(notebook.cells[1], "x = 1")
+        setcode!(notebook.cells[2], "y = 2")
         update_run!(🍭, notebook, notebook.cells[1:2])
         update_run!(🍭, notebook, notebook.cells[5:6])
         @test notebook.cells[5] |> noerror
         @test notebook.cells[6].output.body == "3"
 
-        setcode(notebook.cells[2], "y = 1")
+        setcode!(notebook.cells[2], "y = 1")
         update_run!(🍭, notebook, notebook.cells[2])
         @test notebook.cells[6].output.body == "2"
 
-        setcode(notebook.cells[1], "x = 2")
+        setcode!(notebook.cells[1], "x = 2")
         update_run!(🍭, notebook, notebook.cells[1])
         @test notebook.cells[6].output.body == "3"
 
@@ -103,15 +103,15 @@ import Distributed
         @test occursinerror("Multiple", notebook.cells[1])
         @test occursinerror("Multiple", notebook.cells[2])
     
-        setcode(notebook.cells[1], "")
+        setcode!(notebook.cells[1], "")
         update_run!(🍭, notebook, notebook.cells[1])
         @test notebook.cells[1] |> noerror
         @test notebook.cells[2] |> noerror
     
     # https://github.com/fonsp/Pluto.jl/issues/26
-        setcode(notebook.cells[1], "x = 1")
+        setcode!(notebook.cells[1], "x = 1")
         update_run!(🍭, notebook, notebook.cells[1])
-        setcode(notebook.cells[2], "x")
+        setcode!(notebook.cells[2], "x")
         update_run!(🍭, notebook, notebook.cells[2])
         @test notebook.cells[1] |> noerror
         @test notebook.cells[2] |> noerror
@@ -121,7 +121,7 @@ import Distributed
         @test occursinerror("Multiple", notebook.cells[3])
         @test occursinerror("Multiple", notebook.cells[4])
     
-        setcode(notebook.cells[3], "")
+        setcode!(notebook.cells[3], "")
         update_run!(🍭, notebook, notebook.cells[3])
         @test notebook.cells[3] |> noerror
         @test notebook.cells[4] |> noerror
@@ -131,7 +131,7 @@ import Distributed
         @test occursinerror("Multiple", notebook.cells[5])
         @test occursinerror("Multiple", notebook.cells[6])
     
-        setcode(notebook.cells[5], "")
+        setcode!(notebook.cells[5], "")
         update_run!(🍭, notebook, notebook.cells[5])
         @test notebook.cells[5] |> noerror
         @test notebook.cells[6] |> noerror
@@ -300,19 +300,19 @@ import Distributed
         @test notebook.cells[1] |> noerror
         @test notebook.cells[3] |> noerror
 
-        setcode(notebook.cells[2], "")
+        setcode!(notebook.cells[2], "")
         update_run!(🍭, notebook, notebook.cells[2:2])
 
         @test notebook.cells[1].errored == true
         @test notebook.cells[3].errored == true
 
-        setcode(notebook.cells[4], "December = 13")
+        setcode!(notebook.cells[4], "December = 13")
         update_run!(🍭, notebook, notebook.cells[4:4])
 
         @test notebook.cells[1].errored == true
         @test notebook.cells[3] |> noerror
 
-        setcode(notebook.cells[2], "using Dates")
+        setcode!(notebook.cells[2], "using Dates")
         update_run!(🍭, notebook, notebook.cells[2:2])
 
         @test notebook.cells[1] |> noerror
@@ -332,7 +332,7 @@ import Distributed
         @test notebook.cells[1].errored == true
         @test notebook.cells[2].errored == true
 
-        setcode(notebook.cells[2], "using Pkg.Artifacts")
+        setcode!(notebook.cells[2], "using Pkg.Artifacts")
         update_run!(🍭, notebook, notebook.cells)
 
         @test notebook.cells[1] |> noerror
@@ -357,7 +357,7 @@ import Distributed
         @test notebook.cells[2].errored == true
         @test notebook.cells[3].errored == true
 
-        setcode(notebook.cells[4], "import Pkg; using Dates, Printf, Pkg.Artifacts")
+        setcode!(notebook.cells[4], "import Pkg; using Dates, Printf, Pkg.Artifacts")
         update_run!(🍭, notebook, notebook.cells[4:4])
 
         @test notebook.cells[1] |> noerror
@@ -383,7 +383,7 @@ import Distributed
 
         @test all(noerror, notebook.cells)
 
-        setcode(notebook.cells[begin], raw"""
+        setcode!(notebook.cells[begin], raw"""
             begin
                 @eval(module Hello
                     December = 12
@@ -444,7 +444,7 @@ import Distributed
         @test cell(3) |> noerror
 
         # Empty and run cells to remove the Base overloads that we created, just to be sure
-        setcode.(notebook.cells, [""])
+        setcode!.(notebook.cells, [""])
         update_run!(🍭, notebook, notebook.cells)
 
         WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
@@ -471,20 +471,20 @@ import Distributed
         @test all(noerror, notebook.cells)
         @test notebook.cells[end].output.body == "\"blahblah\""
 
-        setcode(cell(1), "Base.inv(s::String) = s * \"suffix\"")
+        setcode!(cell(1), "Base.inv(s::String) = s * \"suffix\"")
         update_run!(🍭, notebook, cell(1))
 
         @test all(noerror, notebook.cells)
         @test notebook.cells[end].output.body == "\"blahblahsuffixsuffix\"" # 2 invs, 1 in constructor, 1 in inv(::MyStruct)
 
-        setcode(cell(3), "Base.inv(ms::MyStruct) = ms.x") # remove inv in inv(::MyStruct)
+        setcode!(cell(3), "Base.inv(ms::MyStruct) = ms.x") # remove inv in inv(::MyStruct)
         update_run!(🍭, notebook, cell(3))
 
         @test all(noerror, notebook.cells)
         @test notebook.cells[end].output.body == "\"blahblahsuffix\"" # only one inv
 
         # Empty and run cells to remove the Base overloads that we created, just to be sure
-        setcode.(notebook.cells, [""])
+        setcode!.(notebook.cells, [""])
         update_run!(🍭, notebook, notebook.cells)
         WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
@@ -519,7 +519,7 @@ import Distributed
         @test occursinerror("Cyclic", notebook.cells[1])
         @test occursinerror("UndefVarError: y", notebook.cells[end]) # this is an UndefVarError and not a CyclicError
 
-        setcode.(notebook.cells, [""])
+        setcode!.(notebook.cells, [""])
         update_run!(🍭, notebook, notebook.cells)
         WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
@@ -541,7 +541,7 @@ import Distributed
         output_21 = cell(2).output.body
         @test contains(output_21, "sqrt(🍕)")
 
-        setcode(cell(3), """
+        setcode!(cell(3), """
         Base.sqrt(x::Int) = sqrt(Float64(x)^2)
         """)
         update_run!(🍭, notebook, cell(3))
@@ -553,7 +553,7 @@ import Distributed
         @test output_21 != output_22 # cell2 re-run
         @test contains(output_22, "sqrt(🍕)")
 
-        setcode.(notebook.cells, [""])
+        setcode!.(notebook.cells, [""])
         update_run!(🍭, notebook, notebook.cells)
         WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
@@ -600,7 +600,7 @@ import Distributed
         @test notebook.cells[1].output.body == output_1
         @test noerror(notebook.cells[2])
 
-        setcode.(notebook.cells, [""])
+        setcode!.(notebook.cells, [""])
         update_run!(🍭, notebook, notebook.cells)
         WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
@@ -651,21 +651,21 @@ import Distributed
         @test notebook.cells[3].output.body == "1"
         @test notebook.cells[4].output.body == "2"
 
-        setcode(notebook.cells[1], "a(x,x) = 999")
+        setcode!(notebook.cells[1], "a(x,x) = 999")
         update_run!(🍭, notebook, notebook.cells[1])
         @test notebook.cells[1].errored == true
         @test notebook.cells[2].errored == true
         @test notebook.cells[3].errored == true
         @test notebook.cells[4].errored == true
         
-        setcode(notebook.cells[1], "a(x) = 1")
+        setcode!(notebook.cells[1], "a(x) = 1")
         update_run!(🍭, notebook, notebook.cells[1])
         @test notebook.cells[1] |> noerror
         @test notebook.cells[2] |> noerror
         @test notebook.cells[3].output.body == "1"
         @test notebook.cells[4].output.body == "2"
 
-        setcode(notebook.cells[1], "")
+        setcode!(notebook.cells[1], "")
         update_run!(🍭, notebook, notebook.cells[1])
         @test notebook.cells[1] |> noerror
         @test notebook.cells[2] |> noerror
@@ -678,15 +678,15 @@ import Distributed
         @test notebook.cells[7].errored == true
         @test notebook.cells[8].errored == true
 
-        setcode(notebook.cells[5], "")
+        setcode!(notebook.cells[5], "")
         update_run!(🍭, notebook, notebook.cells[5])
         @test notebook.cells[5] |> noerror
         @test notebook.cells[6] |> noerror
         @test notebook.cells[7].errored == true
         @test notebook.cells[8].output.body == "6"
 
-        setcode(notebook.cells[5], "b = 5")
-        setcode(notebook.cells[6], "")
+        setcode!(notebook.cells[5], "b = 5")
+        setcode!(notebook.cells[6], "")
         update_run!(🍭, notebook, notebook.cells[5:6])
         @test notebook.cells[5] |> noerror
         @test notebook.cells[6] |> noerror
@@ -705,12 +705,12 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[13])
         @test notebook.cells[13].output.body == "10"
 
-        setcode(notebook.cells[9], "")
+        setcode!(notebook.cells[9], "")
         update_run!(🍭, notebook, notebook.cells[9])
         @test notebook.cells[11].errored == true
         @test notebook.cells[12].output.body == "10"
 
-        setcode(notebook.cells[10], "")
+        setcode!(notebook.cells[10], "")
         update_run!(🍭, notebook, notebook.cells[10])
         @test notebook.cells[11].errored == true
         @test notebook.cells[12].output.body == "missing"
@@ -736,13 +736,13 @@ import Distributed
         @test notebook.cells[17] |> noerror
         @test notebook.cells[18] |> noerror
 
-        setcode(notebook.cells[14], "")
+        setcode!(notebook.cells[14], "")
         update_run!(🍭, notebook, notebook.cells[14])
         @test notebook.cells[16].errored == true
         @test notebook.cells[17] |> noerror
         @test notebook.cells[18] |> noerror
 
-        setcode(notebook.cells[15], "")
+        setcode!(notebook.cells[15], "")
         update_run!(🍭, notebook, notebook.cells[15])
         @test notebook.cells[16].errored == true
         @test notebook.cells[17].errored == true
@@ -759,7 +759,7 @@ import Distributed
         @test notebook.cells[21] |> noerror
         @test notebook.cells[22].errored == true
 
-        setcode(notebook.cells[20], "asdf(x) = asdf(x,x)")
+        setcode!(notebook.cells[20], "asdf(x) = asdf(x,x)")
         update_run!(🍭, notebook, notebook.cells[20])
         @test occursinerror("Multiple definitions", notebook.cells[19])
         @test occursinerror("Multiple definitions", notebook.cells[20])
@@ -768,15 +768,15 @@ import Distributed
         @test notebook.cells[21].errored == true
         @test notebook.cells[22].errored == true
 
-        setcode(notebook.cells[20], "")
+        setcode!(notebook.cells[20], "")
         update_run!(🍭, notebook, notebook.cells[20])
         @test notebook.cells[19] |> noerror
         @test notebook.cells[20] |> noerror
         @test notebook.cells[21] |> noerror
         @test notebook.cells[22].errored == true
 
-        setcode(notebook.cells[19], "begin struct asdf; x; y; end; asdf(x) = asdf(x,x); end")
-        setcode(notebook.cells[20], "")
+        setcode!(notebook.cells[19], "begin struct asdf; x; y; end; asdf(x) = asdf(x,x); end")
+        setcode!(notebook.cells[20], "")
         update_run!(🍭, notebook, notebook.cells[19:20])
         @test notebook.cells[19] |> noerror
         @test notebook.cells[20] |> noerror
@@ -796,10 +796,10 @@ import Distributed
         @test notebook.cells[26] |> noerror
         @test notebook.cells[27] |> noerror
 
-        setcode.(notebook.cells[23:27], [""])
+        setcode!.(notebook.cells[23:27], [""])
         update_run!(🍭, notebook, notebook.cells[23:27])
 
-        setcode(notebook.cells[23], "@assert !any(isdefined.([@__MODULE__], [Symbol(:e,i) for i in 1:14]))")
+        setcode!(notebook.cells[23], "@assert !any(isdefined.([@__MODULE__], [Symbol(:e,i) for i in 1:14]))")
         update_run!(🍭, notebook, notebook.cells[23])
         @test notebook.cells[23] |> noerror
 
@@ -873,13 +873,13 @@ import Distributed
         @test occursinerror("yyy", notebook.cells[2])
         @test occursinerror("UndefVarError", notebook.cells[3])
 
-        setcode(notebook.cells[1], "xxx = 1")
+        setcode!(notebook.cells[1], "xxx = 1")
         update_run!(🍭, notebook, notebook.cells[1])
         @test notebook.cells[1].output.body == "1"
         @test notebook.cells[2].output.body == "1"
         @test notebook.cells[3].output.body == "1"
 
-        setcode(notebook.cells[1], "xxx = zzz")
+        setcode!(notebook.cells[1], "xxx = zzz")
         update_run!(🍭, notebook, notebook.cells[1])
         @test occursinerror("Cyclic reference", notebook.cells[1])
         @test occursinerror("Cyclic reference", notebook.cells[2])
@@ -894,7 +894,7 @@ import Distributed
         @test occursinerror("yyy", notebook.cells[3])
         @test occursinerror("zzz", notebook.cells[3])
 
-        setcode(notebook.cells[3], "zzz = 3")
+        setcode!(notebook.cells[3], "zzz = 3")
         update_run!(🍭, notebook, notebook.cells[3])
         @test notebook.cells[1].output.body == "3"
         @test notebook.cells[2].output.body == "3"
@@ -950,7 +950,7 @@ import Distributed
         @assert length(notebook.cells) == 32
         
         # Empty and run cells to remove the Base overloads that we created, just to be sure
-        setcode.(notebook.cells, [""])
+        setcode!.(notebook.cells, [""])
         update_run!(🍭, notebook, notebook.cells)
         
         WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
@@ -968,7 +968,7 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[1:2])
         @test notebook.cells[1].output.body == notebook.cells[2].output.body
         
-        setcode(notebook.cells[1], "")
+        setcode!(notebook.cells[1], "")
         update_run!(🍭, notebook, notebook.cells[1])
         @test notebook.cells[1] |> noerror
         @test occursinerror("x not defined", notebook.cells[2])
@@ -980,11 +980,11 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[3])
         @test notebook.cells[3] |> noerror
         @test notebook.cells[4] |> noerror
-        setcode(notebook.cells[3], "struct a; x; y end")
+        setcode!(notebook.cells[3], "struct a; x; y end")
         update_run!(🍭, notebook, notebook.cells[3])
         @test notebook.cells[3] |> noerror
         @test notebook.cells[4] |> noerror
-        setcode(notebook.cells[3], "")
+        setcode!(notebook.cells[3], "")
         update_run!(🍭, notebook, notebook.cells[3])
         @test notebook.cells[3] |> noerror
         @test notebook.cells[4].errored == true
@@ -1020,7 +1020,7 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[4])
         @test notebook.cells[4].output.body == "2"
 
-        setcode(notebook.cells[2], "k = 2")
+        setcode!(notebook.cells[2], "k = 2")
         update_run!(🍭, notebook, notebook.cells[2])
         @test notebook.cells[4].output.body == "4"
 
@@ -1034,7 +1034,7 @@ import Distributed
         fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells[1])
-        setcode(notebook.cells[1], "x = x + 1")
+        setcode!(notebook.cells[1], "x = x + 1")
         update_run!(🍭, notebook, notebook.cells[1])
         @test occursinerror("UndefVarError", notebook.cells[1])
 
@@ -1109,12 +1109,12 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[3])
         @test notebook.cells[3].output.body == "4"
 
-        setcode(notebook.cells[1], "y = 2")
+        setcode!(notebook.cells[1], "y = 2")
         update_run!(🍭, notebook, notebook.cells[1])
         @test notebook.cells[3].output.body == "5"
         @test notebook.cells[2] |> noerror
 
-        setcode(notebook.cells[1], "y")
+        setcode!(notebook.cells[1], "y")
         update_run!(🍭, notebook, notebook.cells[1])
         @test occursinerror("UndefVarError", notebook.cells[1])
         @test notebook.cells[2] |> noerror
@@ -1124,12 +1124,12 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[5])
         @test notebook.cells[5].output.body == "11"
 
-        setcode(notebook.cells[4], "g(a) = a+a")
+        setcode!(notebook.cells[4], "g(a) = a+a")
         update_run!(🍭, notebook, notebook.cells[4])
         @test notebook.cells[4] |> noerror
         @test notebook.cells[5].errored == true
 
-        setcode(notebook.cells[5], "g(5)")
+        setcode!(notebook.cells[5], "g(5)")
         update_run!(🍭, notebook, notebook.cells[5])
         @test notebook.cells[5].output.body == "10"
 
@@ -1140,7 +1140,7 @@ import Distributed
         @test notebook.cells[7] |> noerror
         @test notebook.cells[8].errored == true
     
-        setcode(notebook.cells[6], "h(x::Float64) = 2.0 * x")
+        setcode!(notebook.cells[6], "h(x::Float64) = 2.0 * x")
         update_run!(🍭, notebook, notebook.cells[6])
         @test notebook.cells[6] |> noerror
         @test notebook.cells[7].errored == true
@@ -1150,16 +1150,16 @@ import Distributed
         @test notebook.cells[9] |> noerror
         @test notebook.cells[10].output.body == "true"
 
-        setcode(notebook.cells[9], "p = p")
+        setcode!(notebook.cells[9], "p = p")
         update_run!(🍭, notebook, notebook.cells[9])
         @test occursinerror("UndefVarError", notebook.cells[9])
 
-        setcode(notebook.cells[9], "p = 9")
+        setcode!(notebook.cells[9], "p = 9")
         update_run!(🍭, notebook, notebook.cells[9])
         @test notebook.cells[9] |> noerror
         @test notebook.cells[10].output.body == "false"
         
-        setcode(notebook.cells[9], "p(x) = 9")
+        setcode!(notebook.cells[9], "p(x) = 9")
         update_run!(🍭, notebook, notebook.cells[9])
         @test notebook.cells[9] |> noerror
         @test notebook.cells[10].output.body == "true"
@@ -1193,7 +1193,7 @@ import Distributed
         @test notebook.cells[23].output.body == "\"🐟\""
         @test notebook.cells[24].output.body == "24"
 
-        setcode(notebook.cells[22], "import .Wow: c")
+        setcode!(notebook.cells[22], "import .Wow: c")
         @test_nowarn update_run!(🍭, notebook, notebook.cells[22])
         @test notebook.cells[22] |> noerror
         @test notebook.cells[23].output.body == "\"🐟\""
@@ -1209,7 +1209,7 @@ import Distributed
         @test_nowarn update_run!(🍭, notebook, notebook.cells[25])
         @test notebook.cells[25].output.body == "🐟"
 
-        setcode(notebook.cells[26], "")
+        setcode!(notebook.cells[26], "")
         @test_nowarn update_run!(🍭, notebook, notebook.cells[26])
         @test_nowarn update_run!(🍭, notebook, notebook.cells[25])
         @test notebook.cells[25].output.body isa Dict
@@ -1224,7 +1224,7 @@ import Distributed
         @test notebook.cells[28].output.body == "\"🎈\""
         @test notebook.cells[29].output.body == "\"🎈\""
 
-        setcode(notebook.cells[27], "")
+        setcode!(notebook.cells[27], "")
         update_run!(🍭, notebook, notebook.cells[27])
         @test notebook.cells[28].output.body == "false"
         @test notebook.cells[29].output.body == "true" # removing the overload doesn't trigger automatic re-eval because `isodd` doesn't match `Base.isodd`
@@ -1240,7 +1240,7 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[31])
         @test notebook.cells[31].output.body == "31"
 
-        setcode(notebook.cells[30], "")
+        setcode!(notebook.cells[30], "")
         update_run!(🍭, notebook, notebook.cells[30:31])
         @test occursinerror("UndefVarError", notebook.cells[31])
     end
@@ -1272,7 +1272,7 @@ import Distributed
         @test notebook.cells[6] |> noerror
         @test notebook.cells[6].output.body == "9"
 
-        setcode(notebook.cells[3], "b = -3")
+        setcode!(notebook.cells[3], "b = -3")
         update_run!(🍭, notebook, notebook.cells[3])
         @test notebook.cells[6].output.body == "3"
 
@@ -1280,7 +1280,7 @@ import Distributed
         @test notebook.cells[7] |> noerror
         @test notebook.cells[8].output.body == "5"
 
-        setcode(notebook.cells[3], "b = 3")
+        setcode!(notebook.cells[3], "b = 3")
         update_run!(🍭, notebook, notebook.cells[3])
         @test notebook.cells[8].output.body == "11"
 
@@ -1322,7 +1322,7 @@ import Distributed
         @test occursinerror("Multiple definitions for x", notebook.cells[1])
         @test occursinerror("Multiple definitions for x", notebook.cells[1])
     
-        setcode(notebook.cells[2], "x + 1")
+        setcode!(notebook.cells[2], "x + 1")
         update_run!(🍭, notebook, notebook.cells[2])
         @test notebook.cells[1].output.body == "1"
         @test notebook.cells[2].output.body == "2"
@@ -1361,7 +1361,7 @@ import Distributed
         @test notebook.cells[13].output.body == "15"
         @test notebook.cells[14] |> noerror
 
-        setcode(notebook.cells[15], "orange = 10005")
+        setcode!(notebook.cells[15], "orange = 10005")
         update_run!(🍭, notebook, notebook.cells[15])
         @test notebook.cells[13].output.body == "10005"
 
@@ -1520,17 +1520,17 @@ import Distributed
         @test 0.1 * good < notebook.cells[3].runtime / 1.0e9 < 0.5 * bad
 
         old = notebook.cells[4].output.body
-        setcode(notebook.cells[4], "4.0")
+        setcode!(notebook.cells[4], "4.0")
         update_run!(🍭, notebook, notebook.cells[4])
         @test old != notebook.cells[4].output.body
         
         old = notebook.cells[5].output.body
-        setcode(notebook.cells[5], "[5.0]")
+        setcode!(notebook.cells[5], "[5.0]")
         update_run!(🍭, notebook, notebook.cells[5])
         @test old != notebook.cells[5].output.body
 
         old = notebook.cells[6].output.body
-        setcode(notebook.cells[6], "66 / 6")
+        setcode!(notebook.cells[6], "66 / 6")
         update_run!(🍭, notebook, notebook.cells[6])
         @test old != notebook.cells[6].output.body
 
@@ -1649,7 +1649,7 @@ import Distributed
         @test notebook.cells[17] |> noerror
         @test notebook.cells[18] |> noerror
 
-        setcode(notebook.cells[18], "υ = 8")
+        setcode!(notebook.cells[18], "υ = 8")
         update_run!(🍭, notebook, notebook.cells[18])
         @test notebook.cells[16].output.body == "24"
         
@@ -1660,7 +1660,7 @@ import Distributed
         @test notebook.cells[21] |> noerror
         @test notebook.cells[22] |> noerror
 
-        setcode(notebook.cells[22], "y = 0")
+        setcode!(notebook.cells[22], "y = 0")
         update_run!(🍭, notebook, notebook.cells[22])
         @test notebook.cells[19].output.body == "38"
 
diff --git a/test/WorkspaceManager.jl b/test/WorkspaceManager.jl
index a6b1073789..b86f76d632 100644
--- a/test/WorkspaceManager.jl
+++ b/test/WorkspaceManager.jl
@@ -97,13 +97,13 @@ import Distributed
         @test notebook.cells[4] |> noerror
         @test notebook.cells[5] |> noerror
 
-        setcode(notebook.cells[5], "length(nb.cells)")
+        setcode!(notebook.cells[5], "length(nb.cells)")
         update_run!(🍭, notebook, notebook.cells[5])
         @test notebook.cells[5] |> noerror
 
 
         desired_nprocs = Distributed.nprocs() - 1
-        setcode(notebook.cells[5], "Pluto.SessionActions.shutdown(s, nb)")
+        setcode!(notebook.cells[5], "Pluto.SessionActions.shutdown(s, nb)")
         update_run!(🍭, notebook, notebook.cells[5])
         @test noerror(notebook.cells[5])
 
diff --git a/test/cell_disabling.jl b/test/cell_disabling.jl
index 7e1632404a..1f9602f0d5 100644
--- a/test/cell_disabling.jl
+++ b/test/cell_disabling.jl
@@ -44,14 +44,14 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook
     original_z_output = notebook.cells[3].output.body
     original_a_output = notebook.cells[4].output.body
     original_w_output = notebook.cells[5].output.body
-    setcode(notebook.cells[2], "x = 123123")
+    setcode!(notebook.cells[2], "x = 123123")
     update_run!(🍭, notebook, notebook.cells[2])
     @test notebook.cells[1].output.body == original_y_output
     @test notebook.cells[3].output.body == original_z_output
     @test notebook.cells[4].output.body != original_a_output
     @test notebook.cells[5].output.body == original_w_output
 
-    setcode(notebook.cells[2], "x = 2")
+    setcode!(notebook.cells[2], "x = 2")
     update_run!(🍭, notebook, notebook.cells[2])
     @test notebook.cells[1].output.body == original_y_output
     @test notebook.cells[3].output.body == original_z_output
@@ -65,7 +65,7 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook
 
 
     original_6_output = notebook.cells[6].output.body
-    setcode(notebook.cells[6], "x + 6")
+    setcode!(notebook.cells[6], "x + 6")
     update_run!(🍭, notebook, notebook.cells[6])
     @test notebook.cells[6].depends_on_disabled_cells
     @test notebook.cells[6].errored === false
@@ -77,7 +77,7 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook
     @test get_disabled_cells(notebook) == collect(1:6)
 
     # the x cell is disabled, so changing it should have no effect
-    setcode(notebook.cells[2], "x = 123123")
+    setcode!(notebook.cells[2], "x = 123123")
     update_run!(🍭, notebook, notebook.cells[2])
     @test notebook.cells[1].output.body == original_y_output
     @test notebook.cells[3].output.body == original_z_output
diff --git a/test/helpers.jl b/test/helpers.jl
index 175f31cfe6..6720378363 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -127,7 +127,7 @@ function easy_symstate(expected_references, expected_definitions, expected_funcc
     SymbolsState(Set(expected_references), Set(expected_definitions), new_expected_funccalls, new_expected_funcdefs, new_expected_macrocalls)
 end
 
-function setcode(cell, newcode)
+function setcode!(cell, newcode)
     cell.code = newcode
 end
 
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index beb46e48b0..eeee6abcc7 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -185,7 +185,7 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
         end
 
         ## remove `import Dates`
-        setcode(notebook.cells[9], "")
+        setcode!(notebook.cells[9], "")
         update_save_run!(🍭, notebook, notebook.cells[9])
 
         # removing a stdlib does not require a restart
@@ -198,7 +198,7 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
 
 
         ## remove `import PlutoPkgTestD`
-        setcode(notebook.cells[7], "")
+        setcode!(notebook.cells[7], "")
         update_save_run!(🍭, notebook, notebook.cells[7])
 
         @test noerror(notebook.cells[7])
@@ -264,9 +264,9 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
         # not necessary since there are no packages:
         # @test has_embedded_pkgfiles(notebook)
 
-        setcode(notebook.cells[1], "import Pkg")
+        setcode!(notebook.cells[1], "import Pkg")
         update_save_run!(🍭, notebook, notebook.cells[1])
-        setcode(notebook.cells[2], "Pkg.activate(mktempdir())")
+        setcode!(notebook.cells[2], "Pkg.activate(mktempdir())")
         update_save_run!(🍭, notebook, notebook.cells[2])
 
         @test noerror(notebook.cells[1])
@@ -276,11 +276,11 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
         @test notebook.nbpkg_restart_required_msg === nothing
         @test !has_embedded_pkgfiles(notebook)
 
-        setcode(notebook.cells[3], "Pkg.add(\"JSON\")")
+        setcode!(notebook.cells[3], "Pkg.add(\"JSON\")")
         update_save_run!(🍭, notebook, notebook.cells[3])
-        setcode(notebook.cells[4], "using JSON")
+        setcode!(notebook.cells[4], "using JSON")
         update_save_run!(🍭, notebook, notebook.cells[4])
-        setcode(notebook.cells[5], "using Dates")
+        setcode!(notebook.cells[5], "using Dates")
         update_save_run!(🍭, notebook, notebook.cells[5])
 
         @test noerror(notebook.cells[3])
@@ -289,8 +289,8 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
 
         @test !has_embedded_pkgfiles(notebook)
 
-        setcode(notebook.cells[2], "2")
-        setcode(notebook.cells[3], "3")
+        setcode!(notebook.cells[2], "2")
+        setcode!(notebook.cells[3], "3")
         update_save_run!(🍭, notebook, notebook.cells[2:3])
         
         @test notebook.nbpkg_ctx !== nothing
@@ -550,12 +550,12 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
             @test notebook.nbpkg_restart_recommended_msg === nothing
             @test notebook.nbpkg_restart_required_msg === nothing
 
-            setcode(notebook.cells[2], "1 + 1")
+            setcode!(notebook.cells[2], "1 + 1")
             update_save_run!(🍭, notebook, notebook.cells[2])
             @test notebook.cells[2].output.body == "2"
 
             
-            setcode(notebook.cells[2], """
+            setcode!(notebook.cells[2], """
             begin
                 import PlutoPkgTestD
                 PlutoPkgTestD.MY_VERSION |> Text
@@ -630,11 +630,11 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
         
         for _ in 1:5
             sleep(lag / 2)
-            setcode(notebook.cells[9], "import PlutoPkgTestE")
+            setcode!(notebook.cells[9], "import PlutoPkgTestE")
             update_save_run!(🍭, notebook, notebook.cells[[9]]; run_async=true) |> remember # import E
             
             sleep(lag / 2)
-            setcode(notebook.cells[9], "")
+            setcode!(notebook.cells[9], "")
             update_save_run!(🍭, notebook, notebook.cells[[9]]; run_async=true) |> remember # don't import E
         end
         

From 40c766486b97a258b72e1a6e1e884d691fa412ef Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 9 May 2022 15:39:14 +0200
Subject: [PATCH 290/821] package manager tweak: hide terminal when plutopkg
 disabled

---
 src/packages/Packages.jl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 26ef9dfc02..23ba2f6c38 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -73,10 +73,15 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
         👺 = !no_packages_loaded_yet
         notebook.nbpkg_ctx = nothing
     end
+    if !use_plutopkg_new
+        notebook.nbpkg_ctx_instantiated = true
+    end
     
     (lag > 0) && sleep(lag * (0.5 + rand())) # sleep(0) would yield to the process manager which we dont want
 
-    if notebook.nbpkg_ctx !== nothing
+    if use_plutopkg_new
+        @assert notebook.nbpkg_ctx !== nothing
+        
         PkgCompat.mark_original!(notebook.nbpkg_ctx)
 
         old_packages = String.(keys(PkgCompat.project(notebook.nbpkg_ctx).dependencies))

From b61d5b14415fcfd9151c4d9f9bee05aae3ee4425 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 9 May 2022 15:59:50 +0200
Subject: [PATCH 291/821] retry bundle 3 times

---
 .github/workflows/Bundle.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Bundle.yml b/.github/workflows/Bundle.yml
index 5c3dc847d2..a9cd41993a 100644
--- a/.github/workflows/Bundle.yml
+++ b/.github/workflows/Bundle.yml
@@ -38,9 +38,11 @@ jobs:
                   cache-dependency-path: frontend-bundler/package-lock.json
             - run: npm install
               working-directory: frontend-bundler
-            - name: The Actual Build
+            
+            - name: The Actual Build (try 3 times)
               working-directory: frontend-bundler
-              run: npm run build
+              run: |
+                (npm run build) || (npm run build) || (npm run build)
 
             # Push the rebuild frontend-dist to the release branch.
             # Needs to be `add --force` because frontend-dist is normally gitignored.

From 3777f0a4b26f6e25f36d8dbc42c102ce2cecf3ee Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 9 May 2022 16:13:46 +0200
Subject: [PATCH 292/821] Performance of state diffing: lazy dictionaries,
 immutable comparison (#2073)

---
 src/webserver/Dynamic.jl                      |  15 +--
 ...AppendonlyMarkers.jl => FirebaseyUtils.jl} | 101 ++++++++++++++++--
 2 files changed, 99 insertions(+), 17 deletions(-)
 rename src/webserver/{AppendonlyMarkers.jl => FirebaseyUtils.jl} (64%)

diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index b9e84607ce..3671d900fd 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -78,10 +78,10 @@ Besides `:update_notebook`, you will find more functions in [`responses`](@ref)
 
 """
 module Firebasey include("./Firebasey.jl") end
-module AppendonlyMarkers
+module FirebaseyUtils
     # I put Firebasey here manually THANKS JULIA
     import ..Firebasey
-    include("./AppendonlyMarkers.jl")
+    include("./FirebaseyUtils.jl")
 end
 
 # All of the arrays in the notebook_to_js object are 'immutable' (we write code as if they are), so we can enable this optimization:
@@ -131,20 +131,13 @@ function notebook_to_js(notebook::Notebook)
             id => Dict{String,Any}(
                 "cell_id" => cell.cell_id,
                 "depends_on_disabled_cells" => cell.depends_on_disabled_cells,
-                "output" => Dict{String,Any}(
-                    "body" => cell.output.body,
-                    "mime" => cell.output.mime,
-                    "rootassignee" => cell.output.rootassignee,
-                    "last_run_timestamp" => cell.output.last_run_timestamp,
-                    "persist_js_state" => cell.output.persist_js_state,
-                    "has_pluto_hook_features" => cell.output.has_pluto_hook_features,
-                ),
+                "output" => FirebaseyUtils.ImmutableMarker(cell.output),
                 "published_object_keys" => keys(cell.published_objects),
                 "queued" => cell.queued,
                 "running" => cell.running,
                 "errored" => cell.errored,
                 "runtime" => cell.runtime,
-                "logs" => AppendonlyMarkers.AppendonlyMarker(cell.logs),
+                "logs" => FirebaseyUtils.AppendonlyMarker(cell.logs),
             )
         for (id, cell) in notebook.cells_dict),
         "cell_order" => notebook.cell_order,
diff --git a/src/webserver/AppendonlyMarkers.jl b/src/webserver/FirebaseyUtils.jl
similarity index 64%
rename from src/webserver/AppendonlyMarkers.jl
rename to src/webserver/FirebaseyUtils.jl
index 3f4b8532dc..1033870053 100644
--- a/src/webserver/AppendonlyMarkers.jl
+++ b/src/webserver/FirebaseyUtils.jl
@@ -1,9 +1,40 @@
 ### A Pluto.jl notebook ###
-# v0.17.5
+# v0.19.3
 
 using Markdown
 using InteractiveUtils
 
+# ╔═╡ 058a3333-0567-43b7-ac5f-1f6688325a08
+begin
+	"""
+	Mark an instance of a custom struct as immutable. The resulting object is also an `AbstractDict`, where the keys are the struct fields (converted to strings).
+	"""
+	struct ImmutableMarker{T} <: AbstractDict{String,Any}
+		source::T
+	end
+
+	
+	function Base.getindex(ldict::ImmutableMarker, key::String)
+	    Base.getfield(ldict.source, Symbol(key))
+	end
+	# disabled because it's immutable!
+	# Base.setindex!(ldict::ImmutableMarker, args...) = Base.setindex!(ldict.source, args...)
+	# Base.delete!(ldict::ImmutableMarker, args...) = Base.delete!(ldict.source, args...)
+	Base.keys(ldict::ImmutableMarker{T}) where T = String.(fieldnames(T))
+	# Base.values(ldict::ImmutableMarker) = Base.values(ldict.source)
+	Base.length(ldict::ImmutableMarker) = nfields(ldict.source)
+	Base.iterate(ldict::ImmutableMarker) = Base.iterate(ldict, 1)
+	function Base.iterate(ldict::ImmutableMarker{T}, i) where T
+		a = ldict.source
+		
+		if i <= nfields(a)
+			name = fieldname(T, i)
+			(String(name) => getfield(a, name), i + 1)
+		end
+	end
+	
+end
+
 # ╔═╡ 273c7c85-8178-44a7-99f0-581754aeb8c8
 begin
 	"""
@@ -26,6 +57,11 @@ begin
 	Base.iterate(arr::AppendonlyMarker, args...) = Base.iterate(arr.mutable_source, args...)
 end
 
+# ╔═╡ ef7032d1-a666-48a6-a56e-df175f5ed832
+md"""
+## ImmutableMarker
+"""
+
 # ╔═╡ 183cef1f-bfe9-42cd-8239-49e9ed00a7b6
 md"""
 ## AppendonlyMarker(s)
@@ -36,6 +72,9 @@ It might be very specific per problem, but that's fine for performance problems
 It also keeps the performance solutions as separate modules/packages to whatever it is you're actually modeling.
 """
 
+# ╔═╡ 2284ae12-5b8c-4542-81fa-c4d34f2483e7
+# @skip_as_script @test length([AppendonlyMarker([1,2,3], 1)...]) == 1
+
 # ╔═╡ 971709de-074e-49cf-8bd4-9c675b037dfd
 md"## `@skip_as_script`"
 
@@ -62,6 +101,22 @@ macro skip_as_script(ex)
 	end
 end
 
+# ╔═╡ 55975e53-f70f-4b70-96d2-b144f74e7cde
+@skip_as_script struct A
+	x
+	y
+	z
+end
+
+# ╔═╡ d7e0de85-5cb2-4036-a2e3-ca416ea83737
+@skip_as_script id1 = ImmutableMarker(A(1,"asdf",3))
+
+# ╔═╡ 08350326-526e-4c34-ab27-df9fbf69243e
+@skip_as_script id2 = ImmutableMarker(A(1,"asdf",4))
+
+# ╔═╡ aa6192e8-410f-4924-8250-4775e21b1590
+@skip_as_script id1d, id2d = Dict(id1), Dict(id2)
+
 # ╔═╡ 35d3bcd7-af51-466a-b4c4-cc055e74d01d
 @skip_as_script appendonly_1, appendonly_2 = let
 	array_1 = [1,2,3,4]
@@ -117,9 +172,6 @@ end
 # ╔═╡ 06492e8d-4500-4efe-80ee-55bf1ee2348c
 @skip_as_script @test length([AppendonlyMarker([1,2,3])...]) == 3
 
-# ╔═╡ 2284ae12-5b8c-4542-81fa-c4d34f2483e7
-@skip_as_script @test length([AppendonlyMarker([1,2,3], 1)...]) == 1
-
 # ╔═╡ dc5cd268-9cfb-49bf-87fb-5b7db4fa6e3c
 md"## Import Firebasey when running inside notebook"
 
@@ -149,16 +201,53 @@ function Firebasey.diff(a::AppendonlyMarker, b::AppendonlyMarker)
 	end
 end
 
+# ╔═╡ 129dee79-61c0-4524-9bef-388837f035bb
+function Firebasey.diff(a::ImmutableMarker, b::ImmutableMarker)
+	if a.source !== b.source
+		Firebasey.diff(Dict(a), Dict(b))
+		# Firebasey.JSONPatch[Firebasey.ReplacePatch([], b)]
+	else
+		Firebasey.JSONPatch[]
+	end
+end
+
+# ╔═╡ 138d2cc2-59ba-4f76-bf66-ecdb98cf4fd5
+@skip_as_script Firebasey.diff(id1, id2)
+
 # ╔═╡ 8537488d-2ff9-42b7-8bfc-72d43fca713f
-@skip_as_script @test array_diff(appendonly_1, appendonly_2) == [Firebasey.AddPatch([5], 5)]
+@skip_as_script @test Firebasey.diff(appendonly_1, appendonly_2) == [Firebasey.AddPatch([5], 5)]
 
 # ╔═╡ 70179239-357a-424d-bac3-3a1431aff536
 var"@track" = Firebasey.var"@track"
 
+# ╔═╡ a5f43f47-6189-413f-95a0-d98f927bb7ce
+@skip_as_script @track for _ in 1:1000 Firebasey.diff(id1, id1) end
+
+# ╔═╡ ab5089cc-fec8-43b9-9aa4-d6fa96e231e0
+@skip_as_script @track for _ in 1:1000 Firebasey.diff(id1d, id1d) end
+
+# ╔═╡ a84dcdc3-e9ed-4bf5-9bec-c9cbfc267c17
+@skip_as_script @track for _ in 1:1000 Firebasey.diff(id1, id2) end
+
+# ╔═╡ f696bb85-0bbd-43c9-99ea-533816bc8e0d
+@skip_as_script @track for _ in 1:1000 Firebasey.diff(id1d, id2d) end
+
 # ╔═╡ 37fe8c10-09f0-4f72-8cfd-9ce044c78c13
-@skip_as_script @track for _ in 1:1000 array_diff(appendonly_1_large, appendonly_2_large) end
+@skip_as_script @track for _ in 1:1000 Firebasey.diff(appendonly_1_large, appendonly_2_large) end
 
 # ╔═╡ Cell order:
+# ╟─ef7032d1-a666-48a6-a56e-df175f5ed832
+# ╠═058a3333-0567-43b7-ac5f-1f6688325a08
+# ╠═129dee79-61c0-4524-9bef-388837f035bb
+# ╠═55975e53-f70f-4b70-96d2-b144f74e7cde
+# ╠═d7e0de85-5cb2-4036-a2e3-ca416ea83737
+# ╠═08350326-526e-4c34-ab27-df9fbf69243e
+# ╠═138d2cc2-59ba-4f76-bf66-ecdb98cf4fd5
+# ╠═aa6192e8-410f-4924-8250-4775e21b1590
+# ╠═a5f43f47-6189-413f-95a0-d98f927bb7ce
+# ╠═ab5089cc-fec8-43b9-9aa4-d6fa96e231e0
+# ╠═a84dcdc3-e9ed-4bf5-9bec-c9cbfc267c17
+# ╠═f696bb85-0bbd-43c9-99ea-533816bc8e0d
 # ╟─183cef1f-bfe9-42cd-8239-49e9ed00a7b6
 # ╠═273c7c85-8178-44a7-99f0-581754aeb8c8
 # ╠═2903d17e-c6fd-4cea-8585-4db26a00b0e7

From 83b42a7ca31f1cd1edca1bfe7334d47f3decc8d7 Mon Sep 17 00:00:00 2001
From: SamarthMayya <67407158+SamarthMayya@users.noreply.github.com>
Date: Mon, 9 May 2022 19:55:35 +0530
Subject: [PATCH 293/821] Change path to wsl path, if on wsl (#2085)

Co-authored-by: Rik Huijzer <t.h.huijzer@rug.nl>
Co-authored-by: Panagiotis Georgakopoulos <panagiotis.georgakopoulos@juliacomputing.com>
---
 src/notebook/PathHelpers.jl     | 35 +++++++++++++++++++++++++++++++++
 src/webserver/SessionActions.jl |  3 ++-
 src/webserver/Static.jl         |  2 +-
 src/webserver/WebServer.jl      |  7 -------
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/notebook/PathHelpers.jl b/src/notebook/PathHelpers.jl
index b49b88596d..cc7df105ea 100644
--- a/src/notebook/PathHelpers.jl
+++ b/src/notebook/PathHelpers.jl
@@ -1,5 +1,40 @@
 import Base64: base64decode
 
+# from https://github.com/JuliaLang/julia/pull/36425
+function detectwsl()
+    Sys.islinux() &&
+    isfile("/proc/sys/kernel/osrelease") &&
+    occursin(r"Microsoft|WSL"i, read("/proc/sys/kernel/osrelease", String))
+end
+
+"""
+    maybe_convert_path_to_wsl(path)
+    
+Return the WSL path if the system is using the Windows Subsystem for Linux (WSL) and return `path` otherwise.
+WSL mounts the windows drive to /mnt/ and provides a utility tool to convert windows
+paths into WSL paths. This function will try to use this tool to automagically
+convert paths pasted from windows (with the right click -> copy as path functionality)
+into paths Pluto can understand.
+
+Example:
+$(raw"C:\Users\pankg\OneDrive\Desktop\pluto\bakery_pnl_ready2.jl")
+→
+"/mnt/c/Users/pankg/OneDrive/Desktop/pluto/bakery_pnl_ready2.jl"
+
+but "/mnt/c/Users/pankg/OneDrive/Desktop/pluto/bakery_pnl_ready2.jl" stays the same
+
+"""
+function maybe_convert_path_to_wsl(path)
+    try
+        if detectwsl()
+            return readchomp(`wslpath -u $(path)`)
+        end
+    catch
+        return path
+    end
+    return path
+end
+
 const adjectives = [
 	"groundbreaking"
 	"revolutionary"
diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index ddd8c1cfe4..e8b2d31419 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -1,6 +1,6 @@
 module SessionActions
 
-import ..Pluto: ServerSession, Notebook, Cell, emptynotebook, tamepath, new_notebooks_directory, without_pluto_file_extension, numbered_until_new, cutename, readwrite, update_save_run!, update_from_file, wait_until_file_unchanged, putnotebookupdates!, putplutoupdates!, load_notebook, clientupdate_notebook_list, WorkspaceManager, try_event_call, NewNotebookEvent, OpenNotebookEvent, ShutdownNotebookEvent, @asynclog, ProcessStatus
+import ..Pluto: ServerSession, Notebook, Cell, emptynotebook, tamepath, new_notebooks_directory, without_pluto_file_extension, numbered_until_new, cutename, readwrite, update_save_run!, update_from_file, wait_until_file_unchanged, putnotebookupdates!, putplutoupdates!, load_notebook, clientupdate_notebook_list, WorkspaceManager, try_event_call, NewNotebookEvent, OpenNotebookEvent, ShutdownNotebookEvent, @asynclog, ProcessStatus, maybe_convert_path_to_wsl
 using FileWatching
 import ..Pluto.DownloadCool: download_cool
 import HTTP
@@ -42,6 +42,7 @@ end
 
 "Open the notebook at `path` into `session::ServerSession` and run it. Returns the `Notebook`."
 function open(session::ServerSession, path::AbstractString; run_async=true, compiler_options=nothing, as_sample=false, notebook_id::UUID=uuid1())
+    path = maybe_convert_path_to_wsl(path)
     if as_sample
         new_filename = "sample " * without_pluto_file_extension(basename(path))
         new_path = numbered_until_new(joinpath(new_notebooks_directory(), new_filename); suffix=".jl")
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index e96efa16e8..0c7dbae421 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -206,7 +206,7 @@ function http_router_for(session::ServerSession)
             query = HTTP.queryparams(uri)
             as_sample = haskey(query, "as_sample")
             if haskey(query, "path")
-                path = tamepath(query["path"])
+                path = tamepath(maybe_convert_path_to_wsl(query["path"]))
                 if isfile(path)
                     return try_launch_notebook_response(
                         SessionActions.open, path; 
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 1bbd8e81ba..7d2a25f472 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -6,13 +6,6 @@ import .PkgCompat
 
 include("./WebSocketFix.jl")
 
-# from https://github.com/JuliaLang/julia/pull/36425
-function detectwsl()
-    Sys.islinux() &&
-    isfile("/proc/sys/kernel/osrelease") &&
-    occursin(r"Microsoft|WSL"i, read("/proc/sys/kernel/osrelease", String))
-end
-
 function open_in_default_browser(url::AbstractString)::Bool
     try
         if Sys.isapple()

From 879822a6e87e18ea506393ca2d2de5bea05f5988 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 9 May 2022 16:27:10 +0200
Subject: [PATCH 294/821] log message tweak

---
 src/packages/Packages.jl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 23ba2f6c38..53e8194555 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -272,12 +272,12 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
 			@debug "PlutoPkg: success!" pkg_result
 
 			if pkg_result.restart_recommended
-				@debug "PlutoPkg: Notebook restart recommended"
 				notebook.nbpkg_restart_recommended_msg = "Yes, something changed during regular sync."
+				@debug "PlutoPkg: Notebook restart recommended" notebook.nbpkg_restart_recommended_msg
 			end
 			if pkg_result.restart_required
-				@debug "PlutoPkg: Notebook restart REQUIRED"
 				notebook.nbpkg_restart_required_msg = "Yes, something changed during regular sync."
+				@debug "PlutoPkg: Notebook restart REQUIRED" notebook.nbpkg_restart_required_msg
 			end
 
 			notebook.nbpkg_busy_packages = String[]
@@ -433,12 +433,12 @@ function update_nbpkg(session, notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.U
 
 		if pkg_result.did_something
 			if pkg_result.restart_recommended
-				@debug "PlutoPkg: Notebook restart recommended"
 				notebook.nbpkg_restart_recommended_msg = "Yes, something changed during regular update_nbpkg."
+				@debug "PlutoPkg: Notebook restart recommended" notebook.nbpkg_restart_recommended_msg
 			end
 			if pkg_result.restart_required
-				@debug "PlutoPkg: Notebook restart REQUIRED"
 				notebook.nbpkg_restart_required_msg = "Yes, something changed during regular update_nbpkg."
+				@debug "PlutoPkg: Notebook restart REQUIRED" notebook.nbpkg_restart_required_msg
 			end
 		else
             isfile(bp) && rm(bp)

From 1731573ab88f361318eb943e4bd6297ecb21e11c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 9 May 2022 16:27:34 +0200
Subject: [PATCH 295/821] update sample notebook packages

---
 sample/JavaScript.jl |  30 +++-----
 sample/Plots.jl.jl   | 178 ++++++++++++++++++++++++++-----------------
 sample/PlutoUI.jl.jl |  16 ++--
 3 files changed, 123 insertions(+), 101 deletions(-)

diff --git a/sample/JavaScript.jl b/sample/JavaScript.jl
index d5ec691e74..0a77ab805a 100644
--- a/sample/JavaScript.jl
+++ b/sample/JavaScript.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.18.0
+# v0.19.3
 
 using Markdown
 using InteractiveUtils
@@ -1094,10 +1094,6 @@ git-tree-sha1 = "024fe24d83e4a5bf5fc80501a314ce0d1aa35597"
 uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
 version = "0.11.0"
 
-[[CompilerSupportLibraries_jll]]
-deps = ["Artifacts", "Libdl"]
-uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
-
 [[Dates]]
 deps = ["Printf"]
 uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
@@ -1135,9 +1131,9 @@ uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 
 [[JSON]]
 deps = ["Dates", "Mmap", "Parsers", "Unicode"]
-git-tree-sha1 = "8076680b162ada2a031f707ac7b4953e30667a37"
+git-tree-sha1 = "3c837543ddb02250ef42f4738347454f95079d4e"
 uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-version = "0.21.2"
+version = "0.21.3"
 
 [[LibCURL]]
 deps = ["LibCURL_jll", "MozillaCACerts_jll"]
@@ -1159,7 +1155,7 @@ uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
 uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 
 [[LinearAlgebra]]
-deps = ["Libdl", "libblastrampoline_jll"]
+deps = ["Libdl"]
 uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [[Logging]]
@@ -1182,15 +1178,11 @@ uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
 [[NetworkOptions]]
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
-[[OpenBLAS_jll]]
-deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
-uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
-
 [[Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "0b5cfbb704034b5b4c1869e36634438a047df065"
+git-tree-sha1 = "1285416549ccfcdf0c50d4997a94331e88d68413"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.2.1"
+version = "2.3.1"
 
 [[Pkg]]
 deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
@@ -1198,9 +1190,9 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[PlutoUI]]
 deps = ["AbstractPlutoDingetjes", "Base64", "ColorTypes", "Dates", "Hyperscript", "HypertextLiteral", "IOCapture", "InteractiveUtils", "JSON", "Logging", "Markdown", "Random", "Reexport", "UUIDs"]
-git-tree-sha1 = "8979e9802b4ac3d58c503a20f2824ad67f9074dd"
+git-tree-sha1 = "670e559e5c8e191ded66fa9ea89c97f10376bb4c"
 uuid = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
-version = "0.7.34"
+version = "0.7.38"
 
 [[Printf]]
 deps = ["Unicode"]
@@ -1211,7 +1203,7 @@ deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
 uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 
 [[Random]]
-deps = ["SHA", "Serialization"]
+deps = ["Serialization"]
 uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [[Reexport]]
@@ -1259,10 +1251,6 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 deps = ["Libdl"]
 uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
 
-[[libblastrampoline_jll]]
-deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
-uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
-
 [[nghttp2_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
diff --git a/sample/Plots.jl.jl b/sample/Plots.jl.jl
index 436207f68f..d06ef34be9 100644
--- a/sample/Plots.jl.jl
+++ b/sample/Plots.jl.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.17.7
+# v0.19.3
 
 using Markdown
 using InteractiveUtils
@@ -215,7 +215,7 @@ PLUTO_PROJECT_TOML_CONTENTS = """
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 
 [compat]
-Plots = "~1.25.7"
+Plots = "~1.29.0"
 """
 
 # ╔═╡ 00000000-0000-0000-0000-000000000002
@@ -251,9 +251,9 @@ version = "1.16.1+1"
 
 [[ChainRulesCore]]
 deps = ["Compat", "LinearAlgebra", "SparseArrays"]
-git-tree-sha1 = "f9982ef575e19b0e5c7a98c6e75ee496c0f73a93"
+git-tree-sha1 = "9950387274246d08af38f6eef8cb5480862a435f"
 uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
-version = "1.12.0"
+version = "1.14.0"
 
 [[ChangesOfVariables]]
 deps = ["ChainRulesCore", "LinearAlgebra", "Test"]
@@ -262,10 +262,10 @@ uuid = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0"
 version = "0.1.2"
 
 [[ColorSchemes]]
-deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random"]
-git-tree-sha1 = "6b6f04f93710c71550ec7e16b650c1b9a612d0b6"
+deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Random"]
+git-tree-sha1 = "7297381ccb5df764549818d9a7d57e45f1057d30"
 uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
-version = "3.16.0"
+version = "3.18.0"
 
 [[ColorTypes]]
 deps = ["FixedPointNumbers", "Random"]
@@ -273,6 +273,12 @@ git-tree-sha1 = "024fe24d83e4a5bf5fc80501a314ce0d1aa35597"
 uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
 version = "0.11.0"
 
+[[ColorVectorSpace]]
+deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "TensorCore"]
+git-tree-sha1 = "3f1f500312161f1ae067abe07d13b40f78f32e07"
+uuid = "c3611d14-8923-5661-9e6a-0046d554d3a4"
+version = "0.9.8"
+
 [[Colors]]
 deps = ["ColorTypes", "FixedPointNumbers", "Reexport"]
 git-tree-sha1 = "417b0ed7b8b838aa6ca0a87aadf1bb9eb111ce40"
@@ -281,9 +287,9 @@ version = "0.12.8"
 
 [[Compat]]
 deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
-git-tree-sha1 = "44c37b4636bc54afac5c574d2d02b625349d6582"
+git-tree-sha1 = "b153278a25dd42c65abbf4e62344f9d22e59191b"
 uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
-version = "3.41.0"
+version = "3.43.0"
 
 [[CompilerSupportLibraries_jll]]
 deps = ["Artifacts", "Libdl"]
@@ -296,15 +302,15 @@ uuid = "d38c429a-6771-53c6-b99e-75d170b6e991"
 version = "0.5.7"
 
 [[DataAPI]]
-git-tree-sha1 = "cc70b17275652eb47bc9e5f81635981f13cea5c8"
+git-tree-sha1 = "fb5f5316dd3fd4c5e7c30a24d50643b73e37cd40"
 uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
-version = "1.9.0"
+version = "1.10.0"
 
 [[DataStructures]]
 deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
-git-tree-sha1 = "3daef5523dd2e769dad2365274f760ff5f282c7d"
+git-tree-sha1 = "cc1a8e22627f33c789ab60b36a9132ac050bbf75"
 uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
-version = "0.18.11"
+version = "0.18.12"
 
 [[DataValueInterfaces]]
 git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6"
@@ -341,9 +347,9 @@ version = "2.2.3+0"
 
 [[Expat_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "b3bfd02e98aedfa5cf885665493c5598c350cd2f"
+git-tree-sha1 = "bad72f730e9e91c08d9427d5e8db95478a3c323d"
 uuid = "2e619515-83b5-522b-bb60-26c02a35a201"
-version = "2.2.10+0"
+version = "2.4.8+0"
 
 [[FFMPEG]]
 deps = ["FFMPEG_jll"]
@@ -395,21 +401,21 @@ version = "3.3.6+0"
 
 [[GR]]
 deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Printf", "Random", "RelocatableFolders", "Serialization", "Sockets", "Test", "UUIDs"]
-git-tree-sha1 = "4a740db447aae0fbeb3ee730de1afbb14ac798a1"
+git-tree-sha1 = "af237c08bda486b74318c8070adb96efa6952530"
 uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
-version = "0.63.1"
+version = "0.64.2"
 
 [[GR_jll]]
 deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Pkg", "Qt5Base_jll", "Zlib_jll", "libpng_jll"]
-git-tree-sha1 = "aa22e1ee9e722f1da183eb33370df4c1aeb6c2cd"
+git-tree-sha1 = "cd6efcf9dc746b06709df14e462f0a3fe0786b1e"
 uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
-version = "0.63.1+0"
+version = "0.64.2+0"
 
 [[GeometryBasics]]
 deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"]
-git-tree-sha1 = "58bcdf5ebc057b085e58d95c138725628dd7453c"
+git-tree-sha1 = "83ea630384a13fc4f002b77690bc0afeb4255ac9"
 uuid = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
-version = "0.4.1"
+version = "0.4.2"
 
 [[Gettext_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"]
@@ -447,10 +453,9 @@ uuid = "2e76f6c2-a576-52d4-95c1-20adfe4de566"
 version = "2.8.1+1"
 
 [[IniFile]]
-deps = ["Test"]
-git-tree-sha1 = "098e4d2c533924c921f9f9847274f2ad89e018b8"
+git-tree-sha1 = "f550e6e32074c939295eb5ea6de31849ac2c9625"
 uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f"
-version = "0.5.0"
+version = "0.5.1"
 
 [[InteractiveUtils]]
 deps = ["Markdown"]
@@ -458,9 +463,9 @@ uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 
 [[InverseFunctions]]
 deps = ["Test"]
-git-tree-sha1 = "a7254c0acd8e62f1ac75ad24d5db43f5f19f3c65"
+git-tree-sha1 = "336cc738f03e069ef2cac55a104eb823455dca75"
 uuid = "3587e190-3f89-42d0-90ee-14403ec27112"
-version = "0.1.2"
+version = "0.1.4"
 
 [[IrrationalConstants]]
 git-tree-sha1 = "7fd44fd4ff43fc60815f8e764c0f352b83c49151"
@@ -485,15 +490,15 @@ version = "1.4.1"
 
 [[JSON]]
 deps = ["Dates", "Mmap", "Parsers", "Unicode"]
-git-tree-sha1 = "8076680b162ada2a031f707ac7b4953e30667a37"
+git-tree-sha1 = "3c837543ddb02250ef42f4738347454f95079d4e"
 uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-version = "0.21.2"
+version = "0.21.3"
 
 [[JpegTurbo_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "d735490ac75c5cb9f1b00d8b5509c11984dc6943"
+git-tree-sha1 = "b53380851c6e6664204efb2e62cd24fa5c47e4ba"
 uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8"
-version = "2.1.0+0"
+version = "2.1.2+0"
 
 [[LAME_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -501,6 +506,12 @@ git-tree-sha1 = "f6250b16881adf048549549fba48b1161acdac8c"
 uuid = "c1c5ebd0-6772-5130-a774-d5fcae4a789d"
 version = "3.100.1+0"
 
+[[LERC_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "bf36f528eec6634efc60d7ec062008f171071434"
+uuid = "88015f11-f218-50d7-93a8-a6af411a945d"
+version = "3.0.0+1"
+
 [[LZO_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
 git-tree-sha1 = "e5b909bcf985c5e2605737d2ce278ed791b89be6"
@@ -514,9 +525,9 @@ version = "1.3.0"
 
 [[Latexify]]
 deps = ["Formatting", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "Printf", "Requires"]
-git-tree-sha1 = "a8f4f279b6fa3c3c4f1adadd78a621b13a506bce"
+git-tree-sha1 = "46a39b9c58749eefb5f2dc1178cb8fab5332b1ab"
 uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
-version = "0.15.9"
+version = "0.15.15"
 
 [[LibCURL]]
 deps = ["LibCURL_jll", "MozillaCACerts_jll"]
@@ -574,10 +585,10 @@ uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9"
 version = "2.35.0+0"
 
 [[Libtiff_jll]]
-deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"]
-git-tree-sha1 = "340e257aada13f95f98ee352d316c3bed37c8ab9"
+deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"]
+git-tree-sha1 = "c9551dd26e31ab17b86cbd00c2ede019c08758eb"
 uuid = "89763e89-9b03-5906-acba-b20f662cd828"
-version = "4.3.0+0"
+version = "4.3.0+1"
 
 [[Libuuid_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -591,9 +602,9 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [[LogExpFunctions]]
 deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"]
-git-tree-sha1 = "e5718a00af0ab9756305a0392832c8952c7426c1"
+git-tree-sha1 = "76c987446e8d555677f064aaac1145c4c17662f8"
 uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
-version = "0.3.6"
+version = "0.3.14"
 
 [[Logging]]
 uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -636,9 +647,9 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
 
 [[NaNMath]]
-git-tree-sha1 = "b086b7ea07f8e38cf122f5016af580881ac914fe"
+git-tree-sha1 = "737a5957f387b17e74d4ad2f440eb330b39a62c5"
 uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
-version = "0.3.7"
+version = "1.0.0"
 
 [[NetworkOptions]]
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
@@ -649,11 +660,21 @@ git-tree-sha1 = "887579a3eb005446d514ab7aeac5d1d027658b8f"
 uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051"
 version = "1.3.5+1"
 
+[[OpenLibm_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "05823500-19ac-5b8b-9628-191a04bc5112"
+
 [[OpenSSL_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "648107615c15d4e09f7eca16307bc821c1f718d8"
+git-tree-sha1 = "ab05aa4cc89736e95915b01e7279e61b1bfe33b8"
 uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
-version = "1.1.13+0"
+version = "1.1.14+0"
+
+[[OpenSpecFun_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1"
+uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e"
+version = "0.5.5+0"
 
 [[Opus_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -674,9 +695,9 @@ version = "8.44.0+0"
 
 [[Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "0b5cfbb704034b5b4c1869e36634438a047df065"
+git-tree-sha1 = "1285416549ccfcdf0c50d4997a94331e88d68413"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.2.1"
+version = "2.3.1"
 
 [[Pixman_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -689,28 +710,28 @@ deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markd
 uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[PlotThemes]]
-deps = ["PlotUtils", "Requires", "Statistics"]
-git-tree-sha1 = "a3a964ce9dc7898193536002a6dd892b1b5a6f1d"
+deps = ["PlotUtils", "Statistics"]
+git-tree-sha1 = "8162b2f8547bc23876edd0c5181b27702ae58dce"
 uuid = "ccf2f8ad-2431-5c83-bf29-c5338b663b6a"
-version = "2.0.1"
+version = "3.0.0"
 
 [[PlotUtils]]
 deps = ["ColorSchemes", "Colors", "Dates", "Printf", "Random", "Reexport", "Statistics"]
-git-tree-sha1 = "6f1b25e8ea06279b5689263cc538f51331d7ca17"
+git-tree-sha1 = "bb16469fd5224100e422f0b027d26c5a25de1200"
 uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043"
-version = "1.1.3"
+version = "1.2.0"
 
 [[Plots]]
-deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "Unzip"]
-git-tree-sha1 = "7e4920a7d4323b8ffc3db184580598450bde8a8e"
+deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "Unzip"]
+git-tree-sha1 = "d457f881ea56bbfa18222642de51e0abf67b9027"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
-version = "1.25.7"
+version = "1.29.0"
 
 [[Preferences]]
 deps = ["TOML"]
-git-tree-sha1 = "2cf929d64681236a2e074ffafb8d568733d2e6af"
+git-tree-sha1 = "47e5f437cc0e7ef2ce8406ce1e7e24d44915f88d"
 uuid = "21216c6a-2e73-6563-6e65-726566657250"
-version = "1.2.3"
+version = "1.3.0"
 
 [[Printf]]
 deps = ["Unicode"]
@@ -718,9 +739,9 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
 [[Qt5Base_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "xkbcommon_jll"]
-git-tree-sha1 = "ad368663a5e20dbb8d6dc2fddeefe4dae0781ae8"
+git-tree-sha1 = "c6c0f690d0cc7caddb74cef7aa847b824a16b256"
 uuid = "ea2cea3b-5b76-57ae-a6ef-0a8af62496e1"
-version = "5.15.3+0"
+version = "5.15.3+1"
 
 [[REPL]]
 deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
@@ -737,9 +758,9 @@ version = "1.2.1"
 
 [[RecipesPipeline]]
 deps = ["Dates", "NaNMath", "PlotUtils", "RecipesBase"]
-git-tree-sha1 = "37c1631cb3cc36a535105e6d5557864c82cd8c2b"
+git-tree-sha1 = "dc1e451e15d90347a7decc4221842a022b011714"
 uuid = "01d81517-befc-4cb6-b9ec-a95719d0359c"
-version = "0.5.0"
+version = "0.5.2"
 
 [[Reexport]]
 git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b"
@@ -793,32 +814,39 @@ version = "1.0.1"
 deps = ["LinearAlgebra", "Random"]
 uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
+[[SpecialFunctions]]
+deps = ["ChainRulesCore", "IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"]
+git-tree-sha1 = "5ba658aeecaaf96923dce0da9e703bd1fe7666f9"
+uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
+version = "2.1.4"
+
 [[StaticArrays]]
 deps = ["LinearAlgebra", "Random", "Statistics"]
-git-tree-sha1 = "a635a9333989a094bddc9f940c04c549cd66afcf"
+git-tree-sha1 = "cd56bf18ed715e8b09f06ef8c6b781e6cdc49911"
 uuid = "90137ffa-7385-5640-81b9-e52037218182"
-version = "1.3.4"
+version = "1.4.4"
 
 [[Statistics]]
 deps = ["LinearAlgebra", "SparseArrays"]
 uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [[StatsAPI]]
-git-tree-sha1 = "d88665adc9bcf45903013af0982e2fd05ae3d0a6"
+deps = ["LinearAlgebra"]
+git-tree-sha1 = "c82aaa13b44ea00134f8c9c89819477bd3986ecd"
 uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0"
-version = "1.2.0"
+version = "1.3.0"
 
 [[StatsBase]]
 deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
-git-tree-sha1 = "51383f2d367eb3b444c961d485c565e4c0cf4ba0"
+git-tree-sha1 = "8977b17906b0a1cc74ab2e3a05faa16cf08a8291"
 uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
-version = "0.33.14"
+version = "0.33.16"
 
 [[StructArrays]]
 deps = ["Adapt", "DataAPI", "StaticArrays", "Tables"]
-git-tree-sha1 = "d21f2c564b21a202f4677c0fba5b5ee431058544"
+git-tree-sha1 = "e75d82493681dfd884a357952bbd7ab0608e1dc3"
 uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
-version = "0.6.4"
+version = "0.6.7"
 
 [[TOML]]
 deps = ["Dates"]
@@ -831,15 +859,21 @@ uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c"
 version = "1.0.1"
 
 [[Tables]]
-deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"]
-git-tree-sha1 = "bb1064c9a84c52e277f1096cf41434b675cd368b"
+deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "TableTraits", "Test"]
+git-tree-sha1 = "5ce79ce186cc678bbb5c5681ca3379d1ddae11a1"
 uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
-version = "1.6.1"
+version = "1.7.0"
 
 [[Tar]]
 deps = ["ArgTools", "SHA"]
 uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
 
+[[TensorCore]]
+deps = ["LinearAlgebra"]
+git-tree-sha1 = "1feb45f88d133a655e001435632f019a9a1bcdb6"
+uuid = "62fd8b95-f654-4bbd-a8a5-9c27f68ccd50"
+version = "0.1.1"
+
 [[Test]]
 deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
 uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
@@ -875,9 +909,9 @@ version = "1.19.0+0"
 
 [[Wayland_protocols_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "66d72dc6fcc86352f01676e8f0f698562e60510f"
+git-tree-sha1 = "4528479aa01ee1b3b4cd0e6faef0e04cf16466da"
 uuid = "2381bf8a-dfd0-557d-9999-79630e7b1b91"
-version = "1.23.0+0"
+version = "1.25.0+0"
 
 [[XML2_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"]
@@ -1023,9 +1057,9 @@ uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
 
 [[Zstd_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "cc4bf3fdde8b7e3e9fa0351bdeedba1cf3b7f6e6"
+git-tree-sha1 = "e45044cd873ded54b6a5bac0eb5c971392cf1927"
 uuid = "3161d3a3-bdf6-5164-811a-617609db77b4"
-version = "1.5.0+0"
+version = "1.5.2+0"
 
 [[libass_jll]]
 deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "HarfBuzz_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]
diff --git a/sample/PlutoUI.jl.jl b/sample/PlutoUI.jl.jl
index 9369358d87..29a81b33d7 100644
--- a/sample/PlutoUI.jl.jl
+++ b/sample/PlutoUI.jl.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.17.7
+# v0.19.3
 
 using Markdown
 using InteractiveUtils
@@ -620,7 +620,7 @@ PLUTO_PROJECT_TOML_CONTENTS = """
 PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
 
 [compat]
-PlutoUI = "~0.7.34"
+PlutoUI = "~0.7.38"
 """
 
 # ╔═╡ 00000000-0000-0000-0000-000000000002
@@ -685,9 +685,9 @@ uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 
 [[JSON]]
 deps = ["Dates", "Mmap", "Parsers", "Unicode"]
-git-tree-sha1 = "8076680b162ada2a031f707ac7b4953e30667a37"
+git-tree-sha1 = "3c837543ddb02250ef42f4738347454f95079d4e"
 uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-version = "0.21.2"
+version = "0.21.3"
 
 [[LibCURL]]
 deps = ["LibCURL_jll", "MozillaCACerts_jll"]
@@ -734,9 +734,9 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
 [[Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "0b5cfbb704034b5b4c1869e36634438a047df065"
+git-tree-sha1 = "1285416549ccfcdf0c50d4997a94331e88d68413"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.2.1"
+version = "2.3.1"
 
 [[Pkg]]
 deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
@@ -744,9 +744,9 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[PlutoUI]]
 deps = ["AbstractPlutoDingetjes", "Base64", "ColorTypes", "Dates", "Hyperscript", "HypertextLiteral", "IOCapture", "InteractiveUtils", "JSON", "Logging", "Markdown", "Random", "Reexport", "UUIDs"]
-git-tree-sha1 = "8979e9802b4ac3d58c503a20f2824ad67f9074dd"
+git-tree-sha1 = "670e559e5c8e191ded66fa9ea89c97f10376bb4c"
 uuid = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
-version = "0.7.34"
+version = "0.7.38"
 
 [[Printf]]
 deps = ["Unicode"]

From f98004b11b875ecbbb2fa589167a8dc8b5849c72 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 9 May 2022 16:27:55 +0200
Subject: [PATCH 296/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index df6ac547ae..9993995d95 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.3"
+version = "0.19.4"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 22ed3bfff9990ef27be0a2bc90b930a4b232afdf Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Mon, 9 May 2022 23:37:01 +0200
Subject: [PATCH 297/821] Slightly reduce TTFX for `SessionActions.open`
 (#2098)

---
 src/analysis/ExpressionExplorer.jl |  4 ++--
 src/analysis/topological_order.jl  |  5 +++--
 src/notebook/Notebook.jl           | 17 +++++++++--------
 src/runner/PlutoRunner.jl          |  5 +++--
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 1ac38ffdf9..b7e1d6f836 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -320,8 +320,8 @@ end
 # Possible leaf: value
 # Like: a = 1
 # 1 is a value (Int64)
-function explore!(value, scopestate::ScopeState)::SymbolsState
-    # includes: LineNumberNode, Int64, String, 
+function explore!(@nospecialize(value), scopestate::ScopeState)::SymbolsState
+    # includes: LineNumberNode, Int64, String, Markdown.LaTeX, DataType and more.
     return SymbolsState()
 end
 
diff --git a/src/analysis/topological_order.jl b/src/analysis/topological_order.jl
index 534909663a..4f21de965b 100644
--- a/src/analysis/topological_order.jl
+++ b/src/analysis/topological_order.jl
@@ -89,8 +89,9 @@ function topological_order(topology::NotebookTopology, roots::AbstractVector{Cel
 	# we use MergeSort because it is a stable sort: leaves cells in order if they are in the same category
 	prelim_order_1 = sort(roots, alg=MergeSort, by=c -> cell_precedence_heuristic(topology, c))
 	# reversing because our search returns reversed order
-	prelim_order_2 = Iterators.reverse(prelim_order_1)
-	bfs.(prelim_order_2)
+    for i in length(prelim_order_1):-1:1
+        bfs(prelim_order_1[i])
+    end
 	ordered = reverse(exits)
 	TopologicalOrder(topology, setdiff(ordered, keys(errable)), errable)
 end
diff --git a/src/notebook/Notebook.jl b/src/notebook/Notebook.jl
index db3b9cb598..47d178c370 100644
--- a/src/notebook/Notebook.jl
+++ b/src/notebook/Notebook.jl
@@ -24,7 +24,7 @@ Base.@kwdef mutable struct Notebook
     "Cells are ordered in a `Notebook`, and this order can be changed by the user. Cells will always have a constant UUID."
     cells_dict::Dict{UUID,Cell}
     cell_order::Array{UUID,1}
-    
+
     path::String
     notebook_id::UUID=uuid1()
     topology::NotebookTopology
@@ -64,17 +64,18 @@ _initial_topology(cells_dict::Dict{UUID,Cell}, cells_order::Vector{UUID}) =
     NotebookTopology(;
         cell_order=ImmutableVector(_collect_cells(cells_dict, cells_order)),
     )
-    
-function Notebook(cells::Vector{Cell}, path::AbstractString, notebook_id::UUID)
+
+function Notebook(cells::Vector{Cell}, @nospecialize(path::AbstractString), notebook_id::UUID)
     cells_dict=Dict(map(cells) do cell
         (cell.cell_id, cell)
     end)
     cell_order=map(x -> x.cell_id, cells)
     Notebook(;
-        cells_dict, cell_order,
+        cells_dict,
+        cell_order,
         topology=_initial_topology(cells_dict, cell_order),
-        path=path,
-        notebook_id=notebook_id,
+        path,
+        notebook_id
     )
 end
 
@@ -208,8 +209,8 @@ end
 save_notebook(notebook::Notebook) = save_notebook(notebook, notebook.path)
 
 "Load a notebook without saving it or creating a backup; returns a `Notebook`. REMEMBER TO CHANGE THE NOTEBOOK PATH after loading it to prevent it from autosaving and overwriting the original file."
-function load_notebook_nobackup(io, path)::Notebook
-    firstline = String(readline(io))
+function load_notebook_nobackup(@nospecialize(io::IO), @nospecialize(path::AbstractString))::Notebook
+    firstline = String(readline(io))::String
 
     if firstline != _notebook_header
         error("File is not a Pluto.jl notebook")
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 4dc5171352..3d4a59a7f1 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -466,8 +466,8 @@ function run_expression(
         m::Module,
         expr::Any,
         cell_id::UUID,
-        function_wrapped_info::Union{Nothing,Tuple{Set{Symbol},Set{Symbol}}}=nothing,
-        forced_expr_id::Union{ObjectID,Nothing}=nothing;
+        @nospecialize(function_wrapped_info::Union{Nothing,Tuple{Set{Symbol},Set{Symbol}}}=nothing),
+        @nospecialize(forced_expr_id::Union{ObjectID,Nothing}=nothing);
         user_requested_run::Bool=true,
         capture_stdout::Bool=true,
     )
@@ -570,6 +570,7 @@ function run_expression(
     
     cell_results[cell_id], cell_runtimes[cell_id] = result, runtime
 end
+precompile(run_expression, (Module, Expr, UUID, Nothing, Nothing))
 
 # Channel to trigger implicits run
 const run_channel = Channel{UUID}(10)

From b482ef1d1b6da790a0d722d1a195b67641b6f224 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Tue, 10 May 2022 12:20:11 +0200
Subject: [PATCH 298/821] Simplify show_richest sprint call (#2100)

---
 src/runner/PlutoRunner.jl | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 3d4a59a7f1..a4262779cc 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -918,12 +918,12 @@ See [`allmimes`](@ref) for the ordered list of supported MIME types.
 """
 function format_output_default(@nospecialize(val), @nospecialize(context=default_iocontext))::MimedOutput
     try
-        io_sprinted, (value, mime) = sprint_withreturned(show_richest, val; context=context)
+        io_sprinted, (value, mime) = show_richest_withreturned(val; context)
         if value === nothing
             if mime ∈ imagemimes
                 (io_sprinted, mime)
             else
-                (String(io_sprinted), mime)
+                (String(io_sprinted)::String, mime)
             end
         else
             (value, mime)
@@ -1007,11 +1007,11 @@ function pretty_stackcall(frame::Base.StackFrame, linfo::Core.MethodInstance)
     end
 end
 
-"Like `Base.sprint`, but return a `(String, Any)` tuple containing function output as the second entry."
-function sprint_withreturned(f::Function, args...; context=nothing, sizehint::Integer=0)
-    buffer = IOBuffer(sizehint=sizehint)
-    val = f(IOContext(buffer, context), args...)
-    resize!(buffer.data, buffer.size), val
+"Return a `(String, Any)` tuple containing function output as the second entry."
+function show_richest_withreturned(@nospecialize(args...); context=nothing, sizehint::Integer=0)
+    buffer = IOBuffer(; sizehint)
+    val = show_richest(IOContext(buffer, context), args...)
+    return (resize!(buffer.data, buffer.size), val)
 end
 
 "Super important thing don't change."
@@ -1183,7 +1183,7 @@ end
 function tree_data(@nospecialize(x::AbstractVector{<:Any}), context::IOContext)
     if Base.show_circular(context, x)
         Dict{Symbol,Any}(
-            :objectid => string(objectid(x), base=16),
+            :objectid => string(objectid(x), base=16)::String,
             :type => :circular,
         )
     else
@@ -1319,7 +1319,7 @@ function tree_data(@nospecialize(x::Any), context::IOContext)
         t = typeof(x)
         nf = nfields(x)
         nb = sizeof(x)
-        
+
         elements = Any[
             let
                 f = fieldname(t, i)
@@ -1334,9 +1334,9 @@ function tree_data(@nospecialize(x::Any), context::IOContext)
         ]
 
         Dict{Symbol,Any}(
-            :prefix => repr(t; context=context),
-            :prefix_short => string(t |> trynameof),
-            :objectid => string(objectid(x), base=16),
+            :prefix => repr(t; context),
+            :prefix_short => string(trynameof(t)),
+            :objectid => string(objectid(x), base=16)::String,
             :type => :struct,
             :elements => elements,
         )

From 7638903e500e5a7295e586d8c21f11bebe3fa244 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 11 May 2022 23:17:43 +0200
Subject: [PATCH 299/821] web server: MIME fix for unknown assets

---
 src/webserver/Static.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index 0c7dbae421..1c1b2513ca 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -49,7 +49,7 @@ function asset_response(path; cacheable::Bool=false)
     if isfile(path)
         data = read(path)
         response = HTTP.Response(200, data)
-        push!(response.headers, "Content-Type" => MIMEs.contenttype_from_mime(MIMEs.mime_from_path(path)))
+        push!(response.headers, "Content-Type" => MIMEs.contenttype_from_mime(MIMEs.mime_from_path(path, MIME"application/octet-stream"())))
         push!(response.headers, "Content-Length" => string(length(data)))
         push!(response.headers, "Access-Control-Allow-Origin" => "*")
         cacheable && push!(response.headers, "Cache-Control" => "public, max-age=$(30day), immutable")

From d79351008092cf32ac1264558ea4afde2d0ea1e5 Mon Sep 17 00:00:00 2001
From: Yuval <yharel@campus.technion.ac.il>
Date: Fri, 13 May 2022 00:05:48 +0300
Subject: [PATCH 300/821] Fix error message when opening a port fails (#2103)

This error message is too specific, and is misleading when listening on the port fails due to missing permissions.
---
 src/webserver/WebServer.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 7d2a25f472..238da299a9 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -121,7 +121,7 @@ function port_serversocket(hostIP::Sockets.IPAddr, favourite_port)
         try
             serversocket = Sockets.listen(hostIP, port)
         catch e
-            error("Port with number $port is already in use. Use Pluto.run() to automatically select an available port.")
+            error("Cannot listen on port $port. It may already be in use, or you may not have sufficient permissions. Use Pluto.run() to automatically select an available port.")
         end
     end
     return port, serversocket

From c3cad093292d3e90dad47b8b8bcab79b249cbac1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 17 May 2022 14:18:13 +0200
Subject: [PATCH 301/821] ImageShow.jl: disable HTML show method for cell
 output (#2108)

---
 src/runner/PlutoRunner.jl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index a4262779cc..5510a0dbce 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1490,7 +1490,13 @@ const integrations = Integration[
             pluto_showable(::MIME"image/svg+xml", p::Plots.Plot{Plots.GRBackend}) = approx_size(p) <= max_plot_size
             pluto_showable(::MIME"text/html", p::Plots.Plot{Plots.GRBackend}) = false
         end,
-    )
+    ),
+    Integration(
+        id = Base.PkgId(UUID("4e3cecfd-b093-5904-9786-8bbb286a6a31"), "ImageShow"),
+        code = quote
+            pluto_showable(::MIME"text/html", ::AbstractMatrix{<:ImageShow.Colorant}) = false
+        end,
+    ),
 ]
 
 function load_integration_if_needed(integration::Integration)

From 96968ac23db15f5b3b4458144b4762df397a7068 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 17 May 2022 14:40:46 +0200
Subject: [PATCH 302/821] CompatHelper: bump compat for RelocatableFolders to
 0.3, (keep existing compat) (#2105)

Co-authored-by: CompatHelper Julia <compathelper_noreply@julialang.org>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 9993995d95..02feaba4ec 100644
--- a/Project.toml
+++ b/Project.toml
@@ -33,7 +33,7 @@ HTTP = "^0.9.1"
 MIMEs = "0.1"
 MsgPack = "1.1"
 PrecompileSignatures = "3"
-RelocatableFolders = "0.1, 0.2"
+RelocatableFolders = "0.1, 0.2, 0.3"
 Tables = "1"
 julia = "^1.6"
 

From 12c53ed9df231a4e3f1c84e39979f57167acf43c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Tue, 17 May 2022 18:39:34 +0300
Subject: [PATCH 303/821] Environment detect: JH localhost proxy (#2102)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 src/webserver/WebServer.jl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 238da299a9..4f2119cd67 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -323,7 +323,12 @@ get_favorite_notebook(notebook:: String) = notebook
 get_favorite_notebook(notebook:: AbstractVector) = first(notebook)
 
 function pretty_address(session::ServerSession, hostIP, port)
-    root = if session.options.server.root_url === nothing
+    root = if session.options.server.root_url !== nothing
+        @assert endswith(session.options.server.root_url, "/")
+        session.options.server.root_url
+    elseif haskey(ENV, "JH_APP_URL")
+        "$(ENV["JH_APP_URL"])proxy/$(Int(port))/"
+    else
         host_str = string(hostIP)
         host_pretty = if isa(hostIP, Sockets.IPv6)
             if host_str == "::1"
@@ -338,9 +343,6 @@ function pretty_address(session::ServerSession, hostIP, port)
         end
         port_pretty = Int(port)
         "http://$(host_pretty):$(port_pretty)/"
-    else
-        @assert endswith(session.options.server.root_url, "/")
-        session.options.server.root_url
     end
 
     url_params = Dict{String,String}()

From 24b0df1c72ff70a3fcc43f906b329855c4f2fe84 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 17 May 2022 17:42:24 +0200
Subject: [PATCH 304/821] Scope log_channel to a single notebook_id (#2027)

* Scope log_channel to a single notebook_id

* remove logs oops

* whitespace

* merge part 2

* fixfix
---
 src/evaluation/WorkspaceManager.jl | 38 ++++++++----
 src/runner/PlutoRunner.jl          | 93 ++++++++++++++++++------------
 test/compiletimes.jl               | 15 ++++-
 3 files changed, 96 insertions(+), 50 deletions(-)

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index a3a5e5752c..a012391d4c 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -11,8 +11,9 @@ import Distributed
 "Contains the Julia process (in the sense of `Distributed.addprocs`) to evaluate code in. Each notebook gets at most one `Workspace` at any time, but it can also have no `Workspace` (it cannot `eval` code in this case)."
 Base.@kwdef mutable struct Workspace
     pid::Integer
+    notebook_id::UUID
     discarded::Bool=false
-    log_channel::Distributed.RemoteChannel
+    remote_log_channel::Distributed.RemoteChannel
     module_name::Symbol
     dowork_token::Token=Token()
     nbpkg_was_active::Bool=false
@@ -60,9 +61,21 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
     end
 
     Distributed.remotecall_eval(Main, [pid], :(PlutoRunner.notebook_id[] = $(notebook.notebook_id)))
-    log_channel = Core.eval(Main, quote
-        $(Distributed).RemoteChannel(() -> eval(:(Main.PlutoRunner.log_channel)), $pid)
+    
+    remote_log_channel = Core.eval(Main, quote
+        $(Distributed).RemoteChannel(() -> eval(quote
+        
+            channel = Channel{Any}(10)
+            Main.PlutoRunner.setup_plutologger(
+                $($(notebook.notebook_id)), 
+                channel; 
+                make_global=$($(use_distributed))
+            )
+            
+            channel
+        end), $pid)
     end)
+    
     run_channel = Core.eval(Main, quote
         $(Distributed).RemoteChannel(() -> eval(:(Main.PlutoRunner.run_channel)), $pid)
     end)
@@ -71,15 +84,16 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
     original_LOAD_PATH, original_ACTIVE_PROJECT = Distributed.remotecall_eval(Main, pid, :(Base.LOAD_PATH, Base.ACTIVE_PROJECT[]))
     
     workspace = Workspace(;
-        pid=pid,
-        log_channel=log_channel, 
-        module_name=module_name,
-        original_LOAD_PATH=original_LOAD_PATH,
-        original_ACTIVE_PROJECT=original_ACTIVE_PROJECT,
-        is_offline_renderer=is_offline_renderer,
+        pid,
+        notebook_id=notebook.notebook_id,
+        remote_log_channel, 
+        module_name,
+        original_LOAD_PATH,
+        original_ACTIVE_PROJECT,
+        is_offline_renderer,
     )
 
-    @async start_relaying_logs((session, notebook), log_channel)
+    @async start_relaying_logs((session, notebook), remote_log_channel)
     @async start_relaying_self_updates((session, notebook), run_channel)
     cd_workspace(workspace, notebook.path)
     use_nbpkg_environment((session, notebook), workspace)
@@ -387,7 +401,8 @@ function eval_format_fetch_in_workspace(
         Distributed.remotecall_eval(Main, [workspace.pid], :(PlutoRunner.run_expression(
             getfield(Main, $(QuoteNode(workspace.module_name))), 
             $(QuoteNode(expr)), 
-            $cell_id, 
+            $(workspace.notebook_id),
+            $cell_id,
             $function_wrapped_info,
             $forced_expr_id;
             user_requested_run=$user_requested_run,
@@ -427,6 +442,7 @@ function format_fetch_in_workspace(
     withtoken(workspace.dowork_token) do
         try
             Distributed.remotecall_eval(Main, workspace.pid, :(PlutoRunner.formatted_result_of(
+                $(workspace.notebook_id),
                 $cell_id, 
                 $ends_with_semicolon, 
                 $known_published_objects,
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 5510a0dbce..94cefbac99 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -465,6 +465,7 @@ This function is memoized: running the same expression a second time will simply
 function run_expression(
         m::Module,
         expr::Any,
+        notebook_id::UUID,
         cell_id::UUID,
         @nospecialize(function_wrapped_info::Union{Nothing,Tuple{Set{Symbol},Set{Symbol}}}=nothing),
         @nospecialize(forced_expr_id::Union{ObjectID,Nothing}=nothing);
@@ -478,7 +479,10 @@ function run_expression(
         # TODO Could also put explicit `try_macroexpand` here, to make clear that user_requested_run => fresh macro identity
     end
 
+    old_currently_running_cell_id = currently_running_cell_id[]
     currently_running_cell_id[] = cell_id
+    logger = pluto_loggers[notebook_id]
+    logger.currently_running_cell_id[] = cell_id
 
     # reset published objects
     cell_published_objects[cell_id] = Dict{String,Any}()
@@ -532,37 +536,42 @@ function run_expression(
         throw("Expression still contains macro calls!!")
     end
 
-    result, runtime = with_io_to_logs(; enabled=capture_stdout, loglevel=stdout_log_level) do
-        if function_wrapped_info === nothing
-            toplevel_expr = Expr(:toplevel, expr)
-            wrapped = timed_expr(toplevel_expr)
-            ans, runtime = run_inside_trycatch(m, wrapped)
-            (ans, add_runtimes(runtime, expansion_runtime))
-        else
-            expr_id = forced_expr_id !== nothing ? forced_expr_id : expr_hash(expr)
-            local computer = get(computers, cell_id, nothing)
-            if computer === nothing || computer.expr_id !== expr_id
-                try
-                    computer = register_computer(expr, expr_id, cell_id, collect.(function_wrapped_info)...)
-                catch e
-                    # @error "Failed to generate computer function" expr exception=(e,stacktrace(catch_backtrace()))
-                    return run_expression(m, original_expr, cell_id, nothing; user_requested_run=user_requested_run)
+    result, runtime = Logging.with_logger(logger) do # about 200ns overhead
+        with_io_to_logs(; enabled=capture_stdout, loglevel=stdout_log_level) do # about 3ms overhead i think?
+            if function_wrapped_info === nothing
+                toplevel_expr = Expr(:toplevel, expr)
+                wrapped = timed_expr(toplevel_expr)
+                ans, runtime = run_inside_trycatch(m, wrapped)
+                (ans, add_runtimes(runtime, expansion_runtime))
+            else
+                expr_id = forced_expr_id !== nothing ? forced_expr_id : expr_hash(expr)
+                local computer = get(computers, cell_id, nothing)
+                if computer === nothing || computer.expr_id !== expr_id
+                    try
+                        computer = register_computer(expr, expr_id, cell_id, collect.(function_wrapped_info)...)
+                    catch e
+                        # @error "Failed to generate computer function" expr exception=(e,stacktrace(catch_backtrace()))
+                        return run_expression(m, original_expr, notebook_id, cell_id, nothing; user_requested_run=user_requested_run)
+                    end
                 end
-            end
 
-            # This check solves the problem of a cell like `false && variable_that_does_not_exist`. This should run without error, but will fail in our function-wrapping-magic because we get the value of `variable_that_does_not_exist` before calling the generated function.
-            # The fix is to detect this situation and run the expression in the classical way.
-            ans, runtime = if any(name -> !isdefined(m, name), computer.input_globals)
-                # Do run_expression but with function_wrapped_info=nothing so it doesn't go in a Computer()
-                # @warn "Got variables that don't exist, running outside of computer" not_existing=filter(name -> !isdefined(m, name), computer.input_globals)
-                run_expression(m, original_expr, cell_id; user_requested_run)
-            else
-                run_inside_trycatch(m, () -> compute(m, computer))
-            end
+                # This check solves the problem of a cell like `false && variable_that_does_not_exist`. This should run without error, but will fail in our function-wrapping-magic because we get the value of `variable_that_does_not_exist` before calling the generated function.
+                # The fix is to detect this situation and run the expression in the classical way.
+                ans, runtime = if any(name -> !isdefined(m, name), computer.input_globals)
+                    # Do run_expression but with function_wrapped_info=nothing so it doesn't go in a Computer()
+                    # @warn "Got variables that don't exist, running outside of computer" not_existing=filter(name -> !isdefined(m, name), computer.input_globals)
+                    run_expression(m, original_expr, notebook_id, cell_id; user_requested_run)
+                else
+                    run_inside_trycatch(m, () -> compute(m, computer))
+                end
 
-            ans, add_runtimes(runtime, expansion_runtime)
+                ans, add_runtimes(runtime, expansion_runtime)
+            end
         end
     end
+    
+    currently_running_cell_id[] = old_currently_running_cell_id
+    
 
     if (result isa CapturedException) && (result.ex isa InterruptException)
         throw(result.ex)
@@ -570,7 +579,7 @@ function run_expression(
     
     cell_results[cell_id], cell_runtimes[cell_id] = result, runtime
 end
-precompile(run_expression, (Module, Expr, UUID, Nothing, Nothing))
+precompile(run_expression, (Module, Expr, UUID, UUID, Nothing, Nothing))
 
 # Channel to trigger implicits run
 const run_channel = Channel{UUID}(10)
@@ -817,6 +826,7 @@ const tree_display_extra_items = Dict{UUID,Dict{ObjectDimPair,Int64}}()
 const FormattedCellResult = NamedTuple{(:output_formatted, :errored, :interrupted, :process_exited, :runtime, :published_objects, :has_pluto_hook_features),Tuple{PlutoRunner.MimedOutput,Bool,Bool,Bool,Union{UInt64,Nothing},Dict{String,Any},Bool}}
 
 function formatted_result_of(
+    notebook_id::UUID, 
     cell_id::UUID, 
     ends_with_semicolon::Bool, 
     known_published_objects::Vector{String}=String[],
@@ -825,6 +835,8 @@ function formatted_result_of(
 )::FormattedCellResult
     load_integrations_if_needed()
     currently_running_cell_id[] = cell_id
+    logger = pluto_loggers[notebook_id]
+    logger.currently_running_cell_id[] = cell_id
 
     extra_items = if showmore === nothing
         tree_display_extra_items[cell_id] = Dict{ObjectDimPair,Int64}()
@@ -2052,14 +2064,16 @@ end
 const original_stdout = stdout
 const original_stderr = stderr
 
-
-const log_channel = Channel{Any}(10)
 const old_logger = Ref{Union{Logging.AbstractLogger,Nothing}}(nothing)
 
 struct PlutoLogger <: Logging.AbstractLogger
-    stream
+    stream # some packages expect this field to exist...
+    log_channel::Channel{Any}
+    currently_running_cell_id::Ref{UUID}
 end
 
+const pluto_loggers = Dict{UUID,PlutoLogger}()
+
 function Logging.shouldlog(::PlutoLogger, level, _module, _...)
     # Accept logs
     # - From the user's workspace module
@@ -2074,7 +2088,7 @@ end
 
 Logging.min_enabled_level(::PlutoLogger) = min(Logging.Debug, stdout_log_level)
 Logging.catch_exceptions(::PlutoLogger) = false
-function Logging.handle_message(::PlutoLogger, level, msg, _module, group, id, file, line; kwargs...)
+function Logging.handle_message(pl::PlutoLogger, level, msg, _module, group, id, file, line; kwargs...)
     # println("receiving msg from ", _module, " ", group, " ", id, " ", msg, " ", level, " ", line, " ", file)
     # println("with types: ", "_module: ", typeof(_module), ", ", "msg: ", typeof(msg), ", ", "group: ", typeof(group), ", ", "id: ", typeof(id), ", ", "file: ", typeof(file), ", ", "line: ", typeof(line), ", ", "kwargs: ", typeof(kwargs)) # thanks Copilot
 
@@ -2082,13 +2096,13 @@ function Logging.handle_message(::PlutoLogger, level, msg, _module, group, id, f
         
         yield()
         
-        put!(log_channel, Dict{String,Any}(
+        put!(pl.log_channel, Dict{String,Any}(
             "level" => string(level),
             "msg" => format_output_default(msg isa String ? Text(msg) : msg),
             "group" => string(group),
             "id" => string(id),
             "file" => string(file),
-            "cell_id" => currently_running_cell_id[],
+            "cell_id" => pl.currently_running_cell_id[],
             "line" => line isa Union{Int32,Int64} ? line : nothing,
             "kwargs" => Tuple{String,Any}[(string(k), format_log_value(v)) for (k, v) in kwargs],
             )
@@ -2167,13 +2181,16 @@ function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogL
     result
 end
 
-# we put this in __init__ to fix a world age problem
-function __init__()
-    if !isdefined(Main, Symbol("##Pluto_logger_switched")) && Distributed.myid() != 1
+
+function setup_plutologger(notebook_id::UUID, log_channel::Channel{Any}; make_global::Bool=false)
+    logger = pluto_loggers[notebook_id] = 
+        PlutoLogger(nothing, log_channel, Ref{UUID}(uuid4()))
+    
+    if make_global
         old_logger[] = Logging.global_logger()
-        Logging.global_logger(PlutoLogger(nothing))
-        Core.eval(Main, Expr(:(=), Symbol("##Pluto_logger_switched"), true)) # if Pluto is loaded again on the same process, prevent it from also setting the logger
+        Logging.global_logger(logger)
     end
+    logger
 end
 
 end
diff --git a/test/compiletimes.jl b/test/compiletimes.jl
index 1466b1cacd..123f01ca3c 100644
--- a/test/compiletimes.jl
+++ b/test/compiletimes.jl
@@ -7,7 +7,20 @@
 #   4. Note that some benchmarks depend on disk and network speeds too, so focus on the number of allocations since those are more robust.
 
 module Foo end
-@timeit TOUT "PlutoRunner.run_expression" @eval Pluto.PlutoRunner.run_expression(Foo, Expr(:toplevel, :(1 + 1)), Pluto.uuid1(), nothing);
+
+using UUIDs
+
+# setup required for run_exporession:
+const test_notebook_id = uuid1()
+let
+    channel = Channel{Any}(10)
+    Pluto.PlutoRunner.setup_plutologger(
+        test_notebook_id, 
+        channel; 
+        make_global=false
+    )
+end
+@timeit TOUT "PlutoRunner.run_expression" @eval Pluto.PlutoRunner.run_expression(Foo, Expr(:toplevel, :(1 + 1)), test_notebook_id, uuid1(), nothing);
 
 function wait_for_ready(notebook::Pluto.Notebook)
     while notebook.process_status != Pluto.ProcessStatus.ready

From bd4af1d8bb271aa835e2c9a5fd1e31f4ca4ff2ae Mon Sep 17 00:00:00 2001
From: Connor Burns <ctrekker4@gmail.com>
Date: Tue, 17 May 2022 14:06:01 -0600
Subject: [PATCH 305/821] Notebook metadata (#2016)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/CellOutput.js |  14 +++-
 frontend/components/Editor.js     |  11 ++--
 src/notebook/Cell.jl              |   9 +--
 src/notebook/Notebook.jl          |  79 +++++++++++++++++++----
 src/webserver/Dynamic.jl          |   7 ++
 test/Notebook.jl                  | 104 ++++++++++++++++++++++++++++--
 test/helpers.jl                   |   2 +-
 7 files changed, 193 insertions(+), 33 deletions(-)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 24f85851f6..d9c9c05c21 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -271,7 +271,7 @@ const is_displayable = (result) => result instanceof Element && result.nodeType
  * @typedef PlutoScript
  * @type {HTMLScriptElement | { pluto_is_loading_me?: boolean }}
  */
-const execute_scripttags = async ({ root_node, script_nodes, previous_results_map, invalidation }) => {
+const execute_scripttags = async ({ root_node, script_nodes, previous_results_map, invalidation, pluto_actions }) => {
     let results_map = new Map()
 
     // Reattach DOM results from old scripts, you might want to skip reading this
@@ -333,6 +333,15 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
                                 currentScript: currentScript,
                                 invalidation: invalidation,
                                 getPublishedObject: (id) => cell.getPublishedObject(id),
+                                getNotebookMetadataExperimental: (key) => pluto_actions.get_notebook()?.metadata[key],
+                                setNotebookMetadataExperimental: (key, value) =>
+                                    pluto_actions.update_notebook((notebook) => {
+                                        notebook.metadata[key] = value
+                                    }),
+                                deleteNotebookMetadataExperimental: (key) =>
+                                    pluto_actions.update_notebook((notebook) => {
+                                        delete notebook.metadata[key]
+                                    }),
                                 ...observablehq_for_cells,
                             },
                             code: node.innerText,
@@ -444,8 +453,9 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
                 previous_results_map.current = await execute_scripttags({
                     root_node: container.current,
                     script_nodes: new_scripts,
-                    invalidation: invalidation,
+                    invalidation,
                     previous_results_map: persist_js_state ? previous_results_map.current : new Map(),
+                    pluto_actions,
                 })
 
                 if (pluto_actions != null) {
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index a9b76d5bd4..503fd47f86 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -39,8 +39,8 @@ import { HijackExternalLinksToOpenInNewTab } from "./HackySideStuff/HijackExtern
 export const default_path = "..."
 const DEBUG_DIFFING = false
 
-// Be sure to keep this in sync with DEFAULT_METADATA in Cell.jl
-const DEFAULT_METADATA = {
+// Be sure to keep this in sync with DEFAULT_CELL_METADATA in Cell.jl
+const DEFAULT_CELL_METADATA = {
     disabled: false,
     show_logs: true,
 }
@@ -211,6 +211,7 @@ const first_true_key = (obj) => {
  *  published_objects: { [objectid: string]: any},
  *  bonds: { [name: string]: any },
  *  nbpkg: NotebookPkgData?,
+ *  metadata: object,
  * }}
  */
 
@@ -385,7 +386,7 @@ export class Editor extends Component {
                             // Fill the cell with empty code remotely, so it doesn't run unsafe code
                             code: "",
                             metadata: {
-                                ...DEFAULT_METADATA,
+                                ...DEFAULT_CELL_METADATA,
                             },
                         }
                     }
@@ -425,7 +426,7 @@ export class Editor extends Component {
                         code: code,
                         code_folded: false,
                         metadata: {
-                            ...DEFAULT_METADATA,
+                            ...DEFAULT_CELL_METADATA,
                         },
                     }
                 })
@@ -484,7 +485,7 @@ export class Editor extends Component {
                         cell_id: id,
                         code,
                         code_folded: false,
-                        metadata: { ...DEFAULT_METADATA },
+                        metadata: { ...DEFAULT_CELL_METADATA },
                     }
                     notebook.cell_order = [...notebook.cell_order.slice(0, index), id, ...notebook.cell_order.slice(index, Infinity)]
                 })
diff --git a/src/notebook/Cell.jl b/src/notebook/Cell.jl
index bf76176355..23b2c3dcac 100644
--- a/src/notebook/Cell.jl
+++ b/src/notebook/Cell.jl
@@ -1,8 +1,8 @@
 import UUIDs: UUID, uuid1
 import .ExpressionExplorer: SymbolsState, UsingsImports
 
-# Make sure to keep this in sync with DEFAULT_METADATA in ../frontend/components/Editor.js
-const DEFAULT_METADATA = Dict{String, Any}(
+# Make sure to keep this in sync with DEFAULT_CELL_METADATA in ../frontend/components/Editor.js
+const DEFAULT_CELL_METADATA = Dict{String, Any}(
     "disabled" => false,
     "show_logs" => true,
 )
@@ -52,7 +52,7 @@ Base.@kwdef mutable struct Cell
 
     depends_on_disabled_cells::Bool=false
 
-    metadata::Dict{String,Any}=copy(DEFAULT_METADATA)
+    metadata::Dict{String,Any}=copy(DEFAULT_CELL_METADATA)
 end
 
 Cell(cell_id, code) = Cell(cell_id=cell_id, code=code)
@@ -72,9 +72,6 @@ function Base.convert(::Type{UUID}, string::String)
     UUID(string)
 end
 
-create_metadata(metadata::Dict{String,<:Any}) = merge(DEFAULT_METADATA, metadata)
-get_cell_metadata(cell::Cell)::Dict{String,Any} = cell.metadata
-get_cell_metadata_no_default(cell::Cell)::Dict{String,Any} = Dict{String,Any}(setdiff(pairs(cell.metadata), pairs(DEFAULT_METADATA)))
 
 "Returns whether or not the cell is **explicitely** disabled."
 is_disabled(c::Cell) = get(c.metadata, "disabled", false)
diff --git a/src/notebook/Notebook.jl b/src/notebook/Notebook.jl
index 47d178c370..83bfd6aba1 100644
--- a/src/notebook/Notebook.jl
+++ b/src/notebook/Notebook.jl
@@ -5,6 +5,9 @@ import .PkgCompat: PkgCompat, PkgContext
 import Pkg
 import TOML
 
+
+const DEFAULT_NOTEBOOK_METADATA = Dict{String, Any}()
+
 mutable struct BondValue
     value::Any
 end
@@ -56,6 +59,8 @@ Base.@kwdef mutable struct Notebook
     last_hot_reload_time::typeof(time())=zero(time())
 
     bonds::Dict{Symbol,BondValue}=Dict{Symbol,BondValue}()
+
+    metadata::Dict{String, Any}=copy(DEFAULT_NOTEBOOK_METADATA)
 end
 
 _collect_cells(cells_dict::Dict{UUID,Cell}, cells_order::Vector{UUID}) = 
@@ -91,7 +96,12 @@ function Base.getproperty(notebook::Notebook, property::Symbol)
     end
 end
 
+
+emptynotebook(args...) = Notebook([Cell()], args...)
+
+
 const _notebook_header = "### A Pluto.jl notebook ###"
+const _notebook_metadata_prefix = "#> "
 # We use a creative delimiter to avoid accidental use in code
 # so don't get inspired to suddenly use these in your code!
 const _cell_id_delimiter = "# ╔═╡ "
@@ -106,7 +116,6 @@ const _disabled_suffix = "\n  ╠═╡ =#"
 const _ptoml_cell_id = UUID(1)
 const _mtoml_cell_id = UUID(2)
 
-emptynotebook(args...) = Notebook([Cell()], args...)
 
 """
 Save the notebook to `io`, `file` or to `notebook.path`.
@@ -118,6 +127,17 @@ Have a look at our [JuliaCon 2020 presentation](https://youtu.be/IAF8DjrQSSk?t=1
 function save_notebook(io, notebook::Notebook)
     println(io, _notebook_header)
     println(io, "# ", PLUTO_VERSION_STR)
+    
+    # Notebook metadata
+    let nb_metadata_toml = strip(sprint(TOML.print, get_metadata_no_default(notebook)))
+        if !isempty(nb_metadata_toml)
+            println(io)
+            for line in split(nb_metadata_toml, "\n")
+                println(io, _notebook_metadata_prefix, line)
+            end
+        end
+    end
+
     # Anything between the version string and the first UUID delimiter will be ignored by the notebook loader.
     println(io, "")
     println(io, "using Markdown")
@@ -134,13 +154,16 @@ function save_notebook(io, notebook::Notebook)
     
     for c in cells_ordered
         println(io, _cell_id_delimiter, string(c.cell_id))
-        metadata_toml = strip(sprint(TOML.print, get_cell_metadata_no_default(c)))
-        if metadata_toml != ""
-            for line in split(metadata_toml, "\n")
-                println(io, _cell_metadata_prefix, line)
+        
+        let metadata_toml = strip(sprint(TOML.print, get_metadata_no_default(c)))
+            if metadata_toml != ""
+                for line in split(metadata_toml, "\n")
+                    println(io, _cell_metadata_prefix, line)
+                end
             end
         end
-        cell_running_disabled = c.metadata["disabled"]
+        
+        cell_running_disabled = get(c.metadata, "disabled", false)::Bool
         if cell_running_disabled || c.depends_on_disabled_cells
             print(io, _disabled_prefix)
             print(io, replace(c.code, _cell_id_delimiter => "# "))
@@ -210,7 +233,10 @@ save_notebook(notebook::Notebook) = save_notebook(notebook, notebook.path)
 
 "Load a notebook without saving it or creating a backup; returns a `Notebook`. REMEMBER TO CHANGE THE NOTEBOOK PATH after loading it to prevent it from autosaving and overwriting the original file."
 function load_notebook_nobackup(@nospecialize(io::IO), @nospecialize(path::AbstractString))::Notebook
-    firstline = String(readline(io))::String
+    
+    ## HEADER
+    
+    firstline = String(readline(io))
 
     if firstline != _notebook_header
         error("File is not a Pluto.jl notebook")
@@ -220,12 +246,28 @@ function load_notebook_nobackup(@nospecialize(io::IO), @nospecialize(path::Abstr
     if file_VERSION_STR != PLUTO_VERSION_STR
         # @info "Loading a notebook saved with Pluto $(file_VERSION_STR). This is Pluto $(PLUTO_VERSION_STR)."
     end
+    
+    # Read all remaining file contents before the first cell delimiter.
+    header_content = readuntil(io, _cell_id_delimiter)
+    header_lines = split(header_content, "\n")
+    
+    nb_prefix_length = ncodeunits(_notebook_metadata_prefix)
+    nb_metadata_toml_lines = String[
+        line[begin+nb_prefix_length:end]
+        for line in header_lines if startswith(line, _notebook_metadata_prefix)
+    ]
+    
+    notebook_metadata = try
+        create_notebook_metadata(TOML.parse(join(nb_metadata_toml_lines, "\n")))
+    catch e
+        @error "Failed to parse embedded TOML content" exception=(e, catch_backtrace())
+        DEFAULT_NOTEBOOK_METADATA
+    end
 
+    
+    ### CELLS
+    
     collected_cells = Dict{UUID,Cell}()
-
-    # ignore first bits of file
-    readuntil(io, _cell_id_delimiter)
-
     while !eof(io)
         cell_id_str = String(readline(io))
         if cell_id_str == "Cell order:"
@@ -257,7 +299,12 @@ function load_notebook_nobackup(@nospecialize(io::IO), @nospecialize(path::Abstr
             code = code_normalised[1:prevind(code_normalised, end, length(_cell_suffix))]
 
             # parse metadata
-            metadata = Dict{String, Any}(DEFAULT_METADATA..., TOML.parse(join(metadata_toml_lines, "\n"))...)
+            metadata = try
+                create_cell_metadata(TOML.parse(join(metadata_toml_lines, "\n")))
+            catch
+                @error "Failed to parse embedded TOML content" cell_id exception=(e, catch_backtrace())
+                DEFAULT_CELL_METADATA
+            end
 
             read_cell = Cell(; cell_id, code, metadata)
             collected_cells[cell_id] = read_cell
@@ -335,6 +382,7 @@ function load_notebook_nobackup(@nospecialize(io::IO), @nospecialize(path::Abstr
         path=path, 
         nbpkg_ctx=nbpkg_ctx, 
         nbpkg_installed_versions_cache=nbpkg_cache(nbpkg_ctx),
+        metadata=notebook_metadata,
     )
 end
 
@@ -422,3 +470,10 @@ function sample_notebook(name::String)
     nb.path = tempname() * ".jl"
     nb
 end
+
+create_cell_metadata(metadata::Dict{String,<:Any}) = merge(DEFAULT_CELL_METADATA, metadata)
+create_notebook_metadata(metadata::Dict{String,<:Any}) = merge(DEFAULT_NOTEBOOK_METADATA, metadata)
+get_metadata(cell::Cell)::Dict{String,Any} = cell.metadata
+get_metadata(notebook::Notebook)::Dict{String,Any} = notebook.metadata
+get_metadata_no_default(cell::Cell)::Dict{String,Any} = Dict{String,Any}(setdiff(pairs(cell.metadata), pairs(DEFAULT_CELL_METADATA)))
+get_metadata_no_default(notebook::Notebook)::Dict{String,Any} = Dict{String,Any}(setdiff(pairs(notebook.metadata), pairs(DEFAULT_NOTEBOOK_METADATA)))
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 3671d900fd..a74a09b762 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -147,6 +147,7 @@ function notebook_to_js(notebook::Notebook)
                 "value" => bondvalue.value, 
             )
         for (key, bondvalue) in notebook.bonds),
+        "metadata" => notebook.metadata,
         "nbpkg" => let
             ctx = notebook.nbpkg_ctx
             Dict{String,Any}(
@@ -267,6 +268,12 @@ const effects_of_changed_state = Dict(
             Firebasey.applypatch!(request.notebook, patch)
             [BondChanged(name, patch isa Firebasey.AddPatch)]
         end,
+    ),
+    "metadata" => Dict(
+        Wildcard() => function(property; request::ClientRequest, patch::Firebasey.JSONPatch)
+            Firebasey.applypatch!(request.notebook, patch)
+            [FileChanged()]
+        end
     )
 )
 
diff --git a/test/Notebook.jl b/test/Notebook.jl
index 16993701ee..553092a742 100644
--- a/test/Notebook.jl
+++ b/test/Notebook.jl
@@ -1,5 +1,5 @@
 using Test
-import Pluto: Notebook, ServerSession, ClientSession, Cell, load_notebook, load_notebook_nobackup, save_notebook, WorkspaceManager, cutename, numbered_until_new, readwrite, without_pluto_file_extension, update_run!, get_cell_metadata_no_default, is_disabled, create_metadata
+import Pluto: Notebook, ServerSession, ClientSession, Cell, load_notebook, load_notebook_nobackup, save_notebook, WorkspaceManager, cutename, numbered_until_new, readwrite, without_pluto_file_extension, update_run!, get_metadata_no_default, is_disabled, create_cell_metadata
 import Pluto.WorkspaceManager: poll, WorkspaceManager
 import Random
 import Pkg
@@ -30,7 +30,7 @@ function basic_notebook()
     ]) |> init_packages!
 end
 
-function metadata_notebook()
+function cell_metadata_notebook()
     Notebook([
         Cell(
             code="100*a + b",
@@ -41,11 +41,28 @@ function metadata_notebook()
                     "number" => 10000,
                 ),
                 "disabled" => true,
-            ) |> create_metadata,
+            ) |> create_cell_metadata,
         ),
     ]) |> init_packages!
 end
 
+function notebook_metadata_notebook()
+    nb = Notebook([
+        Cell(code="n * (n + 1) / 2"),
+    ]) |> init_packages!
+    nb.metadata = Dict(
+        "boolean" => true,
+        "string" => "String",
+        "number" => 10000,
+        "ozymandias" => Dict(
+            "l1" => "And on the pedestal, these words appear:",
+            "l2" => "My name is Ozymandias, King of Kings;",
+            "l3" => "Look on my Works, ye Mighty, and despair!",
+        ),
+    )
+    nb
+end
+
 function shuffled_notebook()
     Notebook([
         Cell("z = y"),
@@ -158,17 +175,17 @@ end
         end
     end
 
-    @testset "Metadata" begin
+    @testset "Cell Metadata" begin
         🍭 = ServerSession()
         🍭.options.evaluation.workspace_use_distributed = false
         fakeclient = ClientSession(:fake, nothing)
         🍭.connected_clients[fakeclient.id] = fakeclient
 
         @testset "Disabling & Metadata" begin
-            nb = metadata_notebook()
+            nb = cell_metadata_notebook()
             update_run!(🍭, nb, nb.cells)
             cell = first(values(nb.cells_dict))
-            @test get_cell_metadata_no_default(cell) == Dict(
+            @test get_metadata_no_default(cell) == Dict(
                 "a metadata tag" => Dict(
                     "boolean" => true,
                     "string" => "String",
@@ -182,7 +199,7 @@ end
             @test_notebook_inputs_equal(nb, result)
             cell = first(nb.cells)
             @test is_disabled(cell)
-            @test get_cell_metadata_no_default(cell) == Dict(
+            @test get_metadata_no_default(cell) == Dict(
                 "a metadata tag" => Dict(
                     "boolean" => true,
                     "string" => "String",
@@ -190,9 +207,82 @@ end
                 ),
                 "disabled" => true,
             )
+            
+            WorkspaceManager.unmake_workspace((🍭, nb); verbose=false)
         end
     end
 
+    @testset "Notebook Metadata" begin
+        🍭 = ServerSession()
+        🍭.options.evaluation.workspace_use_distributed = false
+        fakeclient = ClientSession(:fake, nothing)
+        🍭.connected_clients[fakeclient.id] = fakeclient
+
+        nb = notebook_metadata_notebook()
+        update_run!(🍭, nb, nb.cells)
+        
+        @test nb.metadata == Dict(
+            "boolean" => true,
+            "string" => "String",
+            "number" => 10000,
+            "ozymandias" => Dict(
+                "l1" => "And on the pedestal, these words appear:",
+                "l2" => "My name is Ozymandias, King of Kings;",
+                "l3" => "Look on my Works, ye Mighty, and despair!",
+            ),
+        )
+
+        save_notebook(nb)
+        nb_loaded = load_notebook_nobackup(nb.path)
+        @test nb.metadata == nb_loaded.metadata
+        
+        WorkspaceManager.unmake_workspace((🍭, nb); verbose=false)
+    end
+    
+    @testset "More Metadata" begin
+        test_file_contents = """
+        ### A Pluto.jl notebook ###
+        # v0.19.4
+        
+        @hello from the future where we might put extra stuff here
+        
+        #> [hello]
+        #> world = [1, 2, 3]
+        
+        using Markdown
+        using SecretThings
+        
+        # asdfasdf
+
+        # ╔═╡ a86be878-d616-11ec-05a3-c902726cee5f
+        # ╠═╡ disabled = true
+        # ╠═╡ fonsi = 123
+        #=╠═╡
+        1 + 1
+        ╠═╡ =#
+
+        # ╔═╡ Cell order:
+        # ╠═a86be878-d616-11ec-05a3-c902726cee5f
+        
+        # ok thx byeeeee
+        
+        """
+        
+        test_filename = tempname()
+        write(test_filename, test_file_contents)
+        nb = load_notebook_nobackup(test_filename)
+        @test nb.metadata == Dict(
+            "hello" => Dict(
+                "world" => [1,2,3],
+            )
+        )
+        
+        @test get_metadata_no_default(only(nb.cells)) == Dict(
+            "disabled" => true,
+            "fonsi" => 123,
+        )
+    end
+
     @testset "I/O overloaded" begin
         @testset "$(name)" for (name, nb) in nbs
             let
diff --git a/test/helpers.jl b/test/helpers.jl
index 6720378363..2a81f44010 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -155,7 +155,7 @@ macro test_notebook_inputs_equal(nbA, nbB, check_paths_equality::Bool=true)
         @test getproperty.(nbA.cells, :cell_id) == getproperty.(nbB.cells, :cell_id)
         @test getproperty.(nbA.cells, :code_folded) == getproperty.(nbB.cells, :code_folded)
         @test getproperty.(nbA.cells, :code) == getproperty.(nbB.cells, :code)
-        @test get_cell_metadata_no_default.(nbA.cells) ==  get_cell_metadata_no_default.(nbB.cells)
+        @test get_metadata_no_default.(nbA.cells) ==  get_metadata_no_default.(nbB.cells)
         
     end |> Base.remove_linenums!
 end

From a2b1e7a2eb4913415f96fe0ab4b3bfd9d88619d3 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 17 May 2022 23:14:52 +0200
Subject: [PATCH 306/821] move some files around

---
 src/Pluto.jl                                  |   3 +-
 src/notebook/Notebook.jl                      | 365 -----------------
 .../{PathHelpers.jl => path helpers.jl}       |   0
 src/notebook/saving and loading.jl            | 382 ++++++++++++++++++
 4 files changed, 384 insertions(+), 366 deletions(-)
 rename src/notebook/{PathHelpers.jl => path helpers.jl} (100%)
 create mode 100644 src/notebook/saving and loading.jl

diff --git a/src/Pluto.jl b/src/Pluto.jl
index 654fa0e777..835fea5eb8 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -39,7 +39,7 @@ const PLUTO_VERSION = VersionNumber(Pkg.TOML.parsefile(joinpath(ROOT_DIR, "Proje
 const PLUTO_VERSION_STR = 'v' * string(PLUTO_VERSION)
 const JULIA_VERSION_STR = 'v' * string(VERSION)
 
-include("./notebook/PathHelpers.jl")
+include("./notebook/path helpers.jl")
 include("./notebook/Export.jl")
 include("./Configuration.jl")
 
@@ -57,6 +57,7 @@ include("./analysis/Topology.jl")
 include("./analysis/Errors.jl")
 include("./analysis/TopologicalOrder.jl")
 include("./notebook/Notebook.jl")
+include("./notebook/saving and loading.jl")
 include("./notebook/frontmatter.jl")
 include("./notebook/Events.jl")
 include("./webserver/Session.jl")
diff --git a/src/notebook/Notebook.jl b/src/notebook/Notebook.jl
index 83bfd6aba1..6c32708738 100644
--- a/src/notebook/Notebook.jl
+++ b/src/notebook/Notebook.jl
@@ -99,371 +99,6 @@ end
 
 emptynotebook(args...) = Notebook([Cell()], args...)
 
-
-const _notebook_header = "### A Pluto.jl notebook ###"
-const _notebook_metadata_prefix = "#> "
-# We use a creative delimiter to avoid accidental use in code
-# so don't get inspired to suddenly use these in your code!
-const _cell_id_delimiter = "# ╔═╡ "
-const _cell_metadata_prefix = "# ╠═╡ "
-const _order_delimiter = "# ╠═"
-const _order_delimiter_folded = "# ╟─"
-const _cell_suffix = "\n\n"
-
-const _disabled_prefix = "#=╠═╡\n"
-const _disabled_suffix = "\n  ╠═╡ =#"
-
-const _ptoml_cell_id = UUID(1)
-const _mtoml_cell_id = UUID(2)
-
-
-"""
-Save the notebook to `io`, `file` or to `notebook.path`.
-
-In the produced file, cells are not saved in the notebook order. If `notebook.topology` is up-to-date, I will save cells in _topological order_. This guarantees that you can run the notebook file outside of Pluto, with `julia my_notebook.jl`.
-
-Have a look at our [JuliaCon 2020 presentation](https://youtu.be/IAF8DjrQSSk?t=1085) to learn more!
-"""
-function save_notebook(io, notebook::Notebook)
-    println(io, _notebook_header)
-    println(io, "# ", PLUTO_VERSION_STR)
-    
-    # Notebook metadata
-    let nb_metadata_toml = strip(sprint(TOML.print, get_metadata_no_default(notebook)))
-        if !isempty(nb_metadata_toml)
-            println(io)
-            for line in split(nb_metadata_toml, "\n")
-                println(io, _notebook_metadata_prefix, line)
-            end
-        end
-    end
-
-    # Anything between the version string and the first UUID delimiter will be ignored by the notebook loader.
-    println(io, "")
-    println(io, "using Markdown")
-    println(io, "using InteractiveUtils")
-    # Super Advanced Code Analysis™ to add the @bind macro to the saved file if it's used somewhere.
-    if any(occursin("@bind", c.code) for c in notebook.cells)
-        println(io, "")
-        println(io, "# This Pluto notebook uses @bind for interactivity. When running this notebook outside of Pluto, the following 'mock version' of @bind gives bound variables a default value (instead of an error).")
-        println(io, PlutoRunner.fake_bind)
-    end
-    println(io)
-
-    cells_ordered = collect(topological_order(notebook))
-    
-    for c in cells_ordered
-        println(io, _cell_id_delimiter, string(c.cell_id))
-        
-        let metadata_toml = strip(sprint(TOML.print, get_metadata_no_default(c)))
-            if metadata_toml != ""
-                for line in split(metadata_toml, "\n")
-                    println(io, _cell_metadata_prefix, line)
-                end
-            end
-        end
-        
-        cell_running_disabled = get(c.metadata, "disabled", false)::Bool
-        if cell_running_disabled || c.depends_on_disabled_cells
-            print(io, _disabled_prefix)
-            print(io, replace(c.code, _cell_id_delimiter => "# "))
-            print(io, _disabled_suffix)
-            print(io, _cell_suffix)
-        else
-            # write the cell code and prevent collisions with the cell delimiter
-            print(io, replace(c.code, _cell_id_delimiter => "# "))
-            print(io, _cell_suffix)
-        end
-    end
-
-    
-    using_plutopkg = notebook.nbpkg_ctx !== nothing
-    
-    write_package = if using_plutopkg
-        ptoml_contents = PkgCompat.read_project_file(notebook)
-        mtoml_contents = PkgCompat.read_manifest_file(notebook)
-        
-        !isempty(strip(ptoml_contents))
-    else
-        false
-    end
-
-    if write_package
-        println(io, _cell_id_delimiter, string(_ptoml_cell_id))
-        print(io, "PLUTO_PROJECT_TOML_CONTENTS = \"\"\"\n")
-        write(io, ptoml_contents)
-        print(io, "\"\"\"")
-        print(io, _cell_suffix)
-        
-        println(io, _cell_id_delimiter, string(_mtoml_cell_id))
-        print(io, "PLUTO_MANIFEST_TOML_CONTENTS = \"\"\"\n")
-        write(io, mtoml_contents)
-        print(io, "\"\"\"")
-        print(io, _cell_suffix)
-    end
-    
-
-    println(io, _cell_id_delimiter, "Cell order:")
-    for c in notebook.cells
-        delim = c.code_folded ? _order_delimiter_folded : _order_delimiter
-        println(io, delim, string(c.cell_id))
-    end
-    if write_package
-        println(io, _order_delimiter_folded, string(_ptoml_cell_id))
-        println(io, _order_delimiter_folded, string(_mtoml_cell_id))
-    end
-
-    notebook
-end
-
-function write_buffered(fn::Function, path)
-    file_content = sprint(fn)
-    write(path, file_content)
-end
-    
-function save_notebook(notebook::Notebook, path::String)
-    # @warn "Saving to file!!" exception=(ErrorException(""), backtrace())
-    notebook.last_save_time = time()
-    write_buffered(path) do io
-        save_notebook(io, notebook)
-    end
-end
-
-save_notebook(notebook::Notebook) = save_notebook(notebook, notebook.path)
-
-"Load a notebook without saving it or creating a backup; returns a `Notebook`. REMEMBER TO CHANGE THE NOTEBOOK PATH after loading it to prevent it from autosaving and overwriting the original file."
-function load_notebook_nobackup(@nospecialize(io::IO), @nospecialize(path::AbstractString))::Notebook
-    
-    ## HEADER
-    
-    firstline = String(readline(io))
-
-    if firstline != _notebook_header
-        error("File is not a Pluto.jl notebook")
-    end
-
-    file_VERSION_STR = readline(io)[3:end]
-    if file_VERSION_STR != PLUTO_VERSION_STR
-        # @info "Loading a notebook saved with Pluto $(file_VERSION_STR). This is Pluto $(PLUTO_VERSION_STR)."
-    end
-    
-    # Read all remaining file contents before the first cell delimiter.
-    header_content = readuntil(io, _cell_id_delimiter)
-    header_lines = split(header_content, "\n")
-    
-    nb_prefix_length = ncodeunits(_notebook_metadata_prefix)
-    nb_metadata_toml_lines = String[
-        line[begin+nb_prefix_length:end]
-        for line in header_lines if startswith(line, _notebook_metadata_prefix)
-    ]
-    
-    notebook_metadata = try
-        create_notebook_metadata(TOML.parse(join(nb_metadata_toml_lines, "\n")))
-    catch e
-        @error "Failed to parse embedded TOML content" exception=(e, catch_backtrace())
-        DEFAULT_NOTEBOOK_METADATA
-    end
-
-    
-    ### CELLS
-    
-    collected_cells = Dict{UUID,Cell}()
-    while !eof(io)
-        cell_id_str = String(readline(io))
-        if cell_id_str == "Cell order:"
-            break
-        else
-            cell_id = UUID(cell_id_str)
-            
-            metadata_toml_lines = String[]
-            initial_code_line = ""
-            while !eof(io)
-                line = String(readline(io))
-                if startswith(line, _cell_metadata_prefix)
-                    prefix_length = ncodeunits(_cell_metadata_prefix)
-                    push!(metadata_toml_lines, line[begin+prefix_length:end])
-                else
-                    initial_code_line = line
-                    break
-                end
-            end
-
-            code_raw = initial_code_line * "\n" * String(readuntil(io, _cell_id_delimiter))
-            # change Windows line endings to Linux
-            code_normalised = replace(code_raw, "\r\n" => "\n")
-
-            # remove the disabled on startup comments for further processing in Julia
-            code_normalised = replace(replace(code_normalised, _disabled_prefix => ""), _disabled_suffix => "")
-
-            # remove the cell suffix
-            code = code_normalised[1:prevind(code_normalised, end, length(_cell_suffix))]
-
-            # parse metadata
-            metadata = try
-                create_cell_metadata(TOML.parse(join(metadata_toml_lines, "\n")))
-            catch
-                @error "Failed to parse embedded TOML content" cell_id exception=(e, catch_backtrace())
-                DEFAULT_CELL_METADATA
-            end
-
-            read_cell = Cell(; cell_id, code, metadata)
-            collected_cells[cell_id] = read_cell
-        end
-    end
-
-    cell_order = UUID[]
-    while !eof(io)
-        cell_id_str = String(readline(io))
-        if length(cell_id_str) >= 36 && (startswith(cell_id_str, _order_delimiter_folded) || startswith(cell_id_str, _order_delimiter))
-            cell_id = let
-                UUID(cell_id_str[end - 35:end])
-            end
-            next_cell = get(collected_cells, cell_id, nothing)
-            if next_cell !== nothing
-                next_cell.code_folded = startswith(cell_id_str, _order_delimiter_folded)
-            end
-            push!(cell_order, cell_id)
-        else
-            break
-        end
-    end
-
-    read_package = 
-        _ptoml_cell_id ∈ cell_order && 
-        _mtoml_cell_id ∈ cell_order && 
-        haskey(collected_cells, _ptoml_cell_id) && 
-        haskey(collected_cells, _mtoml_cell_id)
-
-    nbpkg_ctx = if read_package
-        ptoml_code = collected_cells[_ptoml_cell_id].code
-        mtoml_code = collected_cells[_mtoml_cell_id].code
-
-        ptoml_contents = lstrip(split(ptoml_code, "\"\"\"")[2])
-        mtoml_contents = lstrip(split(mtoml_code, "\"\"\"")[2])
-
-        env_dir = mktempdir()
-        write(joinpath(env_dir, "Project.toml"), ptoml_contents)
-        write(joinpath(env_dir, "Manifest.toml"), mtoml_contents)
-
-        try
-            PkgCompat.load_ctx(env_dir)
-        catch e
-            @error "Failed to load notebook files: Project.toml+Manifest.toml parse error. Trying to recover Project.toml without Manifest.toml..." exception=(e,catch_backtrace())
-            try
-                rm(joinpath(env_dir, "Manifest.toml"))
-                PkgCompat.load_ctx(env_dir)
-            catch e
-                @error "Failed to load notebook files: Project.toml parse error." exception=(e,catch_backtrace())
-                PkgCompat.create_empty_ctx()
-            end
-        end
-    else
-        PkgCompat.create_empty_ctx()
-    end
-
-    appeared_order = setdiff!(
-        union!(
-            # don't include cells that only appear in the order, but no code was given
-            intersect!(cell_order, keys(collected_cells)),
-            # add cells that appeared in code, but not in the order.
-            keys(collected_cells)
-        ), 
-        # remove Pkg cells
-        (_ptoml_cell_id, _mtoml_cell_id)
-    )
-    appeared_cells_dict = filter(collected_cells) do (k, v)
-        k ∈ appeared_order
-    end
-
-    Notebook(;
-        cells_dict=appeared_cells_dict, 
-        cell_order=appeared_order,
-        topology=_initial_topology(appeared_cells_dict, appeared_order),
-        path=path, 
-        nbpkg_ctx=nbpkg_ctx, 
-        nbpkg_installed_versions_cache=nbpkg_cache(nbpkg_ctx),
-        metadata=notebook_metadata,
-    )
-end
-
-function load_notebook_nobackup(path::String)::Notebook
-    local loaded
-    open(path, "r") do io
-        loaded = load_notebook_nobackup(io, path)
-    end
-    loaded
-end
-
-"Create a backup of the given file, load the file as a .jl Pluto notebook, save the loaded notebook, compare the two files, and delete the backup of the newly saved file is equal to the backup."
-function load_notebook(path::String; disable_writing_notebook_files::Bool=false)::Notebook
-    backup_path = backup_filename(path)
-    # local backup_num = 1
-    # backup_path = path
-    # while isfile(backup_path)
-    #     backup_path = path * ".backup" * string(backup_num)
-    #     backup_num += 1
-    # end
-    disable_writing_notebook_files || readwrite(path, backup_path)
-
-    loaded = load_notebook_nobackup(path)
-    # Analyze cells so that the initial save is in topological order
-    loaded.topology = updated_topology(loaded.topology, loaded, loaded.cells) |> static_resolve_topology
-    update_dependency_cache!(loaded)
-
-    disable_writing_notebook_files || save_notebook(loaded)
-    loaded.topology = NotebookTopology(; cell_order=ImmutableVector(loaded.cells))
-
-    disable_writing_notebook_files || if only_versions_or_lineorder_differ(path, backup_path)
-        rm(backup_path)
-    else
-        @warn "Old Pluto notebook might not have loaded correctly. Backup saved to: " backup_path
-    end
-
-    loaded
-end
-
-_after_first_cell(lines) = lines[something(findfirst(startswith(_cell_id_delimiter), lines), 1):end]
-
-"""
-Check if two savefiles are identical, up to their version numbers and a possible line shuffle.
-
-If a notebook has not yet had all of its cells analysed, we can't deduce the topological cell order. (but can we ever??) (no)
-"""
-function only_versions_or_lineorder_differ(pathA::AbstractString, pathB::AbstractString)::Bool
-    Set(readlines(pathA) |> _after_first_cell) == Set(readlines(pathB) |> _after_first_cell)
-end
-
-function only_versions_differ(pathA::AbstractString, pathB::AbstractString)::Bool
-    readlines(pathA) |> _after_first_cell == readlines(pathB) |> _after_first_cell
-end
-
-"Set `notebook.path` to the new value, save the notebook, verify file integrity, and if all OK, delete the old savefile. Normalizes the given path to make it absolute. Moving is always hard. 😢"
-function move_notebook!(notebook::Notebook, newpath::String; disable_writing_notebook_files::Bool=false)
-    # Will throw exception and return if anything goes wrong, so at least one file is guaranteed to exist.
-    oldpath_tame = tamepath(notebook.path)
-    newpath_tame = tamepath(newpath)
-
-    if !disable_writing_notebook_files
-        save_notebook(notebook, oldpath_tame)
-        save_notebook(notebook, newpath_tame)
-
-        # @assert that the new file looks alright
-        @assert only_versions_differ(oldpath_tame, newpath_tame)
-
-        notebook.path = newpath_tame
-
-        if oldpath_tame != newpath_tame
-            rm(oldpath_tame)
-        end
-    else
-        notebook.path = newpath_tame
-    end
-    if isdir("$oldpath_tame.assets")
-        mv("$oldpath_tame.assets", "$newpath_tame.assets")
-    end
-    notebook
-end
-
 function sample_notebook(name::String)
     file = project_relative_path("sample", name * ".jl")
     nb = load_notebook_nobackup(file)
diff --git a/src/notebook/PathHelpers.jl b/src/notebook/path helpers.jl
similarity index 100%
rename from src/notebook/PathHelpers.jl
rename to src/notebook/path helpers.jl
diff --git a/src/notebook/saving and loading.jl b/src/notebook/saving and loading.jl
new file mode 100644
index 0000000000..b1d7fa46bf
--- /dev/null
+++ b/src/notebook/saving and loading.jl	
@@ -0,0 +1,382 @@
+
+
+const _notebook_header = "### A Pluto.jl notebook ###"
+const _notebook_metadata_prefix = "#> "
+# We use a creative delimiter to avoid accidental use in code
+# so don't get inspired to suddenly use these in your code!
+const _cell_id_delimiter = "# ╔═╡ "
+const _cell_metadata_prefix = "# ╠═╡ "
+const _order_delimiter = "# ╠═"
+const _order_delimiter_folded = "# ╟─"
+const _cell_suffix = "\n\n"
+
+const _disabled_prefix = "#=╠═╡\n"
+const _disabled_suffix = "\n  ╠═╡ =#"
+
+const _ptoml_cell_id = UUID(1)
+const _mtoml_cell_id = UUID(2)
+
+
+###
+# SAVING
+###
+
+
+"""
+Save the notebook to `io`, `file` or to `notebook.path`.
+
+In the produced file, cells are not saved in the notebook order. If `notebook.topology` is up-to-date, I will save cells in _topological order_. This guarantees that you can run the notebook file outside of Pluto, with `julia my_notebook.jl`.
+
+Have a look at our [JuliaCon 2020 presentation](https://youtu.be/IAF8DjrQSSk?t=1085) to learn more!
+"""
+function save_notebook(io::IO, notebook::Notebook)
+    println(io, _notebook_header)
+    println(io, "# ", PLUTO_VERSION_STR)
+    
+    # Notebook metadata
+    let nb_metadata_toml = strip(sprint(TOML.print, get_metadata_no_default(notebook)))
+        if !isempty(nb_metadata_toml)
+            println(io)
+            for line in split(nb_metadata_toml, "\n")
+                println(io, _notebook_metadata_prefix, line)
+            end
+        end
+    end
+
+    # Anything between the version string and the first UUID delimiter will be ignored by the notebook loader.
+    println(io, "")
+    println(io, "using Markdown")
+    println(io, "using InteractiveUtils")
+    # Super Advanced Code Analysis™ to add the @bind macro to the saved file if it's used somewhere.
+    if any(occursin("@bind", c.code) for c in notebook.cells)
+        println(io, "")
+        println(io, "# This Pluto notebook uses @bind for interactivity. When running this notebook outside of Pluto, the following 'mock version' of @bind gives bound variables a default value (instead of an error).")
+        println(io, PlutoRunner.fake_bind)
+    end
+    println(io)
+
+    cells_ordered = collect(topological_order(notebook))
+    
+    for c in cells_ordered
+        println(io, _cell_id_delimiter, string(c.cell_id))
+        
+        let metadata_toml = strip(sprint(TOML.print, get_metadata_no_default(c)))
+            if metadata_toml != ""
+                for line in split(metadata_toml, "\n")
+                    println(io, _cell_metadata_prefix, line)
+                end
+            end
+        end
+        
+        cell_running_disabled = get(c.metadata, "disabled", false)::Bool
+        if cell_running_disabled || c.depends_on_disabled_cells
+            print(io, _disabled_prefix)
+            print(io, replace(c.code, _cell_id_delimiter => "# "))
+            print(io, _disabled_suffix)
+            print(io, _cell_suffix)
+        else
+            # write the cell code and prevent collisions with the cell delimiter
+            print(io, replace(c.code, _cell_id_delimiter => "# "))
+            print(io, _cell_suffix)
+        end
+    end
+
+    
+    using_plutopkg = notebook.nbpkg_ctx !== nothing
+    
+    write_package = if using_plutopkg
+        ptoml_contents = PkgCompat.read_project_file(notebook)
+        mtoml_contents = PkgCompat.read_manifest_file(notebook)
+        
+        !isempty(strip(ptoml_contents))
+    else
+        false
+    end
+
+    if write_package
+        println(io, _cell_id_delimiter, string(_ptoml_cell_id))
+        print(io, "PLUTO_PROJECT_TOML_CONTENTS = \"\"\"\n")
+        write(io, ptoml_contents)
+        print(io, "\"\"\"")
+        print(io, _cell_suffix)
+        
+        println(io, _cell_id_delimiter, string(_mtoml_cell_id))
+        print(io, "PLUTO_MANIFEST_TOML_CONTENTS = \"\"\"\n")
+        write(io, mtoml_contents)
+        print(io, "\"\"\"")
+        print(io, _cell_suffix)
+    end
+    
+
+    println(io, _cell_id_delimiter, "Cell order:")
+    for c in notebook.cells
+        delim = c.code_folded ? _order_delimiter_folded : _order_delimiter
+        println(io, delim, string(c.cell_id))
+    end
+    if write_package
+        println(io, _order_delimiter_folded, string(_ptoml_cell_id))
+        println(io, _order_delimiter_folded, string(_mtoml_cell_id))
+    end
+
+    notebook
+end
+
+# UTILS
+
+function write_buffered(fn::Function, path)
+    file_content = sprint(fn)
+    write(path, file_content)
+end
+    
+function save_notebook(notebook::Notebook, path::String)
+    # @warn "Saving to file!!" exception=(ErrorException(""), backtrace())
+    notebook.last_save_time = time()
+    write_buffered(path) do io
+        save_notebook(io, notebook)
+    end
+end
+
+save_notebook(notebook::Notebook) = save_notebook(notebook, notebook.path)
+
+
+###
+# LOADING
+###
+
+
+"Load a notebook without saving it or creating a backup; returns a `Notebook`. REMEMBER TO CHANGE THE NOTEBOOK PATH after loading it to prevent it from autosaving and overwriting the original file."
+function load_notebook_nobackup(@nospecialize(io::IO), @nospecialize(path::AbstractString))::Notebook
+    
+    ## HEADER
+    
+    firstline = String(readline(io))
+
+    if firstline != _notebook_header
+        error("File is not a Pluto.jl notebook")
+    end
+
+    file_VERSION_STR = readline(io)[3:end]
+    if file_VERSION_STR != PLUTO_VERSION_STR
+        # @info "Loading a notebook saved with Pluto $(file_VERSION_STR). This is Pluto $(PLUTO_VERSION_STR)."
+    end
+    
+    # Read all remaining file contents before the first cell delimiter.
+    header_content = readuntil(io, _cell_id_delimiter)
+    header_lines = split(header_content, "\n")
+    
+    nb_prefix_length = ncodeunits(_notebook_metadata_prefix)
+    nb_metadata_toml_lines = String[
+        line[begin+nb_prefix_length:end]
+        for line in header_lines if startswith(line, _notebook_metadata_prefix)
+    ]
+    
+    notebook_metadata = try
+        create_notebook_metadata(TOML.parse(join(nb_metadata_toml_lines, "\n")))
+    catch e
+        @error "Failed to parse embedded TOML content" exception=(e, catch_backtrace())
+        DEFAULT_NOTEBOOK_METADATA
+    end
+
+    
+    ### CELLS
+    
+    collected_cells = Dict{UUID,Cell}()
+    while !eof(io)
+        cell_id_str = String(readline(io))
+        if cell_id_str == "Cell order:"
+            break
+        else
+            cell_id = UUID(cell_id_str)
+            
+            metadata_toml_lines = String[]
+            initial_code_line = ""
+            while !eof(io)
+                line = String(readline(io))
+                if startswith(line, _cell_metadata_prefix)
+                    prefix_length = ncodeunits(_cell_metadata_prefix)
+                    push!(metadata_toml_lines, line[begin+prefix_length:end])
+                else
+                    initial_code_line = line
+                    break
+                end
+            end
+
+            code_raw = initial_code_line * "\n" * String(readuntil(io, _cell_id_delimiter))
+            # change Windows line endings to Linux
+            code_normalised = replace(code_raw, "\r\n" => "\n")
+
+            # remove the disabled on startup comments for further processing in Julia
+            code_normalised = replace(replace(code_normalised, _disabled_prefix => ""), _disabled_suffix => "")
+
+            # remove the cell suffix
+            code = code_normalised[1:prevind(code_normalised, end, length(_cell_suffix))]
+
+            # parse metadata
+            metadata = try
+                create_cell_metadata(TOML.parse(join(metadata_toml_lines, "\n")))
+            catch
+                @error "Failed to parse embedded TOML content" cell_id exception=(e, catch_backtrace())
+                DEFAULT_CELL_METADATA
+            end
+
+            read_cell = Cell(; cell_id, code, metadata)
+            collected_cells[cell_id] = read_cell
+        end
+    end
+
+    cell_order = UUID[]
+    while !eof(io)
+        cell_id_str = String(readline(io))
+        if length(cell_id_str) >= 36 && (startswith(cell_id_str, _order_delimiter_folded) || startswith(cell_id_str, _order_delimiter))
+            cell_id = let
+                UUID(cell_id_str[end - 35:end])
+            end
+            next_cell = get(collected_cells, cell_id, nothing)
+            if next_cell !== nothing
+                next_cell.code_folded = startswith(cell_id_str, _order_delimiter_folded)
+            end
+            push!(cell_order, cell_id)
+        else
+            break
+        end
+    end
+
+    read_package = 
+        _ptoml_cell_id ∈ cell_order && 
+        _mtoml_cell_id ∈ cell_order && 
+        haskey(collected_cells, _ptoml_cell_id) && 
+        haskey(collected_cells, _mtoml_cell_id)
+
+    nbpkg_ctx = if read_package
+        ptoml_code = collected_cells[_ptoml_cell_id].code
+        mtoml_code = collected_cells[_mtoml_cell_id].code
+
+        ptoml_contents = lstrip(split(ptoml_code, "\"\"\"")[2])
+        mtoml_contents = lstrip(split(mtoml_code, "\"\"\"")[2])
+
+        env_dir = mktempdir()
+        write(joinpath(env_dir, "Project.toml"), ptoml_contents)
+        write(joinpath(env_dir, "Manifest.toml"), mtoml_contents)
+
+        try
+            PkgCompat.load_ctx(env_dir)
+        catch e
+            @error "Failed to load notebook files: Project.toml+Manifest.toml parse error. Trying to recover Project.toml without Manifest.toml..." exception=(e,catch_backtrace())
+            try
+                rm(joinpath(env_dir, "Manifest.toml"))
+                PkgCompat.load_ctx(env_dir)
+            catch e
+                @error "Failed to load notebook files: Project.toml parse error." exception=(e,catch_backtrace())
+                PkgCompat.create_empty_ctx()
+            end
+        end
+    else
+        PkgCompat.create_empty_ctx()
+    end
+
+    appeared_order = setdiff!(
+        union!(
+            # don't include cells that only appear in the order, but no code was given
+            intersect!(cell_order, keys(collected_cells)),
+            # add cells that appeared in code, but not in the order.
+            keys(collected_cells)
+        ), 
+        # remove Pkg cells
+        (_ptoml_cell_id, _mtoml_cell_id)
+    )
+    appeared_cells_dict = filter(collected_cells) do (k, v)
+        k ∈ appeared_order
+    end
+
+    Notebook(;
+        cells_dict=appeared_cells_dict, 
+        cell_order=appeared_order,
+        topology=_initial_topology(appeared_cells_dict, appeared_order),
+        path=path, 
+        nbpkg_ctx=nbpkg_ctx, 
+        nbpkg_installed_versions_cache=nbpkg_cache(nbpkg_ctx),
+        metadata=notebook_metadata,
+    )
+end
+
+# UTILS
+
+function load_notebook_nobackup(path::String)::Notebook
+    local loaded
+    open(path, "r") do io
+        loaded = load_notebook_nobackup(io, path)
+    end
+    loaded
+end
+
+# BACKUPS
+
+"Create a backup of the given file, load the file as a .jl Pluto notebook, save the loaded notebook, compare the two files, and delete the backup of the newly saved file is equal to the backup."
+function load_notebook(path::String; disable_writing_notebook_files::Bool=false)::Notebook
+    backup_path = backup_filename(path)
+    # local backup_num = 1
+    # backup_path = path
+    # while isfile(backup_path)
+    #     backup_path = path * ".backup" * string(backup_num)
+    #     backup_num += 1
+    # end
+    disable_writing_notebook_files || readwrite(path, backup_path)
+
+    loaded = load_notebook_nobackup(path)
+    # Analyze cells so that the initial save is in topological order
+    loaded.topology = updated_topology(loaded.topology, loaded, loaded.cells) |> static_resolve_topology
+    update_dependency_cache!(loaded)
+
+    disable_writing_notebook_files || save_notebook(loaded)
+    loaded.topology = NotebookTopology(; cell_order=ImmutableVector(loaded.cells))
+
+    disable_writing_notebook_files || if only_versions_or_lineorder_differ(path, backup_path)
+        rm(backup_path)
+    else
+        @warn "Old Pluto notebook might not have loaded correctly. Backup saved to: " backup_path
+    end
+
+    loaded
+end
+
+_after_first_cell(lines) = lines[something(findfirst(startswith(_cell_id_delimiter), lines), 1):end]
+
+"""
+Check if two savefiles are identical, up to their version numbers and a possible line shuffle.
+
+If a notebook has not yet had all of its cells analysed, we can't deduce the topological cell order. (but can we ever??) (no)
+"""
+function only_versions_or_lineorder_differ(pathA::AbstractString, pathB::AbstractString)::Bool
+    Set(readlines(pathA) |> _after_first_cell) == Set(readlines(pathB) |> _after_first_cell)
+end
+
+function only_versions_differ(pathA::AbstractString, pathB::AbstractString)::Bool
+    readlines(pathA) |> _after_first_cell == readlines(pathB) |> _after_first_cell
+end
+
+"Set `notebook.path` to the new value, save the notebook, verify file integrity, and if all OK, delete the old savefile. Normalizes the given path to make it absolute. Moving is always hard. 😢"
+function move_notebook!(notebook::Notebook, newpath::String; disable_writing_notebook_files::Bool=false)
+    # Will throw exception and return if anything goes wrong, so at least one file is guaranteed to exist.
+    oldpath_tame = tamepath(notebook.path)
+    newpath_tame = tamepath(newpath)
+
+    if !disable_writing_notebook_files
+        save_notebook(notebook, oldpath_tame)
+        save_notebook(notebook, newpath_tame)
+
+        # @assert that the new file looks alright
+        @assert only_versions_differ(oldpath_tame, newpath_tame)
+
+        notebook.path = newpath_tame
+
+        if oldpath_tame != newpath_tame
+            rm(oldpath_tame)
+        end
+    else
+        notebook.path = newpath_tame
+    end
+    if isdir("$oldpath_tame.assets")
+        mv("$oldpath_tame.assets", "$newpath_tame.assets")
+    end
+    notebook
+end
\ No newline at end of file

From 089870f933132c7bec7fe894846c1b6a69558d1a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 18 May 2022 00:32:50 +0200
Subject: [PATCH 307/821] Pluto.frontmatter(nb) from nb.metadata (#2110)

---
 src/notebook/frontmatter.jl | 67 ++++++++++--------------------------
 test/Notebook.jl            | 11 +++++-
 test/frontmatter.jl         | 68 -------------------------------------
 test/runtests.jl            |  1 -
 4 files changed, 27 insertions(+), 120 deletions(-)
 delete mode 100644 test/frontmatter.jl

diff --git a/src/notebook/frontmatter.jl b/src/notebook/frontmatter.jl
index 7c3c6e0f20..c5842848e4 100644
--- a/src/notebook/frontmatter.jl
+++ b/src/notebook/frontmatter.jl
@@ -1,63 +1,30 @@
 
 const FrontMatter = Dict{String,Any}
 
-
 """
-    frontmatter(nb::Notebook; raise::Bool=false)::Dict{String,Any}
+	frontmatter(nb::Notebook; raise::Bool=false)::Dict{String,Any}
+	frontmatter(nb_path::String; raise::Bool=false)::Dict{String,Any}
 
 Extract frontmatter from a notebook, which is extra meta-information that the author attaches to the notebook, often including *title*, *description*, *tags*, *author*, and more. Search for *frontmatter* online to learn more.
 
 If `raise` is true, then parsing errors will be rethrown. If `false`, this function will always return a `Dict`.
-
-Currently, you can give frontmatter to a notebook by defining a global variable `frontmatter` anywhere in the notebook, which should be a named tuple. Like so:
-
-```julia
-frontmatter = (
-	title = "⚡️ JavaScript for widgets",
-	description = "A simple notebook demonstrating the Julia syntax essentials",
-	layout = "layout.jlhtml",
-	tags = ["docs", "advanced", "widgets"],
-);
-```
-
-This definition will be picked up (using syntax analysis) and evaluated. Note:
-- You are not allowed to use variables defined in other cells. (But you can *use* `frontmatter` in your notebook.)
-- You can use `;` to hide it from being displayed, only the definition matters.
-
-
-!!! warning
-    This will change in the future, because we might make this a GUI thing! Consider this function in the experimental phase.
 """
 function frontmatter(nb::Notebook; raise::Bool=false)
-    top = updated_topology(nb.topology, nb, nb.cells)
-    
-	cs = where_assigned(top, Set([:frontmatter]))
-	if isempty(cs)
-		FrontMatter()
-	else
-		try
-			c = only(cs)
-			m = Module()
-			Core.eval(m, Meta.parse(c.code))
-			result = Core.eval(m, :frontmatter)
-			if result isa FrontMatter
-				result
-			else
-				FrontMatter(String(k)=>v for (k,v) in pairs(result))
-			end
-		catch e
-            if raise
-                rethrow(e)
-            else
-                @error "Error reading frontmatter. Make sure that `frontmatter` is a `NamedTuple` or a `Dict{String,Any}`, and that it does not use global variables." nb.path exception=(e,catch_backtrace())
-                FrontMatter()
-            end
+	convert(FrontMatter, 
+		get(() -> FrontMatter(), get_metadata(nb), "frontmatter")
+	)
+end
+
+function frontmatter(abs_path::String; raise::Bool=false)
+    try
+		# this will load the notebook to analyse, it won't run it
+		frontmatter(load_notebook_nobackup(abs_path); raise)
+	catch e
+		if raise
+			rethrow(e)
+		else
+			@error "Error reading notebook file." abs_path exception=(e,catch_backtrace())
+			FrontMatter()
 		end
 	end
 end
-
-
-function frontmatter(abs_path::String)
-	# this will load the notebook to analyse, it won't run it
-    frontmatter(load_notebook_nobackup(abs_path))
-end
\ No newline at end of file
diff --git a/test/Notebook.jl b/test/Notebook.jl
index 553092a742..5b8dfb870a 100644
--- a/test/Notebook.jl
+++ b/test/Notebook.jl
@@ -248,6 +248,8 @@ end
         
         #> [hello]
         #> world = [1, 2, 3]
+        #> [frontmatter]
+        #> title = "cool stuff"
         
         using Markdown
         using SecretThings
@@ -274,13 +276,20 @@ end
         @test nb.metadata == Dict(
             "hello" => Dict(
                 "world" => [1,2,3],
-            )
+            ),
+            "frontmatter" => Dict(
+                "title" => "cool stuff",
+            ),
         )
         
         @test get_metadata_no_default(only(nb.cells)) == Dict(
             "disabled" => true,
             "fonsi" => 123,
         )
+        
+        @test Pluto.frontmatter(nb) == Dict(
+            "title" => "cool stuff",
+        )
     end
 
     @testset "I/O overloaded" begin
diff --git a/test/frontmatter.jl b/test/frontmatter.jl
deleted file mode 100644
index 850dce97e0..0000000000
--- a/test/frontmatter.jl
+++ /dev/null
@@ -1,68 +0,0 @@
-using Test
-import Logging
-import Pluto: Configuration, Notebook, ServerSession, ClientSession, update_run!, Cell, WorkspaceManager, save_notebook
-
-
-@testset "Frontmatter" begin
-    d = Dict{String,Any}("title" => 123, "wow" => ["a", "b"])
-    e = Dict{String,Any}()
-    cases = [
-        1 => (
-            Notebook([
-                Cell("""
-                frontmatter = Dict{Any,Any}("title" => 123, "wow" => ["a", "b"])
-                """),
-            ]),
-            d,
-        ),
-        2 => (
-            Notebook([
-                Cell("""
-                frontmatter = (title = 123, wow = ["a", "b"])
-                """),
-            ]),
-            d
-        ),
-        3 => (
-            Notebook([
-                Cell("""
-                frontmatter = 123
-                """),
-            ]),
-            e
-        ),
-        4 => (
-            Notebook([
-                Cell("""
-                frontmatter = 123
-                """),
-                Cell("""
-                frontmatter = 123
-                """),
-            ]),
-            e            
-        ),
-        5 => (
-            Notebook([
-                Cell("""
-                """),
-            ]),
-            e            
-        ),
-    ]
-    
-    @testset "Notebook $i" for (i, (nb, expected)) in cases
-        save_notebook(nb)
-        
-        Logging.with_logger(Logging.NullLogger()) do
-            @test Pluto.frontmatter(nb.path) == expected
-            @test Pluto.frontmatter(nb) == expected
-            @test typeof(Pluto.frontmatter(nb)) === Dict{String,Any}
-        end
-        
-        if i ∈ (3,4)
-            @test_throws Exception Pluto.frontmatter(nb.path, raise=true)
-        end
-        
-    end
-end
diff --git a/test/runtests.jl b/test/runtests.jl
index 8fcebffe43..3b3ce21a51 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -34,7 +34,6 @@ verify_no_running_processes()
 verify_no_running_processes()
 
 # tests that don't start new processes:
-@timeit_include("frontmatter.jl")
 @timeit_include("ReloadFromFile.jl")
 @timeit_include("packages/PkgCompat.jl")
 @timeit_include("ExpressionExplorer.jl")

From 16985ac3c4e0e972182de9045fe4c4c735831879 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 18 May 2022 02:17:29 +0200
Subject: [PATCH 308/821] Use frontmatter for <meta> tags in HTML export
 (#2111)

---
 Project.toml           |  2 ++
 frontend/editor.html   | 23 +++++++++-------
 src/notebook/Export.jl | 61 +++++++++++++++++++++++++++++++++++++++---
 test/Notebook.jl       | 14 +++++++++-
 4 files changed, 87 insertions(+), 13 deletions(-)

diff --git a/Project.toml b/Project.toml
index 02feaba4ec..25d221bda7 100644
--- a/Project.toml
+++ b/Project.toml
@@ -12,6 +12,7 @@ Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 FileWatching = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
 FuzzyCompletions = "fb4132e2-a121-4a70-b8a1-d5b831dcdcc2"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
+HypertextLiteral = "ac1192a8-f4b3-4bfe-ba22-af5b92cd3ab2"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 MIMEs = "6c6e2e6c-3030-632d-7369-2d6c69616d65"
@@ -30,6 +31,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 Configurations = "0.15, 0.16, 0.17"
 FuzzyCompletions = "0.3, 0.4, 0.5"
 HTTP = "^0.9.1"
+HypertextLiteral = "0.7, 0.8, 0.9"
 MIMEs = "0.1"
 MsgPack = "1.1"
 PrecompileSignatures = "3"
diff --git a/frontend/editor.html b/frontend/editor.html
index a5864b7309..50b7987f9b 100644
--- a/frontend/editor.html
+++ b/frontend/editor.html
@@ -1,13 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta name="viewport" content="width=device-width" />
     <meta charset="utf-8" />
-    <script>
-        console.log(
-            "Pluto.jl, by Fons van der Plas (https://github.com/fonsp), Mikołaj Bochenski (https://github.com/malyvsen), Michiel Dral (https://github.com/dralletje) and friends 🌈"
-        )
-    </script>
+    
+    <!-- [automatically generated meta tags can be inserted here] -->
+    
     <meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
     <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#2a2928">
     <meta name="color-scheme" content="light dark">
@@ -17,6 +16,12 @@
     <link rel="icon" type="image/png" sizes="96x96" href="./img/favicon-96x96.png" />
     <link rel="pluto-logo-big" href="./img/logo.svg" />
     <link rel="pluto-logo-small" href="./img/favicon_unsaturated.svg" />
+    
+    <script defer>
+        console.log(
+            "Pluto.jl, by Fons van der Plas (https://github.com/fonsp), Mikołaj Bochenski (https://github.com/malyvsen), Michiel Dral (https://github.com/dralletje) and friends 🌈"
+        )
+    </script>
 
     <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.20/lodash.min.js" defer></script>
     <script src="https://cdn.jsdelivr.net/npm/@observablehq/stdlib@3.3.1/dist/stdlib.js" defer></script>
@@ -44,8 +49,8 @@
 </head>
 
 <body class="loading no-MαθJax">
-<div style="display: flex; min-height: 100vh;">
-<pluto-editor class="fullscreen"></pluto-editor>
-</div>
+    <div style="display: flex; min-height: 100vh;">
+        <pluto-editor class="fullscreen"></pluto-editor>
+    </div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/notebook/Export.jl b/src/notebook/Export.jl
index 5fb1a2c7fe..64bffcad43 100644
--- a/src/notebook/Export.jl
+++ b/src/notebook/Export.jl
@@ -1,5 +1,6 @@
 import Pkg
 using Base64
+using HypertextLiteral
 
 const default_binder_url = "https://mybinder.org/v2/gh/fonsp/pluto-on-binder/v$(string(PLUTO_VERSION))"
 
@@ -27,6 +28,8 @@ function generate_html(;
         preamble_html_js::AbstractString="undefined",
         notebook_id_js::AbstractString="undefined", 
         isolated_cell_ids_js::AbstractString="undefined",
+        
+        header_html::AbstractString="",
     )::String
 
     # Here we don't use frontend-dist (bundled code) yet, might want to
@@ -45,11 +48,17 @@ function generate_html(;
     @debug "Using CDN for Pluto assets:" cdn_root
 
     cdnified = replace(
-    replace(original, 
+        replace(original, 
         "href=\"./" => "href=\"$(cdn_root)"),
         "src=\"./" => "src=\"$(cdn_root)")
 
-    result = replace(cdnified, 
+    result = replace_at_least_once(
+        replace_at_least_once(cdnified, 
+            "<!-- [automatically generated meta tags can be inserted here] -->" => 
+            """
+            $(header_html)
+            <!-- [automatically generated meta tags can be inserted here] -->
+            """),
         "<!-- [automatically generated launch parameters can be inserted here] -->" => 
         """
         <script data-pluto-file="launch-parameters">
@@ -69,6 +78,12 @@ function generate_html(;
     return result
 end
 
+function replace_at_least_once(s, pair)
+    from, to = pair
+    @assert occursin(from, s)
+    replace(s, pair)
+end
+
 
 function generate_html(notebook; kwargs...)::String
     state = notebook_to_js(notebook)
@@ -89,6 +104,46 @@ function generate_html(notebook; kwargs...)::String
         "\"data:;base64,$(statefile64)\""
     end
     
+    fm = frontmatter(notebook)
+    header_html = isempty(fm) ? "" : frontmatter_html(fm) # avoid loading HypertextLiteral if there is no frontmatter
+    
     # We don't set `notebook_id_js` because this is generated by the server, the option is only there for funky setups.
-    generate_html(; statefile_js, notebookfile_js, kwargs...)
+    generate_html(; statefile_js, notebookfile_js, header_html, kwargs...)
+end
+
+
+const frontmatter_writers = (
+    ("title", x -> @htl("""
+        <title>$(x)</title>
+        """)),
+    ("description", x -> @htl("""
+        <meta name="description" content=$(x)>
+        """)),
+    ("tags", x -> x isa Vector ? @htl("$((
+        @htl("""
+            <meta property="og:article:tag" content=$(t)>
+            """)
+        for t in x
+    ))") : nothing),
+)
+
+
+const _og_properties = ("title", "type", "description", "image", "url", "audio", "video", "site_name", "locale", "locale:alternate", "determiner")
+
+const _default_frontmatter = Dict{String, Any}(
+    "type" => "article",
+    # Note: these defaults are skipped when there is no frontmatter at all.
+)
+
+function frontmatter_html(frontmatter::Dict{String,Any}; default_frontmatter::Dict{String,Any}=_default_frontmatter)::String
+    d = merge(default_frontmatter, frontmatter)
+    repr(MIME"text/html"(), 
+        @htl("""$((
+            f(d[key])
+            for (key, f) in frontmatter_writers if haskey(d, key)
+        ))$((
+            @htl("""<meta property=$("og:$(key)") content=$(val)>
+            """)
+            for (key, val) in d if key in _og_properties
+        ))"""))
 end
diff --git a/test/Notebook.jl b/test/Notebook.jl
index 5b8dfb870a..f3d2ef4016 100644
--- a/test/Notebook.jl
+++ b/test/Notebook.jl
@@ -487,7 +487,19 @@ end
 
     @testset "Import & export HTML" begin
         nb = basic_notebook()
-        export_html = Pluto.generate_html(nb)
+        nb.metadata["frontmatter"] = Dict{String,Any}(
+            "title" => "My<Title",
+            "tags" => ["aaa", "bbb"],
+            "description" => "ccc",
+        )
+        export_html = replace(Pluto.generate_html(nb), "'" => "\"")
+        
+        @test occursin("<title>My&lt;Title</title>", export_html)
+        @test occursin("""<meta name="description" content="ccc">""", export_html)
+        @test occursin("""<meta property="og:description" content="ccc">""", export_html)
+        @test occursin("""<meta property="og:article:tag" content="aaa">""", export_html)
+        @test occursin("""<meta property="og:article:tag" content="bbb">""", export_html)
+        @test occursin("""<meta property="og:type" content="article">""", export_html)
 
         embedded_jl = Pluto.embedded_notebookfile(export_html)
         jl_path = tempname()

From dd4097f13704cf8b9b4ee15881dbc71fc23bc255 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 18 May 2022 02:18:07 +0200
Subject: [PATCH 309/821] Frontmatter GUI (#2104)

---
 frontend/components/Editor.js           |   8 ++
 frontend/components/ExportBanner.js     |  19 ++-
 frontend/components/FrontmatterInput.js | 164 ++++++++++++++++++++++++
 frontend/components/Notebook.js         |   2 +-
 frontend/editor.css                     |  54 +++++++-
 5 files changed, 239 insertions(+), 8 deletions(-)
 create mode 100644 frontend/components/FrontmatterInput.js

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 503fd47f86..f5b3f54a79 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -32,6 +32,7 @@ import { IsolatedCell } from "./Cell.js"
 import { RawHTMLContainer } from "./CellOutput.js"
 import { RecordingPlaybackUI, RecordingUI } from "./RecordingUI.js"
 import { HijackExternalLinksToOpenInNewTab } from "./HackySideStuff/HijackExternalLinksToOpenInNewTab.js"
+import { FrontMatterInput } from "./FrontmatterInput.js"
 
 // This is imported asynchronously - uncomment for development
 // import environment from "../common/Environment.js"
@@ -1384,6 +1385,13 @@ patch: ${JSON.stringify(
                               />`
                             : null
                     }
+                    <${FrontMatterInput} 
+                        remote_frontmatter=${notebook.metadata?.frontmatter} 
+                        set_remote_frontmatter=${(newval) =>
+                            this.actions.update_notebook((nb) => {
+                                nb.metadata["frontmatter"] = newval
+                            })} 
+                    />
                     ${launch_params.preamble_html ? html`<${RawHTMLContainer} body=${launch_params.preamble_html} className=${"preamble"} />` : null}
                     <${Main}>
                         <${Preamble}
diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index 56a883704e..531306b0e7 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -67,10 +67,21 @@ export const ExportBanner = ({ onClose, notebookfile_url, notebookexport_url, st
                           `
                         : null
                 }
-
-                <button title="Close" class="toggle_export" onClick=${() => onClose()}>
-                    <span></span>
-                </button>
+                <div class="export_small_btns">
+                    <button
+                        title="Edit frontmatter"
+                        class="toggle_frontmatter_edit"
+                        onClick=${() => {
+                            onClose()
+                            window.dispatchEvent(new CustomEvent("open pluto frontmatter"))
+                        }}
+                    >
+                        <span></span>
+                    </button>
+                    <button title="Close" class="toggle_export" onClick=${() => onClose()}>
+                        <span></span>
+                    </button>
+                </div>
             </div>
         </aside>
     `
diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
new file mode 100644
index 0000000000..0c88a0b439
--- /dev/null
+++ b/frontend/components/FrontmatterInput.js
@@ -0,0 +1,164 @@
+import { html, Component, useRef, useLayoutEffect, useState, useEffect } from "../imports/Preact.js"
+import { has_ctrl_or_cmd_pressed } from "../common/KeyboardShortcuts.js"
+
+import "https://cdn.jsdelivr.net/gh/fonsp/rebel-tag-input@1.0.4/lib/rebel-tag-input.mjs"
+
+//@ts-ignore
+import dialogPolyfill from "https://cdn.jsdelivr.net/npm/dialog-polyfill@0.5.6/dist/dialog-polyfill.esm.min.js"
+
+/**
+ * @param {{
+ *  remote_frontmatter: Record<String,any>?,
+ *  set_remote_frontmatter: (newval: Record<String,any>) => Promise<void>,
+ * }} props
+ * */
+export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter }) => {
+    const [frontmatter, set_frontmatter] = useState(remote_frontmatter ?? {})
+
+    useEffect(() => {
+        set_frontmatter(remote_frontmatter ?? {})
+    }, [remote_frontmatter])
+
+    // useEffect(() => {
+    //     console.log("New frontmatter:", frontmatter)
+    // }, [frontmatter])
+
+    const fm_setter = (key) => (value) => {
+        set_frontmatter((fm) => ({ ...fm, [key]: value }))
+    }
+
+    const dialog_ref = useRef(/** @type {HTMLDialogElement} */ (null))
+    useLayoutEffect(() => {
+        dialogPolyfill.registerDialog(dialog_ref.current)
+    })
+
+    //@ts-ignore
+    const open = () => dialog_ref.current.showModal()
+    //@ts-ignore
+    const close = () => dialog_ref.current.close()
+
+    const cancel = () => {
+        set_frontmatter(remote_frontmatter ?? {})
+        close()
+    }
+    const submit = () => {
+        set_remote_frontmatter(frontmatter).then(() => alert("Frontmatter synchronized ✔\n\nThese parameters will be used in future exports."))
+        close()
+    }
+
+    useLayoutEffect(() => {
+        window.addEventListener("open pluto frontmatter", open)
+        return () => {
+            window.removeEventListener("open pluto frontmatter", open)
+        }
+    }, [])
+
+    useLayoutEffect(() => {
+        const listener = (e) => {
+            if (dialog_ref.current.contains(e.target)) if (e.key === "Enter" && has_ctrl_or_cmd_pressed(e)) submit()
+        }
+        window.addEventListener("keydown", listener)
+        return () => {
+            window.removeEventListener("keydown", listener)
+        }
+    }, [])
+
+    const frontmatter_with_defaults = {
+        title: null,
+        description: null,
+        date: null,
+        tags: [],
+        ...frontmatter,
+    }
+
+    return html`<dialog ref=${dialog_ref} class="pluto-frontmatter">
+        <h1>Frontmatter</h1>
+        <p>
+            If you are publishing this notebook on the web, you can set the parameters below to provide HTML metadata. This is useful for search engines and
+            social media.
+        </p>
+        <div class="fm-table">
+            ${Object.entries(frontmatter_with_defaults).map(([key, value]) => {
+                let id = `fm-${key}`
+                return html`
+                    <label for=${id}>${key}</label>
+                    <${Input} type=${field_type(key)} id=${id} value=${value} on_value=${fm_setter(key)} />
+                    <button
+                        class="deletefield"
+                        onClick=${() => {
+                            set_frontmatter((fm) => Object.fromEntries(Object.entries(fm).filter(([k]) => k !== key)))
+                        }}
+                    >
+                        ⨯
+                    </button>
+                `
+            })}
+            <button
+                class="addentry"
+                onClick=${() => {
+                    const fieldname = prompt("Field name:")
+                    if (fieldname) {
+                        set_frontmatter((fm) => ({ ...fm, [fieldname]: null }))
+                    }
+                }}
+            >
+                Add entry +
+            </button>
+        </div>
+
+        <div class="final"><button onClick=${cancel}>Cancel</button><button onClick=${submit}>Save</button></div>
+    </dialog>`
+}
+
+const special_field_names = ["tags", "date", "license"]
+
+const field_type = (name) => {
+    for (const t of special_field_names) {
+        if (name === t || name.endsWith(`_${t}`)) {
+            return t
+        }
+    }
+    return "text"
+}
+
+const Input = ({ value, on_value, type, id }) => {
+    const input_ref = useRef(/** @type {HTMLInputElement} */ (null))
+
+    useLayoutEffect(() => {
+        input_ref.current.value = value
+    }, [input_ref.current, value])
+
+    useLayoutEffect(() => {
+        const listener = (e) => {
+            on_value(input_ref.current.value)
+        }
+
+        input_ref.current.addEventListener("input", listener)
+        return () => {
+            input_ref.current.removeEventListener("input", listener)
+        }
+    }, [input_ref.current])
+
+    return type === "tags"
+        ? html`<rbl-tag-input id=${id} ref=${input_ref} />`
+        : type === "license"
+        ? LicenseInput({ ref: input_ref, id })
+        : html`<input type=${type} id=${id} ref=${input_ref} />`
+}
+
+// https://choosealicense.com/licenses/
+// and check https://github.com/sindresorhus/spdx-license-list/blob/HEAD/spdx-simple.json
+const code_licenses = ["AGPL-3.0", "GPL-3.0", "LGPL-3.0", "MPL-2.0", "Apache-2.0", "MIT", "BSL-1.0", "Unlicense"]
+
+// https://creativecommons.org/about/cclicenses/
+// and check https://github.com/sindresorhus/spdx-license-list/blob/HEAD/spdx-simple.json
+const creative_licenses = ["CC-BY-4.0", "CC-BY-SA-4.0", "CC-BY-NC-4.0", "CC-BY-NC-SA-4.0", "CC-BY-ND-4.0", "CC-BY-NC-ND-4.0", "CC0-1.0"]
+
+const licenses = [...code_licenses, ...creative_licenses]
+
+const LicenseInput = ({ ref, id }) => {
+    return html`
+        <input ref=${ref} id=${id} type="text" list="oss-licenses" />
+        <datalist id="oss-licenses">${licenses.map((name) => html`<option>${name}</option>`)}</datalist>
+    `
+}
diff --git a/frontend/components/Notebook.js b/frontend/components/Notebook.js
index ea2aedc6ee..26052bd5c9 100644
--- a/frontend/components/Notebook.js
+++ b/frontend/components/Notebook.js
@@ -112,7 +112,7 @@ const render_cell_outputs_minimum = 20
  *  selected_cells: Array<string>,
  *  is_initializing: boolean,
  *  is_process_ready: boolean,
- *  disable_input: any,
+ *  disable_input: boolean,
  * }} props
  * */
 export const Notebook = ({ notebook, cell_inputs_local, last_created_cell, selected_cells, is_initializing, is_process_ready, disable_input }) => {
diff --git a/frontend/editor.css b/frontend/editor.css
index c147f0f656..05770f708b 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1,3 +1,5 @@
+@import url("https://cdn.jsdelivr.net/npm/dialog-polyfill@0.5.6/dist/dialog-polyfill.css");
+
 /* @import url("https://fonts.googleapis.com/css?family=Roboto+Mono:400,400i,500,700&display=swap&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext"); */
 @import url("https://cdn.jsdelivr.net/npm/@fontsource/roboto-mono@4.4.5/400.css");
 @import url("https://cdn.jsdelivr.net/npm/@fontsource/roboto-mono@4.4.5/400-italic.css");
@@ -32,6 +34,8 @@
     --sans-serif-font-stack: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
     --lato-ui-font-stack: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, Helvetica, Arial, "Apple Color Emoji",
         "Segoe UI Emoji", "Segoe UI Symbol", system-ui, sans-serif;
+    --system-ui-font-stack: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, Helvetica, Arial, "Apple Color Emoji",
+        "Segoe UI Emoji", "Segoe UI Symbol", system-ui, sans-serif;
 
     color-scheme: light dark;
 }
@@ -544,9 +548,11 @@ a.export_card section {
     /* font-size: 14px; */
     padding: 3px;
 }
-aside#export button.toggle_export {
+aside#export .export_small_btns {
     margin-left: auto;
     height: 60px;
+    display: flex;
+    flex-direction: row;
 }
 body.static_preview button.toggle_export {
     display: none;
@@ -657,14 +663,16 @@ pluto-filepicker button:disabled {
 }
 
 button.start_stop_recording,
-button.toggle_export {
+button.toggle_export,
+.export_small_btns button {
     border: none;
     background: none;
     cursor: pointer;
     opacity: 0.5;
 }
 button.start_stop_recording span,
-button.toggle_export span {
+button.toggle_export span,
+.export_small_btns button span {
     display: block;
     content: " " !important;
     background-size: 25px 25px;
@@ -686,6 +694,10 @@ aside#export button.toggle_export span {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-outline.svg");
     filter: var(--image-filters);
 }
+aside#export button.toggle_frontmatter_edit span {
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/newspaper-outline.svg");
+    filter: var(--image-filters);
+}
 nav#at_the_top:after {
     margin-left: auto;
     align-self: center;
@@ -1427,6 +1439,7 @@ pluto-input > button > span {
         /* to make it feel smooth: */
         transition: opacity 0.25s ease-in-out;
     }
+    .export_small_btns button,
     button.toggle_export,
     button.start_stop_recording,
     pluto-cell:hover > button,
@@ -1436,6 +1449,7 @@ pluto-input > button > span {
         opacity: 0.4;
         transition: opacity 0.25s ease-in-out;
     }
+    .export_small_btns button:hover,
     button.toggle_export:hover,
     button.start_stop_recording:hover,
     .overlay-button button:hover,
@@ -2867,3 +2881,37 @@ pluto-cell.hooked_up pluto-output {
     border-bottom: solid 2px;
     border-color: var(--pluto-cell-force-color);
 }
+
+.fm-table {
+    display: grid;
+    grid-template-columns: auto 1fr min-content;
+    gap: 0.3em 1em;
+}
+
+.pluto-frontmatter {
+    font-family: var(--system-ui-font-stack);
+    width: min(31rem, 90vw);
+    color: var(--black);
+    background: var(--export-bg-color);
+}
+
+.pluto-frontmatter button {
+    cursor: pointer;
+}
+
+.pluto-frontmatter .deletefield {
+    align-self: baseline;
+}
+
+.pluto-frontmatter .addentry {
+    grid-column: 1/3;
+    margin-top: 0.5em;
+    background-color: transparent;
+}
+
+.pluto-frontmatter .final {
+    display: flex;
+    margin-top: 2rem;
+    justify-content: flex-end;
+    gap: 0.5em;
+}

From 3ec42c744d76a6fa0d5db99bdfef8f49d1f1bc4b Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Wed, 18 May 2022 11:57:07 +0200
Subject: [PATCH 310/821] Use URI(uri, ...) instead of merge(uri, ...) (#2113)

---
 src/webserver/WebServer.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 4f2119cd67..fdf1942204 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -358,7 +358,7 @@ function pretty_address(session::ServerSession, hostIP, port)
     else
         root
     end
-    merge(HTTP.URIs.URI(new_root), query=url_params) |> string
+    string(HTTP.URI(HTTP.URI(new_root); query=url_params))
 end
 
 "All messages sent over the WebSocket get decoded+deserialized and end up here."

From 07374e518aeb4893e657a210ef5e6bd0a9baa287 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 18 May 2022 11:58:02 +0200
Subject: [PATCH 311/821] JS API to get/set input value of element like Pluto
 (#1755)

* Add getBoundElementValueLikePluto and setBoundElementValueLikePluto to API

* add `getBoundElementEventNameLikePluto`
---
 frontend/common/Bond.js           | 6 +++---
 frontend/components/CellOutput.js | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/common/Bond.js b/frontend/common/Bond.js
index 1ecfd7554f..ffa8b27efe 100644
--- a/frontend/common/Bond.js
+++ b/frontend/common/Bond.js
@@ -11,7 +11,7 @@ import observablehq from "./SetupCellEnvironment.js"
  * @param {Element} input
  * @returns {any}
  */
-function get_input_value(input) {
+export function get_input_value(input) {
     if (input instanceof HTMLInputElement) {
         switch (input.type) {
             case "range":
@@ -40,7 +40,7 @@ function get_input_value(input) {
  * @param {Element} input
  * @returns {string}
  */
-function eventof(input) {
+export function eventof(input) {
     //@ts-ignore
     switch (input.type) {
         case "button":
@@ -78,7 +78,7 @@ function input_generator(input) {
  * @param {Element} input
  * @param {any} new_value
  */
-const set_input_value = (input, new_value) => {
+export const set_input_value = (input, new_value) => {
     if (input instanceof HTMLInputElement && input.type === "file") {
         return
     }
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index d9c9c05c21..55e098d85d 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -3,7 +3,7 @@ import { html, Component, useRef, useLayoutEffect, useContext, useEffect, useMem
 import { ErrorMessage } from "./ErrorMessage.js"
 import { TreeView, TableView, DivElement } from "./TreeView.js"
 
-import { add_bonds_disabled_message_handler, add_bonds_listener, set_bound_elements_to_their_value } from "../common/Bond.js"
+import { add_bonds_disabled_message_handler, add_bonds_listener, set_bound_elements_to_their_value, get_input_value, set_input_value, eventof } from "../common/Bond.js"
 import { cl } from "../common/ClassTable.js"
 
 import { observablehq_for_cells } from "../common/SetupCellEnvironment.js"
@@ -333,6 +333,11 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
                                 currentScript: currentScript,
                                 invalidation: invalidation,
                                 getPublishedObject: (id) => cell.getPublishedObject(id),
+
+                                getBoundElementValueLikePluto: get_input_value,
+                                setBoundElementValueLikePluto: set_input_value,
+                                getBoundElementEventNameLikePluto: eventof,
+
                                 getNotebookMetadataExperimental: (key) => pluto_actions.get_notebook()?.metadata[key],
                                 setNotebookMetadataExperimental: (key, value) =>
                                     pluto_actions.update_notebook((notebook) => {
@@ -342,6 +347,7 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
                                     pluto_actions.update_notebook((notebook) => {
                                         delete notebook.metadata[key]
                                     }),
+
                                 ...observablehq_for_cells,
                             },
                             code: node.innerText,

From 752973ff481568b29a88c60d80fce926a45340df Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 18 May 2022 19:36:39 +0200
Subject: [PATCH 312/821] README: update doi

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cf27ce9525..22d5c17def 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,7 @@ Pluto.jl is open source! Specifically, it is [MIT Licensed](https://github.com/f
 -   `developit/htm` - [license](https://github.com/developit/htm/blob/master/LICENSE)
 -   `MathJax` - [license](https://github.com/mathjax/MathJax-src/blob/master/LICENSE)
 
-If you want to reference Pluto.jl in scientific writing, you can use our DOI: [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5889169.svg)](https://doi.org/10.5281/zenodo.5889169)
+If you want to reference Pluto.jl in scientific writing, you can use our DOI: [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4792401.svg)](https://doi.org/10.5281/zenodo.4792401)
 
 ### Sample notebooks
 

From 191a04577f7d9ef628aa2bf63d10b4cba9724182 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Wed, 18 May 2022 22:53:20 +0200
Subject: [PATCH 313/821] Speed up `tree_data_array_elements` (#2117)

---
 src/runner/PlutoRunner.jl | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 94cefbac99..c78689a570 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1120,7 +1120,9 @@ pluto_showable(::MIME"application/vnd.pluto.tree+object", ::Any) = false
 # in the next functions you see a `context` argument
 # this is really only used for the circular reference tracking
 
-function tree_data_array_elements(@nospecialize(x::AbstractVector{<:Any}), indices::AbstractVector{I}, context::IOContext)::Vector{Tuple{I,Any}} where {I<:Integer}
+const Context = IOContext{IOBuffer}
+
+function tree_data_array_elements(@nospecialize(x::AbstractVector{<:Any}), indices::AbstractVector{I}, context::Context) where {I<:Integer}
     Tuple{I,Any}[
         if isassigned(x, i)
             i, format_output_default(x[i], context)
@@ -1130,17 +1132,18 @@ function tree_data_array_elements(@nospecialize(x::AbstractVector{<:Any}), indic
         for i in indices
     ] |> collect
 end
+precompile(tree_data_array_elements, (Vector{Any}, Vector{Int}, Context))
 
-function array_prefix(@nospecialize(x::Array{<:Any,1}))::String
-    string(eltype(x))
+function array_prefix(@nospecialize(x::Vector{<:Any}))
+    string(eltype(x))::String
 end
 
-function array_prefix(@nospecialize(x))::String
+function array_prefix(@nospecialize(x))
     original = sprint(Base.showarg, x, false)
-    lstrip(original, ':') * ": "
+    string(lstrip(original, ':'), ": ")::String
 end
 
-function get_my_display_limit(@nospecialize(x), dim::Integer, depth::Integer, context::IOContext, a::Integer, b::Integer)::Int # needs to be system-dependent Int because it is used as array index
+function get_my_display_limit(@nospecialize(x), dim::Integer, depth::Integer, context::Context, a::Integer, b::Integer)::Int # needs to be system-dependent Int because it is used as array index
     let
         if depth < 3
             a ÷ (1 + 2 * depth)
@@ -1157,7 +1160,7 @@ function get_my_display_limit(@nospecialize(x), dim::Integer, depth::Integer, co
     end
 end
 
-function tree_data(@nospecialize(x::AbstractSet{<:Any}), context::IOContext)
+function tree_data(@nospecialize(x::AbstractSet{<:Any}), context::Context)
     if Base.show_circular(context, x)
         Dict{Symbol,Any}(
             :objectid => string(objectid(x), base=16),
@@ -1192,7 +1195,7 @@ function tree_data(@nospecialize(x::AbstractSet{<:Any}), context::IOContext)
     end
 end
 
-function tree_data(@nospecialize(x::AbstractVector{<:Any}), context::IOContext)
+function tree_data(@nospecialize(x::AbstractVector{<:Any}), context::Context)
     if Base.show_circular(context, x)
         Dict{Symbol,Any}(
             :objectid => string(objectid(x), base=16)::String,
@@ -1229,7 +1232,7 @@ function tree_data(@nospecialize(x::AbstractVector{<:Any}), context::IOContext)
     end
 end
 
-function tree_data(@nospecialize(x::Tuple), context::IOContext)
+function tree_data(@nospecialize(x::Tuple), context::Context)
     depth = get(context, :tree_viewer_depth, 0)
     recur_io = IOContext(context, Pair{Symbol,Any}(:tree_viewer_depth, depth + 1))
 
@@ -1245,7 +1248,7 @@ function tree_data(@nospecialize(x::Tuple), context::IOContext)
     )
 end
 
-function tree_data(@nospecialize(x::AbstractDict{<:Any,<:Any}), context::IOContext)
+function tree_data(@nospecialize(x::AbstractDict{<:Any,<:Any}), context::Context)
     if Base.show_circular(context, x)
         Dict{Symbol,Any}(
             :objectid => string(objectid(x), base=16),
@@ -1280,14 +1283,14 @@ function tree_data(@nospecialize(x::AbstractDict{<:Any,<:Any}), context::IOConte
     end
 end
 
-function tree_data_nt_row(@nospecialize(pair::Tuple), context::IOContext)
+function tree_data_nt_row(@nospecialize(pair::Tuple), context::Context)
     # this is an entry of a NamedTuple, the first element of the Tuple is a Symbol, which we want to print as `x` instead of `:x`
     k, element = pair
     string(k), format_output_default(element, context)
 end
 
 
-function tree_data(@nospecialize(x::NamedTuple), context::IOContext)
+function tree_data(@nospecialize(x::NamedTuple), context::Context)
     depth = get(context, :tree_viewer_depth, 0)
     recur_io = IOContext(context, Pair{Symbol,Any}(:tree_viewer_depth, depth + 1))
 
@@ -1304,7 +1307,7 @@ function tree_data(@nospecialize(x::NamedTuple), context::IOContext)
     )
 end
 
-function tree_data(@nospecialize(x::Pair), context::IOContext)
+function tree_data(@nospecialize(x::Pair), context::Context)
     k, v = x
     Dict{Symbol,Any}(
         :objectid => string(objectid(x), base=16),
@@ -1314,7 +1317,7 @@ function tree_data(@nospecialize(x::Pair), context::IOContext)
 end
 
 # Based on Julia source code but without writing to IO
-function tree_data(@nospecialize(x::Any), context::IOContext)
+function tree_data(@nospecialize(x::Any), context::Context)
     if Base.show_circular(context, x)
         Dict{Symbol,Any}(
             :objectid => string(objectid(x), base=16),
@@ -1423,7 +1426,7 @@ const integrations = Integration[
                 end
             end
 
-            function table_data(x::Any, io::IOContext)
+            function table_data(x::Any, io::Context)
                 rows = Tables.rows(x)
 
                 my_row_limit = get_my_display_limit(x, 1, 0, io, table_row_display_limit, table_row_display_limit_increase)
@@ -2044,7 +2047,7 @@ Base.@kwdef struct DivElement
     class::Union{String,Nothing}=nothing
 end
 
-tree_data(@nospecialize(e::DivElement), context::IOContext) = Dict{Symbol, Any}(
+tree_data(@nospecialize(e::DivElement), context::Context) = Dict{Symbol, Any}(
     :style => e.style, 
     :classname => e.class, 
     :children => Any[

From fcd9b4586150356be0b1144cbf6f9bd9ab2c91bd Mon Sep 17 00:00:00 2001
From: Hirumal Priyashan <57571152+HirumalPriyashan@users.noreply.github.com>
Date: Thu, 19 May 2022 03:35:49 +0530
Subject: [PATCH 314/821] Hide UndefVarError if the upstream cell errored
 (#2057)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/ErrorMessage.js | 50 +++++++++++++++++++++++++++--
 frontend/editor.css                 |  4 +++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/frontend/components/ErrorMessage.js b/frontend/components/ErrorMessage.js
index 1e88d3fd27..e5d82ba9f6 100644
--- a/frontend/components/ErrorMessage.js
+++ b/frontend/components/ErrorMessage.js
@@ -1,5 +1,5 @@
 import { PlutoContext } from "../common/PlutoContext.js"
-import { html, useContext } from "../imports/Preact.js"
+import { html, useContext, useState } from "../imports/Preact.js"
 
 const StackFrameFilename = ({ frame, cell_id }) => {
     const sep_index = frame.file.indexOf("#==#")
@@ -133,6 +133,35 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
                     }
                 }),
         },
+        {
+            pattern: /^UndefVarError: (.*) not defined\.?$/,
+            display: (/** @type{string} */ x) => {
+                const notebook = pluto_actions.get_notebook()
+                const erred_upstreams = get_erred_upstreams(notebook, cell_id)
+
+                // Verify that the UndefVarError is indeed about a variable from an upstream cell.
+                const match = x.match(/UndefVarError: (.*) not defined/)
+                let sym = match[1]
+                const undefvar_is_from_upstream = Object.values(notebook.cell_dependencies).some((map) => Object.keys(map.downstream_cells_map).includes(sym))
+
+                if (!erred_upstreams || !undefvar_is_from_upstream) {
+                    return html`<p>${x}</p>`
+                }
+
+                const symbol_links = Object.keys(erred_upstreams).map((key) => {
+                    const onclick = (ev) => {
+                        ev.preventDefault()
+                        const where = document.querySelector(`pluto-cell[id='${erred_upstreams[key]}']`)
+                        where.scrollIntoView()
+                    }
+                    return html`<a href="#" onclick=${onclick}>${key}</a>`
+                })
+
+                // const plural = symbol_links.length > 1
+                return html`<p><em>Another cell defining ${insert_commas_and_and(symbol_links)} contains errors.</em></p>`
+            },
+            show_stacktrace: () => get_erred_upstreams(pluto_actions.get_notebook(), cell_id) == null,
+        },
         {
             pattern: /.?/,
             display: (/** @type{string} */ x) => x.split("\n").map((line) => html`<p>${line}</p>`),
@@ -143,7 +172,7 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
 
     return html`<jlerror>
         <header>${matched_rewriter.display(msg)}</header>
-        ${stacktrace.length == 0
+        ${stacktrace.length == 0 || !(matched_rewriter.show_stacktrace?.() ?? true)
             ? null
             : html`<section>
                   <ol>
@@ -160,3 +189,20 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
               </section>`}
     </jlerror>`
 }
+
+const get_erred_upstreams = (/** @type {import("./Editor.js").NotebookData} */ notebook, /** @type {string} */ cell_id) => {
+    let erred_upstreams = null
+    notebook.cell_results[cell_id].errored &&
+        Object.keys(notebook.cell_dependencies[cell_id]?.upstream_cells_map).forEach((key) => {
+            notebook.cell_dependencies[cell_id]?.upstream_cells_map[key].forEach((upstream_cell_id) => {
+                let upstream_cells = get_erred_upstreams(notebook, upstream_cell_id)
+                erred_upstreams = { ...erred_upstreams, ...upstream_cells }
+                // if upstream got no errors and current cell is errored
+                // then current cell is responsible for errors
+                if (!upstream_cells && notebook.cell_results[upstream_cell_id].errored) {
+                    erred_upstreams[key] = upstream_cell_id
+                }
+            })
+        })
+    return erred_upstreams == null || Object.keys(erred_upstreams).length === 0 ? null : erred_upstreams
+}
diff --git a/frontend/editor.css b/frontend/editor.css
index 05770f708b..969642f383 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1052,6 +1052,10 @@ pluto-output > assignee:empty {
     display: none;
 }
 
+.errored pluto-output > assignee {
+    display: none;
+}
+
 pluto-output > div {
     flex-shrink: 0;
     overflow-y: hidden;

From 76e4dd60aa15f2259eaa537981745741edbdb4c8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 19 May 2022 00:42:52 +0200
Subject: [PATCH 315/821] whitespace

---
 src/evaluation/RunBonds.jl | 52 ++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/evaluation/RunBonds.jl b/src/evaluation/RunBonds.jl
index ea8143c6a3..646bb8a3c3 100644
--- a/src/evaluation/RunBonds.jl
+++ b/src/evaluation/RunBonds.jl
@@ -6,45 +6,47 @@ function set_bond_values_reactive(;
     kwargs...
 )::Union{Task,TopologicalOrder}
     # filter out the bonds that don't need to be set
-    to_set = filter(zip(bound_sym_names, is_first_values) |> collect) do (bound_sym, is_first_value)
-        new_value = notebook.bonds[bound_sym].value
-
-        variable_exists = is_assigned_anywhere(notebook, notebook.topology, bound_sym)
-        if !variable_exists
-            # a bond was set while the cell is in limbo state
-            # we don't need to do anything
-            return false
-        end
+    syms_to_set = first.(
+        Iterators.filter(zip(bound_sym_names, is_first_values) |> collect) do (bound_sym, is_first_value)
+            new_value = notebook.bonds[bound_sym].value
+
+            variable_exists = is_assigned_anywhere(notebook, notebook.topology, bound_sym)
+            if !variable_exists
+                # a bond was set while the cell is in limbo state
+                # we don't need to do anything
+                return false
+            end
 
-        # TODO: Not checking for any dependents now
-        # any_dependents = is_referenced_anywhere(notebook, notebook.topology, bound_sym)
+            # TODO: Not checking for any dependents now
+            # any_dependents = is_referenced_anywhere(notebook, notebook.topology, bound_sym)
 
-        # fix for https://github.com/fonsp/Pluto.jl/issues/275
-        # if `Base.get` was defined to give an initial value (read more about this in the Interactivity sample notebook), then we want to skip the first value sent back from the bond. (if `Base.get` was not defined, then the variable has value `missing`)
-        # Check if the variable does not already have that value.
-        # because if the initial value is already set, then we don't want to run dependent cells again.
-        eq_tester = :(try !ismissing($bound_sym) && ($bound_sym == Main.PlutoRunner.transform_bond_value($(QuoteNode(bound_sym)), $(new_value))) === true catch; false end) # not just a === comparison because JS might send back the same value but with a different type (Float64 becomes Int64 in JS when it's an integer. The `=== true` check handles cases like `[missing] == [123]`, which returns `missing`, not `true` or `false`.)
-        if is_first_value && will_run_code(notebook) && WorkspaceManager.eval_fetch_in_workspace((session, notebook), eq_tester)
-            return false
+            # fix for https://github.com/fonsp/Pluto.jl/issues/275
+            # if `Base.get` was defined to give an initial value (read more about this in the Interactivity sample notebook), then we want to skip the first value sent back from the bond. (if `Base.get` was not defined, then the variable has value `missing`)
+            # Check if the variable does not already have that value.
+            # because if the initial value is already set, then we don't want to run dependent cells again.
+            eq_tester = :(try !ismissing($bound_sym) && ($bound_sym == Main.PlutoRunner.transform_bond_value($(QuoteNode(bound_sym)), $(new_value))) === true catch; false end) # not just a === comparison because JS might send back the same value but with a different type (Float64 becomes Int64 in JS when it's an integer. The `=== true` check handles cases like `[missing] == [123]`, which returns `missing`, not `true` or `false`.)
+            if is_first_value && will_run_code(notebook) && WorkspaceManager.eval_fetch_in_workspace((session, notebook), eq_tester)
+                return false
+            end
+            return true
         end
-        return true
-    end .|> first
+    )::Vector{Symbol}
 
-    if isempty(to_set) || !will_run_code(notebook)
+    if isempty(syms_to_set) || !will_run_code(notebook)
         send_notebook_changes!(ClientRequest(; session, notebook, initiator))
         return TopologicalOrder(notebook.topology, Cell[], Dict{Cell, ReactivityError}())
     end
 
-    new_values = [notebook.bonds[bound_sym].value for bound_sym in to_set]
+    new_values = Any[notebook.bonds[bound_sym].value for bound_sym in syms_to_set]
     
     function custom_deletion_hook((session, notebook)::Tuple{ServerSession,Notebook}, old_workspace_name, new_workspace_name, to_delete_vars::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, to_reimport::Set{Expr}, invalidated_cell_uuids::Set{UUID}; to_run::AbstractVector{Cell})
-        to_delete_vars = Set([to_delete_vars..., to_set...]) # also delete the bound symbols
+        to_delete_vars = Set([to_delete_vars..., syms_to_set...]) # also delete the bound symbols
         WorkspaceManager.move_vars((session, notebook), old_workspace_name, new_workspace_name, to_delete_vars, methods_to_delete, to_reimport, invalidated_cell_uuids)
-        for (bound_sym, new_value) in zip(to_set, new_values)
+        for (bound_sym, new_value) in zip(syms_to_set, new_values)
             WorkspaceManager.eval_in_workspace((session, notebook), :($(bound_sym) = Main.PlutoRunner.transform_bond_value($(QuoteNode(bound_sym)), $(new_value))))
         end
     end
-    to_reeval = where_referenced(notebook, notebook.topology, Set{Symbol}(to_set))
+    to_reeval = where_referenced(notebook, notebook.topology, Set{Symbol}(syms_to_set))
 
     run_reactive_async!(session, notebook, to_reeval; deletion_hook=custom_deletion_hook, user_requested_run=false, run_async=false, kwargs...)
 end

From 1179cf6717cc79c04937bf04f0114bb649e08d0b Mon Sep 17 00:00:00 2001
From: Benjamin Lungwitz <52384612+lungben@users.noreply.github.com>
Date: Thu, 19 May 2022 01:30:39 +0200
Subject: [PATCH 316/821] Support dependent bound variables for SliderServer
 (#2014)

Co-authored-by: Benjamin Lungwitz <Benjamin.Lungwitz@d-fine.de>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 src/evaluation/Run.jl      |  30 +++++++++-
 src/evaluation/RunBonds.jl |   7 +--
 test/Bonds.jl              | 119 +++++++++++++++++++++++++++++++++++++
 3 files changed, 151 insertions(+), 5 deletions(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 0179550198..43e12ff1fb 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -2,9 +2,27 @@ import REPL:ends_with_semicolon
 import .Configuration
 import .ExpressionExplorer: FunctionNameSignaturePair, is_joined_funcname, UsingsImports, external_package_names
 import .WorkspaceManager: macroexpand_in_workspace
+import .MoreAnalysis: find_bound_variables
 
 Base.push!(x::Set{Cell}) = x
 
+"""
+```julia
+set_bond_value_pairs!(session::ServerSession, notebook::Notebook, bond_value_pairs::Vector{Tuple{Symbol, Any}})
+```
+
+Given a list of tuples of the form `(bound variable name, (untransformed) value)`, assign each (transformed) value to the corresponding global bound variable in the notebook workspace.
+
+`bond_value_pairs` can also be an iterator.
+"""
+function set_bond_value_pairs!(session::ServerSession, notebook::Notebook, bond_value_pairs)
+	for (bound_sym, new_value) in bond_value_pairs
+		WorkspaceManager.eval_in_workspace((session, notebook), :($(bound_sym) = Main.PlutoRunner.transform_bond_value($(QuoteNode(bound_sym)), $(new_value))))
+	end
+end
+
+const _empty_bond_value_pairs = zip(Symbol[],Any[])
+
 """
 Run given cells and all the cells that depend on them, based on the topology information before and after the changes.
 """
@@ -16,6 +34,7 @@ function run_reactive!(
     roots::Vector{Cell};
     deletion_hook::Function = WorkspaceManager.move_vars,
     user_requested_run::Bool = true,
+	bond_value_pairs=_empty_bond_value_pairs,
 )::TopologicalOrder
     withtoken(notebook.executetoken) do
         run_reactive_core!(
@@ -26,6 +45,7 @@ function run_reactive!(
             roots;
             deletion_hook,
             user_requested_run,
+			bond_value_pairs
         )
     end
 end
@@ -44,7 +64,8 @@ function run_reactive_core!(
     roots::Vector{Cell};
     deletion_hook::Function = WorkspaceManager.move_vars,
     user_requested_run::Bool = true,
-    already_run::Vector{Cell} = Cell[]
+    already_run::Vector{Cell} = Cell[],
+	bond_value_pairs = _empty_bond_value_pairs,
 )::TopologicalOrder
     @assert !isready(notebook.executetoken) "run_reactive_core!() was called with a free notebook.executetoken."
     @assert will_run_code(notebook)
@@ -159,6 +180,13 @@ function run_reactive_core!(
 				capture_stdout = session.options.evaluation.capture_stdout,
             )
             any_interrupted |= run.interrupted
+
+			# Support one bond defining another when setting both simultaneously in PlutoSliderServer
+			# https://github.com/fonsp/Pluto.jl/issues/1695
+
+			# set the redefined bound variables to their original value from the request
+			defs = notebook.topology.nodes[cell].definitions
+			set_bond_value_pairs!(session, notebook, Iterators.filter(((sym,val),) -> sym ∈ defs, bond_value_pairs))
         end
 
         cell.running = false
diff --git a/src/evaluation/RunBonds.jl b/src/evaluation/RunBonds.jl
index 646bb8a3c3..fd70d9c694 100644
--- a/src/evaluation/RunBonds.jl
+++ b/src/evaluation/RunBonds.jl
@@ -38,17 +38,16 @@ function set_bond_values_reactive(;
     end
 
     new_values = Any[notebook.bonds[bound_sym].value for bound_sym in syms_to_set]
+    bond_value_pairs = zip(syms_to_set, new_values)
     
     function custom_deletion_hook((session, notebook)::Tuple{ServerSession,Notebook}, old_workspace_name, new_workspace_name, to_delete_vars::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, to_reimport::Set{Expr}, invalidated_cell_uuids::Set{UUID}; to_run::AbstractVector{Cell})
         to_delete_vars = Set([to_delete_vars..., syms_to_set...]) # also delete the bound symbols
         WorkspaceManager.move_vars((session, notebook), old_workspace_name, new_workspace_name, to_delete_vars, methods_to_delete, to_reimport, invalidated_cell_uuids)
-        for (bound_sym, new_value) in zip(syms_to_set, new_values)
-            WorkspaceManager.eval_in_workspace((session, notebook), :($(bound_sym) = Main.PlutoRunner.transform_bond_value($(QuoteNode(bound_sym)), $(new_value))))
-        end
+        set_bond_value_pairs!(session, notebook, zip(syms_to_set, new_values))
     end
     to_reeval = where_referenced(notebook, notebook.topology, Set{Symbol}(syms_to_set))
 
-    run_reactive_async!(session, notebook, to_reeval; deletion_hook=custom_deletion_hook, user_requested_run=false, run_async=false, kwargs...)
+    run_reactive_async!(session, notebook, to_reeval; deletion_hook=custom_deletion_hook, user_requested_run=false, run_async=false, bond_value_pairs, kwargs...)
 end
 
 """
diff --git a/test/Bonds.jl b/test/Bonds.jl
index f934ec903e..d8469e2b16 100644
--- a/test/Bonds.jl
+++ b/test/Bonds.jl
@@ -323,4 +323,123 @@ import Distributed
         end)
         Distributed.rmprocs(test_proc)
     end
+
+    @testset "Dependent Bound Variables" begin
+        🍭 = ServerSession()
+        🍭.options.evaluation.workspace_use_distributed = false
+        fakeclient = ClientSession(:fake, nothing)
+        🍭.connected_clients[fakeclient.id] = fakeclient
+        🍭.options.evaluation.workspace_use_distributed = true
+        notebook = Notebook([
+            Cell(raw"""@bind x HTML("<input type=range min=1 max=10>")"""),
+            Cell(raw"""@bind y HTML("<input type=range min=1 max=$(x)>")"""),
+            Cell(raw"""x"""), #3
+            Cell(raw"""y"""), #4
+            Cell(raw"""
+            begin
+                struct TransformSlider
+                    range::AbstractRange
+                end
+                
+                Base.show(io::IO, m::MIME"text/html", os::TransformSlider) = write(io, "<input type=range value=$(minimum(os.range)) min=$(minimum(os.range)) max=$(maximum(os.range))>")
+                
+                Bonds.initial_value(os::TransformSlider) = Bonds.transform_value(os, minimum(os.range))
+                Bonds.possible_values(os::TransformSlider) = os.range
+                Bonds.transform_value(os::TransformSlider, from_js) = from_js * 2
+            end
+            """),
+            Cell(raw"""begin
+                hello1 = 123
+                @bind a TransformSlider(1:10)
+            end"""),
+            Cell(raw"""begin
+                hello2 = 234
+                @bind b TransformSlider(1:a)
+            end"""),
+            Cell(raw"""a"""), #8
+            Cell(raw"""b"""), #9
+            Cell(raw"""hello1"""), #10
+            Cell(raw"""hello2"""), #11
+            Cell(raw"""using AbstractPlutoDingetjes"""),
+        ])
+        fakeclient.connected_notebook = notebook
+        update_run!(🍭, notebook, notebook.cells)
+
+        function set_bond_values!(notebook:: Notebook, bonds:: Dict; is_first_value=false)
+            for (name, value) in bonds
+                notebook.bonds[name] = Dict("value" => value)
+            end
+            Pluto.set_bond_values_reactive(; session=🍭, notebook, bound_sym_names=collect(keys(bonds)), run_async=false, is_first_values=fill(is_first_value, length(bonds)))
+        end
+        
+        @test notebook.cells[3].output.body == "missing"
+        @test notebook.cells[4].output.body == "missing" # no initial value defined for simple html slider (in contrast to TransformSlider)
+        @test notebook.cells[8].output.body == "2"
+        @test notebook.cells[9].output.body == "2"
+        @test notebook.cells[10].output.body == "123"
+        @test notebook.cells[11].output.body == "234"
+
+        set_bond_values!(notebook, Dict(:x => 1, :a => 1); is_first_value=true)
+        @test notebook.cells[3].output.body == "1"
+        @test notebook.cells[4].output.body == "missing" # no initial value defined for simple html slider (in contrast to TransformSlider)
+        @test notebook.cells[8].output.body == "2" # TransformSlider scales values *2
+        @test notebook.cells[9].output.body == "2"
+        @test notebook.cells[10].output.body == "123"
+        @test notebook.cells[11].output.body == "234"
+
+        set_bond_values!(notebook, Dict(:y => 1, :b => 1); is_first_value=true)
+        @test notebook.cells[3].output.body == "1"
+        @test notebook.cells[4].output.body == "1"
+        @test notebook.cells[8].output.body == "2"
+        @test notebook.cells[9].output.body == "2"
+        @test notebook.cells[10].output.body == "123"
+        @test notebook.cells[11].output.body == "234"
+
+        set_bond_values!(notebook, Dict(:x => 5))
+        @test notebook.cells[3].output.body == "5"
+        @test notebook.cells[4].output.body == "missing" # the slider object is re-defined, therefore its value is the default one
+
+        set_bond_values!(notebook, Dict(:y => 3))
+        @test notebook.cells[3].output.body == "5"
+        @test notebook.cells[4].output.body == "3"
+
+        set_bond_values!(notebook, Dict(:x => 10, :y => 5))
+        @test notebook.cells[3].output.body == "10"
+        @test notebook.cells[4].output.body == "5" # this would fail without PR #2014 - previously `y` was reset to the default value `missing`
+
+        set_bond_values!(notebook, Dict(:b => 2))
+        @test notebook.cells[8].output.body == "2"
+        @test notebook.cells[9].output.body == "4"
+        @test notebook.cells[10].output.body == "123"
+        @test notebook.cells[11].output.body == "234"
+
+        set_bond_values!(notebook, Dict(:a => 8, :b => 12))
+        @test notebook.cells[8].output.body == "16"
+        @test notebook.cells[9].output.body == "24" # this would fail without PR #2014
+        @test notebook.cells[10].output.body == "123"
+        @test notebook.cells[11].output.body == "234"
+        
+        set_bond_values!(notebook, Dict(:a => 1, :b => 1))
+        setcode!(notebook.cells[10], "a + hello1")
+        setcode!(notebook.cells[11], "b + hello2")
+        update_run!(🍭, notebook, notebook.cells[10:11])
+        
+        @test notebook.cells[10].output.body == "125"
+        @test notebook.cells[11].output.body == "236"
+        
+        set_bond_values!(notebook, Dict(:a => 2, :b => 2))
+        @test notebook.cells[10].output.body == "127"
+        @test notebook.cells[11].output.body == "238"
+        set_bond_values!(notebook, Dict(:b => 3))
+        @test notebook.cells[10].output.body == "127"
+        @test notebook.cells[11].output.body == "240"
+        set_bond_values!(notebook, Dict(:a => 1))
+        @test notebook.cells[10].output.body == "125"
+        @test notebook.cells[11].output.body == "236" # changing a will reset b
+        
+        
+
+        WorkspaceManager.unmake_workspace((🍭, notebook))
+
+    end
 end

From b91937501061221962c4cb1b85c20fdb859bcf25 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 19 May 2022 01:32:52 +0200
Subject: [PATCH 317/821] Display logs from async cell at source (#2115)

---
 src/evaluation/WorkspaceManager.jl | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index a012391d4c..f9238fe5ee 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -159,20 +159,19 @@ function start_relaying_logs((session, notebook)::SN, log_channel::Distributed.R
 
             # We always show the log at the currently running cell, which is given by
             running_cell_id = next_log["cell_id"]::UUID
-            running_cell = notebook.cells_dict[running_cell_id]
 
             # Some logs originate from outside of the running code, through function calls. Some code here to deal with that:
             begin
                 source_cell_id = if match !== nothing
                     # the log originated from within the notebook
                     
-                    UUID(fn[findfirst("#==#", fn)[end]+1:end])
+                    UUID(fn[match[end]+1:end])
                 else
                     # the log originated from a function call defined outside of the notebook
                     
                     # we will show the log at the currently running cell, at "line -1", i.e. without line info.
                     next_log["line"] = -1
-                    UUID(next_log["cell_id"])
+                    running_cell_id
                 end
                 
                 if running_cell_id != source_cell_id
@@ -181,10 +180,21 @@ function start_relaying_logs((session, notebook)::SN, log_channel::Distributed.R
                     next_log["line"] = -1
                 end
             end
+            
+            source_cell = get(notebook.cells_dict, source_cell_id, nothing)
+            running_cell = get(notebook.cells_dict, running_cell_id, nothing)
+            
+            display_cell = if running_cell === nothing || (source_cell !== nothing && source_cell.output.has_pluto_hook_features)
+                source_cell
+            else
+                running_cell
+            end
+            
+            @assert !isnothing(display_cell)
 
             maybe_max_log = findfirst(((key, _),) -> key == "maxlog", next_log["kwargs"])
             if maybe_max_log !== nothing
-                n_logs = count(log -> log["id"] == next_log["id"], running_cell.logs)
+                n_logs = count(log -> log["id"] == next_log["id"], display_cell.logs)
                 try
                     max_log = parse(Int, next_log["kwargs"][maybe_max_log][2] |> first)
 
@@ -200,7 +210,7 @@ function start_relaying_logs((session, notebook)::SN, log_channel::Distributed.R
                 end
             end
 
-            push!(running_cell.logs, next_log)
+            push!(display_cell.logs, next_log)
             Pluto.@asynclog update_throttled()
         catch e
             if !isopen(log_channel)

From 59ccfaf8ad4348f52e9db4a6176ae598a1c00c5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 May 2022 01:43:17 +0200
Subject: [PATCH 318/821] Bump ejs from 3.1.6 to 3.1.7 in /frontend-bundler
 (#2067)

* Bump ejs from 3.1.6 to 3.1.7 in /frontend-bundler

Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.7.
- [Release notes](https://github.com/mde/ejs/releases)
- [Changelog](https://github.com/mde/ejs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mde/ejs/compare/v3.1.6...v3.1.7)

---
updated-dependencies:
- dependency-name: ejs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update package-lock.json

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend-bundler/package-lock.json | 2980 +++++++---------------------
 1 file changed, 728 insertions(+), 2252 deletions(-)

diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index d421249dd0..7d6ca6c481 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -72,20 +72,6 @@
                 "url": "https://opencollective.com/babel"
             }
         },
-        "node_modules/@babel/core/node_modules/json5": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-            "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-            "dependencies": {
-                "minimist": "^1.2.5"
-            },
-            "bin": {
-                "json5": "lib/cli.js"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
         "node_modules/@babel/core/node_modules/semver": {
             "version": "6.3.0",
             "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -396,10 +382,31 @@
                 "node": ">=6.9.0"
             }
         },
-        "node_modules/@iarna/toml": {
-            "version": "2.2.5",
-            "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
-            "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+        "node_modules/@lezer/common": {
+            "version": "0.15.12",
+            "resolved": "https://registry.npmjs.org/@lezer/common/-/common-0.15.12.tgz",
+            "integrity": "sha512-edfwCxNLnzq5pBA/yaIhwJ3U3Kz8VAUOTRg0hhxaizaI1N+qxV7EXDv/kLCkLeq2RzSFvxexlaj5Mzfn2kY0Ig=="
+        },
+        "node_modules/@lezer/lr": {
+            "version": "0.15.8",
+            "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-0.15.8.tgz",
+            "integrity": "sha512-bM6oE6VQZ6hIFxDNKk8bKPa14hqFrV07J/vHGOeiAbJReIaQXmkVb6xQu4MR+JBTLa5arGRyAAjJe1qaQt3Uvg==",
+            "dependencies": {
+                "@lezer/common": "^0.15.0"
+            }
+        },
+        "node_modules/@mischnic/json-sourcemap": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/@mischnic/json-sourcemap/-/json-sourcemap-0.1.0.tgz",
+            "integrity": "sha512-dQb3QnfNqmQNYA4nFSN/uLaByIic58gOXq4Y4XqLOWmOrw73KmJPt/HLyG0wvn1bnR6mBKs/Uwvkh+Hns1T0XA==",
+            "dependencies": {
+                "@lezer/common": "^0.15.7",
+                "@lezer/lr": "^0.15.4",
+                "json5": "^2.2.1"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
         },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
@@ -489,13 +496,14 @@
             }
         },
         "node_modules/@parcel/cache": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/cache/-/cache-2.0.0.tgz",
-            "integrity": "sha512-HThLpk1qXkyRyWrqXh5EYdINFd4tl4SCUgbipZ46pQWtwZ8+0nmudbuszeRKi1UCyNCdgktcZu8xmXmSVQNDyA==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/cache/-/cache-2.5.0.tgz",
+            "integrity": "sha512-3kOO3cZQv0FAKhrMHGLdb4Qtzpmy78Q6jPN3u8eCY4yqeDTnyQBZvWNHoyCm5WlmL8y6Q6REYMbETLxSH1ggAQ==",
             "dependencies": {
-                "@parcel/logger": "^2.0.0",
-                "@parcel/utils": "^2.0.0",
-                "lmdb-store": "^1.5.5"
+                "@parcel/fs": "2.5.0",
+                "@parcel/logger": "2.5.0",
+                "@parcel/utils": "2.5.0",
+                "lmdb": "2.2.4"
             },
             "engines": {
                 "node": ">= 12.0.0"
@@ -505,18 +513,15 @@
                 "url": "https://opencollective.com/parcel"
             },
             "peerDependencies": {
-                "@parcel/core": "^2.0.0"
+                "@parcel/core": "^2.5.0"
             }
         },
         "node_modules/@parcel/codeframe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.0.0.tgz",
-            "integrity": "sha512-34L0qa72rxtzng2Bw195YYVAZWhuWm1V9u+0bHfajyl242BDUbUNpQOowP/AYRjj7XSmIN6XCUv3luogvMPo8A==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.5.0.tgz",
+            "integrity": "sha512-qafqL8Vu2kr932cCWESoDEEoAeKVi7/xdzTBuhzEJng1AfmRT0rCbt/P4ao3RjiDyozPSjXsHOqM6GDZcto4eQ==",
             "dependencies": {
-                "chalk": "^4.1.0",
-                "emphasize": "^4.2.0",
-                "slice-ansi": "^4.0.0",
-                "string-width": "^4.2.0"
+                "chalk": "^4.1.0"
             },
             "engines": {
                 "node": ">= 12.0.0"
@@ -651,34 +656,34 @@
             }
         },
         "node_modules/@parcel/core": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/core/-/core-2.0.0.tgz",
-            "integrity": "sha512-wiY3XyGetCpek0aEi+xB0eQQUn4v9xt20AKx71KpU30SShwcHnVEUEVxuVEi7+NgJQsUCsp8nXUeZluwRTfUFA==",
-            "dependencies": {
-                "@parcel/cache": "^2.0.0",
-                "@parcel/diagnostic": "^2.0.0",
-                "@parcel/events": "^2.0.0",
-                "@parcel/fs": "^2.0.0",
-                "@parcel/graph": "^2.0.0",
-                "@parcel/hash": "^2.0.0",
-                "@parcel/logger": "^2.0.0",
-                "@parcel/package-manager": "^2.0.0",
-                "@parcel/plugin": "^2.0.0",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/core/-/core-2.5.0.tgz",
+            "integrity": "sha512-dygDmPsfAYJKTnUftcbEzjCik7AAaPbFvJW8ETYz8diyjkAG9y6hvCAZIrJE5pNOjFzg32en4v4UWv8Sqlzl9g==",
+            "dependencies": {
+                "@mischnic/json-sourcemap": "^0.1.0",
+                "@parcel/cache": "2.5.0",
+                "@parcel/diagnostic": "2.5.0",
+                "@parcel/events": "2.5.0",
+                "@parcel/fs": "2.5.0",
+                "@parcel/graph": "2.5.0",
+                "@parcel/hash": "2.5.0",
+                "@parcel/logger": "2.5.0",
+                "@parcel/package-manager": "2.5.0",
+                "@parcel/plugin": "2.5.0",
                 "@parcel/source-map": "^2.0.0",
-                "@parcel/types": "^2.0.0",
-                "@parcel/utils": "^2.0.0",
-                "@parcel/workers": "^2.0.0",
+                "@parcel/types": "2.5.0",
+                "@parcel/utils": "2.5.0",
+                "@parcel/workers": "2.5.0",
                 "abortcontroller-polyfill": "^1.1.9",
                 "base-x": "^3.0.8",
                 "browserslist": "^4.6.6",
                 "clone": "^2.1.1",
                 "dotenv": "^7.0.0",
                 "dotenv-expand": "^5.1.0",
-                "json-source-map": "^0.6.1",
-                "json5": "^1.0.1",
-                "micromatch": "^4.0.2",
+                "json5": "^2.2.0",
+                "msgpackr": "^1.5.4",
                 "nullthrows": "^1.1.1",
-                "semver": "^5.4.1"
+                "semver": "^5.7.1"
             },
             "engines": {
                 "node": ">= 12.0.0"
@@ -689,11 +694,11 @@
             }
         },
         "node_modules/@parcel/diagnostic": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.0.0.tgz",
-            "integrity": "sha512-cADyFWaMlhDawQdraFt2TECpiD/DvQ76L+RK97X7sUj5b+cGY7fjrnWPKRVmog5+OoNlbmh1EO3FOLx5vuxzww==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.5.0.tgz",
+            "integrity": "sha512-KiMGGRpEV7wl5gjcxBKcgX84a+cG+IEn94gwy5LK3lENR09nuKShqqgKGAmj/17CobJgw1QNP94/H4Md+oxIWg==",
             "dependencies": {
-                "json-source-map": "^0.6.1",
+                "@mischnic/json-sourcemap": "^0.1.0",
                 "nullthrows": "^1.1.1"
             },
             "engines": {
@@ -705,9 +710,9 @@
             }
         },
         "node_modules/@parcel/events": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/events/-/events-2.0.0.tgz",
-            "integrity": "sha512-v9+pXLtgc44+eIbNAs/SB2tyXKUv+5XF1f3TRsLJ44276e9ksa3Cstrs1EFxZtpi03UoXkXJQoJljGigb2bt8A==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/events/-/events-2.5.0.tgz",
+            "integrity": "sha512-Gc2LPwL1H34Ony5MENbKZg7wvCscZ4x9y7Fu92sfbdWpLo3K13hVtsX3TMIIgYt3B7R7OmO8yR880U2T+JfVkQ==",
             "engines": {
                 "node": ">= 12.0.0"
             },
@@ -717,22 +722,15 @@
             }
         },
         "node_modules/@parcel/fs": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/fs/-/fs-2.0.0.tgz",
-            "integrity": "sha512-1FQIVDO3zWE2vv9EJmLJq+EeZ7DE4lwi/e0fR1PAS1g5YbO9n3u01Xnpzy/jmlL14LnBXdhy4r7OBziShYLK6w==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/fs/-/fs-2.5.0.tgz",
+            "integrity": "sha512-YYr14BWtx/bJ+hu6PPQQ6G/3omOTWgVqEw+UFI3iQH3P6+e0LRXW/Ja1yAcJeepGcTwIP0opnXZBQOm8PBQ2SA==",
             "dependencies": {
-                "@parcel/fs-search": "^2.0.0",
-                "@parcel/fs-write-stream-atomic": "^2.0.0",
-                "@parcel/types": "^2.0.0",
-                "@parcel/utils": "^2.0.0",
+                "@parcel/fs-search": "2.5.0",
+                "@parcel/types": "2.5.0",
+                "@parcel/utils": "2.5.0",
                 "@parcel/watcher": "^2.0.0",
-                "@parcel/workers": "^2.0.0",
-                "graceful-fs": "^4.2.4",
-                "mkdirp": "^0.5.1",
-                "ncp": "^2.0.0",
-                "nullthrows": "^1.1.1",
-                "rimraf": "^3.0.2",
-                "utility-types": "^3.10.0"
+                "@parcel/workers": "2.5.0"
             },
             "engines": {
                 "node": ">= 12.0.0"
@@ -742,13 +740,13 @@
                 "url": "https://opencollective.com/parcel"
             },
             "peerDependencies": {
-                "@parcel/core": "^2.0.0"
+                "@parcel/core": "^2.5.0"
             }
         },
         "node_modules/@parcel/fs-search": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.0.0.tgz",
-            "integrity": "sha512-OVWA0elZm5BKaHgS5FnvlmMwQiU++0sGW7PIyaNJnY0lvpZndU+Pot0xNTSrG3Aq7OkpQlcUWkEMA8KtkHZH1A==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.5.0.tgz",
+            "integrity": "sha512-uBONkz9ZCNSOqbPGWJY3MNl+pqBTfvzHH9+4UhzHEHPArvK2oD0+syYPVE60+zGrxybXTESYMCJp4bHvH6Z2hA==",
             "dependencies": {
                 "detect-libc": "^1.0.3"
             },
@@ -760,37 +758,12 @@
                 "url": "https://opencollective.com/parcel"
             }
         },
-        "node_modules/@parcel/fs-write-stream-atomic": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/fs-write-stream-atomic/-/fs-write-stream-atomic-2.0.0.tgz",
-            "integrity": "sha512-PSvAcu7f+3zzjQZuYJjPQVRI99Lu2HEphr04JChwdO5wr/sm6dYFRQdL0SahH/vF1tnEaBFxC4vTslNEBT+9bg==",
-            "dependencies": {
-                "graceful-fs": "^4.1.2",
-                "iferr": "^1.0.2",
-                "imurmurhash": "^0.1.4",
-                "readable-stream": "1 || 2"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            }
-        },
-        "node_modules/@parcel/fs/node_modules/mkdirp": {
-            "version": "0.5.5",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-            "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-            "dependencies": {
-                "minimist": "^1.2.5"
-            },
-            "bin": {
-                "mkdirp": "bin/cmd.js"
-            }
-        },
         "node_modules/@parcel/graph": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/graph/-/graph-2.0.0.tgz",
-            "integrity": "sha512-ZI3pYSWWqGAFi4qDa00kieiKpHz3xY9vPr4iVTjNiNXD6fU7C+Y25mxPmLv4uYbJTzccAo0iaN9VGqPo/FyiBg==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/graph/-/graph-2.5.0.tgz",
+            "integrity": "sha512-qa2VtG08dJyTaWrxYAkMIlkoDRSPoiqLDNxxHKplkcxAjXBUw0/AkWaz82VO5r1G6jfOj+nM30ajH9uygZYwbw==",
             "dependencies": {
+                "@parcel/utils": "2.5.0",
                 "nullthrows": "^1.1.1"
             },
             "engines": {
@@ -802,12 +775,12 @@
             }
         },
         "node_modules/@parcel/hash": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/hash/-/hash-2.0.0.tgz",
-            "integrity": "sha512-+Yq+mGnZOSyJ6atLCFvA1Kyg/NVysVzlwSNrmA3dc3yO63GtXojQEEyW9U20d+Bj/DVlocLO52Z61d4P9ak4Tw==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/hash/-/hash-2.5.0.tgz",
+            "integrity": "sha512-47JL0XpB7UvIW6Ijf8vv+yVMt9dLvB/lRlBHFmAkmovisueVMVbYD7smxVZnCSehD8UH8BcymKbMzyL5dimgoQ==",
             "dependencies": {
                 "detect-libc": "^1.0.3",
-                "xxhash-wasm": "^0.4.1"
+                "xxhash-wasm": "^0.4.2"
             },
             "engines": {
                 "node": ">= 12.0.0"
@@ -818,12 +791,12 @@
             }
         },
         "node_modules/@parcel/logger": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/logger/-/logger-2.0.0.tgz",
-            "integrity": "sha512-jpESL6m4tEGP+Yj/PZGb6ellrOx3irEIvSjbhwZBGoXaApqqvB352dLXrVJ/vyrmzj9YLNdm2rPWeZWkMDGgMA==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/logger/-/logger-2.5.0.tgz",
+            "integrity": "sha512-pT1L3ceH6trL1N3I3r2HawPjz/PCubOo/Kazu7IeXsMsKVjj1a6AeieZHzkNZIbhiGPtm/cHbBNLz2zTWDLeOA==",
             "dependencies": {
-                "@parcel/diagnostic": "^2.0.0",
-                "@parcel/events": "^2.0.0"
+                "@parcel/diagnostic": "2.5.0",
+                "@parcel/events": "2.5.0"
             },
             "engines": {
                 "node": ">= 12.0.0"
@@ -834,9 +807,9 @@
             }
         },
         "node_modules/@parcel/markdown-ansi": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.0.0.tgz",
-            "integrity": "sha512-AgxIXRaEpNi1GukjWC6FTLO7t/EImv+3KuwFF5tGlWhXO41V1Igl6gXCDpzRmTk5dBbdqOWdRWip1O5Qy74cwA==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.5.0.tgz",
+            "integrity": "sha512-ixkNF3KWIqxMlfxTe9Gb2cp/uNmklQev8VEUxujMVxmUfGyQs4859zdJIQlIinabWYhArhsXATkVf3MzCUN6TQ==",
             "dependencies": {
                 "chalk": "^4.1.0"
             },
@@ -1103,21 +1076,17 @@
             }
         },
         "node_modules/@parcel/package-manager": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.0.0.tgz",
-            "integrity": "sha512-zJY5SOaEC6pyU9bXLmGlnD7VRWURsbxPVNHVreFNttHg2DaT+0u1R5NAoor4BG38esw2TaGdi8QU9TmsTyhSUQ==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.5.0.tgz",
+            "integrity": "sha512-zTuF55/lITUjw9dUU/X0HiF++589xbPXw/zUiG9T6s8BQThLvrxAhYP89S719pw7cTqDimGkTxnIuK+a0djEkg==",
             "dependencies": {
-                "@parcel/diagnostic": "^2.0.0",
-                "@parcel/fs": "^2.0.0",
-                "@parcel/logger": "^2.0.0",
-                "@parcel/types": "^2.0.0",
-                "@parcel/utils": "^2.0.0",
-                "@parcel/workers": "^2.0.0",
-                "command-exists": "^1.2.6",
-                "cross-spawn": "^6.0.4",
-                "nullthrows": "^1.1.1",
-                "semver": "^5.4.1",
-                "split2": "^3.1.1"
+                "@parcel/diagnostic": "2.5.0",
+                "@parcel/fs": "2.5.0",
+                "@parcel/logger": "2.5.0",
+                "@parcel/types": "2.5.0",
+                "@parcel/utils": "2.5.0",
+                "@parcel/workers": "2.5.0",
+                "semver": "^5.7.1"
             },
             "engines": {
                 "node": ">= 12.0.0"
@@ -1127,7 +1096,7 @@
                 "url": "https://opencollective.com/parcel"
             },
             "peerDependencies": {
-                "@parcel/core": "^2.0.0"
+                "@parcel/core": "^2.5.0"
             }
         },
         "node_modules/@parcel/packager-css": {
@@ -1228,11 +1197,11 @@
             }
         },
         "node_modules/@parcel/plugin": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.0.0.tgz",
-            "integrity": "sha512-yOBRbizd27vivgFRxpTBxfViTIYMdoLeAvRHEoL49dkymKkKtq09hZQtVS+iQmypwyJnp4cMsG8FwN+srJub7w==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.5.0.tgz",
+            "integrity": "sha512-obtb6/Gql6YFQ86bdv75A2Noabx8679reFZeyfKKf0L7Lppx4DFQetXwM9XVy7Gx6hJ1Ekm3UMuuIyVJk33YHQ==",
             "dependencies": {
-                "@parcel/types": "^2.0.0"
+                "@parcel/types": "2.5.0"
             },
             "engines": {
                 "node": ">= 12.0.0"
@@ -1485,20 +1454,6 @@
                 "url": "https://opencollective.com/parcel"
             }
         },
-        "node_modules/@parcel/transformer-babel/node_modules/json5": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-            "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-            "dependencies": {
-                "minimist": "^1.2.5"
-            },
-            "bin": {
-                "json5": "lib/cli.js"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
         "node_modules/@parcel/transformer-css": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.0.0.tgz",
@@ -1617,38 +1572,23 @@
                 "url": "https://opencollective.com/parcel"
             }
         },
-        "node_modules/@parcel/transformer-json/node_modules/json5": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-            "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-            "dependencies": {
-                "minimist": "^1.2.5"
-            },
-            "bin": {
-                "json5": "lib/cli.js"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
         "node_modules/@parcel/transformer-postcss": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.0.0.tgz",
-            "integrity": "sha512-CnDgHs2G6nAQghpMWrB84K2QYVLQ2q8CucD4XTe9xc2mo1ObeCtpEijAxsORyp4TTZYOLsw4hmVbv/eY8uLOLg==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.5.0.tgz",
+            "integrity": "sha512-IPNlWElekdQHMTBqhdwJNBCQomuYyo7xgNBdnTrt9VJ+R5ihy6n7ZJSWIAJXAH9VZxETTtunfrzRtgkmtjTeZQ==",
             "dependencies": {
-                "@parcel/hash": "^2.0.0",
-                "@parcel/plugin": "^2.0.0",
-                "@parcel/utils": "^2.0.0",
+                "@parcel/diagnostic": "2.5.0",
+                "@parcel/hash": "2.5.0",
+                "@parcel/plugin": "2.5.0",
+                "@parcel/utils": "2.5.0",
                 "clone": "^2.1.1",
-                "css-modules-loader-core": "^1.1.0",
                 "nullthrows": "^1.1.1",
-                "postcss-modules": "^3.2.2",
-                "postcss-value-parser": "^4.1.0",
-                "semver": "^5.4.1"
+                "postcss-value-parser": "^4.2.0",
+                "semver": "^5.7.1"
             },
             "engines": {
                 "node": ">= 12.0.0",
-                "parcel": "^2.0.0"
+                "parcel": "^2.5.0"
             },
             "funding": {
                 "type": "opencollective",
@@ -1734,45 +1674,31 @@
             }
         },
         "node_modules/@parcel/types": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/types/-/types-2.0.0.tgz",
-            "integrity": "sha512-117vnZuQ1HzXOrIo8qAFgG0lMfz5dck7u+smlaZP1aRxVJaxWBo2C2+8JoTPHjRn9tE5IZGH9PVIZW+X3F474g==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/types/-/types-2.5.0.tgz",
+            "integrity": "sha512-bA0fhG6aXSGYEVo5Dt96x6lseUQHeVZVzgmiRdZsvb614Gvx22ItfaKhPmAVbM9vzbObZDHl9l9G2Ovw8Xve4g==",
             "dependencies": {
-                "@parcel/cache": "^2.0.0",
-                "@parcel/diagnostic": "^2.0.0",
-                "@parcel/fs": "^2.0.0",
-                "@parcel/package-manager": "^2.0.0",
+                "@parcel/cache": "2.5.0",
+                "@parcel/diagnostic": "2.5.0",
+                "@parcel/fs": "2.5.0",
+                "@parcel/package-manager": "2.5.0",
                 "@parcel/source-map": "^2.0.0",
-                "@parcel/workers": "^2.0.0",
+                "@parcel/workers": "2.5.0",
                 "utility-types": "^3.10.0"
             }
         },
         "node_modules/@parcel/utils": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/utils/-/utils-2.0.0.tgz",
-            "integrity": "sha512-4SX8qNyImHLyvVls1U9rxF+h+1kbbdWpxnRiHOFPBYW6H1LiUNBjXPPffTEpKb+RFOqmQ2uNh0aP0mCmROPfXg==",
-            "dependencies": {
-                "@iarna/toml": "^2.2.0",
-                "@parcel/codeframe": "^2.0.0",
-                "@parcel/diagnostic": "^2.0.0",
-                "@parcel/hash": "^2.0.0",
-                "@parcel/logger": "^2.0.0",
-                "@parcel/markdown-ansi": "^2.0.0",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/utils/-/utils-2.5.0.tgz",
+            "integrity": "sha512-kaLGXtQuOOH55KZqXdYDvczhh3mk2eeTVqrrXuuihGjbLKYFlUW2tFDm+5r2s9nCPwTQxOO43ZEOCKSnia+e4w==",
+            "dependencies": {
+                "@parcel/codeframe": "2.5.0",
+                "@parcel/diagnostic": "2.5.0",
+                "@parcel/hash": "2.5.0",
+                "@parcel/logger": "2.5.0",
+                "@parcel/markdown-ansi": "2.5.0",
                 "@parcel/source-map": "^2.0.0",
-                "ansi-html-community": "0.0.8",
-                "chalk": "^4.1.0",
-                "clone": "^2.1.1",
-                "fast-glob": "3.1.1",
-                "fastest-levenshtein": "^1.0.8",
-                "is-glob": "^4.0.0",
-                "is-url": "^1.2.2",
-                "json5": "^1.0.1",
-                "lru-cache": "^6.0.0",
-                "micromatch": "^4.0.4",
-                "node-forge": "^0.10.0",
-                "nullthrows": "^1.1.1",
-                "open": "^7.0.3",
-                "terminal-link": "^2.1.1"
+                "chalk": "^4.1.0"
             },
             "engines": {
                 "node": ">= 12.0.0"
@@ -1864,14 +1790,14 @@
             }
         },
         "node_modules/@parcel/workers": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/workers/-/workers-2.0.0.tgz",
-            "integrity": "sha512-emfezGXmmz5NNrtBvbZO4cFosdpEL+OqhIa4SpUH63aedx+9so/GI/rMp19FmTi0qPKQhOLJmD4VZ2RZHbZM4w==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/workers/-/workers-2.5.0.tgz",
+            "integrity": "sha512-/Ow5OKJWs+9OzV3Jy4J++VnbNx0j3ls/M1CGVBLiBWyCada9DMtquYoBQ4Sk6Uam50BKkIFYetGOeXPNQyyMjg==",
             "dependencies": {
-                "@parcel/diagnostic": "^2.0.0",
-                "@parcel/logger": "^2.0.0",
-                "@parcel/types": "^2.0.0",
-                "@parcel/utils": "^2.0.0",
+                "@parcel/diagnostic": "2.5.0",
+                "@parcel/logger": "2.5.0",
+                "@parcel/types": "2.5.0",
+                "@parcel/utils": "2.5.0",
                 "chrome-trace-event": "^1.0.2",
                 "nullthrows": "^1.1.1"
             },
@@ -1883,7 +1809,7 @@
                 "url": "https://opencollective.com/parcel"
             },
             "peerDependencies": {
-                "@parcel/core": "^2.0.0"
+                "@parcel/core": "^2.5.0"
             }
         },
         "node_modules/@swc/helpers": {
@@ -1975,42 +1901,6 @@
             "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
             "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
         },
-        "node_modules/ansi-escapes": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-            "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-            "dependencies": {
-                "type-fest": "^0.21.3"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/ansi-escapes/node_modules/type-fest": {
-            "version": "0.21.3",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-            "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/ansi-html-community": {
-            "version": "0.0.8",
-            "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-            "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-            "engines": [
-                "node >= 0.8.0"
-            ],
-            "bin": {
-                "ansi-html": "bin/ansi-html"
-            }
-        },
         "node_modules/ansi-regex": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -2086,14 +1976,6 @@
                 "node": ">=0.8"
             }
         },
-        "node_modules/astral-regex": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-            "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/astring": {
             "version": "1.7.5",
             "resolved": "https://registry.npmjs.org/astring/-/astring-1.7.5.tgz",
@@ -2103,9 +1985,9 @@
             }
         },
         "node_modules/async": {
-            "version": "0.9.2",
-            "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-            "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
+            "version": "3.2.3",
+            "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+            "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
         },
         "node_modules/async-limiter": {
             "version": "1.0.1",
@@ -2181,14 +2063,6 @@
                 "tweetnacl": "^0.14.3"
             }
         },
-        "node_modules/big.js": {
-            "version": "5.2.2",
-            "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-            "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-            "engines": {
-                "node": "*"
-            }
-        },
         "node_modules/bl": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -2534,11 +2408,6 @@
                 "node": ">= 0.8"
             }
         },
-        "node_modules/command-exists": {
-            "version": "1.2.9",
-            "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
-            "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
-        },
         "node_modules/commander": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
@@ -2620,11 +2489,6 @@
                 "url": "https://opencollective.com/core-js"
             }
         },
-        "node_modules/core-util-is": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-            "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
-        },
         "node_modules/cosmiconfig": {
             "version": "7.0.1",
             "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
@@ -2679,21 +2543,6 @@
                 "sha.js": "^2.4.8"
             }
         },
-        "node_modules/cross-spawn": {
-            "version": "6.0.5",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-            "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-            "dependencies": {
-                "nice-try": "^1.0.4",
-                "path-key": "^2.0.1",
-                "semver": "^5.5.0",
-                "shebang-command": "^1.2.0",
-                "which": "^1.2.9"
-            },
-            "engines": {
-                "node": ">=4.8"
-            }
-        },
         "node_modules/crypto-browserify": {
             "version": "3.12.0",
             "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
@@ -2737,101 +2586,6 @@
                 "postcss": "^8.0.9"
             }
         },
-        "node_modules/css-modules-loader-core": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz",
-            "integrity": "sha1-WQhmgpShvs0mGuCkziGwtVHyHRY=",
-            "dependencies": {
-                "icss-replace-symbols": "1.1.0",
-                "postcss": "6.0.1",
-                "postcss-modules-extract-imports": "1.1.0",
-                "postcss-modules-local-by-default": "1.2.0",
-                "postcss-modules-scope": "1.1.0",
-                "postcss-modules-values": "1.3.0"
-            }
-        },
-        "node_modules/css-modules-loader-core/node_modules/ansi-regex": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-            "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/css-modules-loader-core/node_modules/ansi-styles": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-            "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/css-modules-loader-core/node_modules/chalk": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-            "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-            "dependencies": {
-                "ansi-styles": "^2.2.1",
-                "escape-string-regexp": "^1.0.2",
-                "has-ansi": "^2.0.0",
-                "strip-ansi": "^3.0.0",
-                "supports-color": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/css-modules-loader-core/node_modules/chalk/node_modules/supports-color": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-            "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-            "engines": {
-                "node": ">=0.8.0"
-            }
-        },
-        "node_modules/css-modules-loader-core/node_modules/has-flag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-            "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/css-modules-loader-core/node_modules/postcss": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
-            "integrity": "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=",
-            "dependencies": {
-                "chalk": "^1.1.3",
-                "source-map": "^0.5.6",
-                "supports-color": "^3.2.3"
-            },
-            "engines": {
-                "node": ">=4.0.0"
-            }
-        },
-        "node_modules/css-modules-loader-core/node_modules/strip-ansi": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-            "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-            "dependencies": {
-                "ansi-regex": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/css-modules-loader-core/node_modules/supports-color": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-            "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-            "dependencies": {
-                "has-flag": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=0.8.0"
-            }
-        },
         "node_modules/css-select": {
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
@@ -2847,15 +2601,6 @@
                 "url": "https://github.com/sponsors/fb55"
             }
         },
-        "node_modules/css-selector-tokenizer": {
-            "version": "0.7.3",
-            "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz",
-            "integrity": "sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==",
-            "dependencies": {
-                "cssesc": "^3.0.0",
-                "fastparse": "^1.1.2"
-            }
-        },
         "node_modules/css-tree": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
@@ -3225,11 +2970,11 @@
             "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
         },
         "node_modules/ejs": {
-            "version": "3.1.6",
-            "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
-            "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
+            "version": "3.1.7",
+            "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.7.tgz",
+            "integrity": "sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==",
             "dependencies": {
-                "jake": "^10.6.1"
+                "jake": "^10.8.5"
             },
             "bin": {
                 "ejs": "bin/cli.js"
@@ -3267,98 +3012,12 @@
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
             "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
         },
-        "node_modules/emojis-list": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-            "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+        "node_modules/encodeurl": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+            "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
             "engines": {
-                "node": ">= 4"
-            }
-        },
-        "node_modules/emphasize": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/emphasize/-/emphasize-4.2.0.tgz",
-            "integrity": "sha512-yGKvcFUHlBsUPwlxTlzKLR8+zhpbitkFOMCUxN8fTJng9bdH3WNzUGkhdaGdjndSUgqmMPBN7umfwnUdLz5Axg==",
-            "dependencies": {
-                "chalk": "^4.0.0",
-                "highlight.js": "~10.4.0",
-                "lowlight": "~1.17.0"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/wooorm"
-            }
-        },
-        "node_modules/emphasize/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/emphasize/node_modules/chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
-        "node_modules/emphasize/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/emphasize/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "node_modules/emphasize/node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/emphasize/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/encodeurl": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-            "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-            "engines": {
-                "node": ">= 0.8"
+                "node": ">= 0.8"
             }
         },
         "node_modules/entities": {
@@ -3586,16 +3245,6 @@
                 "punycode": "^1.3.2"
             }
         },
-        "node_modules/fastest-levenshtein": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-            "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="
-        },
-        "node_modules/fastparse": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
-            "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="
-        },
         "node_modules/fastq": {
             "version": "1.13.0",
             "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
@@ -3604,24 +3253,31 @@
                 "reusify": "^1.0.4"
             }
         },
-        "node_modules/fault": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz",
-            "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==",
+        "node_modules/filelist": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.3.tgz",
+            "integrity": "sha512-LwjCsruLWQULGYKy7TX0OPtrL9kLpojOFKc5VCTxdFTV7w5zbsgqVKfnkKG7Qgjtq50gKfO56hJv88OfcGb70Q==",
             "dependencies": {
-                "format": "^0.2.0"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/wooorm"
+                "minimatch": "^5.0.1"
             }
         },
-        "node_modules/filelist": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
-            "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
+        "node_modules/filelist/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
             "dependencies": {
-                "minimatch": "^3.0.4"
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/filelist/node_modules/minimatch": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+            "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
         "node_modules/filesize": {
@@ -3674,9 +3330,9 @@
             "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         },
         "node_modules/follow-redirects": {
-            "version": "1.14.4",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
-            "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==",
+            "version": "1.15.0",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz",
+            "integrity": "sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==",
             "funding": [
                 {
                     "type": "individual",
@@ -3718,14 +3374,6 @@
                 "node": ">= 0.12"
             }
         },
-        "node_modules/format": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
-            "integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=",
-            "engines": {
-                "node": ">=0.4.x"
-            }
-        },
         "node_modules/fs.realpath": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -3736,14 +3384,6 @@
             "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
             "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
         },
-        "node_modules/generic-names": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/generic-names/-/generic-names-2.0.1.tgz",
-            "integrity": "sha512-kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ==",
-            "dependencies": {
-                "loader-utils": "^1.1.0"
-            }
-        },
         "node_modules/gensync": {
             "version": "1.0.0-beta.2",
             "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -3859,11 +3499,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/graceful-fs": {
-            "version": "4.2.8",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-            "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
-        },
         "node_modules/har-schema": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -3896,25 +3531,6 @@
                 "node": ">= 0.4.0"
             }
         },
-        "node_modules/has-ansi": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-            "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-            "dependencies": {
-                "ansi-regex": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/has-ansi/node_modules/ansi-regex": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-            "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/has-bigints": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
@@ -3991,14 +3607,6 @@
                 "minimalistic-assert": "^1.0.1"
             }
         },
-        "node_modules/highlight.js": {
-            "version": "10.4.1",
-            "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz",
-            "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==",
-            "engines": {
-                "node": "*"
-            }
-        },
         "node_modules/hmac-drbg": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -4119,51 +3727,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/icss-replace-symbols": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
-            "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0="
-        },
-        "node_modules/icss-utils": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-            "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-            "dependencies": {
-                "postcss": "^7.0.14"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/icss-utils/node_modules/picocolors": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-            "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-        },
-        "node_modules/icss-utils/node_modules/postcss": {
-            "version": "7.0.39",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-            "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-            "dependencies": {
-                "picocolors": "^0.2.1",
-                "source-map": "^0.6.1"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/postcss/"
-            }
-        },
-        "node_modules/icss-utils/node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/ieee754": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -4183,14 +3746,6 @@
                 }
             ]
         },
-        "node_modules/iferr": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/iferr/-/iferr-1.0.2.tgz",
-            "integrity": "sha512-9AfeLfji44r5TKInjhz3W9DyZI1zR1JAf2hVBMGhddAKPqBsupb89jGfbCTHIGZd6fGZl9WlHdn4AObygyMKwg==",
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
         "node_modules/ignore": {
             "version": "5.1.8",
             "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
@@ -4214,14 +3769,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/imurmurhash": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-            "engines": {
-                "node": ">=0.8.19"
-            }
-        },
         "node_modules/indexes-of": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
@@ -4333,20 +3880,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/is-docker": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-            "bin": {
-                "is-docker": "cli.js"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -4561,11 +4094,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/is-url": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
-            "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
-        },
         "node_modules/is-weakref": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
@@ -4577,22 +4105,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/is-wsl": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-            "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-            "dependencies": {
-                "is-docker": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/isarray": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-            "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-        },
         "node_modules/isbinaryfile": {
             "version": "4.0.8",
             "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz",
@@ -4605,23 +4117,18 @@
                 "url": "https://github.com/sponsors/gjtorikian/"
             }
         },
-        "node_modules/isexe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-        },
         "node_modules/isstream": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
             "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
         },
         "node_modules/jake": {
-            "version": "10.8.2",
-            "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz",
-            "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==",
+            "version": "10.8.5",
+            "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
+            "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
             "dependencies": {
-                "async": "0.9.x",
-                "chalk": "^2.4.2",
+                "async": "^3.2.3",
+                "chalk": "^4.0.2",
                 "filelist": "^1.0.1",
                 "minimatch": "^3.0.4"
             },
@@ -4629,7 +4136,71 @@
                 "jake": "bin/cli.js"
             },
             "engines": {
-                "node": "*"
+                "node": ">=10"
+            }
+        },
+        "node_modules/jake/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/jake/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
+            }
+        },
+        "node_modules/jake/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jake/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "node_modules/jake/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jake/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
         "node_modules/js-tokens": {
@@ -4703,48 +4274,43 @@
             "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
         },
         "node_modules/json-schema": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-            "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+            "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
         },
         "node_modules/json-schema-traverse": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
             "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
-        "node_modules/json-source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/json-source-map/-/json-source-map-0.6.1.tgz",
-            "integrity": "sha512-1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg=="
-        },
         "node_modules/json-stringify-safe": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
             "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
         },
         "node_modules/json5": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-            "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-            "dependencies": {
-                "minimist": "^1.2.0"
-            },
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+            "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
             "bin": {
                 "json5": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=6"
             }
         },
         "node_modules/jsprim": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-            "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-            "engines": [
-                "node >=0.6.0"
-            ],
+            "version": "1.4.2",
+            "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+            "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
             "dependencies": {
                 "assert-plus": "1.0.0",
                 "extsprintf": "1.3.0",
-                "json-schema": "0.2.3",
+                "json-schema": "0.4.0",
                 "verror": "1.10.0"
+            },
+            "engines": {
+                "node": ">=0.6.0"
             }
         },
         "node_modules/levn": {
@@ -4772,33 +4338,17 @@
             "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
             "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
         },
-        "node_modules/lmdb-store": {
-            "version": "1.6.8",
-            "resolved": "https://registry.npmjs.org/lmdb-store/-/lmdb-store-1.6.8.tgz",
-            "integrity": "sha512-Ltok13VVAfgO5Fdj/jVzXjPJZjefl1iENEHerZyAfAlzFUhvOrA73UdKItqmEPC338U29mm56ZBQr5NJQiKXow==",
+        "node_modules/lmdb": {
+            "version": "2.2.4",
+            "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-2.2.4.tgz",
+            "integrity": "sha512-gto+BB2uEob8qRiTlOq+R3uX0YNHsX9mjxj9Sbdue/LIKqu6IlZjrsjKeGyOMquc/474GEqFyX2pdytpydp0rQ==",
             "hasInstallScript": true,
             "dependencies": {
-                "mkdirp": "^1.0.4",
+                "msgpackr": "^1.5.4",
                 "nan": "^2.14.2",
                 "node-gyp-build": "^4.2.3",
-                "ordered-binary": "^1.0.0",
-                "weak-lru-cache": "^1.0.0"
-            },
-            "optionalDependencies": {
-                "msgpackr": "^1.3.7"
-            }
-        },
-        "node_modules/loader-utils": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-            "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-            "dependencies": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^3.0.0",
-                "json5": "^1.0.1"
-            },
-            "engines": {
-                "node": ">=4.0.0"
+                "ordered-binary": "^1.2.4",
+                "weak-lru-cache": "^1.2.2"
             }
         },
         "node_modules/lodash": {
@@ -4806,11 +4356,6 @@
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
             "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
         },
-        "node_modules/lodash.camelcase": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-            "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
-        },
         "node_modules/lodash.clone": {
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
@@ -4910,30 +4455,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/lowlight": {
-            "version": "1.17.0",
-            "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.17.0.tgz",
-            "integrity": "sha512-vmtBgYKD+QVNy7tIa7ulz5d//Il9R4MooOVh4nkOf9R9Cb/Dk5TXMSTieg/vDulkBkIWj59/BIlyFQxT9X1oAQ==",
-            "dependencies": {
-                "fault": "^1.0.0",
-                "highlight.js": "~10.4.0"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/wooorm"
-            }
-        },
-        "node_modules/lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/md5.js": {
             "version": "1.3.5",
             "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -5046,11 +4567,6 @@
                 "node": "*"
             }
         },
-        "node_modules/minimist": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-            "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
-        },
         "node_modules/mkdirp": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -5068,25 +4584,103 @@
             "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
         "node_modules/msgpackr": {
-            "version": "1.4.5",
-            "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.4.5.tgz",
-            "integrity": "sha512-AFmAehFqidJaSAWig6cp+8MZU3r7rtL1sgBxzXR9YICfG8vGRemCcVoqPG81CqRHdxP/VX/DyM85wltqPseXNw==",
-            "optional": true,
+            "version": "1.5.7",
+            "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.5.7.tgz",
+            "integrity": "sha512-Hsa80i8W4BiObSMHslfnwC+CC1CYHZzoXJZn0+3EvoCEOgt3c5QlXhdcjgFk2aZxMgpV8aUFZqJyQUCIp4UrzA==",
             "optionalDependencies": {
-                "msgpackr-extract": "^1.0.14"
+                "msgpackr-extract": "^1.1.4"
             }
         },
         "node_modules/msgpackr-extract": {
-            "version": "1.0.14",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.0.14.tgz",
-            "integrity": "sha512-t8neMf53jNZRF+f0H9VvEUVvtjGZ21odSBRmFfjZiyxr9lKYY0mpY3kSWZAIc7YWXtCZGOvDQVx2oqcgGiRBrw==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.1.4.tgz",
+            "integrity": "sha512-WQbHvsThprXh+EqZYy+SQFEs7z6bNM7a0vgirwUfwUcphWGT2mdPcpyLCNiRsN6w5q5VKJUMblHY+tNEyceb9Q==",
             "hasInstallScript": true,
             "optional": true,
             "dependencies": {
-                "nan": "^2.14.2",
-                "node-gyp-build": "^4.2.3"
+                "node-gyp-build-optional-packages": "^4.3.2"
+            },
+            "optionalDependencies": {
+                "msgpackr-extract-darwin-arm64": "1.1.0",
+                "msgpackr-extract-darwin-x64": "1.1.0",
+                "msgpackr-extract-linux-arm": "1.1.0",
+                "msgpackr-extract-linux-arm64": "1.1.0",
+                "msgpackr-extract-linux-x64": "1.1.0",
+                "msgpackr-extract-win32-x64": "1.1.0"
             }
         },
+        "node_modules/msgpackr-extract-darwin-arm64": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-1.1.0.tgz",
+            "integrity": "sha512-s1kHoT12tS2cCQOv+Wl3I+/cYNJXBPtwQqGA+dPYoXmchhXiE0Nso+BIfvQ5PxbmAyjj54Q5o7PnLTqVquNfZA==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/msgpackr-extract-darwin-x64": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-1.1.0.tgz",
+            "integrity": "sha512-yx/H/i12IKg4eWGu/eKdKzJD4jaYvvujQSaVmeOMCesbSQnWo5X6YR9TFjoiNoU9Aexk1KufzL9gW+1DozG1yw==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/msgpackr-extract-linux-arm": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-1.1.0.tgz",
+            "integrity": "sha512-0VvSCqi12xpavxl14gMrauwIzHqHbmSChUijy/uo3mpjB1Pk4vlisKpZsaOZvNJyNKj0ACi5jYtbWnnOd7hYGw==",
+            "cpu": [
+                "arm"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/msgpackr-extract-linux-arm64": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-1.1.0.tgz",
+            "integrity": "sha512-AxFle3fHNwz2V4CYDIGFxI6o/ZuI0lBKg0uHI8EcCMUmDE5mVAUWYge5WXmORVvb8sVWyVgFlmi3MTu4Ve6tNQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/msgpackr-extract-linux-x64": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-1.1.0.tgz",
+            "integrity": "sha512-O+XoyNFWpdB8oQL6O/YyzffPpmG5rTNrr1nKLW70HD2ENJUhcITzbV7eZimHPzkn8LAGls1tBaMTHQezTBpFOw==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/msgpackr-extract-win32-x64": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-1.1.0.tgz",
+            "integrity": "sha512-6AJdM5rNsL4yrskRfhujVSPEd6IBpgvsnIT/TPowKNLQ62iIdryizPY2PJNFiW3AJcY249AHEiDBXS1cTDPxzA==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
         "node_modules/nan": {
             "version": "2.15.0",
             "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
@@ -5098,9 +4692,9 @@
             "integrity": "sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ=="
         },
         "node_modules/nanoid": {
-            "version": "3.1.30",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
-            "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==",
+            "version": "3.3.4",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+            "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
             "bin": {
                 "nanoid": "bin/nanoid.cjs"
             },
@@ -5108,33 +4702,28 @@
                 "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
             }
         },
-        "node_modules/ncp": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-            "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
-            "bin": {
-                "ncp": "bin/ncp"
-            }
-        },
-        "node_modules/nice-try": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-            "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-        },
         "node_modules/node-addon-api": {
             "version": "3.2.1",
             "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
             "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
         },
         "node_modules/node-fetch": {
-            "version": "2.6.6",
-            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz",
-            "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==",
+            "version": "2.6.7",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+            "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
             "dependencies": {
                 "whatwg-url": "^5.0.0"
             },
             "engines": {
                 "node": "4.x || >=6.0.0"
+            },
+            "peerDependencies": {
+                "encoding": "^0.1.0"
+            },
+            "peerDependenciesMeta": {
+                "encoding": {
+                    "optional": true
+                }
             }
         },
         "node_modules/node-fetch/node_modules/tr46": {
@@ -5156,14 +4745,6 @@
                 "webidl-conversions": "^3.0.0"
             }
         },
-        "node_modules/node-forge": {
-            "version": "0.10.0",
-            "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-            "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
-            "engines": {
-                "node": ">= 6.0.0"
-            }
-        },
         "node_modules/node-gyp-build": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz",
@@ -5174,6 +4755,17 @@
                 "node-gyp-build-test": "build-test.js"
             }
         },
+        "node_modules/node-gyp-build-optional-packages": {
+            "version": "4.3.2",
+            "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-4.3.2.tgz",
+            "integrity": "sha512-P5Ep3ISdmwcCkZIaBaQamQtWAG0facC89phWZgi5Z3hBU//J6S48OIvyZWSPPf6yQMklLZiqoosWAZUj7N+esA==",
+            "optional": true,
+            "bin": {
+                "node-gyp-build-optional": "optional.js",
+                "node-gyp-build-optional-packages": "bin.js",
+                "node-gyp-build-test": "build-test.js"
+            }
+        },
         "node_modules/node-releases": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.0.tgz",
@@ -5300,21 +4892,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/open": {
-            "version": "7.4.2",
-            "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-            "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
-            "dependencies": {
-                "is-docker": "^2.0.0",
-                "is-wsl": "^2.1.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/optionator": {
             "version": "0.8.3",
             "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -5418,9 +4995,9 @@
             }
         },
         "node_modules/ordered-binary": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.1.3.tgz",
-            "integrity": "sha512-tDTls+KllrZKJrqRXUYJtIcWIyoQycP7cVN7kzNNnhHKF2bMKHflcAQK+pF2Eb1iVaQodHxqZQr0yv4HWLGBhQ=="
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.5.tgz",
+            "integrity": "sha512-djRmZoEpOGvIRW7ufsCDHtvcUa18UC9TxnPbHhSVFZHsoyg0dtut1bWtBZ/fmxdPN62oWXrV6adM7NoWU+CneA=="
         },
         "node_modules/os-browserify": {
             "version": "0.3.0",
@@ -5617,14 +5194,6 @@
             "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
             "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
         },
-        "node_modules/path-key": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-            "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/path-to-regexp": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz",
@@ -5841,253 +5410,43 @@
                 "postcss-value-parser": "^4.1.0"
             },
             "engines": {
-                "node": "^10 || ^12 || >=14.0"
-            },
-            "peerDependencies": {
-                "postcss": "^8.2.15"
-            }
-        },
-        "node_modules/postcss-minify-params": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz",
-            "integrity": "sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw==",
-            "dependencies": {
-                "alphanum-sort": "^1.0.2",
-                "browserslist": "^4.16.0",
-                "cssnano-utils": "^2.0.1",
-                "postcss-value-parser": "^4.1.0",
-                "uniqs": "^2.0.0"
-            },
-            "engines": {
-                "node": "^10 || ^12 || >=14.0"
-            },
-            "peerDependencies": {
-                "postcss": "^8.2.15"
-            }
-        },
-        "node_modules/postcss-minify-selectors": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz",
-            "integrity": "sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og==",
-            "dependencies": {
-                "alphanum-sort": "^1.0.2",
-                "postcss-selector-parser": "^6.0.5"
-            },
-            "engines": {
-                "node": "^10 || ^12 || >=14.0"
-            },
-            "peerDependencies": {
-                "postcss": "^8.2.15"
-            }
-        },
-        "node_modules/postcss-modules": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/postcss-modules/-/postcss-modules-3.2.2.tgz",
-            "integrity": "sha512-JQ8IAqHELxC0N6tyCg2UF40pACY5oiL6UpiqqcIFRWqgDYO8B0jnxzoQ0EOpPrWXvcpu6BSbQU/3vSiq7w8Nhw==",
-            "dependencies": {
-                "generic-names": "^2.0.1",
-                "icss-replace-symbols": "^1.1.0",
-                "lodash.camelcase": "^4.3.0",
-                "postcss": "^7.0.32",
-                "postcss-modules-extract-imports": "^2.0.0",
-                "postcss-modules-local-by-default": "^3.0.2",
-                "postcss-modules-scope": "^2.2.0",
-                "postcss-modules-values": "^3.0.0",
-                "string-hash": "^1.1.1"
-            }
-        },
-        "node_modules/postcss-modules-extract-imports": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz",
-            "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
-            "dependencies": {
-                "postcss": "^6.0.1"
-            }
-        },
-        "node_modules/postcss-modules-extract-imports/node_modules/postcss": {
-            "version": "6.0.23",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-            "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-            "dependencies": {
-                "chalk": "^2.4.1",
-                "source-map": "^0.6.1",
-                "supports-color": "^5.4.0"
-            },
-            "engines": {
-                "node": ">=4.0.0"
-            }
-        },
-        "node_modules/postcss-modules-extract-imports/node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/postcss-modules-local-by-default": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
-            "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
-            "dependencies": {
-                "css-selector-tokenizer": "^0.7.0",
-                "postcss": "^6.0.1"
-            }
-        },
-        "node_modules/postcss-modules-local-by-default/node_modules/postcss": {
-            "version": "6.0.23",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-            "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-            "dependencies": {
-                "chalk": "^2.4.1",
-                "source-map": "^0.6.1",
-                "supports-color": "^5.4.0"
-            },
-            "engines": {
-                "node": ">=4.0.0"
-            }
-        },
-        "node_modules/postcss-modules-local-by-default/node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/postcss-modules-scope": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
-            "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
-            "dependencies": {
-                "css-selector-tokenizer": "^0.7.0",
-                "postcss": "^6.0.1"
-            }
-        },
-        "node_modules/postcss-modules-scope/node_modules/postcss": {
-            "version": "6.0.23",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-            "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-            "dependencies": {
-                "chalk": "^2.4.1",
-                "source-map": "^0.6.1",
-                "supports-color": "^5.4.0"
-            },
-            "engines": {
-                "node": ">=4.0.0"
-            }
-        },
-        "node_modules/postcss-modules-scope/node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/postcss-modules-values": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
-            "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
-            "dependencies": {
-                "icss-replace-symbols": "^1.1.0",
-                "postcss": "^6.0.1"
-            }
-        },
-        "node_modules/postcss-modules-values/node_modules/postcss": {
-            "version": "6.0.23",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-            "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-            "dependencies": {
-                "chalk": "^2.4.1",
-                "source-map": "^0.6.1",
-                "supports-color": "^5.4.0"
-            },
-            "engines": {
-                "node": ">=4.0.0"
-            }
-        },
-        "node_modules/postcss-modules-values/node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/postcss-modules/node_modules/picocolors": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-            "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-        },
-        "node_modules/postcss-modules/node_modules/postcss": {
-            "version": "7.0.39",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-            "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-            "dependencies": {
-                "picocolors": "^0.2.1",
-                "source-map": "^0.6.1"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/postcss/"
-            }
-        },
-        "node_modules/postcss-modules/node_modules/postcss-modules-extract-imports": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-            "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-            "dependencies": {
-                "postcss": "^7.0.5"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/postcss-modules/node_modules/postcss-modules-local-by-default": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
-            "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
-            "dependencies": {
-                "icss-utils": "^4.1.1",
-                "postcss": "^7.0.32",
-                "postcss-selector-parser": "^6.0.2",
-                "postcss-value-parser": "^4.1.0"
-            },
-            "engines": {
-                "node": ">= 6"
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
             }
         },
-        "node_modules/postcss-modules/node_modules/postcss-modules-scope": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-            "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
+        "node_modules/postcss-minify-params": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz",
+            "integrity": "sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw==",
             "dependencies": {
-                "postcss": "^7.0.6",
-                "postcss-selector-parser": "^6.0.0"
+                "alphanum-sort": "^1.0.2",
+                "browserslist": "^4.16.0",
+                "cssnano-utils": "^2.0.1",
+                "postcss-value-parser": "^4.1.0",
+                "uniqs": "^2.0.0"
             },
             "engines": {
-                "node": ">= 6"
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
             }
         },
-        "node_modules/postcss-modules/node_modules/postcss-modules-values": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-            "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
+        "node_modules/postcss-minify-selectors": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz",
+            "integrity": "sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og==",
             "dependencies": {
-                "icss-utils": "^4.0.0",
-                "postcss": "^7.0.6"
-            }
-        },
-        "node_modules/postcss-modules/node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                "alphanum-sort": "^1.0.2",
+                "postcss-selector-parser": "^6.0.5"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
             }
         },
         "node_modules/postcss-normalize-charset": {
@@ -6308,9 +5667,9 @@
             }
         },
         "node_modules/postcss-value-parser": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-            "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+            "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
         },
         "node_modules/postcss/node_modules/picocolors": {
             "version": "0.2.1",
@@ -6367,11 +5726,6 @@
                 "node": ">= 0.6.0"
             }
         },
-        "node_modules/process-nextick-args": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-        },
         "node_modules/psl": {
             "version": "1.8.0",
             "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
@@ -6499,33 +5853,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/readable-stream": {
-            "version": "2.3.7",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-            "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-            "dependencies": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-            }
-        },
-        "node_modules/readable-stream/node_modules/safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        },
-        "node_modules/readable-stream/node_modules/string_decoder": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-            "dependencies": {
-                "safe-buffer": "~5.1.0"
-            }
-        },
         "node_modules/regenerator-runtime": {
             "version": "0.13.9",
             "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
@@ -6654,20 +5981,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/rimraf": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-            "dependencies": {
-                "glob": "^7.1.3"
-            },
-            "bin": {
-                "rimraf": "bin.js"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/ripemd160": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@@ -6774,25 +6087,6 @@
                 "sha.js": "bin.js"
             }
         },
-        "node_modules/shebang-command": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-            "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-            "dependencies": {
-                "shebang-regex": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/shebang-regex": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-            "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/side-channel": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -6819,52 +6113,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/slice-ansi": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-            "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "astral-regex": "^2.0.0",
-                "is-fullwidth-code-point": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-            }
-        },
-        "node_modules/slice-ansi/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/slice-ansi/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/slice-ansi/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
         "node_modules/source-map": {
             "version": "0.5.7",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -6898,27 +6146,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/split2": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-            "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
-            "dependencies": {
-                "readable-stream": "^3.0.0"
-            }
-        },
-        "node_modules/split2/node_modules/readable-stream": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-            "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/srcset": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/srcset/-/srcset-4.0.0.tgz",
@@ -7029,11 +6256,6 @@
                 "safe-buffer": "~5.2.0"
             }
         },
-        "node_modules/string-hash": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
-            "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs="
-        },
         "node_modules/string-width": {
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -7108,37 +6330,6 @@
                 "node": ">=4"
             }
         },
-        "node_modules/supports-hyperlinks": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-            "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-            "dependencies": {
-                "has-flag": "^4.0.0",
-                "supports-color": "^7.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/supports-hyperlinks/node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/supports-hyperlinks/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/svgo": {
             "version": "2.7.0",
             "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.7.0.tgz",
@@ -7175,21 +6366,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/terminal-link": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-            "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-            "dependencies": {
-                "ansi-escapes": "^4.2.1",
-                "supports-hyperlinks": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/terser": {
             "version": "5.9.0",
             "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
@@ -7571,9 +6747,9 @@
             }
         },
         "node_modules/weak-lru-cache": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.1.2.tgz",
-            "integrity": "sha512-Bi5ae8Bev3YulgtLTafpmHmvl3vGbanRkv+qqA2AX8c3qj/MUdvSuaHq7ukDYBcMDINIaRPTPEkXSNCqqWivuA=="
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz",
+            "integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw=="
         },
         "node_modules/webidl-conversions": {
             "version": "4.0.2",
@@ -7603,17 +6779,6 @@
                 "webidl-conversions": "^4.0.2"
             }
         },
-        "node_modules/which": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-            "dependencies": {
-                "isexe": "^2.0.0"
-            },
-            "bin": {
-                "which": "bin/which"
-            }
-        },
         "node_modules/which-boxed-primitive": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
@@ -7750,11 +6915,6 @@
             "resolved": "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-0.4.2.tgz",
             "integrity": "sha512-/eyHVRJQCirEkSZ1agRSCwriMhwlyUcFkXD5TPVSLP+IPzjsqMVzZwdoczLp1SoQU0R3dxz1RpIK+4YNQbCVOA=="
         },
-        "node_modules/yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-        },
         "node_modules/yaml": {
             "version": "1.10.2",
             "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
@@ -7812,14 +6972,6 @@
                 "source-map": "^0.5.0"
             },
             "dependencies": {
-                "json5": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-                    "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-                    "requires": {
-                        "minimist": "^1.2.5"
-                    }
-                },
                 "semver": {
                     "version": "6.3.0",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -8046,10 +7198,28 @@
                 "to-fast-properties": "^2.0.0"
             }
         },
-        "@iarna/toml": {
-            "version": "2.2.5",
-            "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
-            "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+        "@lezer/common": {
+            "version": "0.15.12",
+            "resolved": "https://registry.npmjs.org/@lezer/common/-/common-0.15.12.tgz",
+            "integrity": "sha512-edfwCxNLnzq5pBA/yaIhwJ3U3Kz8VAUOTRg0hhxaizaI1N+qxV7EXDv/kLCkLeq2RzSFvxexlaj5Mzfn2kY0Ig=="
+        },
+        "@lezer/lr": {
+            "version": "0.15.8",
+            "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-0.15.8.tgz",
+            "integrity": "sha512-bM6oE6VQZ6hIFxDNKk8bKPa14hqFrV07J/vHGOeiAbJReIaQXmkVb6xQu4MR+JBTLa5arGRyAAjJe1qaQt3Uvg==",
+            "requires": {
+                "@lezer/common": "^0.15.0"
+            }
+        },
+        "@mischnic/json-sourcemap": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/@mischnic/json-sourcemap/-/json-sourcemap-0.1.0.tgz",
+            "integrity": "sha512-dQb3QnfNqmQNYA4nFSN/uLaByIic58gOXq4Y4XqLOWmOrw73KmJPt/HLyG0wvn1bnR6mBKs/Uwvkh+Hns1T0XA==",
+            "requires": {
+                "@lezer/common": "^0.15.7",
+                "@lezer/lr": "^0.15.4",
+                "json5": "^2.2.1"
+            }
         },
         "@nodelib/fs.scandir": {
             "version": "2.1.5",
@@ -8108,24 +7278,22 @@
             }
         },
         "@parcel/cache": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/cache/-/cache-2.0.0.tgz",
-            "integrity": "sha512-HThLpk1qXkyRyWrqXh5EYdINFd4tl4SCUgbipZ46pQWtwZ8+0nmudbuszeRKi1UCyNCdgktcZu8xmXmSVQNDyA==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/cache/-/cache-2.5.0.tgz",
+            "integrity": "sha512-3kOO3cZQv0FAKhrMHGLdb4Qtzpmy78Q6jPN3u8eCY4yqeDTnyQBZvWNHoyCm5WlmL8y6Q6REYMbETLxSH1ggAQ==",
             "requires": {
-                "@parcel/logger": "^2.0.0",
-                "@parcel/utils": "^2.0.0",
-                "lmdb-store": "^1.5.5"
+                "@parcel/fs": "2.5.0",
+                "@parcel/logger": "2.5.0",
+                "@parcel/utils": "2.5.0",
+                "lmdb": "2.2.4"
             }
         },
         "@parcel/codeframe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.0.0.tgz",
-            "integrity": "sha512-34L0qa72rxtzng2Bw195YYVAZWhuWm1V9u+0bHfajyl242BDUbUNpQOowP/AYRjj7XSmIN6XCUv3luogvMPo8A==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.5.0.tgz",
+            "integrity": "sha512-qafqL8Vu2kr932cCWESoDEEoAeKVi7/xdzTBuhzEJng1AfmRT0rCbt/P4ao3RjiDyozPSjXsHOqM6GDZcto4eQ==",
             "requires": {
-                "chalk": "^4.1.0",
-                "emphasize": "^4.2.0",
-                "slice-ansi": "^4.0.0",
-                "string-width": "^4.2.0"
+                "chalk": "^4.1.0"
             },
             "dependencies": {
                 "ansi-styles": {
@@ -8219,128 +7387,101 @@
             }
         },
         "@parcel/core": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/core/-/core-2.0.0.tgz",
-            "integrity": "sha512-wiY3XyGetCpek0aEi+xB0eQQUn4v9xt20AKx71KpU30SShwcHnVEUEVxuVEi7+NgJQsUCsp8nXUeZluwRTfUFA==",
-            "requires": {
-                "@parcel/cache": "^2.0.0",
-                "@parcel/diagnostic": "^2.0.0",
-                "@parcel/events": "^2.0.0",
-                "@parcel/fs": "^2.0.0",
-                "@parcel/graph": "^2.0.0",
-                "@parcel/hash": "^2.0.0",
-                "@parcel/logger": "^2.0.0",
-                "@parcel/package-manager": "^2.0.0",
-                "@parcel/plugin": "^2.0.0",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/core/-/core-2.5.0.tgz",
+            "integrity": "sha512-dygDmPsfAYJKTnUftcbEzjCik7AAaPbFvJW8ETYz8diyjkAG9y6hvCAZIrJE5pNOjFzg32en4v4UWv8Sqlzl9g==",
+            "requires": {
+                "@mischnic/json-sourcemap": "^0.1.0",
+                "@parcel/cache": "2.5.0",
+                "@parcel/diagnostic": "2.5.0",
+                "@parcel/events": "2.5.0",
+                "@parcel/fs": "2.5.0",
+                "@parcel/graph": "2.5.0",
+                "@parcel/hash": "2.5.0",
+                "@parcel/logger": "2.5.0",
+                "@parcel/package-manager": "2.5.0",
+                "@parcel/plugin": "2.5.0",
                 "@parcel/source-map": "^2.0.0",
-                "@parcel/types": "^2.0.0",
-                "@parcel/utils": "^2.0.0",
-                "@parcel/workers": "^2.0.0",
+                "@parcel/types": "2.5.0",
+                "@parcel/utils": "2.5.0",
+                "@parcel/workers": "2.5.0",
                 "abortcontroller-polyfill": "^1.1.9",
                 "base-x": "^3.0.8",
                 "browserslist": "^4.6.6",
                 "clone": "^2.1.1",
                 "dotenv": "^7.0.0",
                 "dotenv-expand": "^5.1.0",
-                "json-source-map": "^0.6.1",
-                "json5": "^1.0.1",
-                "micromatch": "^4.0.2",
+                "json5": "^2.2.0",
+                "msgpackr": "^1.5.4",
                 "nullthrows": "^1.1.1",
-                "semver": "^5.4.1"
+                "semver": "^5.7.1"
             }
         },
         "@parcel/diagnostic": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.0.0.tgz",
-            "integrity": "sha512-cADyFWaMlhDawQdraFt2TECpiD/DvQ76L+RK97X7sUj5b+cGY7fjrnWPKRVmog5+OoNlbmh1EO3FOLx5vuxzww==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.5.0.tgz",
+            "integrity": "sha512-KiMGGRpEV7wl5gjcxBKcgX84a+cG+IEn94gwy5LK3lENR09nuKShqqgKGAmj/17CobJgw1QNP94/H4Md+oxIWg==",
             "requires": {
-                "json-source-map": "^0.6.1",
+                "@mischnic/json-sourcemap": "^0.1.0",
                 "nullthrows": "^1.1.1"
             }
         },
         "@parcel/events": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/events/-/events-2.0.0.tgz",
-            "integrity": "sha512-v9+pXLtgc44+eIbNAs/SB2tyXKUv+5XF1f3TRsLJ44276e9ksa3Cstrs1EFxZtpi03UoXkXJQoJljGigb2bt8A=="
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/events/-/events-2.5.0.tgz",
+            "integrity": "sha512-Gc2LPwL1H34Ony5MENbKZg7wvCscZ4x9y7Fu92sfbdWpLo3K13hVtsX3TMIIgYt3B7R7OmO8yR880U2T+JfVkQ=="
         },
         "@parcel/fs": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/fs/-/fs-2.0.0.tgz",
-            "integrity": "sha512-1FQIVDO3zWE2vv9EJmLJq+EeZ7DE4lwi/e0fR1PAS1g5YbO9n3u01Xnpzy/jmlL14LnBXdhy4r7OBziShYLK6w==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/fs/-/fs-2.5.0.tgz",
+            "integrity": "sha512-YYr14BWtx/bJ+hu6PPQQ6G/3omOTWgVqEw+UFI3iQH3P6+e0LRXW/Ja1yAcJeepGcTwIP0opnXZBQOm8PBQ2SA==",
             "requires": {
-                "@parcel/fs-search": "^2.0.0",
-                "@parcel/fs-write-stream-atomic": "^2.0.0",
-                "@parcel/types": "^2.0.0",
-                "@parcel/utils": "^2.0.0",
+                "@parcel/fs-search": "2.5.0",
+                "@parcel/types": "2.5.0",
+                "@parcel/utils": "2.5.0",
                 "@parcel/watcher": "^2.0.0",
-                "@parcel/workers": "^2.0.0",
-                "graceful-fs": "^4.2.4",
-                "mkdirp": "^0.5.1",
-                "ncp": "^2.0.0",
-                "nullthrows": "^1.1.1",
-                "rimraf": "^3.0.2",
-                "utility-types": "^3.10.0"
-            },
-            "dependencies": {
-                "mkdirp": {
-                    "version": "0.5.5",
-                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-                    "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-                    "requires": {
-                        "minimist": "^1.2.5"
-                    }
-                }
+                "@parcel/workers": "2.5.0"
             }
         },
         "@parcel/fs-search": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.0.0.tgz",
-            "integrity": "sha512-OVWA0elZm5BKaHgS5FnvlmMwQiU++0sGW7PIyaNJnY0lvpZndU+Pot0xNTSrG3Aq7OkpQlcUWkEMA8KtkHZH1A==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.5.0.tgz",
+            "integrity": "sha512-uBONkz9ZCNSOqbPGWJY3MNl+pqBTfvzHH9+4UhzHEHPArvK2oD0+syYPVE60+zGrxybXTESYMCJp4bHvH6Z2hA==",
             "requires": {
                 "detect-libc": "^1.0.3"
             }
         },
-        "@parcel/fs-write-stream-atomic": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/fs-write-stream-atomic/-/fs-write-stream-atomic-2.0.0.tgz",
-            "integrity": "sha512-PSvAcu7f+3zzjQZuYJjPQVRI99Lu2HEphr04JChwdO5wr/sm6dYFRQdL0SahH/vF1tnEaBFxC4vTslNEBT+9bg==",
-            "requires": {
-                "graceful-fs": "^4.1.2",
-                "iferr": "^1.0.2",
-                "imurmurhash": "^0.1.4",
-                "readable-stream": "1 || 2"
-            }
-        },
         "@parcel/graph": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/graph/-/graph-2.0.0.tgz",
-            "integrity": "sha512-ZI3pYSWWqGAFi4qDa00kieiKpHz3xY9vPr4iVTjNiNXD6fU7C+Y25mxPmLv4uYbJTzccAo0iaN9VGqPo/FyiBg==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/graph/-/graph-2.5.0.tgz",
+            "integrity": "sha512-qa2VtG08dJyTaWrxYAkMIlkoDRSPoiqLDNxxHKplkcxAjXBUw0/AkWaz82VO5r1G6jfOj+nM30ajH9uygZYwbw==",
             "requires": {
+                "@parcel/utils": "2.5.0",
                 "nullthrows": "^1.1.1"
             }
         },
         "@parcel/hash": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/hash/-/hash-2.0.0.tgz",
-            "integrity": "sha512-+Yq+mGnZOSyJ6atLCFvA1Kyg/NVysVzlwSNrmA3dc3yO63GtXojQEEyW9U20d+Bj/DVlocLO52Z61d4P9ak4Tw==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/hash/-/hash-2.5.0.tgz",
+            "integrity": "sha512-47JL0XpB7UvIW6Ijf8vv+yVMt9dLvB/lRlBHFmAkmovisueVMVbYD7smxVZnCSehD8UH8BcymKbMzyL5dimgoQ==",
             "requires": {
                 "detect-libc": "^1.0.3",
-                "xxhash-wasm": "^0.4.1"
+                "xxhash-wasm": "^0.4.2"
             }
         },
         "@parcel/logger": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/logger/-/logger-2.0.0.tgz",
-            "integrity": "sha512-jpESL6m4tEGP+Yj/PZGb6ellrOx3irEIvSjbhwZBGoXaApqqvB352dLXrVJ/vyrmzj9YLNdm2rPWeZWkMDGgMA==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/logger/-/logger-2.5.0.tgz",
+            "integrity": "sha512-pT1L3ceH6trL1N3I3r2HawPjz/PCubOo/Kazu7IeXsMsKVjj1a6AeieZHzkNZIbhiGPtm/cHbBNLz2zTWDLeOA==",
             "requires": {
-                "@parcel/diagnostic": "^2.0.0",
-                "@parcel/events": "^2.0.0"
+                "@parcel/diagnostic": "2.5.0",
+                "@parcel/events": "2.5.0"
             }
         },
         "@parcel/markdown-ansi": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.0.0.tgz",
-            "integrity": "sha512-AgxIXRaEpNi1GukjWC6FTLO7t/EImv+3KuwFF5tGlWhXO41V1Igl6gXCDpzRmTk5dBbdqOWdRWip1O5Qy74cwA==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.5.0.tgz",
+            "integrity": "sha512-ixkNF3KWIqxMlfxTe9Gb2cp/uNmklQev8VEUxujMVxmUfGyQs4859zdJIQlIinabWYhArhsXATkVf3MzCUN6TQ==",
             "requires": {
                 "chalk": "^4.1.0"
             },
@@ -8511,21 +7652,17 @@
             }
         },
         "@parcel/package-manager": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.0.0.tgz",
-            "integrity": "sha512-zJY5SOaEC6pyU9bXLmGlnD7VRWURsbxPVNHVreFNttHg2DaT+0u1R5NAoor4BG38esw2TaGdi8QU9TmsTyhSUQ==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.5.0.tgz",
+            "integrity": "sha512-zTuF55/lITUjw9dUU/X0HiF++589xbPXw/zUiG9T6s8BQThLvrxAhYP89S719pw7cTqDimGkTxnIuK+a0djEkg==",
             "requires": {
-                "@parcel/diagnostic": "^2.0.0",
-                "@parcel/fs": "^2.0.0",
-                "@parcel/logger": "^2.0.0",
-                "@parcel/types": "^2.0.0",
-                "@parcel/utils": "^2.0.0",
-                "@parcel/workers": "^2.0.0",
-                "command-exists": "^1.2.6",
-                "cross-spawn": "^6.0.4",
-                "nullthrows": "^1.1.1",
-                "semver": "^5.4.1",
-                "split2": "^3.1.1"
+                "@parcel/diagnostic": "2.5.0",
+                "@parcel/fs": "2.5.0",
+                "@parcel/logger": "2.5.0",
+                "@parcel/types": "2.5.0",
+                "@parcel/utils": "2.5.0",
+                "@parcel/workers": "2.5.0",
+                "semver": "^5.7.1"
             }
         },
         "@parcel/packager-css": {
@@ -8586,11 +7723,11 @@
             }
         },
         "@parcel/plugin": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.0.0.tgz",
-            "integrity": "sha512-yOBRbizd27vivgFRxpTBxfViTIYMdoLeAvRHEoL49dkymKkKtq09hZQtVS+iQmypwyJnp4cMsG8FwN+srJub7w==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.5.0.tgz",
+            "integrity": "sha512-obtb6/Gql6YFQ86bdv75A2Noabx8679reFZeyfKKf0L7Lppx4DFQetXwM9XVy7Gx6hJ1Ekm3UMuuIyVJk33YHQ==",
             "requires": {
-                "@parcel/types": "^2.0.0"
+                "@parcel/types": "2.5.0"
             }
         },
         "@parcel/reporter-cli": {
@@ -8745,19 +7882,9 @@
                 "@parcel/utils": "^2.0.0",
                 "browserslist": "^4.6.6",
                 "core-js": "^3.2.1",
-                "json5": "^2.1.0",
-                "nullthrows": "^1.1.1",
-                "semver": "^5.7.0"
-            },
-            "dependencies": {
-                "json5": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-                    "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-                    "requires": {
-                        "minimist": "^1.2.5"
-                    }
-                }
+                "json5": "^2.1.0",
+                "nullthrows": "^1.1.1",
+                "semver": "^5.7.0"
             }
         },
         "@parcel/transformer-css": {
@@ -8832,32 +7959,21 @@
             "requires": {
                 "@parcel/plugin": "^2.0.0",
                 "json5": "^2.1.0"
-            },
-            "dependencies": {
-                "json5": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-                    "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-                    "requires": {
-                        "minimist": "^1.2.5"
-                    }
-                }
             }
         },
         "@parcel/transformer-postcss": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.0.0.tgz",
-            "integrity": "sha512-CnDgHs2G6nAQghpMWrB84K2QYVLQ2q8CucD4XTe9xc2mo1ObeCtpEijAxsORyp4TTZYOLsw4hmVbv/eY8uLOLg==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.5.0.tgz",
+            "integrity": "sha512-IPNlWElekdQHMTBqhdwJNBCQomuYyo7xgNBdnTrt9VJ+R5ihy6n7ZJSWIAJXAH9VZxETTtunfrzRtgkmtjTeZQ==",
             "requires": {
-                "@parcel/hash": "^2.0.0",
-                "@parcel/plugin": "^2.0.0",
-                "@parcel/utils": "^2.0.0",
+                "@parcel/diagnostic": "2.5.0",
+                "@parcel/hash": "2.5.0",
+                "@parcel/plugin": "2.5.0",
+                "@parcel/utils": "2.5.0",
                 "clone": "^2.1.1",
-                "css-modules-loader-core": "^1.1.0",
                 "nullthrows": "^1.1.1",
-                "postcss-modules": "^3.2.2",
-                "postcss-value-parser": "^4.1.0",
-                "semver": "^5.4.1"
+                "postcss-value-parser": "^4.2.0",
+                "semver": "^5.7.1"
             }
         },
         "@parcel/transformer-posthtml": {
@@ -8907,45 +8023,31 @@
             }
         },
         "@parcel/types": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/types/-/types-2.0.0.tgz",
-            "integrity": "sha512-117vnZuQ1HzXOrIo8qAFgG0lMfz5dck7u+smlaZP1aRxVJaxWBo2C2+8JoTPHjRn9tE5IZGH9PVIZW+X3F474g==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/types/-/types-2.5.0.tgz",
+            "integrity": "sha512-bA0fhG6aXSGYEVo5Dt96x6lseUQHeVZVzgmiRdZsvb614Gvx22ItfaKhPmAVbM9vzbObZDHl9l9G2Ovw8Xve4g==",
             "requires": {
-                "@parcel/cache": "^2.0.0",
-                "@parcel/diagnostic": "^2.0.0",
-                "@parcel/fs": "^2.0.0",
-                "@parcel/package-manager": "^2.0.0",
+                "@parcel/cache": "2.5.0",
+                "@parcel/diagnostic": "2.5.0",
+                "@parcel/fs": "2.5.0",
+                "@parcel/package-manager": "2.5.0",
                 "@parcel/source-map": "^2.0.0",
-                "@parcel/workers": "^2.0.0",
+                "@parcel/workers": "2.5.0",
                 "utility-types": "^3.10.0"
             }
         },
         "@parcel/utils": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/utils/-/utils-2.0.0.tgz",
-            "integrity": "sha512-4SX8qNyImHLyvVls1U9rxF+h+1kbbdWpxnRiHOFPBYW6H1LiUNBjXPPffTEpKb+RFOqmQ2uNh0aP0mCmROPfXg==",
-            "requires": {
-                "@iarna/toml": "^2.2.0",
-                "@parcel/codeframe": "^2.0.0",
-                "@parcel/diagnostic": "^2.0.0",
-                "@parcel/hash": "^2.0.0",
-                "@parcel/logger": "^2.0.0",
-                "@parcel/markdown-ansi": "^2.0.0",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/utils/-/utils-2.5.0.tgz",
+            "integrity": "sha512-kaLGXtQuOOH55KZqXdYDvczhh3mk2eeTVqrrXuuihGjbLKYFlUW2tFDm+5r2s9nCPwTQxOO43ZEOCKSnia+e4w==",
+            "requires": {
+                "@parcel/codeframe": "2.5.0",
+                "@parcel/diagnostic": "2.5.0",
+                "@parcel/hash": "2.5.0",
+                "@parcel/logger": "2.5.0",
+                "@parcel/markdown-ansi": "2.5.0",
                 "@parcel/source-map": "^2.0.0",
-                "ansi-html-community": "0.0.8",
-                "chalk": "^4.1.0",
-                "clone": "^2.1.1",
-                "fast-glob": "3.1.1",
-                "fastest-levenshtein": "^1.0.8",
-                "is-glob": "^4.0.0",
-                "is-url": "^1.2.2",
-                "json5": "^1.0.1",
-                "lru-cache": "^6.0.0",
-                "micromatch": "^4.0.4",
-                "node-forge": "^0.10.0",
-                "nullthrows": "^1.1.1",
-                "open": "^7.0.3",
-                "terminal-link": "^2.1.1"
+                "chalk": "^4.1.0"
             },
             "dependencies": {
                 "ansi-styles": {
@@ -9003,14 +8105,14 @@
             }
         },
         "@parcel/workers": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/workers/-/workers-2.0.0.tgz",
-            "integrity": "sha512-emfezGXmmz5NNrtBvbZO4cFosdpEL+OqhIa4SpUH63aedx+9so/GI/rMp19FmTi0qPKQhOLJmD4VZ2RZHbZM4w==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/workers/-/workers-2.5.0.tgz",
+            "integrity": "sha512-/Ow5OKJWs+9OzV3Jy4J++VnbNx0j3ls/M1CGVBLiBWyCada9DMtquYoBQ4Sk6Uam50BKkIFYetGOeXPNQyyMjg==",
             "requires": {
-                "@parcel/diagnostic": "^2.0.0",
-                "@parcel/logger": "^2.0.0",
-                "@parcel/types": "^2.0.0",
-                "@parcel/utils": "^2.0.0",
+                "@parcel/diagnostic": "2.5.0",
+                "@parcel/logger": "2.5.0",
+                "@parcel/types": "2.5.0",
+                "@parcel/utils": "2.5.0",
                 "chrome-trace-event": "^1.0.2",
                 "nullthrows": "^1.1.1"
             }
@@ -9088,26 +8190,6 @@
             "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
             "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
         },
-        "ansi-escapes": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-            "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-            "requires": {
-                "type-fest": "^0.21.3"
-            },
-            "dependencies": {
-                "type-fest": {
-                    "version": "0.21.3",
-                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-                    "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
-                }
-            }
-        },
-        "ansi-html-community": {
-            "version": "0.0.8",
-            "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-            "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="
-        },
         "ansi-regex": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -9173,20 +8255,15 @@
             "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
             "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         },
-        "astral-regex": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-            "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
-        },
         "astring": {
             "version": "1.7.5",
             "resolved": "https://registry.npmjs.org/astring/-/astring-1.7.5.tgz",
             "integrity": "sha512-lobf6RWXb8c4uZ7Mdq0U12efYmpD1UFnyOWVJPTa3ukqZrMopav+2hdNu0hgBF0JIBFK9QgrBDfwYvh3DFJDAA=="
         },
         "async": {
-            "version": "0.9.2",
-            "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-            "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
+            "version": "3.2.3",
+            "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+            "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
         },
         "async-limiter": {
             "version": "1.0.1",
@@ -9239,11 +8316,6 @@
                 "tweetnacl": "^0.14.3"
             }
         },
-        "big.js": {
-            "version": "5.2.2",
-            "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-            "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
-        },
         "bl": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -9526,11 +8598,6 @@
                 "delayed-stream": "~1.0.0"
             }
         },
-        "command-exists": {
-            "version": "1.2.9",
-            "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
-            "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
-        },
         "commander": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
@@ -9602,11 +8669,6 @@
             "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.3.tgz",
             "integrity": "sha512-tReEhtMReZaPFVw7dajMx0vlsz3oOb8ajgPoHVYGxr8ErnZ6PcYEvvmjGmXlfpnxpkYSdOQttjB+MvVbCGfvLw=="
         },
-        "core-util-is": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-            "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
-        },
         "cosmiconfig": {
             "version": "7.0.1",
             "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
@@ -9660,18 +8722,6 @@
                 "sha.js": "^2.4.8"
             }
         },
-        "cross-spawn": {
-            "version": "6.0.5",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-            "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-            "requires": {
-                "nice-try": "^1.0.4",
-                "path-key": "^2.0.1",
-                "semver": "^5.5.0",
-                "shebang-command": "^1.2.0",
-                "which": "^1.2.9"
-            }
-        },
         "crypto-browserify": {
             "version": "3.12.0",
             "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
@@ -9703,81 +8753,6 @@
                 "timsort": "^0.3.0"
             }
         },
-        "css-modules-loader-core": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz",
-            "integrity": "sha1-WQhmgpShvs0mGuCkziGwtVHyHRY=",
-            "requires": {
-                "icss-replace-symbols": "1.1.0",
-                "postcss": "6.0.1",
-                "postcss-modules-extract-imports": "1.1.0",
-                "postcss-modules-local-by-default": "1.2.0",
-                "postcss-modules-scope": "1.1.0",
-                "postcss-modules-values": "1.3.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-                },
-                "ansi-styles": {
-                    "version": "2.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-                    "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-                },
-                "chalk": {
-                    "version": "1.1.3",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-                    "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-                    "requires": {
-                        "ansi-styles": "^2.2.1",
-                        "escape-string-regexp": "^1.0.2",
-                        "has-ansi": "^2.0.0",
-                        "strip-ansi": "^3.0.0",
-                        "supports-color": "^2.0.0"
-                    },
-                    "dependencies": {
-                        "supports-color": {
-                            "version": "2.0.0",
-                            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-                            "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-                        }
-                    }
-                },
-                "has-flag": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-                    "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-                },
-                "postcss": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
-                    "integrity": "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=",
-                    "requires": {
-                        "chalk": "^1.1.3",
-                        "source-map": "^0.5.6",
-                        "supports-color": "^3.2.3"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-                    "requires": {
-                        "ansi-regex": "^2.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "3.2.3",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-                    "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-                    "requires": {
-                        "has-flag": "^1.0.0"
-                    }
-                }
-            }
-        },
         "css-select": {
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
@@ -9790,15 +8765,6 @@
                 "nth-check": "^2.0.0"
             }
         },
-        "css-selector-tokenizer": {
-            "version": "0.7.3",
-            "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz",
-            "integrity": "sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==",
-            "requires": {
-                "cssesc": "^3.0.0",
-                "fastparse": "^1.1.2"
-            }
-        },
         "css-tree": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
@@ -10075,11 +9041,11 @@
             "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
         },
         "ejs": {
-            "version": "3.1.6",
-            "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
-            "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
+            "version": "3.1.7",
+            "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.7.tgz",
+            "integrity": "sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==",
             "requires": {
-                "jake": "^10.6.1"
+                "jake": "^10.8.5"
             }
         },
         "electron-to-chromium": {
@@ -10113,66 +9079,6 @@
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
             "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
         },
-        "emojis-list": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-            "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
-        },
-        "emphasize": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/emphasize/-/emphasize-4.2.0.tgz",
-            "integrity": "sha512-yGKvcFUHlBsUPwlxTlzKLR8+zhpbitkFOMCUxN8fTJng9bdH3WNzUGkhdaGdjndSUgqmMPBN7umfwnUdLz5Axg==",
-            "requires": {
-                "chalk": "^4.0.0",
-                "highlight.js": "~10.4.0",
-                "lowlight": "~1.17.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
         "encodeurl": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -10347,16 +9253,6 @@
                 "punycode": "^1.3.2"
             }
         },
-        "fastest-levenshtein": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-            "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="
-        },
-        "fastparse": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
-            "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="
-        },
         "fastq": {
             "version": "1.13.0",
             "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
@@ -10365,20 +9261,30 @@
                 "reusify": "^1.0.4"
             }
         },
-        "fault": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz",
-            "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==",
-            "requires": {
-                "format": "^0.2.0"
-            }
-        },
         "filelist": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
-            "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.3.tgz",
+            "integrity": "sha512-LwjCsruLWQULGYKy7TX0OPtrL9kLpojOFKc5VCTxdFTV7w5zbsgqVKfnkKG7Qgjtq50gKfO56hJv88OfcGb70Q==",
             "requires": {
-                "minimatch": "^3.0.4"
+                "minimatch": "^5.0.1"
+            },
+            "dependencies": {
+                "brace-expansion": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+                    "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+                    "requires": {
+                        "balanced-match": "^1.0.0"
+                    }
+                },
+                "minimatch": {
+                    "version": "5.0.1",
+                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+                    "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+                    "requires": {
+                        "brace-expansion": "^2.0.1"
+                    }
+                }
             }
         },
         "filesize": {
@@ -10424,9 +9330,9 @@
             }
         },
         "follow-redirects": {
-            "version": "1.14.4",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
-            "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="
+            "version": "1.15.0",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz",
+            "integrity": "sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ=="
         },
         "foreach": {
             "version": "2.0.5",
@@ -10448,11 +9354,6 @@
                 "mime-types": "^2.1.12"
             }
         },
-        "format": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
-            "integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs="
-        },
         "fs.realpath": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -10463,14 +9364,6 @@
             "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
             "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
         },
-        "generic-names": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/generic-names/-/generic-names-2.0.1.tgz",
-            "integrity": "sha512-kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ==",
-            "requires": {
-                "loader-utils": "^1.1.0"
-            }
-        },
         "gensync": {
             "version": "1.0.0-beta.2",
             "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -10550,11 +9443,6 @@
                 "slash": "^3.0.0"
             }
         },
-        "graceful-fs": {
-            "version": "4.2.8",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-            "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
-        },
         "har-schema": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -10577,21 +9465,6 @@
                 "function-bind": "^1.1.1"
             }
         },
-        "has-ansi": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-            "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-            "requires": {
-                "ansi-regex": "^2.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-                }
-            }
-        },
         "has-bigints": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
@@ -10646,11 +9519,6 @@
                 "minimalistic-assert": "^1.0.1"
             }
         },
-        "highlight.js": {
-            "version": "10.4.1",
-            "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz",
-            "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg=="
-        },
         "hmac-drbg": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -10748,50 +9616,11 @@
                 "safer-buffer": ">= 2.1.2 < 3"
             }
         },
-        "icss-replace-symbols": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
-            "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0="
-        },
-        "icss-utils": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-            "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-            "requires": {
-                "postcss": "^7.0.14"
-            },
-            "dependencies": {
-                "picocolors": {
-                    "version": "0.2.1",
-                    "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-                    "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-                },
-                "postcss": {
-                    "version": "7.0.39",
-                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-                    "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-                    "requires": {
-                        "picocolors": "^0.2.1",
-                        "source-map": "^0.6.1"
-                    }
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-                }
-            }
-        },
         "ieee754": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
             "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
         },
-        "iferr": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/iferr/-/iferr-1.0.2.tgz",
-            "integrity": "sha512-9AfeLfji44r5TKInjhz3W9DyZI1zR1JAf2hVBMGhddAKPqBsupb89jGfbCTHIGZd6fGZl9WlHdn4AObygyMKwg=="
-        },
         "ignore": {
             "version": "5.1.8",
             "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
@@ -10806,11 +9635,6 @@
                 "resolve-from": "^4.0.0"
             }
         },
-        "imurmurhash": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
-        },
         "indexes-of": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
@@ -10889,11 +9713,6 @@
                 "has-tostringtag": "^1.0.0"
             }
         },
-        "is-docker": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
-        },
         "is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -11027,11 +9846,6 @@
             "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
             "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="
         },
-        "is-url": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
-            "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
-        },
         "is-weakref": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
@@ -11040,44 +9854,71 @@
                 "call-bind": "^1.0.0"
             }
         },
-        "is-wsl": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-            "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-            "requires": {
-                "is-docker": "^2.0.0"
-            }
-        },
-        "isarray": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-            "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-        },
         "isbinaryfile": {
             "version": "4.0.8",
             "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz",
             "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==",
             "dev": true
         },
-        "isexe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-        },
         "isstream": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
             "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
         },
         "jake": {
-            "version": "10.8.2",
-            "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz",
-            "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==",
+            "version": "10.8.5",
+            "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
+            "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
             "requires": {
-                "async": "0.9.x",
-                "chalk": "^2.4.2",
+                "async": "^3.2.3",
+                "chalk": "^4.0.2",
                 "filelist": "^1.0.1",
                 "minimatch": "^3.0.4"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
             }
         },
         "js-tokens": {
@@ -11144,41 +9985,33 @@
             "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
         },
         "json-schema": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-            "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+            "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
         },
         "json-schema-traverse": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
             "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
-        "json-source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/json-source-map/-/json-source-map-0.6.1.tgz",
-            "integrity": "sha512-1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg=="
-        },
         "json-stringify-safe": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
             "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
         },
         "json5": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-            "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-            "requires": {
-                "minimist": "^1.2.0"
-            }
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+            "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
         },
         "jsprim": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-            "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+            "version": "1.4.2",
+            "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+            "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
             "requires": {
                 "assert-plus": "1.0.0",
                 "extsprintf": "1.3.0",
-                "json-schema": "0.2.3",
+                "json-schema": "0.4.0",
                 "verror": "1.10.0"
             }
         },
@@ -11201,27 +10034,16 @@
             "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
             "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
         },
-        "lmdb-store": {
-            "version": "1.6.8",
-            "resolved": "https://registry.npmjs.org/lmdb-store/-/lmdb-store-1.6.8.tgz",
-            "integrity": "sha512-Ltok13VVAfgO5Fdj/jVzXjPJZjefl1iENEHerZyAfAlzFUhvOrA73UdKItqmEPC338U29mm56ZBQr5NJQiKXow==",
+        "lmdb": {
+            "version": "2.2.4",
+            "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-2.2.4.tgz",
+            "integrity": "sha512-gto+BB2uEob8qRiTlOq+R3uX0YNHsX9mjxj9Sbdue/LIKqu6IlZjrsjKeGyOMquc/474GEqFyX2pdytpydp0rQ==",
             "requires": {
-                "mkdirp": "^1.0.4",
-                "msgpackr": "^1.3.7",
+                "msgpackr": "^1.5.4",
                 "nan": "^2.14.2",
                 "node-gyp-build": "^4.2.3",
-                "ordered-binary": "^1.0.0",
-                "weak-lru-cache": "^1.0.0"
-            }
-        },
-        "loader-utils": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-            "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-            "requires": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^3.0.0",
-                "json5": "^1.0.1"
+                "ordered-binary": "^1.2.4",
+                "weak-lru-cache": "^1.2.2"
             }
         },
         "lodash": {
@@ -11229,11 +10051,6 @@
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
             "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
         },
-        "lodash.camelcase": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-            "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
-        },
         "lodash.clone": {
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
@@ -11308,23 +10125,6 @@
                 }
             }
         },
-        "lowlight": {
-            "version": "1.17.0",
-            "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.17.0.tgz",
-            "integrity": "sha512-vmtBgYKD+QVNy7tIa7ulz5d//Il9R4MooOVh4nkOf9R9Cb/Dk5TXMSTieg/vDulkBkIWj59/BIlyFQxT9X1oAQ==",
-            "requires": {
-                "fault": "^1.0.0",
-                "highlight.js": "~10.4.0"
-            }
-        },
-        "lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "requires": {
-                "yallist": "^4.0.0"
-            }
-        },
         "md5.js": {
             "version": "1.3.5",
             "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -11412,11 +10212,6 @@
                 "brace-expansion": "^1.1.7"
             }
         },
-        "minimist": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-            "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
-        },
         "mkdirp": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -11428,24 +10223,64 @@
             "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
         "msgpackr": {
-            "version": "1.4.5",
-            "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.4.5.tgz",
-            "integrity": "sha512-AFmAehFqidJaSAWig6cp+8MZU3r7rtL1sgBxzXR9YICfG8vGRemCcVoqPG81CqRHdxP/VX/DyM85wltqPseXNw==",
-            "optional": true,
+            "version": "1.5.7",
+            "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.5.7.tgz",
+            "integrity": "sha512-Hsa80i8W4BiObSMHslfnwC+CC1CYHZzoXJZn0+3EvoCEOgt3c5QlXhdcjgFk2aZxMgpV8aUFZqJyQUCIp4UrzA==",
             "requires": {
-                "msgpackr-extract": "^1.0.14"
+                "msgpackr-extract": "^1.1.4"
             }
         },
         "msgpackr-extract": {
-            "version": "1.0.14",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.0.14.tgz",
-            "integrity": "sha512-t8neMf53jNZRF+f0H9VvEUVvtjGZ21odSBRmFfjZiyxr9lKYY0mpY3kSWZAIc7YWXtCZGOvDQVx2oqcgGiRBrw==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.1.4.tgz",
+            "integrity": "sha512-WQbHvsThprXh+EqZYy+SQFEs7z6bNM7a0vgirwUfwUcphWGT2mdPcpyLCNiRsN6w5q5VKJUMblHY+tNEyceb9Q==",
             "optional": true,
             "requires": {
-                "nan": "^2.14.2",
-                "node-gyp-build": "^4.2.3"
+                "msgpackr-extract-darwin-arm64": "1.1.0",
+                "msgpackr-extract-darwin-x64": "1.1.0",
+                "msgpackr-extract-linux-arm": "1.1.0",
+                "msgpackr-extract-linux-arm64": "1.1.0",
+                "msgpackr-extract-linux-x64": "1.1.0",
+                "msgpackr-extract-win32-x64": "1.1.0",
+                "node-gyp-build-optional-packages": "^4.3.2"
             }
         },
+        "msgpackr-extract-darwin-arm64": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-1.1.0.tgz",
+            "integrity": "sha512-s1kHoT12tS2cCQOv+Wl3I+/cYNJXBPtwQqGA+dPYoXmchhXiE0Nso+BIfvQ5PxbmAyjj54Q5o7PnLTqVquNfZA==",
+            "optional": true
+        },
+        "msgpackr-extract-darwin-x64": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-1.1.0.tgz",
+            "integrity": "sha512-yx/H/i12IKg4eWGu/eKdKzJD4jaYvvujQSaVmeOMCesbSQnWo5X6YR9TFjoiNoU9Aexk1KufzL9gW+1DozG1yw==",
+            "optional": true
+        },
+        "msgpackr-extract-linux-arm": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-1.1.0.tgz",
+            "integrity": "sha512-0VvSCqi12xpavxl14gMrauwIzHqHbmSChUijy/uo3mpjB1Pk4vlisKpZsaOZvNJyNKj0ACi5jYtbWnnOd7hYGw==",
+            "optional": true
+        },
+        "msgpackr-extract-linux-arm64": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-1.1.0.tgz",
+            "integrity": "sha512-AxFle3fHNwz2V4CYDIGFxI6o/ZuI0lBKg0uHI8EcCMUmDE5mVAUWYge5WXmORVvb8sVWyVgFlmi3MTu4Ve6tNQ==",
+            "optional": true
+        },
+        "msgpackr-extract-linux-x64": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-1.1.0.tgz",
+            "integrity": "sha512-O+XoyNFWpdB8oQL6O/YyzffPpmG5rTNrr1nKLW70HD2ENJUhcITzbV7eZimHPzkn8LAGls1tBaMTHQezTBpFOw==",
+            "optional": true
+        },
+        "msgpackr-extract-win32-x64": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-1.1.0.tgz",
+            "integrity": "sha512-6AJdM5rNsL4yrskRfhujVSPEd6IBpgvsnIT/TPowKNLQ62iIdryizPY2PJNFiW3AJcY249AHEiDBXS1cTDPxzA==",
+            "optional": true
+        },
         "nan": {
             "version": "2.15.0",
             "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
@@ -11457,19 +10292,9 @@
             "integrity": "sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ=="
         },
         "nanoid": {
-            "version": "3.1.30",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
-            "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ=="
-        },
-        "ncp": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-            "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M="
-        },
-        "nice-try": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-            "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+            "version": "3.3.4",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+            "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
         },
         "node-addon-api": {
             "version": "3.2.1",
@@ -11477,9 +10302,9 @@
             "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
         },
         "node-fetch": {
-            "version": "2.6.6",
-            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz",
-            "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==",
+            "version": "2.6.7",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+            "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
             "requires": {
                 "whatwg-url": "^5.0.0"
             },
@@ -11505,16 +10330,17 @@
                 }
             }
         },
-        "node-forge": {
-            "version": "0.10.0",
-            "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-            "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
-        },
         "node-gyp-build": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz",
             "integrity": "sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q=="
         },
+        "node-gyp-build-optional-packages": {
+            "version": "4.3.2",
+            "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-4.3.2.tgz",
+            "integrity": "sha512-P5Ep3ISdmwcCkZIaBaQamQtWAG0facC89phWZgi5Z3hBU//J6S48OIvyZWSPPf6yQMklLZiqoosWAZUj7N+esA==",
+            "optional": true
+        },
         "node-releases": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.0.tgz",
@@ -11602,15 +10428,6 @@
                 "mimic-fn": "^2.1.0"
             }
         },
-        "open": {
-            "version": "7.4.2",
-            "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-            "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
-            "requires": {
-                "is-docker": "^2.0.0",
-                "is-wsl": "^2.1.1"
-            }
-        },
         "optionator": {
             "version": "0.8.3",
             "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -11686,9 +10503,9 @@
             }
         },
         "ordered-binary": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.1.3.tgz",
-            "integrity": "sha512-tDTls+KllrZKJrqRXUYJtIcWIyoQycP7cVN7kzNNnhHKF2bMKHflcAQK+pF2Eb1iVaQodHxqZQr0yv4HWLGBhQ=="
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.5.tgz",
+            "integrity": "sha512-djRmZoEpOGvIRW7ufsCDHtvcUa18UC9TxnPbHhSVFZHsoyg0dtut1bWtBZ/fmxdPN62oWXrV6adM7NoWU+CneA=="
         },
         "os-browserify": {
             "version": "0.3.0",
@@ -11838,11 +10655,6 @@
             "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
             "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
         },
-        "path-key": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-            "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-        },
         "path-to-regexp": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz",
@@ -12015,183 +10827,6 @@
                 "postcss-selector-parser": "^6.0.5"
             }
         },
-        "postcss-modules": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/postcss-modules/-/postcss-modules-3.2.2.tgz",
-            "integrity": "sha512-JQ8IAqHELxC0N6tyCg2UF40pACY5oiL6UpiqqcIFRWqgDYO8B0jnxzoQ0EOpPrWXvcpu6BSbQU/3vSiq7w8Nhw==",
-            "requires": {
-                "generic-names": "^2.0.1",
-                "icss-replace-symbols": "^1.1.0",
-                "lodash.camelcase": "^4.3.0",
-                "postcss": "^7.0.32",
-                "postcss-modules-extract-imports": "^2.0.0",
-                "postcss-modules-local-by-default": "^3.0.2",
-                "postcss-modules-scope": "^2.2.0",
-                "postcss-modules-values": "^3.0.0",
-                "string-hash": "^1.1.1"
-            },
-            "dependencies": {
-                "picocolors": {
-                    "version": "0.2.1",
-                    "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-                    "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-                },
-                "postcss": {
-                    "version": "7.0.39",
-                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-                    "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-                    "requires": {
-                        "picocolors": "^0.2.1",
-                        "source-map": "^0.6.1"
-                    }
-                },
-                "postcss-modules-extract-imports": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-                    "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-                    "requires": {
-                        "postcss": "^7.0.5"
-                    }
-                },
-                "postcss-modules-local-by-default": {
-                    "version": "3.0.3",
-                    "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
-                    "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
-                    "requires": {
-                        "icss-utils": "^4.1.1",
-                        "postcss": "^7.0.32",
-                        "postcss-selector-parser": "^6.0.2",
-                        "postcss-value-parser": "^4.1.0"
-                    }
-                },
-                "postcss-modules-scope": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-                    "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
-                    "requires": {
-                        "postcss": "^7.0.6",
-                        "postcss-selector-parser": "^6.0.0"
-                    }
-                },
-                "postcss-modules-values": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-                    "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
-                    "requires": {
-                        "icss-utils": "^4.0.0",
-                        "postcss": "^7.0.6"
-                    }
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-                }
-            }
-        },
-        "postcss-modules-extract-imports": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz",
-            "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
-            "requires": {
-                "postcss": "^6.0.1"
-            },
-            "dependencies": {
-                "postcss": {
-                    "version": "6.0.23",
-                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-                    "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-                    "requires": {
-                        "chalk": "^2.4.1",
-                        "source-map": "^0.6.1",
-                        "supports-color": "^5.4.0"
-                    }
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-                }
-            }
-        },
-        "postcss-modules-local-by-default": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
-            "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
-            "requires": {
-                "css-selector-tokenizer": "^0.7.0",
-                "postcss": "^6.0.1"
-            },
-            "dependencies": {
-                "postcss": {
-                    "version": "6.0.23",
-                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-                    "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-                    "requires": {
-                        "chalk": "^2.4.1",
-                        "source-map": "^0.6.1",
-                        "supports-color": "^5.4.0"
-                    }
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-                }
-            }
-        },
-        "postcss-modules-scope": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
-            "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
-            "requires": {
-                "css-selector-tokenizer": "^0.7.0",
-                "postcss": "^6.0.1"
-            },
-            "dependencies": {
-                "postcss": {
-                    "version": "6.0.23",
-                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-                    "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-                    "requires": {
-                        "chalk": "^2.4.1",
-                        "source-map": "^0.6.1",
-                        "supports-color": "^5.4.0"
-                    }
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-                }
-            }
-        },
-        "postcss-modules-values": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
-            "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
-            "requires": {
-                "icss-replace-symbols": "^1.1.0",
-                "postcss": "^6.0.1"
-            },
-            "dependencies": {
-                "postcss": {
-                    "version": "6.0.23",
-                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-                    "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-                    "requires": {
-                        "chalk": "^2.4.1",
-                        "source-map": "^0.6.1",
-                        "supports-color": "^5.4.0"
-                    }
-                },
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-                }
-            }
-        },
         "postcss-normalize-charset": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz",
@@ -12324,9 +10959,9 @@
             }
         },
         "postcss-value-parser": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-            "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+            "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
         },
         "posthtml": {
             "version": "0.16.5",
@@ -12363,11 +10998,6 @@
             "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
             "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
         },
-        "process-nextick-args": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-        },
         "psl": {
             "version": "1.8.0",
             "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
@@ -12463,35 +11093,6 @@
             "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.9.0.tgz",
             "integrity": "sha512-Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ=="
         },
-        "readable-stream": {
-            "version": "2.3.7",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-            "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-            "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-            },
-            "dependencies": {
-                "safe-buffer": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                    "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-                },
-                "string_decoder": {
-                    "version": "1.1.1",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-                    "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-                    "requires": {
-                        "safe-buffer": "~5.1.0"
-                    }
-                }
-            }
-        },
         "regenerator-runtime": {
             "version": "0.13.9",
             "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
@@ -12586,14 +11187,6 @@
             "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
             "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
         },
-        "rimraf": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-            "requires": {
-                "glob": "^7.1.3"
-            }
-        },
         "ripemd160": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@@ -12663,19 +11256,6 @@
                 "safe-buffer": "^5.0.1"
             }
         },
-        "shebang-command": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-            "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-            "requires": {
-                "shebang-regex": "^1.0.0"
-            }
-        },
-        "shebang-regex": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-            "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-        },
         "side-channel": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -12696,39 +11276,6 @@
             "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
             "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
         },
-        "slice-ansi": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-            "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-            "requires": {
-                "ansi-styles": "^4.0.0",
-                "astral-regex": "^2.0.0",
-                "is-fullwidth-code-point": "^3.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-                }
-            }
-        },
         "source-map": {
             "version": "0.5.7",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -12755,26 +11302,6 @@
                 }
             }
         },
-        "split2": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-            "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
-            "requires": {
-                "readable-stream": "^3.0.0"
-            },
-            "dependencies": {
-                "readable-stream": {
-                    "version": "3.6.0",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-                    "requires": {
-                        "inherits": "^2.0.3",
-                        "string_decoder": "^1.1.1",
-                        "util-deprecate": "^1.0.1"
-                    }
-                }
-            }
-        },
         "srcset": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/srcset/-/srcset-4.0.0.tgz",
@@ -12863,11 +11390,6 @@
                 "safe-buffer": "~5.2.0"
             }
         },
-        "string-hash": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
-            "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs="
-        },
         "string-width": {
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -12921,30 +11443,6 @@
                 "has-flag": "^3.0.0"
             }
         },
-        "supports-hyperlinks": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-            "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-            "requires": {
-                "has-flag": "^4.0.0",
-                "supports-color": "^7.0.0"
-            },
-            "dependencies": {
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
         "svgo": {
             "version": "2.7.0",
             "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.7.0.tgz",
@@ -12969,15 +11467,6 @@
             "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
             "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="
         },
-        "terminal-link": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-            "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-            "requires": {
-                "ansi-escapes": "^4.2.1",
-                "supports-hyperlinks": "^2.0.0"
-            }
-        },
         "terser": {
             "version": "5.9.0",
             "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
@@ -13289,9 +11778,9 @@
             }
         },
         "weak-lru-cache": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.1.2.tgz",
-            "integrity": "sha512-Bi5ae8Bev3YulgtLTafpmHmvl3vGbanRkv+qqA2AX8c3qj/MUdvSuaHq7ukDYBcMDINIaRPTPEkXSNCqqWivuA=="
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz",
+            "integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw=="
         },
         "webidl-conversions": {
             "version": "4.0.2",
@@ -13321,14 +11810,6 @@
                 "webidl-conversions": "^4.0.2"
             }
         },
-        "which": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-            "requires": {
-                "isexe": "^2.0.0"
-            }
-        },
         "which-boxed-primitive": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
@@ -13423,11 +11904,6 @@
             "resolved": "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-0.4.2.tgz",
             "integrity": "sha512-/eyHVRJQCirEkSZ1agRSCwriMhwlyUcFkXD5TPVSLP+IPzjsqMVzZwdoczLp1SoQU0R3dxz1RpIK+4YNQbCVOA=="
         },
-        "yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-        },
         "yaml": {
             "version": "1.10.2",
             "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",

From 51ff6d4ed3fe26df1e515f81559cbcbedbadbc82 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 19 May 2022 10:24:33 +0200
Subject: [PATCH 319/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 25d221bda7..ceff28be18 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.4"
+version = "0.19.5"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From d5f3549e9fdbc6ca989432c86e3126539ffedd98 Mon Sep 17 00:00:00 2001
From: Panagiotis Georgakopoulos <panagiotis.georgakopoulos@juliacomputing.com>
Date: Thu, 19 May 2022 05:53:27 +0300
Subject: [PATCH 320/821] Guard stderr from wsl utility

---
 src/notebook/path helpers.jl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/notebook/path helpers.jl b/src/notebook/path helpers.jl
index cc7df105ea..4ada9473c4 100644
--- a/src/notebook/path helpers.jl	
+++ b/src/notebook/path helpers.jl	
@@ -27,9 +27,11 @@ but "/mnt/c/Users/pankg/OneDrive/Desktop/pluto/bakery_pnl_ready2.jl" stays the s
 function maybe_convert_path_to_wsl(path)
     try
         if detectwsl()
-            return readchomp(`wslpath -u $(path)`)
+            # wslpath utility prints path to stderr if it fails to convert
+            # (it fails for WSL-valid paths)
+            return readchomp(pipeline(`wslpath -u $(path)`; stderr=devnull))
         end
-    catch
+    catch e
         return path
     end
     return path

From dc565297575f332e73e9f5994a96d33654ca9ce8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 19 May 2022 15:30:49 +0200
Subject: [PATCH 321/821] frontend tests: npm update (#2119)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Παναγιώτης Γεωργακόπουλος <pankgeorg@gmail.com>
---
 test/frontend/package-lock.json | 11669 +++++++++++++++++-------------
 test/frontend/package.json      |     2 +-
 2 files changed, 6491 insertions(+), 5180 deletions(-)

diff --git a/test/frontend/package-lock.json b/test/frontend/package-lock.json
index ec6a57d3cb..4f7cb9e3f7 100644
--- a/test/frontend/package-lock.json
+++ b/test/frontend/package-lock.json
@@ -18,46 +18,64 @@
         "babel-jest": "^26.6.3",
         "jest": "^26.6.3",
         "lodash": "^4.17.21",
-        "puppeteer": "^10.2.0"
+        "puppeteer": "^14.1.0"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.12.13"
+        "@babel/highlight": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz",
-      "integrity": "sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==",
-      "dev": true
+      "version": "7.17.10",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
+      "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
     "node_modules/@babel/core": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.8.tgz",
-      "integrity": "sha512-oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-compilation-targets": "^7.13.8",
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helpers": "^7.13.0",
-        "@babel/parser": "^7.13.4",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.12.tgz",
+      "integrity": "sha512-44ODe6O1IVz9s2oJE3rZ4trNNKTX9O7KpQpfAP4t8QII/zwrVRHL7i2pxhqtcY7tqMLrrKfMlBKnm1QlrRFs5w==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.12",
+        "@babel/helper-compilation-targets": "^7.17.10",
+        "@babel/helper-module-transforms": "^7.17.12",
+        "@babel/helpers": "^7.17.9",
+        "@babel/parser": "^7.17.12",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.12",
+        "@babel/types": "^7.17.12",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
-        "lodash": "^4.17.19",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -67,170 +85,118 @@
         "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@babel/core/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/core/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/core/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@babel/generator": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.12.tgz",
+      "integrity": "sha512-V49KtZiiiLjH/CnIW6OjJdrenrGoyh6AmKQ3k2AZFKozC1h846Q4NYlZ5nqAigPDUXfGzC88+LOUuG8yKd2kCw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+        "@babel/types": "^7.17.12",
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/generator/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/generator/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
+      "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/generator/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.0.0"
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz",
-      "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-annotate-as-pure/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-annotate-as-pure/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz",
-      "integrity": "sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
+      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-explode-assignable-expression": "^7.16.7",
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz",
-      "integrity": "sha512-pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A==",
+      "version": "7.17.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz",
+      "integrity": "sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.13.8",
-        "@babel/helper-validator-option": "^7.12.17",
-        "browserslist": "^4.14.5",
+        "@babel/compat-data": "^7.17.10",
+        "@babel/helper-validator-option": "^7.16.7",
+        "browserslist": "^4.20.2",
         "semver": "^6.3.0"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz",
-      "integrity": "sha512-qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.12.tgz",
+      "integrity": "sha512-sZoOeUTkFJMyhqCei2+Z+wtH/BehW8NVKQt7IRUQlRiOARuXymJYfN/FCcI8CvVbR0XVyDM6eLFOlR7YtiXnew==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-split-export-declaration": "^7.12.13"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-member-expression-to-functions": "^7.17.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz",
-      "integrity": "sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz",
+      "integrity": "sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "regexpu-core": "^4.7.1"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "regexpu-core": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz",
-      "integrity": "sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
+      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.13.0",
@@ -246,773 +212,530 @@
         "@babel/core": "^7.4.0-0"
       }
     },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz",
-      "integrity": "sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==",
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.13.0"
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-explode-assignable-expression/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-explode-assignable-expression/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+    "node_modules/@babel/helper-explode-assignable-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
+      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
+      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
+        "@babel/template": "^7.16.7",
+        "@babel/types": "^7.17.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-function-name/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-function-name/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+    "node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
+      "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.13"
+        "@babel/types": "^7.17.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-get-function-arity/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-get-function-arity/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz",
-      "integrity": "sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==",
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.12.tgz",
+      "integrity": "sha512-t5s2BeSWIghhFRPh9XMn6EIGmvn8Lmw5RVASJzkIx1mSemubQQBNIZiQD7WzaFmaHIrjAec4x8z9Yx8SjJ1/LA==",
       "dev": true,
       "dependencies": {
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-simple-access": "^7.17.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.12",
+        "@babel/types": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-hoist-variables/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
+      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz",
-      "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==",
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz",
+      "integrity": "sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==",
       "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.13.0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
+      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-wrap-function": "^7.16.8",
+        "@babel/types": "^7.16.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz",
-      "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==",
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
+      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.13"
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/traverse": "^7.16.7",
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-module-imports/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-module-imports/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
+      "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+        "@babel/types": "^7.17.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz",
-      "integrity": "sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==",
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
+      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-simple-access": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "lodash": "^4.17.19"
+        "@babel/types": "^7.16.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
-      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
       "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.13"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz",
-      "integrity": "sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==",
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
+      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "@babel/helper-wrap-function": "^7.13.0",
-        "@babel/types": "^7.13.0"
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.16.8",
+        "@babel/types": "^7.16.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+    "node_modules/@babel/helpers": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
+      "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.9",
+        "@babel/types": "^7.17.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz",
-      "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==",
+    "node_modules/@babel/highlight": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
+      "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-replace-supers/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+    "node_modules/@babel/parser": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.12.tgz",
+      "integrity": "sha512-FLzHmN9V3AJIrWfOpvRlZCeVg/WLdicSnTMsLur6uDj9TT8ymUlG9XxURdW/XvuygK+2CW0poOJABdA4m/YKxA==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz",
-      "integrity": "sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==",
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz",
+      "integrity": "sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-simple-access/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz",
+      "integrity": "sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.13.0"
       }
     },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz",
-      "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==",
+    "node_modules/@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz",
+      "integrity": "sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.1"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-remap-async-to-generator": "^7.16.8",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+    "node_modules/@babel/plugin-proposal-class-properties": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz",
+      "integrity": "sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+    "node_modules/@babel/plugin-proposal-class-static-block": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.12.tgz",
+      "integrity": "sha512-8ILyDG6eL14F8iub97dVc8q35Md0PJYAnA5Kz9NACFOkt6ffCcr0FISyUPKHsvuAy36fkpIitxZ9bVYPFMGQHA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-split-export-declaration/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
-      "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz",
-      "integrity": "sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.0.tgz",
-      "integrity": "sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/helpers/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/helpers/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-      "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
       },
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz",
-      "integrity": "sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-remap-async-to-generator": "^7.13.0",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-async-generator-functions/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz",
-      "integrity": "sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.12.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-class-properties/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz",
-      "integrity": "sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
+      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-dynamic-import/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz",
-      "integrity": "sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz",
+      "integrity": "sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-export-namespace-from/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz",
-      "integrity": "sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz",
+      "integrity": "sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "@babel/plugin-syntax-json-strings": "^7.8.3"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-json-strings/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz",
-      "integrity": "sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz",
+      "integrity": "sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz",
-      "integrity": "sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz",
+      "integrity": "sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz",
-      "integrity": "sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
+      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-numeric-separator/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz",
-      "integrity": "sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.12.tgz",
+      "integrity": "sha512-6l9cO3YXXRh4yPCPRA776ZyJ3RobG4ZKJZhp7NDRbKIOeV3dBPG8FXCF7ZtiO2RTCIOkQOph1xDDcc01iWVNjQ==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.13.8",
-        "@babel/helper-compilation-targets": "^7.13.8",
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/compat-data": "^7.17.10",
+        "@babel/helper-compilation-targets": "^7.17.10",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.13.0"
+        "@babel/plugin-transform-parameters": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-object-rest-spread/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz",
-      "integrity": "sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
+      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz",
-      "integrity": "sha512-hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz",
+      "integrity": "sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-optional-chaining/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz",
-      "integrity": "sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz",
+      "integrity": "sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-private-methods/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz",
+      "integrity": "sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
     "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz",
-      "integrity": "sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz",
+      "integrity": "sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-create-regexp-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=4"
@@ -1021,12 +744,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
@@ -1063,11 +780,20 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-class-properties/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
     "node_modules/@babel/plugin-syntax-dynamic-import": {
       "version": "7.8.3",
@@ -1189,643 +915,573 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz",
-      "integrity": "sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==",
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-top-level-await/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz",
-      "integrity": "sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz",
+      "integrity": "sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-arrow-functions/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz",
-      "integrity": "sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz",
+      "integrity": "sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-remap-async-to-generator": "^7.13.0"
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-remap-async-to-generator": "^7.16.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-async-to-generator/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz",
-      "integrity": "sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
+      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-block-scoped-functions/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz",
-      "integrity": "sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.17.12.tgz",
+      "integrity": "sha512-jw8XW/B1i7Lqwqj2CbrViPcZijSxfguBWZP2aN59NHgxUyO/OcO1mfdCxH13QhN5LbWhPkX+f+brKGhZTiqtZQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-block-scoping/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz",
-      "integrity": "sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-split-export-declaration": "^7.12.13",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.17.12.tgz",
+      "integrity": "sha512-cvO7lc7pZat6BsvH6l/EGaI8zpl8paICaoGk+7x7guvtfak/TbIf66nYmJOH13EuG0H+Xx3M+9LQDtSvZFKXKw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
         "globals": "^11.1.0"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz",
-      "integrity": "sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz",
+      "integrity": "sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-computed-properties/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz",
-      "integrity": "sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.12.tgz",
+      "integrity": "sha512-P8pt0YiKtX5UMUL5Xzsc9Oyij+pJE6JuC+F1k0/brq/OOGs5jDa1If3OY0LRWGvJsJhI+8tsiecL3nJLc0WTlg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-destructuring/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz",
-      "integrity": "sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
+      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-dotall-regex/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz",
-      "integrity": "sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz",
+      "integrity": "sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-duplicate-keys/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz",
-      "integrity": "sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
+      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-exponentiation-operator/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz",
-      "integrity": "sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.17.12.tgz",
+      "integrity": "sha512-76lTwYaCxw8ldT7tNmye4LLwSoKDbRCBzu6n/DcK/P3FOR29+38CIIaVIZfwol9By8W/QHORYEnYSLuvcQKrsg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-for-of/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz",
-      "integrity": "sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
+      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz",
-      "integrity": "sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz",
+      "integrity": "sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-literals/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz",
-      "integrity": "sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
+      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-member-expression-literals/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz",
-      "integrity": "sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.17.12.tgz",
+      "integrity": "sha512-p5rt9tB5Ndcc2Za7CeNxVf7YAjRcUMR6yi8o8tKjb9KhRkEvXwa+C0hj6DA5bVDkKRxB0NYhMUGbVKoFu4+zEA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-module-transforms": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz",
-      "integrity": "sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.12.tgz",
+      "integrity": "sha512-tVPs6MImAJz+DiX8Y1xXEMdTk5Lwxu9jiPjlS+nv5M2A59R7+/d1+9A8C/sbuY0b3QjIxqClkj6KAplEtRvzaA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-simple-access": "^7.12.13",
+        "@babel/helper-module-transforms": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-simple-access": "^7.17.7",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz",
-      "integrity": "sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.12.tgz",
+      "integrity": "sha512-NVhDb0q00hqZcuLduUf/kMzbOQHiocmPbIxIvk23HLiEqaTKC/l4eRxeC7lO63M72BmACoiKOcb9AkOAJRerpw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.13.0",
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz",
-      "integrity": "sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.17.12.tgz",
+      "integrity": "sha512-BnsPkrUHsjzZGpnrmJeDFkOMMljWFHPjDc9xDcz71/C+ybF3lfC3V4m3dwXPLZrE5b3bgd4V+3/Pj+3620d7IA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-module-transforms": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz",
-      "integrity": "sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz",
+      "integrity": "sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13"
+        "@babel/helper-create-regexp-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz",
-      "integrity": "sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz",
+      "integrity": "sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-new-target/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz",
-      "integrity": "sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
+      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz",
-      "integrity": "sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz",
+      "integrity": "sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-parameters/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz",
-      "integrity": "sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
+      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-property-literals/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz",
-      "integrity": "sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA==",
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz",
+      "integrity": "sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==",
       "dev": true,
       "dependencies": {
-        "regenerator-transform": "^0.14.2"
+        "regenerator-transform": "^0.15.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz",
-      "integrity": "sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz",
+      "integrity": "sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-reserved-words/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz",
-      "integrity": "sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
+      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-shorthand-properties/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz",
-      "integrity": "sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz",
+      "integrity": "sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-spread/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz",
-      "integrity": "sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
+      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-sticky-regex/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz",
-      "integrity": "sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.17.12.tgz",
+      "integrity": "sha512-kAKJ7DX1dSRa2s7WN1xUAuaQmkTpN+uig4wCKWivVXIObqGbVTUlSavHyfI2iZvz89GFAMGm9p2DBJ4Y1Tp0hw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-template-literals/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz",
-      "integrity": "sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz",
+      "integrity": "sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-typeof-symbol/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz",
-      "integrity": "sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
+      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-unicode-escapes/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz",
-      "integrity": "sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
+      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-unicode-regex/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
     "node_modules/@babel/preset-env": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.9.tgz",
-      "integrity": "sha512-mcsHUlh2rIhViqMG823JpscLMesRt3QbMsv1+jhopXEb3W2wXvQ9QoiOlZI9ZbR3XqPtaFpZwEZKYqGJnGMZTQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.13.8",
-        "@babel/helper-compilation-targets": "^7.13.8",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-validator-option": "^7.12.17",
-        "@babel/plugin-proposal-async-generator-functions": "^7.13.8",
-        "@babel/plugin-proposal-class-properties": "^7.13.0",
-        "@babel/plugin-proposal-dynamic-import": "^7.13.8",
-        "@babel/plugin-proposal-export-namespace-from": "^7.12.13",
-        "@babel/plugin-proposal-json-strings": "^7.13.8",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.13.8",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-        "@babel/plugin-proposal-numeric-separator": "^7.12.13",
-        "@babel/plugin-proposal-object-rest-spread": "^7.13.8",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.13.8",
-        "@babel/plugin-proposal-optional-chaining": "^7.13.8",
-        "@babel/plugin-proposal-private-methods": "^7.13.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.12.13",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.17.12.tgz",
+      "integrity": "sha512-Kke30Rj3Lmcx97bVs71LO0s8M6FmJ7tUAQI9fNId62rf0cYG1UAWwdNO9/sE0/pLEahAw1MqMorymoD12bj5Fg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.17.10",
+        "@babel/helper-compilation-targets": "^7.17.10",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.17.12",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12",
+        "@babel/plugin-proposal-async-generator-functions": "^7.17.12",
+        "@babel/plugin-proposal-class-properties": "^7.17.12",
+        "@babel/plugin-proposal-class-static-block": "^7.17.12",
+        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
+        "@babel/plugin-proposal-export-namespace-from": "^7.17.12",
+        "@babel/plugin-proposal-json-strings": "^7.17.12",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.17.12",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12",
+        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.17.12",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
+        "@babel/plugin-proposal-optional-chaining": "^7.17.12",
+        "@babel/plugin-proposal-private-methods": "^7.17.12",
+        "@babel/plugin-proposal-private-property-in-object": "^7.17.12",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.17.12",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
@@ -1835,78 +1491,59 @@
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.12.13",
-        "@babel/plugin-transform-arrow-functions": "^7.13.0",
-        "@babel/plugin-transform-async-to-generator": "^7.13.0",
-        "@babel/plugin-transform-block-scoped-functions": "^7.12.13",
-        "@babel/plugin-transform-block-scoping": "^7.12.13",
-        "@babel/plugin-transform-classes": "^7.13.0",
-        "@babel/plugin-transform-computed-properties": "^7.13.0",
-        "@babel/plugin-transform-destructuring": "^7.13.0",
-        "@babel/plugin-transform-dotall-regex": "^7.12.13",
-        "@babel/plugin-transform-duplicate-keys": "^7.12.13",
-        "@babel/plugin-transform-exponentiation-operator": "^7.12.13",
-        "@babel/plugin-transform-for-of": "^7.13.0",
-        "@babel/plugin-transform-function-name": "^7.12.13",
-        "@babel/plugin-transform-literals": "^7.12.13",
-        "@babel/plugin-transform-member-expression-literals": "^7.12.13",
-        "@babel/plugin-transform-modules-amd": "^7.13.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.13.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.13.8",
-        "@babel/plugin-transform-modules-umd": "^7.13.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13",
-        "@babel/plugin-transform-new-target": "^7.12.13",
-        "@babel/plugin-transform-object-super": "^7.12.13",
-        "@babel/plugin-transform-parameters": "^7.13.0",
-        "@babel/plugin-transform-property-literals": "^7.12.13",
-        "@babel/plugin-transform-regenerator": "^7.12.13",
-        "@babel/plugin-transform-reserved-words": "^7.12.13",
-        "@babel/plugin-transform-shorthand-properties": "^7.12.13",
-        "@babel/plugin-transform-spread": "^7.13.0",
-        "@babel/plugin-transform-sticky-regex": "^7.12.13",
-        "@babel/plugin-transform-template-literals": "^7.13.0",
-        "@babel/plugin-transform-typeof-symbol": "^7.12.13",
-        "@babel/plugin-transform-unicode-escapes": "^7.12.13",
-        "@babel/plugin-transform-unicode-regex": "^7.12.13",
-        "@babel/preset-modules": "^0.1.4",
-        "@babel/types": "^7.13.0",
-        "babel-plugin-polyfill-corejs2": "^0.1.4",
-        "babel-plugin-polyfill-corejs3": "^0.1.3",
-        "babel-plugin-polyfill-regenerator": "^0.1.2",
-        "core-js-compat": "^3.9.0",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.17.12",
+        "@babel/plugin-transform-async-to-generator": "^7.17.12",
+        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
+        "@babel/plugin-transform-block-scoping": "^7.17.12",
+        "@babel/plugin-transform-classes": "^7.17.12",
+        "@babel/plugin-transform-computed-properties": "^7.17.12",
+        "@babel/plugin-transform-destructuring": "^7.17.12",
+        "@babel/plugin-transform-dotall-regex": "^7.16.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.17.12",
+        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
+        "@babel/plugin-transform-for-of": "^7.17.12",
+        "@babel/plugin-transform-function-name": "^7.16.7",
+        "@babel/plugin-transform-literals": "^7.17.12",
+        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
+        "@babel/plugin-transform-modules-amd": "^7.17.12",
+        "@babel/plugin-transform-modules-commonjs": "^7.17.12",
+        "@babel/plugin-transform-modules-systemjs": "^7.17.12",
+        "@babel/plugin-transform-modules-umd": "^7.17.12",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12",
+        "@babel/plugin-transform-new-target": "^7.17.12",
+        "@babel/plugin-transform-object-super": "^7.16.7",
+        "@babel/plugin-transform-parameters": "^7.17.12",
+        "@babel/plugin-transform-property-literals": "^7.16.7",
+        "@babel/plugin-transform-regenerator": "^7.17.9",
+        "@babel/plugin-transform-reserved-words": "^7.17.12",
+        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
+        "@babel/plugin-transform-spread": "^7.17.12",
+        "@babel/plugin-transform-sticky-regex": "^7.16.7",
+        "@babel/plugin-transform-template-literals": "^7.17.12",
+        "@babel/plugin-transform-typeof-symbol": "^7.17.12",
+        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
+        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.17.12",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "core-js-compat": "^3.22.1",
         "semver": "^6.3.0"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-      "dev": true
-    },
-    "node_modules/@babel/preset-env/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/preset-env/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
     "node_modules/@babel/preset-modules": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
-      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -1920,85 +1557,63 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.9.tgz",
-      "integrity": "sha512-aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA==",
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
+      "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
       "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.13.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "node_modules/@babel/template/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/template/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+        "@babel/code-frame": "^7.16.7",
+        "@babel/parser": "^7.16.7",
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
-        "@babel/types": "^7.13.0",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.12.tgz",
+      "integrity": "sha512-zULPs+TbCvOkIFd4FrG53xrpxvCBwLIgo6tO0tJorY7YV2IWFxUfS/lXDJbGgfyYt9ery/Gxj2niwttNnB0gIw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.12",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/parser": "^7.17.12",
+        "@babel/types": "^7.17.12",
         "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
-    },
-    "node_modules/@babel/traverse/node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.11.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-      "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.12.tgz",
+      "integrity": "sha512-rH8i29wcZ6x9xjzI5ILHL/yZkbQnCERdHlogKuIb4PUr7do4iT8DPekrTbBLWTnRQm6U0GYABbTMSzijmEqlAg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "lodash": "^4.17.19",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@bcoe/v8-coverage": {
@@ -2065,45 +1680,185 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/@jest/core": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
-      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
+    "node_modules/@jest/console/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/reporters": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^26.6.2",
-        "jest-config": "^26.6.3",
-        "jest-haste-map": "^26.6.2",
-        "jest-message-util": "^26.6.2",
-        "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.6.2",
-        "jest-resolve-dependencies": "^26.6.3",
-        "jest-runner": "^26.6.3",
-        "jest-runtime": "^26.6.3",
-        "jest-snapshot": "^26.6.2",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "jest-watcher": "^26.6.2",
-        "micromatch": "^4.0.2",
-        "p-each-series": "^2.1.0",
-        "rimraf": "^3.0.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@jest/console/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/console/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@jest/console/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@jest/console/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/core": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
+      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/reporters": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-changed-files": "^26.6.2",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-resolve-dependencies": "^26.6.3",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "jest-watcher": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "p-each-series": "^2.1.0",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/@jest/core/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@jest/core/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/core/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@jest/core/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/core/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jest/environment": {
       "version": "26.6.2",
       "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
@@ -2188,6 +1943,91 @@
         "node-notifier": "^8.0.0"
       }
     },
+    "node_modules/@jest/reporters/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@jest/reporters/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jest/source-map": {
       "version": "26.6.2",
       "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
@@ -2259,44 +2099,240 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/@jest/types": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+    "node_modules/@jest/transform/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^15.0.0",
-        "chalk": "^4.0.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@sinonjs/commons": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz",
-      "integrity": "sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==",
+    "node_modules/@jest/transform/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
-        "type-detect": "4.0.8"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@sinonjs/fake-timers": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
-      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
+    "node_modules/@jest/transform/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@jest/transform/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/types/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@jest/types/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/types/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@jest/types/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@jest/types/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/types/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
+      "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz",
+      "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
+      "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz",
+      "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
+      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
       "dev": true,
       "dependencies": {
         "@sinonjs/commons": "^1.7.0"
       }
     },
+    "node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/@types/babel__core": {
-      "version": "7.1.12",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.12.tgz",
-      "integrity": "sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==",
+      "version": "7.1.19",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
+      "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
       "dev": true,
       "dependencies": {
         "@babel/parser": "^7.1.0",
@@ -2307,18 +2343,18 @@
       }
     },
     "node_modules/@types/babel__generator": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
-      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
+      "version": "7.6.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
+      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.0.0"
       }
     },
     "node_modules/@types/babel__template": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
-      "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
       "dev": true,
       "dependencies": {
         "@babel/parser": "^7.1.0",
@@ -2326,20 +2362,14 @@
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.0.tgz",
-      "integrity": "sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==",
+      "version": "7.17.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.1.tgz",
+      "integrity": "sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.3.0"
       }
     },
-    "node_modules/@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
-    },
     "node_modules/@types/graceful-fs": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
@@ -2350,9 +2380,9 @@
       }
     },
     "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
+      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
       "dev": true
     },
     "node_modules/@types/istanbul-lib-report": {
@@ -2365,18 +2395,18 @@
       }
     },
     "node_modules/@types/istanbul-reports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-      "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
       "dev": true,
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
     },
     "node_modules/@types/jest": {
-      "version": "26.0.20",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.20.tgz",
-      "integrity": "sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA==",
+      "version": "26.0.24",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz",
+      "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==",
       "dev": true,
       "dependencies": {
         "jest-diff": "^26.0.0",
@@ -2384,48 +2414,48 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "14.14.31",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz",
-      "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==",
+      "version": "17.0.34",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.34.tgz",
+      "integrity": "sha512-XImEz7XwTvDBtzlTnm8YvMqGW/ErMWBsKZ+hMTvnDIjGCKxwK5Xpc+c/oQjOauwq8M4OS11hEkpjX8rrI/eEgA==",
       "dev": true
     },
     "node_modules/@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
       "dev": true
     },
     "node_modules/@types/prettier": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.2.2.tgz",
-      "integrity": "sha512-i99hy7Ki19EqVOl77WplDrvgNugHnsSjECVR/wUrzw2TJXz1zlUfT2ngGckR6xN7yFYaijsMAqPkOLx9HgUqHg==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.1.tgz",
+      "integrity": "sha512-XFjFHmaLVifrAKaZ+EKghFHtHSUonyw8P2Qmy2/+osBnrKbH9UYtlK10zg8/kCt47MFilll/DEDKy3DHfJ0URw==",
       "dev": true
     },
     "node_modules/@types/stack-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
-      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true
     },
     "node_modules/@types/yargs": {
-      "version": "15.0.13",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
-      "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==",
+      "version": "15.0.14",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
+      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/@types/yargs-parser": {
-      "version": "20.2.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
-      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
+      "version": "21.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
+      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
       "dev": true
     },
     "node_modules/@types/yauzl": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
-      "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -2433,15 +2463,15 @@
       }
     },
     "node_modules/abab": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
-      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "version": "8.7.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -2460,6 +2490,18 @@
         "acorn-walk": "^7.1.1"
       }
     },
+    "node_modules/acorn-globals/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/acorn-walk": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
@@ -2481,29 +2523,13 @@
         "node": ">= 6.0.0"
       }
     },
-    "node_modules/ajv": {
-      "version": "6.12.4",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
-      "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
     "node_modules/ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.11.0"
+        "type-fest": "^0.21.3"
       },
       "engines": {
         "node": ">=8"
@@ -2512,18 +2538,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -2534,25 +2548,21 @@
       }
     },
     "node_modules/ansi-styles": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "dependencies": {
-        "@types/color-name": "^1.1.1",
-        "color-convert": "^2.0.1"
+        "color-convert": "^1.9.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=4"
       }
     },
     "node_modules/anymatch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
       "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
@@ -2574,7 +2584,7 @@
     "node_modules/arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -2592,7 +2602,7 @@
     "node_modules/arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -2601,34 +2611,16 @@
     "node_modules/array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -2637,7 +2629,7 @@
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true
     },
     "node_modules/atob": {
@@ -2652,21 +2644,6 @@
         "node": ">= 4.5.0"
       }
     },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/aws4": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
-      "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==",
-      "dev": true
-    },
     "node_modules/babel-jest": {
       "version": "26.6.3",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
@@ -2689,54 +2666,124 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dev": true,
-      "dependencies": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "node_modules/babel-plugin-istanbul": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+    "node_modules/babel-jest/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^4.0.0",
-        "test-exclude": "^6.0.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/babel-plugin-jest-hoist": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
-      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
+    "node_modules/babel-jest/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.0.0",
-        "@types/babel__traverse": "^7.0.6"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
-      }
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/babel-jest/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/babel-jest/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/babel-jest/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-jest/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-dynamic-import-node": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+      "dev": true,
+      "dependencies": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
+      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.0.0",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz",
-      "integrity": "sha512-DO95wD4g0A8KRaHKi0D51NdGXzvpqVLnLu5BTvDlpqUEpTmeEtypgC1xqesORaWmiUOQI14UHKlzNd9iZ2G3ZA==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
+      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.13.0",
-        "@babel/helper-define-polyfill-provider": "^0.1.5",
+        "@babel/compat-data": "^7.13.11",
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
         "semver": "^6.1.1"
       },
       "peerDependencies": {
@@ -2744,25 +2791,25 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz",
-      "integrity": "sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
+      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.1.5",
-        "core-js-compat": "^3.8.1"
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "core-js-compat": "^3.21.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz",
-      "integrity": "sha512-OUrYG9iKPKz8NxswXbRAdSwF0GhRdIEMTloQATJi4bDuFqrXaXcCUT/VGNrr8pBcjMh1RxZ7Xt9cytVJTJfvMg==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
+      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.1.5"
+        "@babel/helper-define-polyfill-provider": "^0.3.1"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
@@ -2808,9 +2855,9 @@
       }
     },
     "node_modules/balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
     "node_modules/base": {
@@ -2843,44 +2890,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/base/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -2901,15 +2910,6 @@
         }
       ]
     },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
-      "dependencies": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
     "node_modules/bl": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -2950,44 +2950,34 @@
       "dev": true
     },
     "node_modules/browserslist": {
-      "version": "4.16.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+      "version": "4.20.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
+      "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
       "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001219",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.723",
+        "caniuse-lite": "^1.0.30001332",
+        "electron-to-chromium": "^1.4.118",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.71"
+        "node-releases": "^2.0.3",
+        "picocolors": "^1.0.0"
       },
       "bin": {
         "browserslist": "cli.js"
       },
       "engines": {
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
-    },
-    "node_modules/browserslist/node_modules/caniuse-lite": {
-      "version": "1.0.30001230",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz",
-      "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
       }
     },
-    "node_modules/browserslist/node_modules/electron-to-chromium": {
-      "version": "1.3.739",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz",
-      "integrity": "sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==",
-      "dev": true
-    },
     "node_modules/bser": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
@@ -3024,16 +3014,16 @@
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
       "dev": true,
       "engines": {
         "node": "*"
       }
     },
     "node_modules/buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
     "node_modules/cache-base": {
@@ -3087,6 +3077,22 @@
         "node": ">=6"
       }
     },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001341",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001341.tgz",
+      "integrity": "sha512-2SodVrFFtvGENGCv0ChVJIDQ0KPaS1cg7/qtfMaICgeMolDdo/Z2OD32F0Aq9yl6F4YFwGPBS5AaPqNYiW4PoA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
+    },
     "node_modules/capture-exit": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
@@ -3099,26 +3105,18 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
-    },
     "node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=4"
       }
     },
     "node_modules/char-regex": {
@@ -3175,6 +3173,77 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/cliui": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
@@ -3216,27 +3285,18 @@
       }
     },
     "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "color-name": "1.1.3"
       }
     },
     "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
     "node_modules/combined-stream": {
@@ -3264,9 +3324,9 @@
       "dev": true
     },
     "node_modules/convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
       "dev": true,
       "dependencies": {
         "safe-buffer": "~5.1.1"
@@ -3282,12 +3342,12 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.9.1.tgz",
-      "integrity": "sha512-jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA==",
+      "version": "3.22.5",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.5.tgz",
+      "integrity": "sha512-rEF75n3QtInrYICvJjrAgV03HwKiYvtKHdPtaba1KucG+cNZ4NJnH9isqt979e67KZlhpbCOTwnsvnIr+CVeOg==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.16.3",
+        "browserslist": "^4.20.3",
         "semver": "7.0.0"
       },
       "funding": {
@@ -3304,35 +3364,27 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+    "node_modules/cross-fetch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "dev": true,
+      "dependencies": {
+        "node-fetch": "2.6.7"
+      }
     },
     "node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
       "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/cross-spawn/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
+        "node": ">= 8"
       }
     },
     "node_modules/cssom": {
@@ -3359,18 +3411,6 @@
       "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
       "dev": true
     },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/data-urls": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
@@ -3386,9 +3426,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -3412,9 +3452,9 @@
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
-      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
       "dev": true
     },
     "node_modules/decode-uri-component": {
@@ -3427,9 +3467,9 @@
       }
     },
     "node_modules/deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
     "node_modules/deepmerge": {
@@ -3442,15 +3482,19 @@
       }
     },
     "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dev": true,
       "dependencies": {
-        "object-keys": "^1.0.12"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/define-property": {
@@ -3466,44 +3510,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/define-property/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -3523,9 +3529,9 @@
       }
     },
     "node_modules/devtools-protocol": {
-      "version": "0.0.901419",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz",
-      "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==",
+      "version": "0.0.982423",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.982423.tgz",
+      "integrity": "sha512-FnVW2nDbjGNw1uD/JRC+9U5768W7e1TfUwqbDTcSsAu1jXFjITSX8w3rkW5FEpHRMPPGpvNSmO1pOpqByiWscA==",
       "dev": true
     },
     "node_modules/diff-sequences": {
@@ -3558,15 +3564,11 @@
         "node": ">=8"
       }
     },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
-      "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.137",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
+      "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
+      "dev": true
     },
     "node_modules/emittery": {
       "version": "0.7.2",
@@ -3623,13 +3625,13 @@
       }
     },
     "node_modules/escodegen": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
       "dev": true,
       "dependencies": {
         "esprima": "^4.0.1",
-        "estraverse": "^4.2.0",
+        "estraverse": "^5.2.0",
         "esutils": "^2.0.2",
         "optionator": "^0.8.1"
       },
@@ -3638,7 +3640,7 @@
         "esgenerate": "bin/esgenerate.js"
       },
       "engines": {
-        "node": ">=4.0"
+        "node": ">=6.0"
       },
       "optionalDependencies": {
         "source-map": "~0.6.1"
@@ -3658,9 +3660,9 @@
       }
     },
     "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
       "engines": {
         "node": ">=4.0"
@@ -3676,27 +3678,32 @@
       }
     },
     "node_modules/exec-sh": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
-      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
+      "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
       "dev": true
     },
     "node_modules/execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
       "dev": true,
       "dependencies": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
+        "cross-spawn": "^7.0.0",
+        "get-stream": "^5.0.0",
+        "human-signals": "^1.1.1",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.0",
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2",
+        "strip-final-newline": "^2.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
     "node_modules/exit": {
@@ -3759,6 +3766,86 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/expand-brackets/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -3782,10 +3869,37 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+    "node_modules/expect/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/expect/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/expect/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/extend-shallow": {
@@ -3801,18 +3915,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/extend-shallow/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
@@ -3856,40 +3958,11 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/extglob/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+    "node_modules/extglob/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3914,36 +3987,6 @@
         "@types/yauzl": "^2.9.1"
       }
     },
-    "node_modules/extract-zip/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ]
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -4008,27 +4051,18 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
       "dev": true,
       "dependencies": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
+        "combined-stream": "^1.0.8",
         "mime-types": "^2.1.12"
       },
       "engines": {
-        "node": ">= 0.12"
+        "node": ">= 6"
       }
     },
     "node_modules/fragment-cache": {
@@ -4117,15 +4151,18 @@
       }
     },
     "node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
       "dev": true,
       "dependencies": {
         "pump": "^3.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/get-value": {
@@ -4137,25 +4174,16 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.1",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
       },
@@ -4176,9 +4204,9 @@
       }
     },
     "node_modules/graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
       "dev": true
     },
     "node_modules/growly": {
@@ -4188,29 +4216,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "deprecated": "this library is no longer supported",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -4224,18 +4229,30 @@
       }
     },
     "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -4331,25 +4348,24 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+    "node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dev": true,
       "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
       },
       "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
+        "node": ">= 6"
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dev": true,
       "dependencies": {
         "agent-base": "6",
@@ -4401,9 +4417,9 @@
       ]
     },
     "node_modules/import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
       "dev": true,
       "dependencies": {
         "pkg-dir": "^4.2.0",
@@ -4414,6 +4430,9 @@
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/imurmurhash": {
@@ -4441,34 +4460,13 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "node_modules/ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
       "dev": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "kind-of": "^6.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -4499,9 +4497,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
-      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -4511,56 +4509,35 @@
       }
     },
     "node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
       "dev": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "kind-of": "^6.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-docker": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
-      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "dev": true,
       "optional": true,
       "bin": {
@@ -4574,10 +4551,13 @@
       }
     },
     "node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
       "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4622,18 +4602,21 @@
       }
     },
     "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
-      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true
     },
     "node_modules/is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-typedarray": {
@@ -4685,30 +4668,25 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
     "node_modules/istanbul-lib-coverage": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/istanbul-lib-instrument": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
+      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.7.5",
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-coverage": "^3.2.0",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -4729,10 +4707,31 @@
         "node": ">=8"
       }
     },
-    "node_modules/istanbul-lib-source-maps": {
+    "node_modules/istanbul-lib-report/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
       "dependencies": {
         "debug": "^4.1.1",
@@ -4740,13 +4739,13 @@
         "source-map": "^0.6.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
     "node_modules/istanbul-reports": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
+      "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
       "dev": true,
       "dependencies": {
         "html-escaper": "^2.0.0",
@@ -4787,122 +4786,101 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-changed-files/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+    "node_modules/jest-cli": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
+      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
       "dev": true,
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "@jest/core": "^26.6.3",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "import-local": "^3.0.2",
+        "is-ci": "^2.0.0",
+        "jest-config": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "prompts": "^2.0.1",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-changed-files/node_modules/execa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+    "node_modules/jest-cli/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "get-stream": "^5.0.0",
-        "human-signals": "^1.1.1",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.0",
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2",
-        "strip-final-newline": "^2.0.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-changed-files/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+    "node_modules/jest-cli/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
-        "pump": "^3.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-changed-files/node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+    "node_modules/jest-cli/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "path-key": "^3.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-changed-files/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/jest-cli/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/jest-changed-files/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+    "node_modules/jest-cli/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-changed-files/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+    "node_modules/jest-cli/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=8"
       }
     },
     "node_modules/jest-config": {
@@ -4942,6 +4920,76 @@
         }
       }
     },
+    "node_modules/jest-config/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-config/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-config/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-config/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-config/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-diff": {
       "version": "26.6.2",
       "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
@@ -4957,6 +5005,76 @@
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-diff/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-diff/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-diff/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-diff/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-docblock": {
       "version": "26.0.0",
       "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
@@ -4985,6 +5103,76 @@
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-each/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-each/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-each/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-each/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-each/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-environment-jsdom": {
       "version": "26.6.2",
       "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
@@ -5085,17 +5273,87 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-leak-detector": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
-      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+    "node_modules/jest-jasmine2/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-jasmine2/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
+      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
     "node_modules/jest-matcher-utils": {
@@ -5113,6 +5371,76 @@
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-matcher-utils/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-message-util": {
       "version": "26.6.2",
       "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
@@ -5133,6 +5461,76 @@
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-message-util/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-message-util/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-mock": {
       "version": "26.6.2",
       "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
@@ -5205,17 +5603,74 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-resolve/node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+    "node_modules/jest-resolve/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-resolve/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/jest-runner": {
@@ -5249,27 +5704,97 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-runtime": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
-      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
+    "node_modules/jest-runner/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "@jest/console": "^26.6.2",
-        "@jest/environment": "^26.6.2",
-        "@jest/fake-timers": "^26.6.2",
-        "@jest/globals": "^26.6.2",
-        "@jest/source-map": "^26.6.2",
-        "@jest/test-result": "^26.6.2",
-        "@jest/transform": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/yargs": "^15.0.0",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^0.6.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.4",
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-runner/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-runner/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-runner/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runner/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
+      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/globals": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^0.6.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.4",
         "jest-config": "^26.6.3",
         "jest-haste-map": "^26.6.2",
         "jest-message-util": "^26.6.2",
@@ -5290,6 +5815,76 @@
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-runtime/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-runtime/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-serializer": {
       "version": "26.6.2",
       "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
@@ -5330,10 +5925,68 @@
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/jest-snapshot/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-snapshot/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -5342,71 +5995,293 @@
         "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "is-ci": "^2.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-util/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-util/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-util/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-util/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-util/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-util/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
+      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "camelcase": "^6.0.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "leven": "^3.1.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-validate/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-validate/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-validate/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-validate/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-validate/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/jest-util": {
+    "node_modules/jest-watcher": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
-      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
+      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
       "dev": true,
       "dependencies": {
+        "@jest/test-result": "^26.6.2",
         "@jest/types": "^26.6.2",
         "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "is-ci": "^2.0.0",
-        "micromatch": "^4.0.2"
+        "jest-util": "^26.6.2",
+        "string-length": "^4.0.1"
       },
       "engines": {
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/jest-validate": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
-      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+    "node_modules/jest-watcher/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "camelcase": "^6.0.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^26.3.0",
-        "leven": "^3.1.0",
-        "pretty-format": "^26.6.2"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+    "node_modules/jest-watcher/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-watcher": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
-      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
+    "node_modules/jest-watcher/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "jest-util": "^26.6.2",
-        "string-length": "^4.0.1"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-watcher/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/jest-worker": {
@@ -5423,31 +6298,25 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/jest/node_modules/jest-cli": {
-      "version": "26.6.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
-      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^26.6.3",
-        "@jest/test-result": "^26.6.2",
-        "@jest/types": "^26.6.2",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "import-local": "^3.0.2",
-        "is-ci": "^2.0.0",
-        "jest-config": "^26.6.3",
-        "jest-util": "^26.6.2",
-        "jest-validate": "^26.6.2",
-        "prompts": "^2.0.1",
-        "yargs": "^15.4.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">=8"
       }
     },
     "node_modules/js-tokens": {
@@ -5469,43 +6338,38 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
     "node_modules/jsdom": {
-      "version": "16.4.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz",
-      "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==",
+      "version": "16.7.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
       "dev": true,
       "dependencies": {
-        "abab": "^2.0.3",
-        "acorn": "^7.1.1",
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
         "acorn-globals": "^6.0.0",
         "cssom": "^0.4.4",
-        "cssstyle": "^2.2.0",
+        "cssstyle": "^2.3.0",
         "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.0",
+        "decimal.js": "^10.2.1",
         "domexception": "^2.0.1",
-        "escodegen": "^1.14.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
         "html-encoding-sniffer": "^2.0.1",
-        "is-potential-custom-element-name": "^1.0.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
         "nwsapi": "^2.2.0",
-        "parse5": "5.1.1",
-        "request": "^2.88.2",
-        "request-promise-native": "^1.0.8",
-        "saxes": "^5.0.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^3.0.1",
+        "tough-cookie": "^4.0.0",
         "w3c-hr-time": "^1.0.2",
         "w3c-xmlserializer": "^2.0.0",
         "webidl-conversions": "^6.1.0",
         "whatwg-encoding": "^1.0.5",
         "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0",
-        "ws": "^7.2.3",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
         "xml-name-validator": "^3.0.0"
       },
       "engines": {
@@ -5538,32 +6402,11 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "node_modules/json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
     "node_modules/json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
       "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -5571,21 +6414,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
     "node_modules/kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -5627,9 +6455,9 @@
       }
     },
     "node_modules/lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
     "node_modules/locate-path": {
@@ -5656,12 +6484,6 @@
       "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
       "dev": true
     },
-    "node_modules/lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-      "dev": true
-    },
     "node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -5690,12 +6512,12 @@
       }
     },
     "node_modules/makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "dev": true,
       "dependencies": {
-        "tmpl": "1.0.x"
+        "tmpl": "1.0.5"
       }
     },
     "node_modules/map-cache": {
@@ -5726,34 +6548,34 @@
       "dev": true
     },
     "node_modules/micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
       "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.6"
       }
     },
     "node_modules/mime-db": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
-      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.27",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
-      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
       "dependencies": {
-        "mime-db": "1.44.0"
+        "mime-db": "1.52.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -5769,9 +6591,9 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -5781,9 +6603,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "node_modules/mixin-deep": {
@@ -5799,18 +6621,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/mixin-deep/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/mkdirp": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -5822,6 +6632,12 @@
         "node": ">=10"
       }
     },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
+    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -5863,12 +6679,45 @@
       "dev": true
     },
     "node_modules/node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "dev": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
       "engines": {
         "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-fetch/node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
+      "dev": true
+    },
+    "node_modules/node-fetch/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
+      "dev": true
+    },
+    "node_modules/node-fetch/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "dev": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
       }
     },
     "node_modules/node-int64": {
@@ -5877,19 +6726,10 @@
       "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
       "dev": true
     },
-    "node_modules/node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/node-notifier": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz",
-      "integrity": "sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -5902,9 +6742,9 @@
       }
     },
     "node_modules/node-notifier/node_modules/semver": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -5917,26 +6757,10 @@
         "node": ">=10"
       }
     },
-    "node_modules/node-notifier/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/node-releases": {
-      "version": "1.1.71",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
-      "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
+      "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
       "dev": true
     },
     "node_modules/normalize-package-data": {
@@ -5970,15 +6794,15 @@
       }
     },
     "node_modules/npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
       "dependencies": {
-        "path-key": "^2.0.0"
+        "path-key": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/nwsapi": {
@@ -5987,15 +6811,6 @@
       "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
       "dev": true
     },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
@@ -6010,14 +6825,61 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6202,9 +7064,9 @@
       }
     },
     "node_modules/parse5": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
       "dev": true
     },
     "node_modules/pascalcase": {
@@ -6235,12 +7097,12 @@
       }
     },
     "node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/path-parse": {
@@ -6255,16 +7117,16 @@
       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
       "dev": true
     },
-    "node_modules/performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
       "dev": true
     },
     "node_modules/picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
       "engines": {
         "node": ">=8.6"
@@ -6274,13 +7136,10 @@
       }
     },
     "node_modules/pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
       "dev": true,
-      "dependencies": {
-        "node-modules-regexp": "^1.0.0"
-      },
       "engines": {
         "node": ">= 6"
       }
@@ -6330,23 +7189,56 @@
         "node": ">= 10"
       }
     },
-    "node_modules/progress": {
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/pretty-format/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz",
-      "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true,
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/prompts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
       "dependencies": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.4"
+        "sisteransi": "^1.0.5"
       },
       "engines": {
         "node": ">= 6"
@@ -6384,42 +7276,54 @@
       }
     },
     "node_modules/puppeteer": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-10.2.0.tgz",
-      "integrity": "sha512-OR2CCHRashF+f30+LBOtAjK6sNtz2HEyTr5FqAvhf8lR/qB3uBRoIZOwQKgwoyZnMBsxX7ZdazlyBgGjpnkiMw==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-14.1.0.tgz",
+      "integrity": "sha512-T3eB4f6k9HVttYvyy8drGIKb04M+vxhepqM7qqcVCBTNT3T6M9cUaJT4k7P+a6wSonObJSJUP98JkPDQG+3fJw==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "debug": "4.3.1",
-        "devtools-protocol": "0.0.901419",
+        "cross-fetch": "3.1.5",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.982423",
         "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.0",
-        "node-fetch": "2.6.1",
+        "https-proxy-agent": "5.0.1",
         "pkg-dir": "4.2.0",
-        "progress": "2.0.1",
+        "progress": "2.0.3",
         "proxy-from-env": "1.1.0",
         "rimraf": "3.0.2",
-        "tar-fs": "2.0.0",
-        "unbzip2-stream": "1.3.3",
-        "ws": "7.4.6"
+        "tar-fs": "2.1.1",
+        "unbzip2-stream": "1.4.3",
+        "ws": "8.6.0"
       },
       "engines": {
-        "node": ">=10.18.1"
+        "node": ">=14.1.0"
       }
     },
-    "node_modules/qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+    "node_modules/puppeteer/node_modules/ws": {
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
+      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
       "dev": true,
       "engines": {
-        "node": ">=0.6"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
     "node_modules/react-is": {
-      "version": "17.0.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz",
-      "integrity": "sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==",
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
     "node_modules/read-pkg": {
@@ -6454,6 +7358,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/read-pkg-up/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/read-pkg/node_modules/type-fest": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
@@ -6484,27 +7397,27 @@
       "dev": true
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
-      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
+      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
       "dev": true,
       "dependencies": {
-        "regenerate": "^1.4.0"
+        "regenerate": "^1.4.2"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
       "dev": true
     },
     "node_modules/regenerator-transform": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
-      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.8.4"
@@ -6524,32 +7437,32 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
-      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
+      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
       "dev": true,
       "dependencies": {
-        "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.2.0",
-        "regjsgen": "^0.5.1",
-        "regjsparser": "^0.6.4",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.2.0"
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.0.1",
+        "regjsgen": "^0.6.0",
+        "regjsparser": "^0.8.2",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/regjsgen": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
+      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==",
       "dev": true
     },
     "node_modules/regjsparser": {
-      "version": "0.6.7",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz",
-      "integrity": "sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==",
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
+      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
       "dev": true,
       "dependencies": {
         "jsesc": "~0.5.0"
@@ -6574,9 +7487,9 @@
       "dev": true
     },
     "node_modules/repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -6591,107 +7504,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dev": true,
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/request-promise-core": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
-      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.19"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "peerDependencies": {
-        "request": "^2.34"
-      }
-    },
-    "node_modules/request-promise-native": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
-      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
-      "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
-      "dev": true,
-      "dependencies": {
-        "request-promise-core": "1.1.4",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=0.12.0"
-      },
-      "peerDependencies": {
-        "request": "^2.34"
-      }
-    },
-    "node_modules/request-promise-native/node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/request/node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/request/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "dev": true,
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -6708,12 +7520,17 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
       "dev": true,
       "dependencies": {
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -6868,6 +7685,40 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sane/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/sane/node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/sane/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -6895,6 +7746,27 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sane/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/sane/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/sane/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -6919,6 +7791,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sane/node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/sane/node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -6955,6 +7836,57 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sane/node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/sane/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/sane/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/sane/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/sane/node_modules/to-regex-range": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
@@ -6968,6 +7900,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sane/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
     "node_modules/saxes": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
@@ -7022,25 +7966,34 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/set-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
       "dependencies": {
-        "shebang-regex": "^1.0.0"
+        "shebang-regex": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/shellwords": {
@@ -7051,9 +8004,9 @@
       "optional": true
     },
     "node_modules/signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "dev": true
     },
     "node_modules/sisteransi": {
@@ -7116,44 +8069,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/snapdragon-node/node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
@@ -7211,6 +8126,86 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/snapdragon/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -7239,6 +8234,7 @@
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
       "dependencies": {
         "atob": "^2.1.2",
@@ -7249,9 +8245,9 @@
       }
     },
     "node_modules/source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
@@ -7262,6 +8258,7 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
       "dev": true
     },
     "node_modules/spdx-correct": {
@@ -7291,9 +8288,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
-      "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
+      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
       "dev": true
     },
     "node_modules/split-string": {
@@ -7314,35 +8311,10 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
-    "node_modules/sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
-      "dependencies": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
+      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
       "dev": true,
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
@@ -7385,10 +8357,72 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -7424,9 +8458,9 @@
       ]
     },
     "node_modules/string-length": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
-      "integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
       "dependencies": {
         "char-regex": "^1.0.2",
@@ -7437,59 +8471,93 @@
       }
     },
     "node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-hyperlinks": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/strip-bom": {
+    "node_modules/supports-hyperlinks/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/supports-color": {
+    "node_modules/supports-hyperlinks/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -7501,17 +8569,16 @@
         "node": ">=8"
       }
     },
-    "node_modules/supports-hyperlinks": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
-      "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/symbol-tree": {
@@ -7521,27 +8588,15 @@
       "dev": true
     },
     "node_modules/tar-fs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz",
-      "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
       "dev": true,
       "dependencies": {
         "chownr": "^1.1.1",
-        "mkdirp": "^0.5.1",
+        "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
-        "tar-stream": "^2.0.0"
-      }
-    },
-    "node_modules/tar-fs/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+        "tar-stream": "^2.1.4"
       }
     },
     "node_modules/tar-stream": {
@@ -7603,9 +8658,9 @@
       "dev": true
     },
     "node_modules/tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
     "node_modules/to-fast-properties": {
@@ -7669,23 +8724,23 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
       "dev": true,
       "dependencies": {
-        "ip-regex": "^2.1.0",
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
       },
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/tr46": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
-      "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
       "dev": true,
       "dependencies": {
         "punycode": "^2.1.1"
@@ -7694,24 +8749,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
-    },
     "node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -7734,12 +8771,15 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/typedarray-to-buffer": {
@@ -7752,9 +8792,9 @@
       }
     },
     "node_modules/unbzip2-stream": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz",
-      "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
       "dev": true,
       "dependencies": {
         "buffer": "^5.2.1",
@@ -7762,40 +8802,40 @@
       }
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
       "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unicode-match-property-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "dev": true,
       "dependencies": {
-        "unicode-canonical-property-names-ecmascript": "^1.0.4",
-        "unicode-property-aliases-ecmascript": "^1.0.4"
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
-      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
       "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -7816,6 +8856,24 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/union-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -7864,15 +8922,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/uri-js": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
-      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
     "node_modules/urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
@@ -7906,9 +8955,9 @@
       }
     },
     "node_modules/v8-to-istanbul": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz",
-      "integrity": "sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
+      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
       "dev": true,
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -7938,20 +8987,6 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "node_modules/verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@@ -7974,12 +9009,12 @@
       }
     },
     "node_modules/walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "dev": true,
       "dependencies": {
-        "makeerror": "1.0.x"
+        "makeerror": "1.0.12"
       }
     },
     "node_modules/webidl-conversions": {
@@ -8007,13 +9042,13 @@
       "dev": true
     },
     "node_modules/whatwg-url": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz",
-      "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
       "dev": true,
       "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^2.0.2",
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
         "webidl-conversions": "^6.1.0"
       },
       "engines": {
@@ -8021,15 +9056,18 @@
       }
     },
     "node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
       "dependencies": {
         "isexe": "^2.0.0"
       },
       "bin": {
-        "which": "bin/which"
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
       }
     },
     "node_modules/which-module": {
@@ -8061,6 +9099,39 @@
         "node": ">=8"
       }
     },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -8080,9 +9151,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
+      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
       "dev": true,
       "engines": {
         "node": ">=8.3.0"
@@ -8113,9 +9184,9 @@
       "dev": true
     },
     "node_modules/y18n": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
-      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
       "dev": true
     },
     "node_modules/yallist": {
@@ -8171,202 +9242,138 @@
     }
   },
   "dependencies": {
+    "@ampproject/remapping": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
     "@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.12.13"
+        "@babel/highlight": "^7.16.7"
       }
     },
     "@babel/compat-data": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz",
-      "integrity": "sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==",
+      "version": "7.17.10",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
+      "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
       "dev": true
     },
     "@babel/core": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.8.tgz",
-      "integrity": "sha512-oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-compilation-targets": "^7.13.8",
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helpers": "^7.13.0",
-        "@babel/parser": "^7.13.4",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.12.tgz",
+      "integrity": "sha512-44ODe6O1IVz9s2oJE3rZ4trNNKTX9O7KpQpfAP4t8QII/zwrVRHL7i2pxhqtcY7tqMLrrKfMlBKnm1QlrRFs5w==",
+      "dev": true,
+      "requires": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.12",
+        "@babel/helper-compilation-targets": "^7.17.10",
+        "@babel/helper-module-transforms": "^7.17.12",
+        "@babel/helpers": "^7.17.9",
+        "@babel/parser": "^7.17.12",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.12",
+        "@babel/types": "^7.17.12",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
-        "lodash": "^4.17.19",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
       }
     },
     "@babel/generator": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.12.tgz",
+      "integrity": "sha512-V49KtZiiiLjH/CnIW6OjJdrenrGoyh6AmKQ3k2AZFKozC1h846Q4NYlZ5nqAigPDUXfGzC88+LOUuG8yKd2kCw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+        "@babel/types": "^7.17.12",
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "jsesc": "^2.5.1"
       },
       "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
+          "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
+            "@jridgewell/set-array": "^1.0.0",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
           }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
         }
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz",
-      "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/types": "^7.16.7"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz",
-      "integrity": "sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
+      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/helper-explode-assignable-expression": "^7.16.7",
+        "@babel/types": "^7.16.7"
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz",
-      "integrity": "sha512-pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A==",
+      "version": "7.17.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz",
+      "integrity": "sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.13.8",
-        "@babel/helper-validator-option": "^7.12.17",
-        "browserslist": "^4.14.5",
+        "@babel/compat-data": "^7.17.10",
+        "@babel/helper-validator-option": "^7.16.7",
+        "browserslist": "^4.20.2",
         "semver": "^6.3.0"
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz",
-      "integrity": "sha512-qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.12.tgz",
+      "integrity": "sha512-sZoOeUTkFJMyhqCei2+Z+wtH/BehW8NVKQt7IRUQlRiOARuXymJYfN/FCcI8CvVbR0XVyDM6eLFOlR7YtiXnew==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-split-export-declaration": "^7.12.13"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-member-expression-to-functions": "^7.17.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7"
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz",
-      "integrity": "sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz",
+      "integrity": "sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "regexpu-core": "^4.7.1"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "regexpu-core": "^5.0.1"
       }
     },
     "@babel/helper-define-polyfill-provider": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz",
-      "integrity": "sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
+      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
       "dev": true,
       "requires": {
         "@babel/helper-compilation-targets": "^7.13.0",
@@ -8377,787 +9384,373 @@
         "lodash.debounce": "^4.0.8",
         "resolve": "^1.14.2",
         "semver": "^6.1.2"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
       }
     },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz",
-      "integrity": "sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==",
+    "@babel/helper-environment-visitor": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
+      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/types": "^7.16.7"
       }
     },
-    "@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+    "@babel/helper-function-name": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
+      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/template": "^7.16.7",
+        "@babel/types": "^7.17.0"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz",
-      "integrity": "sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
       "dev": true,
       "requires": {
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/types": "^7.16.7"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz",
-      "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==",
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
+      "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/types": "^7.17.0"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz",
-      "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/types": "^7.16.7"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz",
-      "integrity": "sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.12.tgz",
+      "integrity": "sha512-t5s2BeSWIghhFRPh9XMn6EIGmvn8Lmw5RVASJzkIx1mSemubQQBNIZiQD7WzaFmaHIrjAec4x8z9Yx8SjJ1/LA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-simple-access": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "lodash": "^4.17.19"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-simple-access": "^7.17.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.12",
+        "@babel/types": "^7.17.12"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
-      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
+      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/types": "^7.16.7"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz",
+      "integrity": "sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==",
       "dev": true
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz",
-      "integrity": "sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
+      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "@babel/helper-wrap-function": "^7.13.0",
-        "@babel/types": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-wrap-function": "^7.16.8",
+        "@babel/types": "^7.16.8"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz",
-      "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
+      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/traverse": "^7.16.7",
+        "@babel/types": "^7.16.7"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz",
-      "integrity": "sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==",
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
+      "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/types": "^7.17.0"
       }
     },
     "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz",
-      "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
+      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.1"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/types": "^7.16.0"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/types": "^7.16.7"
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
       "dev": true
     },
     "@babel/helper-validator-option": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
-      "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
       "dev": true
     },
     "@babel/helper-wrap-function": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz",
-      "integrity": "sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
+      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.16.8",
+        "@babel/types": "^7.16.8"
       }
     },
     "@babel/helpers": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.0.tgz",
-      "integrity": "sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ==",
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
+      "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.9",
+        "@babel/types": "^7.17.0"
       }
     },
     "@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
+      "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "@babel/parser": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
-      "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.12.tgz",
+      "integrity": "sha512-FLzHmN9V3AJIrWfOpvRlZCeVg/WLdicSnTMsLur6uDj9TT8ymUlG9XxURdW/XvuygK+2CW0poOJABdA4m/YKxA==",
       "dev": true
     },
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz",
+      "integrity": "sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
+      }
+    },
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz",
+      "integrity": "sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.17.12"
+      }
+    },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz",
-      "integrity": "sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz",
+      "integrity": "sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-remap-async-to-generator": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-remap-async-to-generator": "^7.16.8",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-proposal-class-properties": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz",
-      "integrity": "sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz",
+      "integrity": "sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
+      }
+    },
+    "@babel/plugin-proposal-class-static-block": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.12.tgz",
+      "integrity": "sha512-8ILyDG6eL14F8iub97dVc8q35Md0PJYAnA5Kz9NACFOkt6ffCcr0FISyUPKHsvuAy36fkpIitxZ9bVYPFMGQHA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz",
-      "integrity": "sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
+      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz",
-      "integrity": "sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz",
+      "integrity": "sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz",
-      "integrity": "sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz",
+      "integrity": "sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz",
-      "integrity": "sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz",
+      "integrity": "sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz",
-      "integrity": "sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz",
+      "integrity": "sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz",
-      "integrity": "sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
+      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz",
-      "integrity": "sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.12.tgz",
+      "integrity": "sha512-6l9cO3YXXRh4yPCPRA776ZyJ3RobG4ZKJZhp7NDRbKIOeV3dBPG8FXCF7ZtiO2RTCIOkQOph1xDDcc01iWVNjQ==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.13.8",
-        "@babel/helper-compilation-targets": "^7.13.8",
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/compat-data": "^7.17.10",
+        "@babel/helper-compilation-targets": "^7.17.10",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/plugin-transform-parameters": "^7.17.12"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz",
-      "integrity": "sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
+      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz",
-      "integrity": "sha512-hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz",
+      "integrity": "sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-proposal-private-methods": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz",
-      "integrity": "sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz",
+      "integrity": "sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
+      }
+    },
+    "@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz",
+      "integrity": "sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz",
-      "integrity": "sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz",
+      "integrity": "sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-create-regexp-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -9185,14 +9778,15 @@
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+      }
+    },
+    "@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-syntax-dynamic-import": {
@@ -9285,606 +9879,369 @@
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
     "@babel/plugin-syntax-top-level-await": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz",
-      "integrity": "sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz",
-      "integrity": "sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz",
+      "integrity": "sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz",
-      "integrity": "sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz",
+      "integrity": "sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-remap-async-to-generator": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-remap-async-to-generator": "^7.16.8"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz",
-      "integrity": "sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
+      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz",
-      "integrity": "sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.17.12.tgz",
+      "integrity": "sha512-jw8XW/B1i7Lqwqj2CbrViPcZijSxfguBWZP2aN59NHgxUyO/OcO1mfdCxH13QhN5LbWhPkX+f+brKGhZTiqtZQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz",
-      "integrity": "sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-split-export-declaration": "^7.12.13",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.17.12.tgz",
+      "integrity": "sha512-cvO7lc7pZat6BsvH6l/EGaI8zpl8paICaoGk+7x7guvtfak/TbIf66nYmJOH13EuG0H+Xx3M+9LQDtSvZFKXKw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
         "globals": "^11.1.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz",
-      "integrity": "sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz",
+      "integrity": "sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz",
-      "integrity": "sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.12.tgz",
+      "integrity": "sha512-P8pt0YiKtX5UMUL5Xzsc9Oyij+pJE6JuC+F1k0/brq/OOGs5jDa1If3OY0LRWGvJsJhI+8tsiecL3nJLc0WTlg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz",
-      "integrity": "sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
+      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz",
-      "integrity": "sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz",
+      "integrity": "sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz",
-      "integrity": "sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
+      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz",
-      "integrity": "sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.17.12.tgz",
+      "integrity": "sha512-76lTwYaCxw8ldT7tNmye4LLwSoKDbRCBzu6n/DcK/P3FOR29+38CIIaVIZfwol9By8W/QHORYEnYSLuvcQKrsg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz",
-      "integrity": "sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
+      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz",
-      "integrity": "sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz",
+      "integrity": "sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz",
-      "integrity": "sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
+      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz",
-      "integrity": "sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.17.12.tgz",
+      "integrity": "sha512-p5rt9tB5Ndcc2Za7CeNxVf7YAjRcUMR6yi8o8tKjb9KhRkEvXwa+C0hj6DA5bVDkKRxB0NYhMUGbVKoFu4+zEA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-module-transforms": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz",
-      "integrity": "sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.12.tgz",
+      "integrity": "sha512-tVPs6MImAJz+DiX8Y1xXEMdTk5Lwxu9jiPjlS+nv5M2A59R7+/d1+9A8C/sbuY0b3QjIxqClkj6KAplEtRvzaA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-simple-access": "^7.12.13",
+        "@babel/helper-module-transforms": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-simple-access": "^7.17.7",
         "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz",
-      "integrity": "sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.12.tgz",
+      "integrity": "sha512-NVhDb0q00hqZcuLduUf/kMzbOQHiocmPbIxIvk23HLiEqaTKC/l4eRxeC7lO63M72BmACoiKOcb9AkOAJRerpw==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.13.0",
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz",
-      "integrity": "sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.17.12.tgz",
+      "integrity": "sha512-BnsPkrUHsjzZGpnrmJeDFkOMMljWFHPjDc9xDcz71/C+ybF3lfC3V4m3dwXPLZrE5b3bgd4V+3/Pj+3620d7IA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-module-transforms": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz",
-      "integrity": "sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz",
+      "integrity": "sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13"
+        "@babel/helper-create-regexp-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz",
-      "integrity": "sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz",
+      "integrity": "sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz",
-      "integrity": "sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
+      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz",
-      "integrity": "sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz",
+      "integrity": "sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz",
-      "integrity": "sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
+      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz",
-      "integrity": "sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA==",
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz",
+      "integrity": "sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.14.2"
+        "regenerator-transform": "^0.15.0"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz",
-      "integrity": "sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz",
+      "integrity": "sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz",
-      "integrity": "sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
+      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz",
-      "integrity": "sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz",
+      "integrity": "sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz",
-      "integrity": "sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
+      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz",
-      "integrity": "sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.17.12.tgz",
+      "integrity": "sha512-kAKJ7DX1dSRa2s7WN1xUAuaQmkTpN+uig4wCKWivVXIObqGbVTUlSavHyfI2iZvz89GFAMGm9p2DBJ4Y1Tp0hw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz",
-      "integrity": "sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz",
+      "integrity": "sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz",
-      "integrity": "sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
+      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz",
-      "integrity": "sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
+      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        }
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/preset-env": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.9.tgz",
-      "integrity": "sha512-mcsHUlh2rIhViqMG823JpscLMesRt3QbMsv1+jhopXEb3W2wXvQ9QoiOlZI9ZbR3XqPtaFpZwEZKYqGJnGMZTQ==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.13.8",
-        "@babel/helper-compilation-targets": "^7.13.8",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-validator-option": "^7.12.17",
-        "@babel/plugin-proposal-async-generator-functions": "^7.13.8",
-        "@babel/plugin-proposal-class-properties": "^7.13.0",
-        "@babel/plugin-proposal-dynamic-import": "^7.13.8",
-        "@babel/plugin-proposal-export-namespace-from": "^7.12.13",
-        "@babel/plugin-proposal-json-strings": "^7.13.8",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.13.8",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-        "@babel/plugin-proposal-numeric-separator": "^7.12.13",
-        "@babel/plugin-proposal-object-rest-spread": "^7.13.8",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.13.8",
-        "@babel/plugin-proposal-optional-chaining": "^7.13.8",
-        "@babel/plugin-proposal-private-methods": "^7.13.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.12.13",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.17.12.tgz",
+      "integrity": "sha512-Kke30Rj3Lmcx97bVs71LO0s8M6FmJ7tUAQI9fNId62rf0cYG1UAWwdNO9/sE0/pLEahAw1MqMorymoD12bj5Fg==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.17.10",
+        "@babel/helper-compilation-targets": "^7.17.10",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.17.12",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12",
+        "@babel/plugin-proposal-async-generator-functions": "^7.17.12",
+        "@babel/plugin-proposal-class-properties": "^7.17.12",
+        "@babel/plugin-proposal-class-static-block": "^7.17.12",
+        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
+        "@babel/plugin-proposal-export-namespace-from": "^7.17.12",
+        "@babel/plugin-proposal-json-strings": "^7.17.12",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.17.12",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12",
+        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.17.12",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
+        "@babel/plugin-proposal-optional-chaining": "^7.17.12",
+        "@babel/plugin-proposal-private-methods": "^7.17.12",
+        "@babel/plugin-proposal-private-property-in-object": "^7.17.12",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.17.12",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
@@ -9894,77 +10251,53 @@
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.12.13",
-        "@babel/plugin-transform-arrow-functions": "^7.13.0",
-        "@babel/plugin-transform-async-to-generator": "^7.13.0",
-        "@babel/plugin-transform-block-scoped-functions": "^7.12.13",
-        "@babel/plugin-transform-block-scoping": "^7.12.13",
-        "@babel/plugin-transform-classes": "^7.13.0",
-        "@babel/plugin-transform-computed-properties": "^7.13.0",
-        "@babel/plugin-transform-destructuring": "^7.13.0",
-        "@babel/plugin-transform-dotall-regex": "^7.12.13",
-        "@babel/plugin-transform-duplicate-keys": "^7.12.13",
-        "@babel/plugin-transform-exponentiation-operator": "^7.12.13",
-        "@babel/plugin-transform-for-of": "^7.13.0",
-        "@babel/plugin-transform-function-name": "^7.12.13",
-        "@babel/plugin-transform-literals": "^7.12.13",
-        "@babel/plugin-transform-member-expression-literals": "^7.12.13",
-        "@babel/plugin-transform-modules-amd": "^7.13.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.13.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.13.8",
-        "@babel/plugin-transform-modules-umd": "^7.13.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13",
-        "@babel/plugin-transform-new-target": "^7.12.13",
-        "@babel/plugin-transform-object-super": "^7.12.13",
-        "@babel/plugin-transform-parameters": "^7.13.0",
-        "@babel/plugin-transform-property-literals": "^7.12.13",
-        "@babel/plugin-transform-regenerator": "^7.12.13",
-        "@babel/plugin-transform-reserved-words": "^7.12.13",
-        "@babel/plugin-transform-shorthand-properties": "^7.12.13",
-        "@babel/plugin-transform-spread": "^7.13.0",
-        "@babel/plugin-transform-sticky-regex": "^7.12.13",
-        "@babel/plugin-transform-template-literals": "^7.13.0",
-        "@babel/plugin-transform-typeof-symbol": "^7.12.13",
-        "@babel/plugin-transform-unicode-escapes": "^7.12.13",
-        "@babel/plugin-transform-unicode-regex": "^7.12.13",
-        "@babel/preset-modules": "^0.1.4",
-        "@babel/types": "^7.13.0",
-        "babel-plugin-polyfill-corejs2": "^0.1.4",
-        "babel-plugin-polyfill-corejs3": "^0.1.3",
-        "babel-plugin-polyfill-regenerator": "^0.1.2",
-        "core-js-compat": "^3.9.0",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.17.12",
+        "@babel/plugin-transform-async-to-generator": "^7.17.12",
+        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
+        "@babel/plugin-transform-block-scoping": "^7.17.12",
+        "@babel/plugin-transform-classes": "^7.17.12",
+        "@babel/plugin-transform-computed-properties": "^7.17.12",
+        "@babel/plugin-transform-destructuring": "^7.17.12",
+        "@babel/plugin-transform-dotall-regex": "^7.16.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.17.12",
+        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
+        "@babel/plugin-transform-for-of": "^7.17.12",
+        "@babel/plugin-transform-function-name": "^7.16.7",
+        "@babel/plugin-transform-literals": "^7.17.12",
+        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
+        "@babel/plugin-transform-modules-amd": "^7.17.12",
+        "@babel/plugin-transform-modules-commonjs": "^7.17.12",
+        "@babel/plugin-transform-modules-systemjs": "^7.17.12",
+        "@babel/plugin-transform-modules-umd": "^7.17.12",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12",
+        "@babel/plugin-transform-new-target": "^7.17.12",
+        "@babel/plugin-transform-object-super": "^7.16.7",
+        "@babel/plugin-transform-parameters": "^7.17.12",
+        "@babel/plugin-transform-property-literals": "^7.16.7",
+        "@babel/plugin-transform-regenerator": "^7.17.9",
+        "@babel/plugin-transform-reserved-words": "^7.17.12",
+        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
+        "@babel/plugin-transform-spread": "^7.17.12",
+        "@babel/plugin-transform-sticky-regex": "^7.16.7",
+        "@babel/plugin-transform-template-literals": "^7.17.12",
+        "@babel/plugin-transform-typeof-symbol": "^7.17.12",
+        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
+        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.17.12",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "core-js-compat": "^3.22.1",
         "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
-          "dev": true
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
       }
     },
     "@babel/preset-modules": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
-      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -9975,88 +10308,50 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.9.tgz",
-      "integrity": "sha512-aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA==",
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
+      "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/code-frame": "^7.16.7",
+        "@babel/parser": "^7.16.7",
+        "@babel/types": "^7.16.7"
       }
     },
     "@babel/traverse": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
-        "@babel/types": "^7.13.0",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.12.tgz",
+      "integrity": "sha512-zULPs+TbCvOkIFd4FrG53xrpxvCBwLIgo6tO0tJorY7YV2IWFxUfS/lXDJbGgfyYt9ery/Gxj2niwttNnB0gIw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.12",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/parser": "^7.17.12",
+        "@babel/types": "^7.17.12",
         "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.13.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-          "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.11.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-      "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.12.tgz",
+      "integrity": "sha512-rH8i29wcZ6x9xjzI5ILHL/yZkbQnCERdHlogKuIb4PUr7do4iT8DPekrTbBLWTnRQm6U0GYABbTMSzijmEqlAg==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "lodash": "^4.17.19",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -10107,6 +10402,57 @@
         "jest-message-util": "^26.6.2",
         "jest-util": "^26.6.2",
         "slash": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "@jest/core": {
@@ -10143,6 +10489,57 @@
         "rimraf": "^3.0.0",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "@jest/environment": {
@@ -10213,6 +10610,69 @@
         "string-length": "^4.0.1",
         "terminal-link": "^2.0.0",
         "v8-to-istanbul": "^7.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "istanbul-lib-instrument": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+          "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.7.5",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.0.0",
+            "semver": "^6.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "@jest/source-map": {
@@ -10272,6 +10732,57 @@
         "slash": "^3.0.0",
         "source-map": "^0.6.1",
         "write-file-atomic": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "@jest/types": {
@@ -10285,12 +10796,101 @@
         "@types/node": "*",
         "@types/yargs": "^15.0.0",
         "chalk": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "@jridgewell/gen-mapping": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
+      "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
+      "dev": true
+    },
+    "@jridgewell/set-array": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz",
+      "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==",
+      "dev": true
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
+      "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==",
+      "dev": true
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz",
+      "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
     "@sinonjs/commons": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz",
-      "integrity": "sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
       "dev": true,
       "requires": {
         "type-detect": "4.0.8"
@@ -10305,10 +10905,16 @@
         "@sinonjs/commons": "^1.7.0"
       }
     },
+    "@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true
+    },
     "@types/babel__core": {
-      "version": "7.1.12",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.12.tgz",
-      "integrity": "sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==",
+      "version": "7.1.19",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
+      "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -10319,18 +10925,18 @@
       }
     },
     "@types/babel__generator": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
-      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
+      "version": "7.6.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
+      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0"
       }
     },
     "@types/babel__template": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
-      "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -10338,20 +10944,14 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.0.tgz",
-      "integrity": "sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==",
+      "version": "7.17.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.1.tgz",
+      "integrity": "sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.3.0"
       }
     },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
-    },
     "@types/graceful-fs": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
@@ -10362,9 +10962,9 @@
       }
     },
     "@types/istanbul-lib-coverage": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
+      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
       "dev": true
     },
     "@types/istanbul-lib-report": {
@@ -10377,18 +10977,18 @@
       }
     },
     "@types/istanbul-reports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-      "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-report": "*"
       }
     },
     "@types/jest": {
-      "version": "26.0.20",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.20.tgz",
-      "integrity": "sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA==",
+      "version": "26.0.24",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz",
+      "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==",
       "dev": true,
       "requires": {
         "jest-diff": "^26.0.0",
@@ -10396,48 +10996,48 @@
       }
     },
     "@types/node": {
-      "version": "14.14.31",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz",
-      "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==",
+      "version": "17.0.34",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.34.tgz",
+      "integrity": "sha512-XImEz7XwTvDBtzlTnm8YvMqGW/ErMWBsKZ+hMTvnDIjGCKxwK5Xpc+c/oQjOauwq8M4OS11hEkpjX8rrI/eEgA==",
       "dev": true
     },
     "@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
       "dev": true
     },
     "@types/prettier": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.2.2.tgz",
-      "integrity": "sha512-i99hy7Ki19EqVOl77WplDrvgNugHnsSjECVR/wUrzw2TJXz1zlUfT2ngGckR6xN7yFYaijsMAqPkOLx9HgUqHg==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.1.tgz",
+      "integrity": "sha512-XFjFHmaLVifrAKaZ+EKghFHtHSUonyw8P2Qmy2/+osBnrKbH9UYtlK10zg8/kCt47MFilll/DEDKy3DHfJ0URw==",
       "dev": true
     },
     "@types/stack-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
-      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true
     },
     "@types/yargs": {
-      "version": "15.0.13",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
-      "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==",
+      "version": "15.0.14",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
+      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "20.2.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
-      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
+      "version": "21.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
+      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
       "dev": true
     },
     "@types/yauzl": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
-      "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -10445,15 +11045,15 @@
       }
     },
     "abab": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
-      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
       "dev": true
     },
     "acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "version": "8.7.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
       "dev": true
     },
     "acorn-globals": {
@@ -10464,6 +11064,14 @@
       "requires": {
         "acorn": "^7.1.1",
         "acorn-walk": "^7.1.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "dev": true
+        }
       }
     },
     "acorn-walk": {
@@ -10481,33 +11089,13 @@
         "debug": "4"
       }
     },
-    "ajv": {
-      "version": "6.12.4",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
-      "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
     "ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
       "requires": {
-        "type-fest": "^0.11.0"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-          "dev": true
-        }
+        "type-fest": "^0.21.3"
       }
     },
     "ansi-regex": {
@@ -10517,19 +11105,18 @@
       "dev": true
     },
     "ansi-styles": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "requires": {
-        "@types/color-name": "^1.1.1",
-        "color-convert": "^2.0.1"
+        "color-convert": "^1.9.0"
       }
     },
     "anymatch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
       "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
@@ -10548,7 +11135,7 @@
     "arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
       "dev": true
     },
     "arr-flatten": {
@@ -10560,40 +11147,25 @@
     "arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
       "dev": true
     },
     "array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
-    },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
       "dev": true
     },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
       "dev": true
     },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true
     },
     "atob": {
@@ -10602,18 +11174,6 @@
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true
     },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
-      "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==",
-      "dev": true
-    },
     "babel-jest": {
       "version": "26.6.3",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
@@ -10628,6 +11188,57 @@
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "slash": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "babel-plugin-dynamic-import-node": {
@@ -10640,15 +11251,15 @@
       }
     },
     "babel-plugin-istanbul": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^4.0.0",
+        "istanbul-lib-instrument": "^5.0.4",
         "test-exclude": "^6.0.0"
       }
     },
@@ -10665,33 +11276,33 @@
       }
     },
     "babel-plugin-polyfill-corejs2": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz",
-      "integrity": "sha512-DO95wD4g0A8KRaHKi0D51NdGXzvpqVLnLu5BTvDlpqUEpTmeEtypgC1xqesORaWmiUOQI14UHKlzNd9iZ2G3ZA==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
+      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.13.0",
-        "@babel/helper-define-polyfill-provider": "^0.1.5",
+        "@babel/compat-data": "^7.13.11",
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
         "semver": "^6.1.1"
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz",
-      "integrity": "sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
+      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.1.5",
-        "core-js-compat": "^3.8.1"
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "core-js-compat": "^3.21.0"
       }
     },
     "babel-plugin-polyfill-regenerator": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz",
-      "integrity": "sha512-OUrYG9iKPKz8NxswXbRAdSwF0GhRdIEMTloQATJi4bDuFqrXaXcCUT/VGNrr8pBcjMh1RxZ7Xt9cytVJTJfvMg==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
+      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.1.5"
+        "@babel/helper-define-polyfill-provider": "^0.3.1"
       }
     },
     "babel-preset-current-node-syntax": {
@@ -10725,9 +11336,9 @@
       }
     },
     "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
     "base": {
@@ -10753,35 +11364,6 @@
           "requires": {
             "is-descriptor": "^1.0.0"
           }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
         }
       }
     },
@@ -10791,15 +11373,6 @@
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "dev": true
     },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
     "bl": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -10837,30 +11410,16 @@
       "dev": true
     },
     "browserslist": {
-      "version": "4.16.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+      "version": "4.20.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
+      "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001219",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.723",
+        "caniuse-lite": "^1.0.30001332",
+        "electron-to-chromium": "^1.4.118",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.71"
-      },
-      "dependencies": {
-        "caniuse-lite": {
-          "version": "1.0.30001230",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz",
-          "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==",
-          "dev": true
-        },
-        "electron-to-chromium": {
-          "version": "1.3.739",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz",
-          "integrity": "sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==",
-          "dev": true
-        }
+        "node-releases": "^2.0.3",
+        "picocolors": "^1.0.0"
       }
     },
     "bser": {
@@ -10885,13 +11444,13 @@
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
       "dev": true
     },
     "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
     "cache-base": {
@@ -10933,6 +11492,12 @@
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
+    "caniuse-lite": {
+      "version": "1.0.30001341",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001341.tgz",
+      "integrity": "sha512-2SodVrFFtvGENGCv0ChVJIDQ0KPaS1cg7/qtfMaICgeMolDdo/Z2OD32F0Aq9yl6F4YFwGPBS5AaPqNYiW4PoA==",
+      "dev": true
+    },
     "capture-exit": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
@@ -10942,20 +11507,15 @@
         "rsvp": "^4.8.4"
       }
     },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
-    },
     "chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       }
     },
     "char-regex": {
@@ -11002,6 +11562,63 @@
           "requires": {
             "is-descriptor": "^0.1.0"
           }
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
+          }
+        },
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
         }
       }
     },
@@ -11038,25 +11655,19 @@
         "object-visit": "^1.0.0"
       }
     },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
       "requires": {
-        "color-name": "~1.1.4"
+        "color-name": "1.1.3"
       }
     },
     "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
     "combined-stream": {
@@ -11081,9 +11692,9 @@
       "dev": true
     },
     "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
       "dev": true,
       "requires": {
         "safe-buffer": "~5.1.1"
@@ -11096,12 +11707,12 @@
       "dev": true
     },
     "core-js-compat": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.9.1.tgz",
-      "integrity": "sha512-jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA==",
+      "version": "3.22.5",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.5.tgz",
+      "integrity": "sha512-rEF75n3QtInrYICvJjrAgV03HwKiYvtKHdPtaba1KucG+cNZ4NJnH9isqt979e67KZlhpbCOTwnsvnIr+CVeOg==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.3",
+        "browserslist": "^4.20.3",
         "semver": "7.0.0"
       },
       "dependencies": {
@@ -11113,31 +11724,24 @@
         }
       }
     },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+    "cross-fetch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "dev": true,
+      "requires": {
+        "node-fetch": "2.6.7"
+      }
     },
     "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
       "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        }
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       }
     },
     "cssom": {
@@ -11163,15 +11767,6 @@
         }
       }
     },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "data-urls": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
@@ -11184,9 +11779,9 @@
       }
     },
     "debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "requires": {
         "ms": "2.1.2"
@@ -11199,9 +11794,9 @@
       "dev": true
     },
     "decimal.js": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
-      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
       "dev": true
     },
     "decode-uri-component": {
@@ -11211,9 +11806,9 @@
       "dev": true
     },
     "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
     "deepmerge": {
@@ -11223,12 +11818,13 @@
       "dev": true
     },
     "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dev": true,
       "requires": {
-        "object-keys": "^1.0.12"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       }
     },
     "define-property": {
@@ -11239,37 +11835,6 @@
       "requires": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
       }
     },
     "delayed-stream": {
@@ -11285,9 +11850,9 @@
       "dev": true
     },
     "devtools-protocol": {
-      "version": "0.0.901419",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz",
-      "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==",
+      "version": "0.0.982423",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.982423.tgz",
+      "integrity": "sha512-FnVW2nDbjGNw1uD/JRC+9U5768W7e1TfUwqbDTcSsAu1jXFjITSX8w3rkW5FEpHRMPPGpvNSmO1pOpqByiWscA==",
       "dev": true
     },
     "diff-sequences": {
@@ -11313,15 +11878,11 @@
         }
       }
     },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
+    "electron-to-chromium": {
+      "version": "1.4.137",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
+      "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
+      "dev": true
     },
     "emittery": {
       "version": "0.7.2",
@@ -11366,13 +11927,13 @@
       "dev": true
     },
     "escodegen": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
       "dev": true,
       "requires": {
         "esprima": "^4.0.1",
-        "estraverse": "^4.2.0",
+        "estraverse": "^5.2.0",
         "esutils": "^2.0.2",
         "optionator": "^0.8.1",
         "source-map": "~0.6.1"
@@ -11385,9 +11946,9 @@
       "dev": true
     },
     "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true
     },
     "esutils": {
@@ -11397,24 +11958,26 @@
       "dev": true
     },
     "exec-sh": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
-      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
+      "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
       "dev": true
     },
     "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
       "dev": true,
       "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
+        "cross-spawn": "^7.0.0",
+        "get-stream": "^5.0.0",
+        "human-signals": "^1.1.1",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.0",
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2",
+        "strip-final-newline": "^2.0.0"
       }
     },
     "exit": {
@@ -11465,6 +12028,69 @@
             "is-extendable": "^0.1.0"
           }
         },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
+          }
+        },
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -11485,14 +12111,34 @@
         "jest-matcher-utils": "^26.6.2",
         "jest-message-util": "^26.6.2",
         "jest-regex-util": "^26.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        }
       }
     },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
     "extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
@@ -11501,17 +12147,6 @@
       "requires": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
       }
     },
     "extglob": {
@@ -11548,34 +12183,11 @@
             "is-extendable": "^0.1.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "dev": true
         }
       }
     },
@@ -11589,31 +12201,8 @@
         "debug": "^4.1.1",
         "get-stream": "^5.1.0",
         "yauzl": "^2.10.0"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        }
       }
     },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -11669,20 +12258,14 @@
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
       "dev": true
     },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
-    },
     "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
       "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
+        "combined-stream": "^1.0.8",
         "mime-types": "^2.1.12"
       }
     },
@@ -11750,9 +12333,9 @@
       "dev": true
     },
     "get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
       "dev": true,
       "requires": {
         "pump": "^3.0.0"
@@ -11764,25 +12347,16 @@
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
       "dev": true
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.1",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
       }
@@ -11794,9 +12368,9 @@
       "dev": true
     },
     "graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
       "dev": true
     },
     "growly": {
@@ -11806,22 +12380,6 @@
       "dev": true,
       "optional": true
     },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      }
-    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -11832,15 +12390,24 @@
       }
     },
     "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
+    "has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.1"
+      }
+    },
     "has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true
     },
     "has-value": {
@@ -11916,21 +12483,21 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+    "http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
       }
     },
     "https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dev": true,
       "requires": {
         "agent-base": "6",
@@ -11959,9 +12526,9 @@
       "dev": true
     },
     "import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
       "dev": true,
       "requires": {
         "pkg-dir": "^4.2.0",
@@ -11986,34 +12553,17 @@
     },
     "inherits": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
     "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+        "kind-of": "^6.0.0"
       }
     },
     "is-arrayish": {
@@ -12038,65 +12588,49 @@
       }
     },
     "is-core-module": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
-      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
       }
     },
     "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+        "kind-of": "^6.0.0"
       }
     },
     "is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
       "dev": true,
       "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
       }
     },
     "is-docker": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
-      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "dev": true,
       "optional": true
     },
     "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "requires": {
+        "is-plain-object": "^2.0.4"
+      }
     },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
@@ -12126,15 +12660,15 @@
       }
     },
     "is-potential-custom-element-name": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
-      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true
     },
     "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true
     },
     "is-typedarray": {
@@ -12177,27 +12711,22 @@
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "dev": true
     },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
     "istanbul-lib-coverage": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "dev": true
     },
     "istanbul-lib-instrument": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
+      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.7.5",
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-coverage": "^3.2.0",
         "semver": "^6.3.0"
       }
     },
@@ -12210,12 +12739,29 @@
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^3.0.0",
         "supports-color": "^7.1.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "istanbul-lib-source-maps": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
       "requires": {
         "debug": "^4.1.1",
@@ -12224,9 +12770,9 @@
       }
     },
     "istanbul-reports": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
+      "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
       "dev": true,
       "requires": {
         "html-escaper": "^2.0.0",
@@ -12242,29 +12788,6 @@
         "@jest/core": "^26.6.3",
         "import-local": "^3.0.2",
         "jest-cli": "^26.6.3"
-      },
-      "dependencies": {
-        "jest-cli": {
-          "version": "26.6.3",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
-          "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
-          "dev": true,
-          "requires": {
-            "@jest/core": "^26.6.3",
-            "@jest/test-result": "^26.6.2",
-            "@jest/types": "^26.6.2",
-            "chalk": "^4.0.0",
-            "exit": "^0.1.2",
-            "graceful-fs": "^4.2.4",
-            "import-local": "^3.0.2",
-            "is-ci": "^2.0.0",
-            "jest-config": "^26.6.3",
-            "jest-util": "^26.6.2",
-            "jest-validate": "^26.6.2",
-            "prompts": "^2.0.1",
-            "yargs": "^15.4.1"
-          }
-        }
       }
     },
     "jest-changed-files": {
@@ -12276,88 +12799,76 @@
         "@jest/types": "^26.6.2",
         "execa": "^4.0.0",
         "throat": "^5.0.0"
+      }
+    },
+    "jest-cli": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
+      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
+      "dev": true,
+      "requires": {
+        "@jest/core": "^26.6.3",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "import-local": "^3.0.2",
+        "is-ci": "^2.0.0",
+        "jest-config": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "prompts": "^2.0.1",
+        "yargs": "^15.4.1"
       },
       "dependencies": {
-        "cross-spawn": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
-        "execa": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-          "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "cross-spawn": "^7.0.0",
-            "get-stream": "^5.0.0",
-            "human-signals": "^1.1.1",
-            "is-stream": "^2.0.0",
-            "merge-stream": "^2.0.0",
-            "npm-run-path": "^4.0.0",
-            "onetime": "^5.1.0",
-            "signal-exit": "^3.0.2",
-            "strip-final-newline": "^2.0.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "get-stream": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "pump": "^3.0.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "is-stream": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-          "dev": true
-        },
-        "npm-run-path": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "path-key": "^3.0.0"
+            "color-name": "~1.1.4"
           }
         },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "isexe": "^2.0.0"
+            "has-flag": "^4.0.0"
           }
         }
       }
@@ -12386,6 +12897,57 @@
         "jest-validate": "^26.6.2",
         "micromatch": "^4.0.2",
         "pretty-format": "^26.6.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "jest-diff": {
@@ -12398,6 +12960,57 @@
         "diff-sequences": "^26.6.2",
         "jest-get-type": "^26.3.0",
         "pretty-format": "^26.6.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "jest-docblock": {
@@ -12420,6 +13033,57 @@
         "jest-get-type": "^26.3.0",
         "jest-util": "^26.6.2",
         "pretty-format": "^26.6.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "jest-environment-jsdom": {
@@ -12503,6 +13167,57 @@
         "jest-util": "^26.6.2",
         "pretty-format": "^26.6.2",
         "throat": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "jest-leak-detector": {
@@ -12525,6 +13240,57 @@
         "jest-diff": "^26.6.2",
         "jest-get-type": "^26.3.0",
         "pretty-format": "^26.6.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "jest-message-util": {
@@ -12542,6 +13308,57 @@
         "pretty-format": "^26.6.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "jest-mock": {
@@ -12583,14 +13400,53 @@
         "slash": "^3.0.0"
       },
       "dependencies": {
-        "resolve": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-          "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "is-core-module": "^2.2.0",
-            "path-parse": "^1.0.6"
+            "has-flag": "^4.0.0"
           }
         }
       }
@@ -12632,6 +13488,57 @@
         "jest-worker": "^26.6.2",
         "source-map-support": "^0.5.6",
         "throat": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "jest-runtime": {
@@ -12667,6 +13574,57 @@
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0",
         "yargs": "^15.4.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "jest-serializer": {
@@ -12703,14 +13661,63 @@
         "semver": "^7.3.2"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
@@ -12726,6 +13733,57 @@
         "graceful-fs": "^4.2.4",
         "is-ci": "^2.0.0",
         "micromatch": "^4.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "jest-validate": {
@@ -12742,11 +13800,60 @@
         "pretty-format": "^26.6.2"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "camelcase": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+          "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
@@ -12763,6 +13870,57 @@
         "chalk": "^4.0.0",
         "jest-util": "^26.6.2",
         "string-length": "^4.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "jest-worker": {
@@ -12774,6 +13932,23 @@
         "@types/node": "*",
         "merge-stream": "^2.0.0",
         "supports-color": "^7.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "js-tokens": {
@@ -12792,43 +13967,38 @@
         "esprima": "^4.0.0"
       }
     },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
     "jsdom": {
-      "version": "16.4.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz",
-      "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==",
+      "version": "16.7.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
       "dev": true,
       "requires": {
-        "abab": "^2.0.3",
-        "acorn": "^7.1.1",
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
         "acorn-globals": "^6.0.0",
         "cssom": "^0.4.4",
-        "cssstyle": "^2.2.0",
+        "cssstyle": "^2.3.0",
         "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.0",
+        "decimal.js": "^10.2.1",
         "domexception": "^2.0.1",
-        "escodegen": "^1.14.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
         "html-encoding-sniffer": "^2.0.1",
-        "is-potential-custom-element-name": "^1.0.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
         "nwsapi": "^2.2.0",
-        "parse5": "5.1.1",
-        "request": "^2.88.2",
-        "request-promise-native": "^1.0.8",
-        "saxes": "^5.0.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^3.0.1",
+        "tough-cookie": "^4.0.0",
         "w3c-hr-time": "^1.0.2",
         "w3c-xmlserializer": "^2.0.0",
         "webidl-conversions": "^6.1.0",
         "whatwg-encoding": "^1.0.5",
         "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0",
-        "ws": "^7.2.3",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
         "xml-name-validator": "^3.0.0"
       }
     },
@@ -12844,44 +14014,11 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
     "json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "dev": true
     },
     "kind-of": {
       "version": "6.0.3",
@@ -12912,9 +14049,9 @@
       }
     },
     "lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
     "locate-path": {
@@ -12938,12 +14075,6 @@
       "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
       "dev": true
     },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-      "dev": true
-    },
     "lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -12963,12 +14094,12 @@
       }
     },
     "makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "dev": true,
       "requires": {
-        "tmpl": "1.0.x"
+        "tmpl": "1.0.5"
       }
     },
     "map-cache": {
@@ -12993,28 +14124,28 @@
       "dev": true
     },
     "micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
       "requires": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       }
     },
     "mime-db": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
-      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true
     },
     "mime-types": {
-      "version": "2.1.27",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
-      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
       "requires": {
-        "mime-db": "1.44.0"
+        "mime-db": "1.52.0"
       }
     },
     "mimic-fn": {
@@ -13024,18 +14155,18 @@
       "dev": true
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "mixin-deep": {
@@ -13046,17 +14177,6 @@
       "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
       }
     },
     "mkdirp": {
@@ -13064,6 +14184,12 @@
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
     },
+    "mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
+    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -13102,10 +14228,37 @@
       "dev": true
     },
     "node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
-      "dev": true
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dev": true,
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      },
+      "dependencies": {
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
+          "dev": true
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
+          "dev": true
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+          "dev": true,
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        }
+      }
     },
     "node-int64": {
       "version": "0.4.0",
@@ -13113,16 +14266,10 @@
       "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
       "dev": true
     },
-    "node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-      "dev": true
-    },
     "node-notifier": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz",
-      "integrity": "sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -13135,31 +14282,21 @@
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "dev": true,
           "optional": true,
           "requires": {
             "lru-cache": "^6.0.0"
           }
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
         }
       }
     },
     "node-releases": {
-      "version": "1.1.71",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
-      "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
+      "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
       "dev": true
     },
     "normalize-package-data": {
@@ -13189,12 +14326,12 @@
       "dev": true
     },
     "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
       "requires": {
-        "path-key": "^2.0.0"
+        "path-key": "^3.0.0"
       }
     },
     "nwsapi": {
@@ -13203,12 +14340,6 @@
       "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
       "dev": true
     },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
-    },
     "object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
@@ -13229,6 +14360,43 @@
             "is-descriptor": "^0.1.0"
           }
         },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -13357,9 +14525,9 @@
       }
     },
     "parse5": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
       "dev": true
     },
     "pascalcase": {
@@ -13381,9 +14549,9 @@
       "dev": true
     },
     "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true
     },
     "path-parse": {
@@ -13398,26 +14566,23 @@
       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
       "dev": true
     },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
       "dev": true
     },
     "picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true
     },
     "pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dev": true,
-      "requires": {
-        "node-modules-regexp": "^1.0.0"
-      }
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+      "dev": true
     },
     "pkg-dir": {
       "version": "4.2.0",
@@ -13450,22 +14615,48 @@
         "ansi-regex": "^5.0.0",
         "ansi-styles": "^4.0.0",
         "react-is": "^17.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        }
       }
     },
     "progress": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz",
-      "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
     "prompts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.4"
+        "sisteransi": "^1.0.5"
       }
     },
     "proxy-from-env": {
@@ -13497,35 +14688,38 @@
       "dev": true
     },
     "puppeteer": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-10.2.0.tgz",
-      "integrity": "sha512-OR2CCHRashF+f30+LBOtAjK6sNtz2HEyTr5FqAvhf8lR/qB3uBRoIZOwQKgwoyZnMBsxX7ZdazlyBgGjpnkiMw==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-14.1.0.tgz",
+      "integrity": "sha512-T3eB4f6k9HVttYvyy8drGIKb04M+vxhepqM7qqcVCBTNT3T6M9cUaJT4k7P+a6wSonObJSJUP98JkPDQG+3fJw==",
       "dev": true,
       "requires": {
-        "debug": "4.3.1",
-        "devtools-protocol": "0.0.901419",
+        "cross-fetch": "3.1.5",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.982423",
         "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.0",
-        "node-fetch": "2.6.1",
+        "https-proxy-agent": "5.0.1",
         "pkg-dir": "4.2.0",
-        "progress": "2.0.1",
+        "progress": "2.0.3",
         "proxy-from-env": "1.1.0",
         "rimraf": "3.0.2",
-        "tar-fs": "2.0.0",
-        "unbzip2-stream": "1.3.3",
-        "ws": "7.4.6"
+        "tar-fs": "2.1.1",
+        "unbzip2-stream": "1.4.3",
+        "ws": "8.6.0"
+      },
+      "dependencies": {
+        "ws": {
+          "version": "8.6.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
+          "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
+          "dev": true,
+          "requires": {}
+        }
       }
     },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true
-    },
     "react-is": {
-      "version": "17.0.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz",
-      "integrity": "sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==",
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
     "read-pkg": {
@@ -13557,6 +14751,14 @@
         "find-up": "^4.1.0",
         "read-pkg": "^5.2.0",
         "type-fest": "^0.8.1"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
+        }
       }
     },
     "readable-stream": {
@@ -13577,24 +14779,24 @@
       "dev": true
     },
     "regenerate-unicode-properties": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
-      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
+      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
       "dev": true,
       "requires": {
-        "regenerate": "^1.4.0"
+        "regenerate": "^1.4.2"
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
       "dev": true
     },
     "regenerator-transform": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
-      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.8.4"
@@ -13611,29 +14813,29 @@
       }
     },
     "regexpu-core": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
-      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
+      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
       "dev": true,
       "requires": {
-        "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.2.0",
-        "regjsgen": "^0.5.1",
-        "regjsparser": "^0.6.4",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.2.0"
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.0.1",
+        "regjsgen": "^0.6.0",
+        "regjsparser": "^0.8.2",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.0.0"
       }
     },
     "regjsgen": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
+      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==",
       "dev": true
     },
     "regjsparser": {
-      "version": "0.6.7",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz",
-      "integrity": "sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==",
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
+      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
       "dev": true,
       "requires": {
         "jsesc": "~0.5.0"
@@ -13654,9 +14856,9 @@
       "dev": true
     },
     "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
       "dev": true
     },
     "repeat-string": {
@@ -13665,84 +14867,6 @@
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true
     },
-    "request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "tough-cookie": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-          "dev": true,
-          "requires": {
-            "psl": "^1.1.28",
-            "punycode": "^2.1.1"
-          }
-        },
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-          "dev": true
-        }
-      }
-    },
-    "request-promise-core": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
-      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.19"
-      }
-    },
-    "request-promise-native": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
-      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
-      "dev": true,
-      "requires": {
-        "request-promise-core": "1.1.4",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      },
-      "dependencies": {
-        "tough-cookie": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-          "dev": true,
-          "requires": {
-            "psl": "^1.1.28",
-            "punycode": "^2.1.1"
-          }
-        }
-      }
-    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -13756,12 +14880,14 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
       "dev": true,
       "requires": {
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
     "resolve-cwd": {
@@ -13883,6 +15009,34 @@
             }
           }
         },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -13906,6 +15060,21 @@
             }
           }
         },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "dev": true
+        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -13926,6 +15095,12 @@
             }
           }
         },
+        "is-stream": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+          "dev": true
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -13956,6 +15131,42 @@
             "remove-trailing-separator": "^1.0.1"
           }
         },
+        "npm-run-path": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+          "dev": true,
+          "requires": {
+            "path-key": "^2.0.0"
+          }
+        },
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^1.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+          "dev": true
+        },
         "to-regex-range": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
@@ -13965,6 +15176,15 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1"
           }
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
         }
       }
     },
@@ -14009,22 +15229,28 @@
           "requires": {
             "is-extendable": "^0.1.0"
           }
+        },
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "dev": true
         }
       }
     },
     "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
       "requires": {
-        "shebang-regex": "^1.0.0"
+        "shebang-regex": "^3.0.0"
       }
     },
     "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
     "shellwords": {
@@ -14035,9 +15261,9 @@
       "optional": true
     },
     "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "dev": true
     },
     "sisteransi": {
@@ -14095,6 +15321,69 @@
             "is-extendable": "^0.1.0"
           }
         },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
+          }
+        },
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -14128,35 +15417,6 @@
           "requires": {
             "is-descriptor": "^1.0.0"
           }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
         }
       }
     },
@@ -14200,9 +15460,9 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
@@ -14242,9 +15502,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
-      "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
+      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
       "dev": true
     },
     "split-string": {
@@ -14262,27 +15522,10 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
     "stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
+      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^2.0.0"
@@ -14314,15 +15557,66 @@
           "requires": {
             "is-descriptor": "^0.1.0"
           }
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
+          }
+        },
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
         }
       }
     },
-    "stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-      "dev": true
-    },
     "string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -14341,9 +15635,9 @@
       }
     },
     "string-length": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
-      "integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
       "requires": {
         "char-regex": "^1.0.2",
@@ -14351,23 +15645,23 @@
       }
     },
     "string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^6.0.1"
       }
     },
     "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "requires": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       }
     },
     "strip-bom": {
@@ -14389,24 +15683,47 @@
       "dev": true
     },
     "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "requires": {
-        "has-flag": "^4.0.0"
+        "has-flag": "^3.0.0"
       }
     },
     "supports-hyperlinks": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
-      "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
       "dev": true,
       "requires": {
         "has-flag": "^4.0.0",
         "supports-color": "^7.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true
+    },
     "symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
@@ -14414,26 +15731,15 @@
       "dev": true
     },
     "tar-fs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz",
-      "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
       "dev": true,
       "requires": {
         "chownr": "^1.1.1",
-        "mkdirp": "^0.5.1",
+        "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
-        "tar-stream": "^2.0.0"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        }
+        "tar-stream": "^2.1.4"
       }
     },
     "tar-stream": {
@@ -14483,9 +15789,9 @@
       "dev": true
     },
     "tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
     "to-fast-properties": {
@@ -14536,40 +15842,25 @@
       }
     },
     "tough-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
       "dev": true,
       "requires": {
-        "ip-regex": "^2.1.0",
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
       }
     },
     "tr46": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
-      "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
       "dev": true,
       "requires": {
         "punycode": "^2.1.1"
       }
     },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
-    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -14586,9 +15877,9 @@
       "dev": true
     },
     "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true
     },
     "typedarray-to-buffer": {
@@ -14601,9 +15892,9 @@
       }
     },
     "unbzip2-stream": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz",
-      "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
       "dev": true,
       "requires": {
         "buffer": "^5.2.1",
@@ -14611,31 +15902,31 @@
       }
     },
     "unicode-canonical-property-names-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
       "dev": true
     },
     "unicode-match-property-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "dev": true,
       "requires": {
-        "unicode-canonical-property-names-ecmascript": "^1.0.4",
-        "unicode-property-aliases-ecmascript": "^1.0.4"
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
-      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
       "dev": true
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
       "dev": true
     },
     "union-value": {
@@ -14648,8 +15939,22 @@
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
         "set-value": "^2.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "dev": true
+        }
       }
     },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true
+    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -14690,15 +15995,6 @@
         }
       }
     },
-    "uri-js": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
-      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
     "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
@@ -14725,9 +16021,9 @@
       "optional": true
     },
     "v8-to-istanbul": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz",
-      "integrity": "sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
+      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -14753,17 +16049,6 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
     "w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@@ -14783,12 +16068,12 @@
       }
     },
     "walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "dev": true,
       "requires": {
-        "makeerror": "1.0.x"
+        "makeerror": "1.0.12"
       }
     },
     "webidl-conversions": {
@@ -14813,20 +16098,20 @@
       "dev": true
     },
     "whatwg-url": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz",
-      "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
       "dev": true,
       "requires": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^2.0.2",
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
         "webidl-conversions": "^6.1.0"
       }
     },
     "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
       "requires": {
         "isexe": "^2.0.0"
@@ -14853,6 +16138,32 @@
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        }
       }
     },
     "wrappy": {
@@ -14874,9 +16185,9 @@
       }
     },
     "ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
+      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
       "dev": true,
       "requires": {}
     },
@@ -14893,9 +16204,9 @@
       "dev": true
     },
     "y18n": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
-      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
       "dev": true
     },
     "yallist": {
diff --git a/test/frontend/package.json b/test/frontend/package.json
index 3ee59f9655..ca42a09d96 100644
--- a/test/frontend/package.json
+++ b/test/frontend/package.json
@@ -9,7 +9,7 @@
     "babel-jest": "^26.6.3",
     "jest": "^26.6.3",
     "lodash": "^4.17.21",
-    "puppeteer": "^10.2.0"
+    "puppeteer": "^14.1.0"
   },
   "scripts": {
     "test": "jest --verbose --runInBand"

From 4daf7c0145ead3fddb2075e408d7787145e10889 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 19 May 2022 18:03:10 +0200
Subject: [PATCH 322/821] show logs in isolated_cell_id mode

---
 frontend/components/Cell.js   | 12 ++++++++++--
 frontend/components/Editor.js |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 169c54025f..3ea33908a6 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -243,15 +243,23 @@ export const Cell = ({
         </pluto-cell>
     `
 }
-
-export const IsolatedCell = ({ cell_id, cell_results: { output, published_object_keys }, hidden }) => {
+/**
+ * @param {{
+ *  cell_result: import("./Editor.js").CellResultData,
+ *  cell_input: import("./Editor.js").CellInputData,
+ *  [key: string]: any,
+ * }} props
+ * */
+export const IsolatedCell = ({ cell_input: { cell_id, metadata }, cell_result: { logs, output, published_object_keys }, hidden }) => {
     const node_ref = useRef(null)
     let pluto_actions = useContext(PlutoContext)
     const cell_api_ready = useCellApi(node_ref, published_object_keys, pluto_actions)
+    const { show_logs } = metadata
 
     return html`
         <pluto-cell ref=${node_ref} id=${cell_id} class=${hidden ? "hidden-cell" : "isolated-cell"}>
             ${cell_api_ready ? html`<${CellOutput} ...${output} cell_id=${cell_id} />` : html``}
+            ${show_logs ? html`<${Logs} logs=${Object.values(logs)} line_heights=${[15]} set_cm_highlighted_line=${() => {}} />` : null}
         </pluto-cell>
     `
 }
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index f5b3f54a79..ff28431c3c 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1246,8 +1246,8 @@ patch: ${JSON.stringify(
                                 ${this.state.notebook.cell_order.map(
                                     (cell_id, i) => html`
                                         <${IsolatedCell}
-                                            cell_id=${cell_id}
-                                            cell_results=${this.state.notebook.cell_results[cell_id]}
+                                            cell_input=${notebook.cell_inputs[cell_id]}
+                                            cell_result=${this.state.notebook.cell_results[cell_id]}
                                             hidden=${!launch_params.isolated_cell_ids.includes(cell_id)}
                                         />
                                     `

From aba1ef228a311f881b07217eaed13f8f62fa9f7a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 20 May 2022 00:35:10 +0200
Subject: [PATCH 323/821] SRI for mathjax import

---
 frontend/editor.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/editor.html b/frontend/editor.html
index 50b7987f9b..034cdc8306 100644
--- a/frontend/editor.html
+++ b/frontend/editor.html
@@ -45,7 +45,7 @@
     <script src="./warn_old_browsers.js"></script>
 
     <!-- This script will be enabled by JS after the notebook has initialized to prevent taking up bandwidth during the initial load. -->
-    <script type="text/javascript" id="MathJax-script" not-the-src-yet="https://cdn.jsdelivr.net/npm/mathjax@3.1.2/es5/tex-svg-full.js" async></script>
+    <script type="text/javascript" id="MathJax-script" integrity="sha384-VNy4JkI16R9GCNiJUCI27sGNe0Sw8gv1ichFHkTMKChXK32eYSMtzAkhFunKJ/fb" crossorigin="anonymous" not-the-src-yet="https://cdn.jsdelivr.net/npm/mathjax@3.1.2/es5/tex-svg-full.js" async></script>
 </head>
 
 <body class="loading no-MαθJax">

From e438662fc5cf662f5b3e8ab9b1a09665048d9e2e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 20 May 2022 00:51:27 +0200
Subject: [PATCH 324/821] improve html parameter insertion trick

---
 frontend/components/RecordingUI.js | 2 +-
 frontend/editor.html               | 4 ++--
 src/notebook/Export.jl             | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/components/RecordingUI.js b/frontend/components/RecordingUI.js
index 434659eb1e..2ca7e584c4 100644
--- a/frontend/components/RecordingUI.js
+++ b/frontend/components/RecordingUI.js
@@ -128,7 +128,7 @@ export const RecordingUI = ({ notebook_name, is_recording, recording_waiting_to_
             const audio_blob_url = await audio_recorder?.stop()
             const audio_data_url = audio_blob_url == null ? null : await blob_url_to_data_url(audio_blob_url)
 
-            const magic_tag = "<!-- [automatically generated launch parameters can be inserted here] -->"
+            const magic_tag = `<meta name="pluto-insertion-spot-parameters">`
             const output_html = initial_html.replace(
                 magic_tag,
                 `
diff --git a/frontend/editor.html b/frontend/editor.html
index 034cdc8306..99df972e44 100644
--- a/frontend/editor.html
+++ b/frontend/editor.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width" />
     <meta charset="utf-8" />
     
-    <!-- [automatically generated meta tags can be inserted here] -->
+    <meta name="pluto-insertion-spot-meta">
     
     <meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
     <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#2a2928">
@@ -39,7 +39,7 @@
     <link rel="preload" href="./vollkorn.css" as="style" />
     <link rel="stylesheet" href="./highlightjs.css" type="text/css">
 
-    <!-- [automatically generated launch parameters can be inserted here] -->
+    <meta name="pluto-insertion-spot-parameters">
 
     <script src="./editor.js" type="module" defer></script>
     <script src="./warn_old_browsers.js"></script>
diff --git a/src/notebook/Export.jl b/src/notebook/Export.jl
index 64bffcad43..95862d0575 100644
--- a/src/notebook/Export.jl
+++ b/src/notebook/Export.jl
@@ -54,12 +54,12 @@ function generate_html(;
 
     result = replace_at_least_once(
         replace_at_least_once(cdnified, 
-            "<!-- [automatically generated meta tags can be inserted here] -->" => 
+            "<meta name=\"pluto-insertion-spot-meta\">" => 
             """
             $(header_html)
-            <!-- [automatically generated meta tags can be inserted here] -->
+            <meta name=\"pluto-insertion-spot-meta\">
             """),
-        "<!-- [automatically generated launch parameters can be inserted here] -->" => 
+        "<meta name=\"pluto-insertion-spot-parameters\">" => 
         """
         <script data-pluto-file="launch-parameters">
         window.pluto_notebook_id = $(notebook_id_js);
@@ -71,7 +71,7 @@ function generate_html(;
         window.pluto_statefile = $(statefile_js);
         window.pluto_preamble_html = $(preamble_html_js);
         </script>
-        <!-- [automatically generated launch parameters can be inserted here] -->
+        <meta name=\"pluto-insertion-spot-parameters\">
         """
     )
 

From 16bba29e0fa488f139698e7ac13fb3d67ec81bd6 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 20 May 2022 00:51:33 +0200
Subject: [PATCH 325/821] type fix

---
 frontend/editor.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/editor.js b/frontend/editor.js
index 84c6259392..72ab6c4155 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -77,6 +77,7 @@ const from_attribute = (element, name) => {
  * @returns {import("./components/Editor.js").NotebookData}
  */
 export const empty_notebook_state = ({ notebook_id }) => ({
+    metadata: {},
     notebook_id: notebook_id,
     path: default_path,
     shortpath: "",

From e82b6ff1a21a683f102bd59712eef620cdc11596 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Mon, 23 May 2022 20:18:15 +0200
Subject: [PATCH 326/821] Handle assignments in parameters expr (#2128)

This code is invalid and cannot be generated using regular Julia. But
Julia does not care when its being generated by a macro for example.

This example results in a Multiple definitions error:

```julia
macro arg(x...)
   quote
       f(; $(esc(x...)))
   end
end

@arg x = false

@arg x = false
```
---
 src/analysis/ExpressionExplorer.jl | 18 +++++++++++++++++-
 test/ExpressionExplorer.jl         | 16 ++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index b7e1d6f836..15bb421cf1 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -495,6 +495,8 @@ function explore!(ex::Expr, scopestate::ScopeState)::SymbolsState
         else
             return explore!(Expr(:block, ex.args...), scopestate)
         end
+    elseif Meta.isexpr(ex, :parameters)
+        return mapfoldl(a -> explore!(to_kw(a), scopestate), union!, ex.args, init = SymbolsState())
     elseif ex.head == :kw
         return explore!(ex.args[2], scopestate)
     elseif ex.head == :struct
@@ -812,6 +814,14 @@ function explore_interpolations!(ex::Expr, scopestate)
 end
 explore_interpolations!(anything_else, scopestate) = SymbolsState()
 
+function to_kw(ex::Expr)
+    if Meta.isexpr(ex, :(=))
+        Expr(:kw, ex.args...)
+    else
+        ex
+    end
+end
+to_kw(x) = x
 
 "Return the function name and the SymbolsState from argument defaults. Add arguments as hidden globals to the `scopestate`.
 
@@ -903,7 +913,13 @@ function explore_funcdef!(ex::Expr, scopestate::ScopeState)::Tuple{FunctionName,
         name, symstate = uncurly!(ex, scopestate)
         return Symbol[name], symstate
 
-    elseif ex.head == :parameters || ex.head == :tuple
+    elseif Meta.isexpr(ex, :parameters)
+        return mapfoldl(
+            a -> explore_funcdef!(to_kw(a), scopestate),
+            union!, ex.args, init = (Symbol[], SymbolsState())
+        )
+
+    elseif ex.head == :tuple
         return mapfoldl(a -> explore_funcdef!(a, scopestate), union!, ex.args, init = (Symbol[], SymbolsState()))
 
     elseif ex.head == :(.)
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index 9c750e2321..cf5e3fbd79 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -608,6 +608,22 @@ Some of these @test_broken lines are commented out to prevent printing to the te
             [:Main, :Base], [], [[:Base, :macroexpand]], [], [Symbol("@enum")]
         )
     end
+    @testset "Invalid code sometimes generated by macros" begin
+        @test testee(
+            :(f(; $(:(x = true)))),
+            [], [], [:f], []
+        )
+        @test testee(
+            :(f(a, b, c; y, z = a, $(:(x = true)))),
+            [:a, :b, :c, :y], [], [:f], []
+        )
+        @test testee(
+            :(f(a, b, c; y, z = a, $(:(x = true))) = nothing),
+            [], [], [], [
+                :f => ([:nothing], [], [], [])
+            ]
+        )
+    end
     @testset "Extracting `using` and `import`" begin
         expr = quote
             using A

From 99701598e43f75df2b0923132f591d289847c11d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 25 May 2022 13:17:44 +0200
Subject: [PATCH 327/821] fix frontmatter colors in not-dark-mode

---
 frontend/editor.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 969642f383..524aac3e78 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -692,11 +692,11 @@ nav#at_the_top button.toggle_export span {
 }
 aside#export button.toggle_export span {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-outline.svg");
-    filter: var(--image-filters);
+    filter: invert(1);
 }
 aside#export button.toggle_frontmatter_edit span {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/newspaper-outline.svg");
-    filter: var(--image-filters);
+    filter: invert(1);
 }
 nav#at_the_top:after {
     margin-left: auto;
@@ -2896,7 +2896,7 @@ pluto-cell.hooked_up pluto-output {
     font-family: var(--system-ui-font-stack);
     width: min(31rem, 90vw);
     color: var(--black);
-    background: var(--export-bg-color);
+    background: var(--white);
 }
 
 .pluto-frontmatter button {

From f03030c004f8151ae2269d7f535aa51fd7527be4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 25 May 2022 18:10:41 +0200
Subject: [PATCH 328/821] Fix pasting plain text creating new cell (#2131)

---
 frontend/common/Serialization.js          |  2 +-
 test/frontend/__tests__/javascript_api.js | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/frontend/common/Serialization.js b/frontend/common/Serialization.js
index 77b989fd34..912ea43ddc 100644
--- a/frontend/common/Serialization.js
+++ b/frontend/common/Serialization.js
@@ -56,6 +56,6 @@ export function deserialize_repl(repl_session) {
 export const detect_deserializer = (topaste, check_in_textarea_or_input = true) =>
     topaste.trim().startsWith(JULIA_REPL_PROMPT)
         ? deserialize_repl
-        : (check_in_textarea_or_input && !in_textarea_or_input()) || topaste.match(/# ╔═╡ ........-....-....-....-............/g)?.length
+        : check_in_textarea_or_input && !in_textarea_or_input() && topaste.match(/# ╔═╡ ........-....-....-....-............/g)?.length
         ? deserialize_cells
         : null
diff --git a/test/frontend/__tests__/javascript_api.js b/test/frontend/__tests__/javascript_api.js
index 6fdefaaa30..c60a6fae9c 100644
--- a/test/frontend/__tests__/javascript_api.js
+++ b/test/frontend/__tests__/javascript_api.js
@@ -65,9 +65,10 @@ describe("JavaScript API", () => {
 
   it("⭐️ If you return an HTML node, it will be displayed.", async () => {
     const expected = "Success";
-    paste(
+    await paste(
       page,
-      `html"""<script>
+      `# ╔═╡ 90cfa9a0-114d-49bf-8dea-e97d58fa2442
+      html"""<script>
     const div = document.createElement("div")
     div.innerHTML = "${expected}"
     return div;
@@ -91,9 +92,10 @@ describe("JavaScript API", () => {
 
   it("⭐️ The observablehq/stdlib library is pre-imported, you can use DOM, html, Promises, etc.", async () => {
     const expected = "Success";
-    paste(
+    await paste(
       page,
-      `html"""<script>
+      `# ╔═╡ 90cfa9a0-114d-49bf-8dea-e97d58fa2442
+      html"""<script>
     return html\`<span>${expected}\</span>\`;
 </script>"""
         `
@@ -112,9 +114,10 @@ describe("JavaScript API", () => {
     );
     expect(initialLastCellContent).toBe(expected);
 
-    paste(
+    await paste(
       page,
-      `html"""<script>
+      `# ╔═╡ 90cfa9a0-114d-49bf-8dea-e97d58fa2442
+      html"""<script>
             const span = DOM.element("span");
             span.innerHTML = "${expected}"
             return span
@@ -137,7 +140,7 @@ describe("JavaScript API", () => {
   });
 
   it("⭐️ When a cell re-runs reactively, this will be set to the previous output", async () => {
-    paste(
+    await paste(
       page,
       `   
                 # ╔═╡ 90cfa9a0-114d-49bf-8dea-e97d58fa2442

From 66971e3cdc5b1a0095d7389b6b8f78994689403a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 25 May 2022 18:12:08 +0200
Subject: [PATCH 329/821] Enable strictNullChecks and fix problems (#2125)

---
 frontend/common/Bond.js                 |  35 ++++----
 frontend/components/Cell.js             |   2 +-
 frontend/components/CellInput.js        |  51 ++++++-----
 frontend/components/CellOutput.js       | 111 +++++++++++++++---------
 frontend/components/DropRuler.js        |   7 +-
 frontend/components/Editor.js           |  30 ++++---
 frontend/components/ErrorMessage.js     |  29 ++++---
 frontend/components/FilePicker.js       |  47 ++++++----
 frontend/components/FrontmatterInput.js |   7 +-
 frontend/components/Logs.js             |  36 ++++----
 frontend/components/PasteHandler.js     |   2 +-
 frontend/components/PkgStatusMark.js    |  61 +++++++------
 frontend/components/PkgTerminalView.js  |   8 +-
 frontend/components/Popup.js            |  65 ++++++++++----
 frontend/components/ProgressBar.js      |  15 +++-
 frontend/components/RecordingUI.js      |  66 ++++++++++----
 frontend/components/RunArea.js          |   5 +-
 frontend/components/SelectionArea.js    |  56 ++++++------
 frontend/components/SlideControls.js    |  29 +++----
 frontend/components/TreeView.js         |  30 +++++--
 frontend/components/welcome/Recent.js   |  12 +--
 frontend/components/welcome/Welcome.js  |   2 +-
 tsconfig.json                           |   3 +-
 23 files changed, 431 insertions(+), 278 deletions(-)

diff --git a/frontend/common/Bond.js b/frontend/common/Bond.js
index ffa8b27efe..c62ea609b9 100644
--- a/frontend/common/Bond.js
+++ b/frontend/common/Bond.js
@@ -1,6 +1,7 @@
 // import Generators_input from "https://unpkg.com/@observablehq/stdlib@3.3.1/src/generators/input.js"
 // import Generators_input from "https://unpkg.com/@observablehq/stdlib@3.3.1/src/generators/input.js"
 
+import { open_pluto_popup } from "../components/Popup.js"
 import _ from "../imports/lodash.js"
 import { html } from "../imports/Preact.js"
 import observablehq from "./SetupCellEnvironment.js"
@@ -152,25 +153,21 @@ export const add_bonds_disabled_message_handler = (bond_nodes, invalidation) =>
     bond_nodes.forEach((bond_node) => {
         const listener = (e) => {
             if (e.target.closest(".bonds_disabled.offer_binder")) {
-                window.dispatchEvent(
-                    new CustomEvent("open pluto popup", {
-                        detail: {
-                            type: "info",
-                            source_element: e.target,
-                            body: html`${`You are viewing a static document. `}
-                                <a
-                                    href="#"
-                                    onClick=${(e) => {
-                                        //@ts-ignore
-                                        window.open_edit_or_run_popup()
-                                        e.preventDefault()
-                                    }}
-                                    >Run this notebook</a
-                                >
-                                ${` to enable interactivity.`}`,
-                        },
-                    })
-                )
+                open_pluto_popup({
+                    type: "info",
+                    source_element: e.target,
+                    body: html`${`You are viewing a static document. `}
+                        <a
+                            href="#"
+                            onClick=${(e) => {
+                                //@ts-ignore
+                                window.open_edit_or_run_popup()
+                                e.preventDefault()
+                            }}
+                            >Run this notebook</a
+                        >
+                        ${` to enable interactivity.`}`,
+                })
             }
         }
         bond_node.addEventListener("click", listener)
diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 3ea33908a6..22ce10990b 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -62,7 +62,7 @@ export const Cell = ({
     const on_change = useCallback((val) => pluto_actions.set_local_cell(cell_id, val), [cell_id, pluto_actions])
     const variables = useMemo(() => Object.keys(cell_dependencies?.downstream_cells_map ?? {}), [cell_dependencies])
     // cm_forced_focus is null, except when a line needs to be highlighted because it is part of a stack trace
-    const [cm_forced_focus, set_cm_forced_focus] = useState(null)
+    const [cm_forced_focus, set_cm_forced_focus] = useState(/** @type{any} */ (null))
     const [cm_highlighted_line, set_cm_highlighted_line] = useState(null)
 
     const any_logs = useMemo(() => !_.isEmpty(logs), [logs])
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 9a0b1cb781..2dff27f32a 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -299,7 +299,7 @@ const replaceRange6 = (/** @type {EditorView} */ cm, text, from, to) =>
     })
 
 // Compartments: https://codemirror.net/6/examples/config/
-let useCompartment = (/** @type {import("../imports/Preact.js").Ref<EditorView>} */ codemirror_ref, value) => {
+let useCompartment = (/** @type {import("../imports/Preact.js").Ref<EditorView?>} */ codemirror_ref, value) => {
     let compartment = useRef(new Compartment())
     let initial_value = useRef(compartment.current.of(value))
 
@@ -357,11 +357,9 @@ export const CellInput = ({
     let pluto_actions = useContext(PlutoContext)
     const { disabled: running_disabled } = metadata
 
-    const newcm_ref = useRef(/** @type {EditorView} */ (null))
-    const dom_node_ref = useRef(/** @type {HTMLElement} */ (null))
-    const remote_code_ref = useRef(null)
-    const on_change_ref = useRef(null)
-    on_change_ref.current = on_change
+    const newcm_ref = useRef(/** @type {EditorView?} */ (null))
+    const dom_node_ref = useRef(/** @type {HTMLElement?} */ (null))
+    const remote_code_ref = useRef(/** @type {string?} */ (null))
 
     let nbpkg_compartment = useCompartment(newcm_ref, NotebookpackagesFacet.of(nbpkg))
     let global_definitions_compartment = useCompartment(newcm_ref, GlobalDefinitionsFacet.of(global_definition_locations))
@@ -381,6 +379,8 @@ export const CellInput = ({
     )
 
     useLayoutEffect(() => {
+        if (dom_node_ref.current == null) return
+
         const keyMapSubmit = () => {
             on_submit()
             return true
@@ -402,7 +402,7 @@ export const CellInput = ({
         let select_autocomplete_command = autocomplete.completionKeymap.find((keybinding) => keybinding.key === "Enter")
         let keyMapTab = (/** @type {EditorView} */ cm) => {
             // This will return true if the autocomplete select popup is open
-            if (select_autocomplete_command.run(cm)) {
+            if (select_autocomplete_command?.run(cm)) {
                 return true
             }
 
@@ -419,7 +419,7 @@ export const CellInput = ({
             }
         }
         const keyMapMD = () => {
-            const cm = newcm_ref.current
+            const cm = /** @type{EditorView} */ (newcm_ref.current)
             const value = getValue6(cm)
             const trimmed = value.trim()
             const offset = value.length - value.trimStart().length
@@ -489,11 +489,12 @@ export const CellInput = ({
                 on_delete()
                 return true
             }
+            return false
         }
 
         const keyMapBackspace = (/** @type {EditorView} */ cm) => {
             if (cm.state.facet(EditorState.readOnly)) {
-                return
+                return false
             }
 
             // Previously this was a very elaborate timed implementation......
@@ -505,6 +506,7 @@ export const CellInput = ({
                 on_delete()
                 return true
             }
+            return false
         }
 
         const plutoKeyMaps = [
@@ -652,6 +654,7 @@ export const CellInput = ({
                     // I put plutoKeyMaps separately because I want make sure we have
                     // higher priority 😈
                     keymap.of(plutoKeyMaps),
+
                     // Before default keymaps (because we override some of them)
                     // but after the autocomplete plugin, because we don't want to move cell when scrolling through autocomplete
                     cell_movement_plugin({
@@ -684,6 +687,7 @@ export const CellInput = ({
         if (focus_after_creation) {
             setTimeout(() => {
                 let view = newcm_ref.current
+                if (view == null) return
                 view.dom.scrollIntoView({
                     behavior: "smooth",
                     block: "nearest",
@@ -700,17 +704,19 @@ export const CellInput = ({
 
         // @ts-ignore
         const lines_wrapper_dom_node = dom_node_ref.current.querySelector("div.cm-content")
-        const lines_wrapper_resize_observer = new ResizeObserver(() => {
-            const line_nodes = lines_wrapper_dom_node.children
-            const tops = _.map(line_nodes, (c) => c.offsetTop)
-            const diffs = tops.slice(1).map((y, i) => y - tops[i])
-            const heights = [...diffs, 15]
-            on_line_heights(heights)
-        })
+        if (lines_wrapper_dom_node) {
+            const lines_wrapper_resize_observer = new ResizeObserver(() => {
+                const line_nodes = lines_wrapper_dom_node.children
+                const tops = _.map(line_nodes, (c) => c.offsetTop)
+                const diffs = tops.slice(1).map((y, i) => y - tops[i])
+                const heights = [...diffs, 15]
+                on_line_heights(heights)
+            })
 
-        lines_wrapper_resize_observer.observe(lines_wrapper_dom_node)
-        return () => {
-            lines_wrapper_resize_observer.unobserve(lines_wrapper_dom_node)
+            lines_wrapper_resize_observer.observe(lines_wrapper_dom_node)
+            return () => {
+                lines_wrapper_resize_observer.unobserve(lines_wrapper_dom_node)
+            }
         }
     }, [])
 
@@ -734,6 +740,7 @@ export const CellInput = ({
 
     useEffect(() => {
         const cm = newcm_ref.current
+        if (cm == null) return
         if (cm_forced_focus == null) {
             cm.dispatch({
                 selection: {
@@ -766,8 +773,8 @@ export const CellInput = ({
                 // block: "center",
             })
 
-            newcm_ref.current.focus()
-            newcm_ref.current.dispatch({
+            cm.focus()
+            cm.dispatch({
                 scrollIntoView: true,
                 selection: new_selection,
                 effects: [
@@ -799,7 +806,7 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, running_disabled, any_
     let pluto_actions = useContext(PlutoContext)
     const [open, setOpen] = useState(false)
     const mouseenter = () => {
-        clearTimeout(timeout.current)
+        if (timeout.current) clearTimeout(timeout.current)
     }
     const toggle_running_disabled = async (e) => {
         const new_val = !running_disabled
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 55e098d85d..788815810c 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -1,9 +1,16 @@
-import { html, Component, useRef, useLayoutEffect, useContext, useEffect, useMemo } from "../imports/Preact.js"
+import { html, Component, useRef, useLayoutEffect, useContext } from "../imports/Preact.js"
 
 import { ErrorMessage } from "./ErrorMessage.js"
 import { TreeView, TableView, DivElement } from "./TreeView.js"
 
-import { add_bonds_disabled_message_handler, add_bonds_listener, set_bound_elements_to_their_value, get_input_value, set_input_value, eventof } from "../common/Bond.js"
+import {
+    add_bonds_disabled_message_handler,
+    add_bonds_listener,
+    set_bound_elements_to_their_value,
+    get_input_value,
+    set_input_value,
+    eventof,
+} from "../common/Bond.js"
 import { cl } from "../common/ClassTable.js"
 
 import { observablehq_for_cells } from "../common/SetupCellEnvironment.js"
@@ -13,7 +20,6 @@ import register from "../imports/PreactCustomElement.js"
 import { EditorState, EditorView, defaultHighlightStyle } from "../imports/CodemirrorPlutoSetup.js"
 
 import { pluto_syntax_colors, ENABLE_CM_MIXED_PARSER } from "./CellInput.js"
-import { useState } from "../imports/Preact.js"
 
 import hljs from "../imports/highlightjs.js"
 import { julia_mixed } from "./CellInput/mixedParsers.js"
@@ -22,9 +28,7 @@ import { julia_andrey } from "../imports/CodemirrorPlutoSetup.js"
 export class CellOutput extends Component {
     constructor() {
         super()
-        this.state = {
-            error: null,
-        }
+        this.state = {}
 
         this.old_height = 0
         // @ts-ignore Is there a way to use the latest DOM spec?
@@ -35,8 +39,8 @@ export class CellOutput extends Component {
             if (document.body.querySelector("pluto-cell:focus-within")) {
                 const cell_outputs_after_focused = document.body.querySelectorAll("pluto-cell:focus-within ~ pluto-cell > pluto-output") // CSS wizardry ✨
                 if (
-                    !(document.activeElement.tagName == "SUMMARY") &&
-                    (cell_outputs_after_focused.length == 0 || !Array.from(cell_outputs_after_focused).includes(this.base))
+                    !(document.activeElement?.tagName === "SUMMARY") &&
+                    (cell_outputs_after_focused.length === 0 || !Array.from(cell_outputs_after_focused).includes(this.base))
                 ) {
                     window.scrollBy(0, new_height - this.old_height)
                 }
@@ -76,7 +80,7 @@ export class CellOutput extends Component {
                 mime=${this.props.mime}
             >
                 <assignee translate=${false}>${this.props.rootassignee}</assignee>
-                ${this.state.error ? html`<div>${this.state.error.message}</div>` : html`<${OutputBody} ...${this.props} />`}
+                <${OutputBody} ...${this.props} />
             </pluto-output>
         `
     }
@@ -179,13 +183,12 @@ let IframeContainer = ({ body }) => {
         iframeref.current.src = url
 
         run(async () => {
-            await new Promise((resolve) => iframeref.current.addEventListener("load", () => resolve()))
+            await new Promise((resolve) => iframeref.current.addEventListener("load", () => resolve(null)))
 
             /** @type {Document} */
             let iframeDocument = iframeref.current.contentWindow.document
-            /** Grab the <script> tag for the iframe content window resizer
-             * @type {HTMLScriptElement} */
-            let original_script_element = document.querySelector("#iframe-resizer-content-window-script")
+            /** Grab the <script> tag for the iframe content window resizer */
+            let original_script_element = /** @type {HTMLScriptElement} */ (document.querySelector("#iframe-resizer-content-window-script"))
 
             // Insert iframe resizer inside the iframe
             let iframe_resizer_content_script = iframeDocument.createElement("script")
@@ -194,7 +197,7 @@ let IframeContainer = ({ body }) => {
             iframeDocument.head.appendChild(iframe_resizer_content_script)
 
             // Apply iframe resizer from the host side
-            new Promise((resolve) => iframe_resizer_content_script.addEventListener("load", () => resolve()))
+            new Promise((resolve) => iframe_resizer_content_script.addEventListener("load", () => resolve(null)))
             // @ts-ignore
             window.iFrameResize({ checkOrigin: false }, iframeref.current)
         })
@@ -256,7 +259,11 @@ let execute_inside_script_tag_that_replaces = async (script_element, fn) => {
     // I use this long variable name to pass the function and result to and from the script we created
     window.____FUNCTION_TO_RUN_INSIDE_SCRIPT = { function_to_run: fn, currentScript: new_script_tag, result: null }
     // Put the script in the DOM, this will run the script
-    script_element.parentNode.replaceChild(new_script_tag, script_element)
+    const parent = script_element.parentNode
+    if (parent == null) {
+        throw "Failed to execute script it has no parent in DOM."
+    }
+    parent.replaceChild(new_script_tag, script_element)
     // @ts-ignore - Get the result back
     let result = await window.____FUNCTION_TO_RUN_INSIDE_SCRIPT.result
     // @ts-ignore - Reset the global variable "just in case"
@@ -268,8 +275,20 @@ let execute_inside_script_tag_that_replaces = async (script_element, fn) => {
 const is_displayable = (result) => result instanceof Element && result.nodeType === Node.ELEMENT_NODE
 
 /**
- * @typedef PlutoScript
- * @type {HTMLScriptElement | { pluto_is_loading_me?: boolean }}
+ * @typedef {HTMLScriptElement} PlutoScript
+ * @property {boolean?} pluto_is_loading_me
+ */
+
+/**
+ *
+ * @param {{
+ * root_node: HTMLElement,
+ * script_nodes: Array<PlutoScript>,
+ * previous_results_map: Map,
+ * invalidation: Promise<void>,
+ * pluto_actions: any,
+ * }} param0
+ * @returns
  */
 const execute_scripttags = async ({ root_node, script_nodes, previous_results_map, invalidation, pluto_actions }) => {
     let results_map = new Map()
@@ -281,7 +300,7 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
             let script_id = node.id
             let old_result = script_id ? previous_results_map.get(script_id) : null
             if (is_displayable(old_result)) {
-                node.parentElement.insertBefore(old_result, node)
+                node.parentElement?.insertBefore(old_result, node)
             }
         }
     }
@@ -290,25 +309,27 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
     for (let node of script_nodes) {
         if (node.src != null && node.src !== "") {
             // If it has a remote src="", de-dupe and copy the script to head
-            var script_el = Array.from(document.head.querySelectorAll("script")).find((s) => s.src === node.src)
+            let script_el = Array.from(document.head.querySelectorAll("script")).find((s) => s.src === node.src)
 
-            if (script_el == null) {
+            if (script_el == undefined) {
                 script_el = document.createElement("script")
                 script_el.src = node.src
                 script_el.type = node.type === "module" ? "module" : "text/javascript"
                 // @ts-ignore
                 script_el.pluto_is_loading_me = true
             }
+            let script_el_really = script_el // for typescript
+
             // @ts-ignore
-            const need_to_await = script_el.pluto_is_loading_me != null
+            const need_to_await = script_el_really.pluto_is_loading_me != null
             if (need_to_await) {
                 await new Promise((resolve) => {
-                    script_el.addEventListener("load", resolve)
-                    script_el.addEventListener("error", resolve)
-                    document.head.appendChild(script_el)
+                    script_el_really.addEventListener("load", resolve)
+                    script_el_really.addEventListener("error", resolve)
+                    document.head.appendChild(script_el_really)
                 })
                 // @ts-ignore
-                script_el.pluto_is_loading_me = undefined
+                script_el_really.pluto_is_loading_me = undefined
             }
         } else {
             // If there is no src="", we take the content and run it in an observablehq-like environment
@@ -322,7 +343,7 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
 
                 if (node.type === "" || node.type === "text/javascript" || node.type === "module") {
                     if (is_displayable(old_result)) {
-                        node.parentElement.insertBefore(old_result, node)
+                        node.parentElement?.insertBefore(old_result, node)
                     }
 
                     const cell = root_node.closest("pluto-cell")
@@ -332,6 +353,7 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
                                 this: script_id ? old_result : window,
                                 currentScript: currentScript,
                                 invalidation: invalidation,
+                                // @ts-ignore
                                 getPublishedObject: (id) => cell.getPublishedObject(id),
 
                                 getBoundElementValueLikePluto: get_input_value,
@@ -364,7 +386,7 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
                             old_result.remove()
                         }
                         if (is_displayable(result)) {
-                            new_node.parentElement.insertBefore(result, new_node)
+                            new_node.parentElement?.insertBefore(result, new_node)
                         }
                     }
                 }
@@ -424,40 +446,43 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
 
     let invalidate_scripts = useRef(() => {})
 
-    let container = useRef(/** @type {HTMLElement} */ (null))
+    let container_ref = useRef(/** @type {HTMLElement?} */ (null))
 
     useLayoutEffect(() => {
-        set_bound_elements_to_their_value(container.current.querySelectorAll("bond"), pluto_bonds)
+        if (container_ref.current) set_bound_elements_to_their_value(container_ref.current.querySelectorAll("bond"), pluto_bonds)
     }, [body, persist_js_state, pluto_actions, pluto_bonds])
 
     useLayoutEffect(() => {
+        const container = container_ref.current
+        if (container == null) return
+
         // Invalidate current scripts and create a new invalidation token immediately
         let invalidation = new Promise((resolve) => {
             invalidate_scripts.current = () => {
-                resolve()
+                resolve(null)
             }
         })
 
         const dump = document.createElement("p-dumpster")
         // @ts-ignore
-        dump.append(...container.current.childNodes)
+        dump.append(...container.childNodes)
 
         // Actually "load" the html
-        container.current.innerHTML = body
+        container.innerHTML = body
 
-        let scripts_in_shadowroots = Array.from(container.current.querySelectorAll("template[shadowroot]")).flatMap((template) => {
+        let scripts_in_shadowroots = Array.from(container.querySelectorAll("template[shadowroot]")).flatMap((template) => {
             // @ts-ignore
             return declarative_shadow_dom_polyfill(template)
         })
 
         // do this synchronously after loading HTML
-        const new_scripts = [...scripts_in_shadowroots, ...Array.from(container.current.querySelectorAll("script"))]
+        const new_scripts = [...scripts_in_shadowroots, ...Array.from(container.querySelectorAll("script"))]
 
         run(async () => {
             try {
-                js_init_set?.add(container.current)
+                js_init_set?.add(container)
                 previous_results_map.current = await execute_scripttags({
-                    root_node: container.current,
+                    root_node: container,
                     script_nodes: new_scripts,
                     invalidation,
                     previous_results_map: persist_js_state ? previous_results_map.current : new Map(),
@@ -465,7 +490,7 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
                 })
 
                 if (pluto_actions != null) {
-                    const bond_nodes = container.current.querySelectorAll("bond")
+                    const bond_nodes = container.querySelectorAll("bond")
                     set_bound_elements_to_their_value(bond_nodes, pluto_bonds)
                     add_bonds_listener(bond_nodes, pluto_actions.set_bond, pluto_bonds, invalidation)
                     add_bonds_disabled_message_handler(bond_nodes, invalidation)
@@ -476,7 +501,7 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
                 if (window.MathJax?.typeset != undefined) {
                     try {
                         // @ts-ignore
-                        window.MathJax.typeset(container.current.querySelectorAll(".tex"))
+                        window.MathJax.typeset(container.querySelectorAll(".tex"))
                     } catch (err) {
                         console.info("Failed to typeset TeX:")
                         console.info(err)
@@ -485,7 +510,7 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
 
                 // Apply syntax highlighting
                 try {
-                    container.current.querySelectorAll("code").forEach((code_element) => {
+                    container.querySelectorAll("code").forEach((code_element) => {
                         code_element.classList.forEach((className) => {
                             if (className.startsWith("language-")) {
                                 // Remove "language-"
@@ -498,17 +523,17 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
                     console.warn("Highlighting failed", err)
                 }
             } finally {
-                js_init_set?.delete(container.current)
+                js_init_set?.delete(container)
             }
         })
 
         return () => {
-            js_init_set?.delete(container.current)
+            js_init_set?.delete(container)
             invalidate_scripts.current?.()
         }
     }, [body, persist_js_state, last_run_timestamp, pluto_actions])
 
-    return html`<div class="raw-html-wrapper ${className}" ref=${container}></div>`
+    return html`<div class="raw-html-wrapper ${className}" ref=${container_ref}></div>`
 }
 
 // https://github.com/fonsp/Pluto.jl/issues/1692
@@ -542,7 +567,7 @@ export let highlight = (code_element, language) => {
                         defaultHighlightStyle.fallback,
                         EditorState.tabSize.of(4),
                         // TODO Other languages possibly?
-                        language === "julia" ? (ENABLE_CM_MIXED_PARSER ? julia_mixed() : julia_andrey()) : null,
+                        ...(language === "julia" ? [ENABLE_CM_MIXED_PARSER ? julia_mixed() : julia_andrey()] : []),
                         EditorView.lineWrapping,
                         EditorView.editable.of(false),
                     ].filter((x) => x != null),
diff --git a/frontend/components/DropRuler.js b/frontend/components/DropRuler.js
index 7ed6c49916..064e70d628 100644
--- a/frontend/components/DropRuler.js
+++ b/frontend/components/DropRuler.js
@@ -28,10 +28,11 @@ export class DropRuler extends Component {
 
     componentDidMount() {
         document.addEventListener("dragstart", (e) => {
+            if (!e.dataTransfer) return
             let target = /** @type {Element} */ (e.target)
             if (target.matches("pluto-shoulder")) {
                 this.dropee = target.parentElement
-                e.dataTransfer.setData("text/pluto-cell", this.props.serialize_selected(this.dropee.id))
+                e.dataTransfer.setData("text/pluto-cell", this.props.serialize_selected(this.dropee?.id))
                 this.dropped = false
                 this.precompute_cell_edges()
 
@@ -50,6 +51,7 @@ export class DropRuler extends Component {
             }
         })
         document.addEventListener("dragenter", (e) => {
+            if (!e.dataTransfer) return
             if (e.dataTransfer.types[0] !== "text/pluto-cell") return
             if (!this.state.drag_target) this.precompute_cell_edges()
             this.lastenter = e.target
@@ -57,6 +59,7 @@ export class DropRuler extends Component {
             e.preventDefault()
         })
         document.addEventListener("dragleave", (e) => {
+            if (!e.dataTransfer) return
             if (e.dataTransfer.types[0] !== "text/pluto-cell") return
             if (e.target === this.lastenter) {
                 this.setState({ drag_target: false })
@@ -73,6 +76,7 @@ export class DropRuler extends Component {
             { leading: false, trailing: true }
         )
         document.addEventListener("dragover", (e) => {
+            if (!e.dataTransfer) return
             // Called continuously during drag
             if (e.dataTransfer.types[0] !== "text/pluto-cell") return
             this.pointer_position = e
@@ -96,6 +100,7 @@ export class DropRuler extends Component {
             this.props.set_scroller({ up: false, down: false })
         })
         document.addEventListener("drop", (e) => {
+            if (!e.dataTransfer) return
             // Guaranteed to fire before the 'dragend' event
             // Ignore files
             if (e.dataTransfer.types[0] !== "text/pluto-cell") {
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index ff28431c3c..9124c4dd56 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -216,8 +216,8 @@ const first_true_key = (obj) => {
  * }}
  */
 
-const url_logo_big = document.head.querySelector("link[rel='pluto-logo-big']").getAttribute("href")
-const url_logo_small = document.head.querySelector("link[rel='pluto-logo-small']").getAttribute("href")
+const url_logo_big = document.head.querySelector("link[rel='pluto-logo-big']")?.getAttribute("href") ?? ""
+const url_logo_small = document.head.querySelector("link[rel='pluto-logo-small']")?.getAttribute("href") ?? ""
 
 /**
  * @typedef EditorProps
@@ -269,7 +269,7 @@ export class Editor extends Component {
             notebook: /** @type {NotebookData} */ initial_notebook_state,
             cell_inputs_local: /** @type {{ [id: string]: CellInputData }} */ ({}),
             desired_doc_query: null,
-            recently_deleted: /** @type {Array<{ index: number, cell: CellInputData }>} */ (null),
+            recently_deleted: /** @type {Array<{ index: number, cell: CellInputData }>} */ ([]),
             last_update_time: 0,
 
             disable_ui: launch_params.disable_ui,
@@ -602,7 +602,7 @@ export class Editor extends Component {
             },
         }
 
-        const apply_notebook_patches = (patches, old_state = undefined, get_reverse_patches = false) =>
+        const apply_notebook_patches = (patches, /** @type {NotebookData?} */ old_state = null, get_reverse_patches = false) =>
             new Promise((resolve) => {
                 if (patches.length !== 0) {
                     let copy_of_patches,
@@ -625,9 +625,9 @@ export class Editor extends Component {
                                 }
                                 new_notebook = applyPatches(old_state ?? state.notebook, patches)
                             } catch (exception) {
-                                const failing_path = String(exception).match(".*'(.*)'.*")[1].replace(/\//gi, ".")
+                                const failing_path = String(exception).match(".*'(.*)'.*")?.[1].replace(/\//gi, ".") ?? exception
                                 const path_value = _.get(this.state.notebook, failing_path, "Not Found")
-                                console.log(String(exception).match(".*'(.*)'.*")[1].replace(/\//gi, "."), failing_path, typeof failing_path)
+                                console.log(String(exception).match(".*'(.*)'.*")?.[1].replace(/\//gi, ".") ?? exception, failing_path, typeof failing_path)
                                 // The alert below is not catastrophic: the editor will try to recover.
                                 // Deactivating to be user-friendly!
                                 // alert(`Ooopsiee.`)
@@ -909,7 +909,7 @@ patch: ${JSON.stringify(
 
                 if (DEBUG_DIFFING) {
                     try {
-                        let previous_function_name = new Error().stack.split("\n")[2].trim().split(" ")[1]
+                        let previous_function_name = new Error().stack?.split("\n")[2].trim().split(" ")[1]
                         console.log(`Changes to send to server from "${previous_function_name}":`, changes)
                     } catch (error) {}
                 }
@@ -1135,11 +1135,13 @@ patch: ${JSON.stringify(
         })
 
         document.addEventListener("paste", async (e) => {
-            const topaste = e.clipboardData.getData("text/plain")
-            const deserializer = detect_deserializer(topaste)
-            if (deserializer != null) {
-                this.actions.add_deserialized_cells(topaste, -1, deserializer)
-                e.preventDefault()
+            const topaste = e.clipboardData?.getData("text/plain")
+            if (topaste) {
+                const deserializer = detect_deserializer(topaste)
+                if (deserializer != null) {
+                    this.actions.add_deserialized_cells(topaste, -1, deserializer)
+                    e.preventDefault()
+                }
             }
         })
 
@@ -1202,7 +1204,7 @@ patch: ${JSON.stringify(
         this.send_queued_bond_changes()
 
         if (old_state.backend_launch_phase !== this.state.backend_launch_phase && this.state.backend_launch_phase != null) {
-            const phase = Object.entries(BackendLaunchPhase).find(([k, v]) => v == this.state.backend_launch_phase)[0]
+            const phase = Object.entries(BackendLaunchPhase).find(([k, v]) => v == this.state.backend_launch_phase)?.[0]
             console.info(`Binder phase: ${phase} at ${new Date().toLocaleTimeString()}`)
         }
 
@@ -1248,7 +1250,7 @@ patch: ${JSON.stringify(
                                         <${IsolatedCell}
                                             cell_input=${notebook.cell_inputs[cell_id]}
                                             cell_result=${this.state.notebook.cell_results[cell_id]}
-                                            hidden=${!launch_params.isolated_cell_ids.includes(cell_id)}
+                                            hidden=${!launch_params.isolated_cell_ids?.includes(cell_id)}
                                         />
                                     `
                                 )}
diff --git a/frontend/components/ErrorMessage.js b/frontend/components/ErrorMessage.js
index e5d82ba9f6..b192c5a4d4 100644
--- a/frontend/components/ErrorMessage.js
+++ b/frontend/components/ErrorMessage.js
@@ -40,6 +40,10 @@ const insert_commas_and_and = (/** @type {any[]} */ xs) => xs.flatMap((x, i) =>
 
 export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
     let pluto_actions = useContext(PlutoContext)
+    const default_rewriter = {
+        pattern: /.?/,
+        display: (/** @type{string} */ x) => x.split("\n").map((line) => html`<p>${line}</p>`),
+    }
     const rewriters = [
         {
             pattern: /syntax: extra token after end of expression/,
@@ -122,7 +126,7 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
                             const onclick = (ev) => {
                                 const where = document.querySelector(`pluto-cell:not([id='${cell_id}']) span[id='${encodeURI(what)}']`)
                                 ev.preventDefault()
-                                where.scrollIntoView()
+                                where?.scrollIntoView()
                             }
                             return html`<a href="#" onclick=${onclick}>${what}</a>`
                         })
@@ -136,13 +140,15 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
         {
             pattern: /^UndefVarError: (.*) not defined\.?$/,
             display: (/** @type{string} */ x) => {
-                const notebook = pluto_actions.get_notebook()
+                const notebook = /** @type{import("./Editor.js").NotebookData?} */ (pluto_actions.get_notebook())
                 const erred_upstreams = get_erred_upstreams(notebook, cell_id)
 
                 // Verify that the UndefVarError is indeed about a variable from an upstream cell.
                 const match = x.match(/UndefVarError: (.*) not defined/)
-                let sym = match[1]
-                const undefvar_is_from_upstream = Object.values(notebook.cell_dependencies).some((map) => Object.keys(map.downstream_cells_map).includes(sym))
+                let sym = match?.[1] ?? ""
+                const undefvar_is_from_upstream = Object.values(notebook?.cell_dependencies ?? {}).some((map) =>
+                    Object.keys(map.downstream_cells_map).includes(sym)
+                )
 
                 if (!erred_upstreams || !undefvar_is_from_upstream) {
                     return html`<p>${x}</p>`
@@ -152,7 +158,7 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
                     const onclick = (ev) => {
                         ev.preventDefault()
                         const where = document.querySelector(`pluto-cell[id='${erred_upstreams[key]}']`)
-                        where.scrollIntoView()
+                        where?.scrollIntoView()
                     }
                     return html`<a href="#" onclick=${onclick}>${key}</a>`
                 })
@@ -162,13 +168,10 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
             },
             show_stacktrace: () => get_erred_upstreams(pluto_actions.get_notebook(), cell_id) == null,
         },
-        {
-            pattern: /.?/,
-            display: (/** @type{string} */ x) => x.split("\n").map((line) => html`<p>${line}</p>`),
-        },
+        default_rewriter,
     ]
 
-    const matched_rewriter = rewriters.find(({ pattern }) => pattern.test(msg))
+    const matched_rewriter = rewriters.find(({ pattern }) => pattern.test(msg)) ?? default_rewriter
 
     return html`<jlerror>
         <header>${matched_rewriter.display(msg)}</header>
@@ -190,12 +193,12 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
     </jlerror>`
 }
 
-const get_erred_upstreams = (/** @type {import("./Editor.js").NotebookData} */ notebook, /** @type {string} */ cell_id) => {
+const get_erred_upstreams = (/** @type {import("./Editor.js").NotebookData?} */ notebook, /** @type {string} */ cell_id) => {
     let erred_upstreams = null
-    notebook.cell_results[cell_id].errored &&
+    if (notebook != null && notebook?.cell_results?.[cell_id]?.errored)
         Object.keys(notebook.cell_dependencies[cell_id]?.upstream_cells_map).forEach((key) => {
             notebook.cell_dependencies[cell_id]?.upstream_cells_map[key].forEach((upstream_cell_id) => {
-                let upstream_cells = get_erred_upstreams(notebook, upstream_cell_id)
+                let upstream_cells = get_erred_upstreams(notebook, upstream_cell_id) ?? {}
                 erred_upstreams = { ...erred_upstreams, ...upstream_cells }
                 // if upstream got no errors and current cell is errored
                 // then current cell is responsible for errors
diff --git a/frontend/components/FilePicker.js b/frontend/components/FilePicker.js
index 0ca1bb3406..cc760dd3be 100644
--- a/frontend/components/FilePicker.js
+++ b/frontend/components/FilePicker.js
@@ -21,6 +21,14 @@ let start_autocomplete_command = completionKeymap.find((keybinding) => keybindin
 let accept_autocomplete_command = completionKeymap.find((keybinding) => keybinding.key === "Enter")
 let close_autocomplete_command = completionKeymap.find((keybinding) => keybinding.key === "Escape")
 
+const assert_not_null = (x) => {
+    if (x == null) {
+        throw new Error("Unexpected null value")
+    } else {
+        return x
+    }
+}
+
 /**
  * @typedef FilePickerProps
  * @type {{
@@ -40,10 +48,11 @@ export class FilePicker extends Component {
             is_button_disabled: true,
         }
         this.forced_value = ""
-        /** @type {EditorView} */
+        /** @type {EditorView?} */
         this.cm = null
 
         this.suggest_not_tmp = () => {
+            if (!this.cm) return
             const suggest = this.props.suggest_new_file
             if (suggest != null && this.cm.state.doc.length === 0) {
                 // this.cm.focus()
@@ -58,18 +67,21 @@ export class FilePicker extends Component {
 
         let run = async (fn) => await fn()
         this.on_submit = () => {
-            const my_val = this.cm.state.doc.toString()
+            if (!this.cm) return true
+            const cm = this.cm
+
+            const my_val = cm.state.doc.toString()
             if (my_val === this.forced_value) {
                 this.suggest_not_tmp()
                 return true
             }
             run(async () => {
                 try {
-                    await this.props.on_submit(this.cm.state.doc.toString())
-                    this.cm.dom.blur()
+                    await this.props.on_submit(cm.state.doc.toString())
+                    cm.dom.blur()
                 } catch (error) {
-                    this.cm.dispatch({
-                        changes: { from: 0, to: this.cm.state.doc.length, insert: this.props.value },
+                    cm.dispatch({
+                        changes: { from: 0, to: cm.state.doc.length, insert: this.props.value },
                         selection: EditorSelection.cursor(this.props.value.length),
                     })
                 }
@@ -79,17 +91,19 @@ export class FilePicker extends Component {
     }
     componentDidUpdate() {
         if (this.forced_value != this.props.value) {
-            this.cm.dispatch({
-                changes: { from: 0, to: this.cm.state.doc.length, insert: this.props.value },
+            if (!this.cm) return
+            const cm = this.cm
+            cm.dispatch({
+                changes: { from: 0, to: cm.state.doc.length, insert: this.props.value },
                 selection: EditorSelection.cursor(this.props.value.length),
             })
             this.forced_value = this.props.value
 
             // a long path like /Users/fons/Documents/article-test-1/asdfasdfasdfsadf.jl does not fit in the little box, so we scroll it to the left so that you can see the filename easily.
-            this.cm.scrollDOM.scrollLeft = 100000
+            cm.scrollDOM.scrollLeft = 100000
             setTimeout(() => {
                 // TODO: do we need this?
-                this.cm.scrollDOM.scrollLeft = 100000
+                cm.scrollDOM.scrollLeft = 100000
             }, 100)
         }
     }
@@ -121,7 +135,7 @@ export class FilePicker extends Component {
                                     cm.scrollPosIntoView(this.props.value.length)
 
                                     setTimeout(() => {
-                                        this.cm.scrollPosIntoView(this.props.value.length)
+                                        this.cm?.scrollPosIntoView(this.props.value.length)
                                     }, 100)
                                 }
                             }, 200)
@@ -157,7 +171,7 @@ export class FilePicker extends Component {
                         ],
                         defaultKeymap: false, // We add these manually later, so we can override them if necessary
                         maxRenderedOptions: 512, // fons's magic number
-                        optionClass: (c) => c.type,
+                        optionClass: (c) => c.type ?? "",
                     }),
                     // When a completion is picked, immediately start autocompleting again
                     EditorView.updateListener.of((update) => {
@@ -175,7 +189,7 @@ export class FilePicker extends Component {
                             key: "Enter",
                             run: (cm) => {
                                 // If there is autocomplete open, accept that. It will return `true`
-                                return accept_autocomplete_command.run(cm)
+                                return assert_not_null(accept_autocomplete_command).run(cm)
                             },
                         },
                         { key: "Enter", run: this.on_submit },
@@ -184,7 +198,7 @@ export class FilePicker extends Component {
                         {
                             key: "Escape",
                             run: (cm) => {
-                                close_autocomplete_command.run(cm)
+                                assert_not_null(close_autocomplete_command).run(cm)
                                 cm.dispatch({
                                     changes: { from: 0, to: cm.state.doc.length, insert: this.props.value },
                                     selection: EditorSelection.cursor(this.props.value.length),
@@ -199,7 +213,7 @@ export class FilePicker extends Component {
                             key: "Tab",
                             run: (cm) => {
                                 // If there is autocomplete open, accept that
-                                if (accept_autocomplete_command.run(cm)) {
+                                if (assert_not_null(accept_autocomplete_command).run(cm)) {
                                     // and request the next ones
                                     this.request_path_completions()
                                     return true
@@ -232,11 +246,12 @@ export class FilePicker extends Component {
     }
 
     request_path_completions() {
+        if (!this.cm) return
         let selection = this.cm.state.selection.main
         if (selection.from !== selection.to) return
         if (this.cm.state.doc.length !== selection.to) return
 
-        return start_autocomplete_command.run(this.cm)
+        return assert_not_null(start_autocomplete_command).run(this.cm)
     }
 }
 
diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index 0c88a0b439..2505c193ef 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -122,20 +122,23 @@ const field_type = (name) => {
 }
 
 const Input = ({ value, on_value, type, id }) => {
-    const input_ref = useRef(/** @type {HTMLInputElement} */ (null))
+    const input_ref = useRef(/** @type {HTMLInputElement?} */ (null))
 
     useLayoutEffect(() => {
+        if (!input_ref.current) return
         input_ref.current.value = value
     }, [input_ref.current, value])
 
     useLayoutEffect(() => {
+        if (!input_ref.current) return
         const listener = (e) => {
+            if (!input_ref.current) return
             on_value(input_ref.current.value)
         }
 
         input_ref.current.addEventListener("input", listener)
         return () => {
-            input_ref.current.removeEventListener("input", listener)
+            input_ref.current?.removeEventListener("input", listener)
         }
     }, [input_ref.current])
 
diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
index 10daad42b7..db2cb1e76d 100644
--- a/frontend/components/Logs.js
+++ b/frontend/components/Logs.js
@@ -2,7 +2,7 @@ import _ from "../imports/lodash.js"
 import { cl } from "../common/ClassTable.js"
 import { html, useState, useEffect, useLayoutEffect, useRef, useMemo } from "../imports/Preact.js"
 import { SimpleOutputBody } from "./TreeView.js"
-import { help_circle_icon } from "./Popup.js"
+import { help_circle_icon, open_pluto_popup } from "./Popup.js"
 
 // Defined in editor.css
 const GRID_WIDTH = 10
@@ -14,7 +14,7 @@ const is_progress_log = (log) => {
 }
 
 export const Logs = ({ logs, line_heights, set_cm_highlighted_line }) => {
-    const container = useRef(null)
+    const container = useRef(/** @type {HTMLElement?} */ (null))
     const [from, setFrom] = useState(0)
     const [to, setTo] = useState(Math.round(1000 / GRID_WIDTH))
     const progress_logs = logs.filter(is_progress_log)
@@ -39,8 +39,8 @@ export const Logs = ({ logs, line_heights, set_cm_highlighted_line }) => {
     )
 
     useEffect(() => {
-        if (!container.current) return
         const elem = container.current
+        if (!elem) return
         const fn = () => {
             const w = elem.clientWidth
             const scroll_left = elem.scrollLeft
@@ -82,11 +82,12 @@ export const Logs = ({ logs, line_heights, set_cm_highlighted_line }) => {
 }
 
 const Progress = ({ progress }) => {
-    const bar_ref = useRef(null)
+    const bar_ref = useRef(/** @type {HTMLElement?} */ (null))
 
     useLayoutEffect(() => {
+        if (!bar_ref.current) return
         bar_ref.current.style.backgroundSize = `${progress * 100}% 100%`
-    }, [progress])
+    }, [bar_ref.current, progress])
 
     return html`<pluto-progress-bar ref=${bar_ref}>${Math.ceil(100 * progress)}%</pluto-progress-bar>`
 }
@@ -94,7 +95,7 @@ const Progress = ({ progress }) => {
 const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${"adsf"} mime=${pair[1]} body=${pair[0]} persist_js_state=${false} />`
 
 const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
-    const node_ref = useRef(null)
+    const node_ref = useRef(/** @type{HTMLElement?} */ (null))
     // const label_ref = useRef(null)
     // useEffect(() => {
     //     label_ref.current.innerHTML = body
@@ -122,9 +123,10 @@ const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
     }
 
     useLayoutEffect(() => {
+        if (!node_ref.current) return
         node_ref.current.style.gridColumn = `${x + 1}`
         node_ref.current.style.gridRow = `${y + 1}`
-    }, [x, y])
+    }, [node_ref.current, x, y])
 
     useLayoutEffect(() => {
         if (inspecting && show) {
@@ -145,7 +147,7 @@ const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
     }, [inspecting])
 
     return show
-        ? html` <pluto-log-dot-positioner
+        ? html`<pluto-log-dot-positioner
               ref=${node_ref}
               class=${cl({ inspecting })}
               onClick=${() => {
@@ -187,22 +189,18 @@ const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
         : html`<pluto-log-dot-positioner ref=${node_ref}></pluto-log-dot-positioner>`
 }
 
-const MoreInfo = ({ body }) => {
+const MoreInfo = (/** @type{{body: import("../imports/Preact.js").ReactElement}} */ { body }) => {
     return html`<a
         class="stdout-info"
         target="_blank"
         title="Click for more info"
         href="#"
-        onClick=${(e) => {
-            window.dispatchEvent(
-                new CustomEvent("open pluto popup", {
-                    detail: {
-                        type: "info",
-                        source_element: e.currentTarget,
-                        body,
-                    },
-                })
-            )
+        onClick=${(/** @type{Event} */ e) => {
+            open_pluto_popup({
+                type: "info",
+                source_element: /** @type {HTMLElement?} */ (e.currentTarget),
+                body,
+            })
             e.preventDefault()
         }}
         ><img alt="❔" src=${help_circle_icon} width="17"
diff --git a/frontend/components/PasteHandler.js b/frontend/components/PasteHandler.js
index eb3a81798e..061ea51f50 100644
--- a/frontend/components/PasteHandler.js
+++ b/frontend/components/PasteHandler.js
@@ -7,7 +7,7 @@ const detectNotebook = (inputtext) => {
     const text = `${inputtext}\n`.replace("\r\n", "\n")
     const from = text.indexOf("### A Pluto.jl notebook ###")
     const cellsfound = text.match(/# ... ........-....-....-....-............/g)
-    const cellscount = cellsfound?.length
+    const cellscount = cellsfound?.length ?? 0
     const cellsorder = text.indexOf("# ╔═╡ Cell order:") + "# ╔═╡ Cell order:".length + 1
     let to = cellsorder
     for (let i = 1; i <= cellscount; i++) {
diff --git a/frontend/components/PkgStatusMark.js b/frontend/components/PkgStatusMark.js
index 36594e817d..3083b42839 100644
--- a/frontend/components/PkgStatusMark.js
+++ b/frontend/components/PkgStatusMark.js
@@ -1,5 +1,6 @@
 import _ from "../imports/lodash.js"
 import { html, useEffect, useState } from "../imports/Preact.js"
+import { open_pluto_popup } from "./Popup.js"
 
 export const nbpkg_fingerprint = (nbpkg) => (nbpkg == null ? [null] : Object.entries(nbpkg).flat())
 
@@ -15,20 +16,32 @@ const can_update = (installed, available) => {
     }
 }
 
+/**
+ * @typedef PackageStatus
+ * @property {string} status
+ * @property {import("../imports/Preact.js").ReactElement} hint
+ * @property {string} hint_raw
+ * @property {string[]?} available_versions
+ * @property {string?} chosen_version
+ * @property {boolean} busy
+ * @property {boolean} offer_update
+ */
+
 /**
  * @param {{
  *  package_name: string,
  *  is_disable_pkg: boolean,
- *  available_versions: string[],
+ *  available_versions: string[]?,
  *  nbpkg: import("./Editor.js").NotebookPkgData?,
  * }} props
+ * @returns {PackageStatus}
  */
 export const package_status = ({ nbpkg, package_name, available_versions, is_disable_pkg }) => {
-    let status = null
-    let hint_raw = null
-    let hint = null
+    let status = "error"
+    let hint_raw = "error"
+    let hint = html`error`
     let offer_update = false
-    const chosen_version = nbpkg?.installed_versions[package_name]
+    const chosen_version = nbpkg?.installed_versions[package_name] ?? null
     const busy = (nbpkg?.busy_packages ?? []).includes(package_name) || !(nbpkg?.instantiated ?? true)
 
     if (is_disable_pkg) {
@@ -56,7 +69,7 @@ export const package_status = ({ nbpkg, package_name, available_versions, is_dis
             }
         }
     } else {
-        if (_.isArray(available_versions)) {
+        if (available_versions != null && _.isArray(available_versions)) {
             if (available_versions.length === 0) {
                 status = "not_found"
                 hint_raw = `The package "${package_name}" could not be found in the registry. Did you make a typo?`
@@ -83,7 +96,7 @@ export const package_status = ({ nbpkg, package_name, available_versions, is_dis
  * }} props
  */
 export const PkgStatusMark = ({ package_name, pluto_actions, notebook_id, nbpkg }) => {
-    const [available_versions, set_available_versions] = useState(null)
+    const [available_versions, set_available_versions] = useState(/** @type {string[]?} */ (null))
 
     useEffect(() => {
         let available_version_promise = pluto_actions.get_avaible_versions({ package_name, notebook_id }) ?? Promise.resolve([])
@@ -96,7 +109,7 @@ export const PkgStatusMark = ({ package_name, pluto_actions, notebook_id, nbpkg
         nbpkg: nbpkg,
         package_name: package_name,
         is_disable_pkg: false,
-        available_versions: available_versions,
+        available_versions,
     })
 
     return html`
@@ -114,16 +127,12 @@ export const PkgStatusMark = ({ package_name, pluto_actions, notebook_id, nbpkg
         >
             <button
                 onClick=${(event) => {
-                    window.dispatchEvent(
-                        new CustomEvent("open pluto popup", {
-                            detail: {
-                                type: "nbpkg",
-                                source_element: event.currentTarget.parentElement,
-                                package_name: package_name,
-                                is_disable_pkg: false,
-                            },
-                        })
-                    )
+                    open_pluto_popup({
+                        type: "nbpkg",
+                        source_element: event.currentTarget.parentElement,
+                        package_name: package_name,
+                        is_disable_pkg: false,
+                    })
                 }}
             >
                 <span></span>
@@ -144,16 +153,12 @@ export const PkgActivateMark = ({ package_name }) => {
         <pkg-status-mark title=${hint_raw} class="disable_pkg">
             <button
                 onClick=${(event) => {
-                    window.dispatchEvent(
-                        new CustomEvent("open pluto popup", {
-                            detail: {
-                                type: "nbpkg",
-                                source_element: event.currentTarget.parentElement,
-                                package_name: package_name,
-                                is_disable_pkg: true,
-                            },
-                        })
-                    )
+                    open_pluto_popup({
+                        type: "nbpkg",
+                        source_element: event.currentTarget.parentElement,
+                        package_name: package_name,
+                        is_disable_pkg: true,
+                    })
                 }}
             >
                 <span></span>
diff --git a/frontend/components/PkgTerminalView.js b/frontend/components/PkgTerminalView.js
index 45a11c109a..a467dd6ac7 100644
--- a/frontend/components/PkgTerminalView.js
+++ b/frontend/components/PkgTerminalView.js
@@ -2,12 +2,14 @@ import AnsiUp from "../imports/AnsiUp.js"
 import { html, Component, useState, useEffect, useRef, useLayoutEffect } from "../imports/Preact.js"
 
 const TerminalViewAnsiUp = ({ value }) => {
-    const node_ref = useRef(null)
+    const node_ref = useRef(/** @type {HTMLElement?} */ (null))
 
     useEffect(() => {
+        if (!node_ref.current) return
         node_ref.current.innerHTML = AnsiUp.ansi_to_html(value)
-        node_ref.current.parentElement.scrollTop = 1e5
-    }, [value])
+        const parent = node_ref.current.parentElement
+        if (parent) parent.scrollTop = 1e5
+    }, [node_ref.current, value])
 
     return html`<pkg-terminal
         ><div class="scroller"><pre ref=${node_ref} class="pkg-terminal"></pre></div
diff --git a/frontend/components/Popup.js b/frontend/components/Popup.js
index 851a4566d2..d6375310ce 100644
--- a/frontend/components/Popup.js
+++ b/frontend/components/Popup.js
@@ -16,12 +16,35 @@ export const arrow_up_circle_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-t
 export const document_text_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg", import.meta.url)
 export const help_circle_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/help-circle-outline.svg", import.meta.url)
 
+/**
+ * @typedef PkgPopupDetails
+ * @property {"nbpkg"} type
+ * @property {HTMLElement?} source_element
+ * @property {string} package_name
+ * @property {boolean} is_disable_pkg
+ */
+
+/**
+ * @typedef MiscPopupDetails
+ * @property {string} type
+ * @property {import("../imports/Preact.js").ReactElement} body
+ * @property {HTMLElement?} source_element
+ */
+
+export const open_pluto_popup = (/** @type{PkgPopupDetails | MiscPopupDetails} */ detail) => {
+    window.dispatchEvent(
+        new CustomEvent("open pluto popup", {
+            detail,
+        })
+    )
+}
+
 export const Popup = ({ notebook }) => {
-    const [recent_event, set_recent_event] = useState(null)
-    const recent_source_element_ref = useRef(null)
+    const [recent_event, set_recent_event] = useState(/** @type{(PkgPopupDetails | MiscPopupDetails)?} */ (null))
+    const recent_source_element_ref = useRef(/** @type{HTMLElement?} */ (null))
     const pos_ref = useRef("")
 
-    const open = (e) => {
+    const open = (/** @type {CustomEvent} */ e) => {
         const el = e.detail.source_element
         recent_source_element_ref.current = el
 
@@ -34,9 +57,12 @@ export const Popup = ({ notebook }) => {
 
     useEffect(() => {
         const onpointerdown = (e) => {
-            if (e.target?.closest("pluto-popup") == null && (e.target == null || !recent_source_element_ref.current?.contains(e.target))) {
-                set_recent_event(null)
-            }
+            if (e.target == null) return
+            if (e.target.closest("pluto-popup") != null) return
+            if (recent_source_element_ref.current == null) return
+            if (recent_source_element_ref.current.contains(e.target)) return
+
+            set_recent_event(null)
         }
         const onkeydown = (e) => {
             if (e.key === "Escape") {
@@ -54,13 +80,6 @@ export const Popup = ({ notebook }) => {
         }
     }, [])
 
-    const pkg_popup = PkgPopup({
-        notebook,
-        recent_event,
-        clear_recent_event: () => set_recent_event(null),
-    })
-    const info_popup = html`<div>${recent_event?.body}</div>`
-
     const type = recent_event?.type
     return html`<pluto-popup
         class=${cl({
@@ -68,14 +87,24 @@ export const Popup = ({ notebook }) => {
         })}
         style="${pos_ref.current}"
     >
-        ${type === "nbpkg" ? pkg_popup : type === "info" ? info_popup : null}
+        ${type === "nbpkg"
+            ? html`<${PkgPopup} notebook=${notebook} recent_event=${recent_event} clear_recent_event=${() => set_recent_event(null)} />`
+            : type === "info"
+            ? html`<div>${recent_event?.body}</div>`
+            : null}
     </pluto-popup>`
 }
 
+/**
+ * @param {{
+ * notebook: import("./Editor.js").NotebookData,
+ * recent_event: PkgPopupDetails,
+ * clear_recent_event: () => void,
+ * }} props
+ */
 const PkgPopup = ({ notebook, recent_event, clear_recent_event }) => {
     let pluto_actions = useContext(PlutoContext)
-
-    const [pkg_status, set_pkg_status] = useState(null)
+    const [pkg_status, set_pkg_status] = useState(/** @type{import("./PkgStatusMark.js").PackageStatus?} */ (null))
 
     useEffect(() => {
         let still_valid = true
@@ -104,7 +133,9 @@ const PkgPopup = ({ notebook, recent_event, clear_recent_event }) => {
 
     // hide popup when nbpkg is switched on/off
     useEffect(() => {
-        clear_recent_event()
+        if (!(notebook.nbpkg?.enabled ?? true)) {
+            clear_recent_event()
+        }
     }, [notebook.nbpkg?.enabled ?? true])
 
     const [showterminal, set_showterminal] = useState(false)
diff --git a/frontend/components/ProgressBar.js b/frontend/components/ProgressBar.js
index 1001b97c36..29e1db5648 100644
--- a/frontend/components/ProgressBar.js
+++ b/frontend/components/ProgressBar.js
@@ -14,9 +14,16 @@ export const useDelayed = (value, delay = 500) => {
     return current
 }
 
+/**
+ * @param {{
+ * notebook: import("./Editor.js").NotebookData,
+ * backend_launch_phase: number?,
+ * status: Record<string,any>,
+ * }} props
+ */
 export const ProgressBar = ({ notebook, backend_launch_phase, status }) => {
-    const [recently_running, set_recently_running] = useState([])
-    const [currently_running, set_currently_running] = useState([])
+    const [recently_running, set_recently_running] = useState(/** @type {string[]} */ ([]))
+    const [currently_running, set_currently_running] = useState(/** @type {string[]} */ ([]))
 
     useEffect(
         () => {
@@ -40,7 +47,7 @@ export const ProgressBar = ({ notebook, backend_launch_phase, status }) => {
     let cell_progress = recently_running.length === 0 ? 0 : 1 - Math.max(0, currently_running.length - 0.3) / recently_running.length
 
     let binder_loading = status.loading && status.binder
-    let progress = binder_loading ? backend_launch_phase : cell_progress
+    let progress = binder_loading ? backend_launch_phase ?? 0 : cell_progress
 
     const anything = (binder_loading || recently_running.length !== 0) && progress !== 1
     const anything_for_a_short_while = useDelayed(anything, 500) ?? false
@@ -68,7 +75,7 @@ export const ProgressBar = ({ notebook, backend_launch_phase, status }) => {
             if (!binder_loading) {
                 const running_cell = Object.values(notebook.cell_results).find((c) => c.running) ?? Object.values(notebook.cell_results).find((c) => c.queued)
                 if (running_cell) {
-                    document.getElementById(running_cell.cell_id).scrollIntoView({
+                    document.getElementById(running_cell.cell_id)?.scrollIntoView({
                         block: "center",
                         behavior: "smooth",
                     })
diff --git a/frontend/components/RecordingUI.js b/frontend/components/RecordingUI.js
index 2ca7e584c4..cc49d53e2a 100644
--- a/frontend/components/RecordingUI.js
+++ b/frontend/components/RecordingUI.js
@@ -9,8 +9,26 @@ import { pack, unpack } from "../common/MsgPack.js"
 const assert_response_ok = (/** @type {Response} */ r) => (r.ok ? r : Promise.reject(r))
 let run = (x) => x()
 
+/**
+ * @typedef {[number, Array?]} PatchStep
+ */
+
+/**
+ * @typedef {Object} RecordingData
+ * @property {Array<PatchStep>} steps
+ * @property {Array<[number, {cell_id: string, relative_distance: number}]>} scrolls
+ */
+
+/**
+ * @typedef {RecordingData & {
+ *   initial_html: string,
+ * scroll_handler: (x: number) => void,
+ * audio_recorder: {start: () => void, stop: () => void}?
+ * }} RecordingState
+ */
+
 export const RecordingUI = ({ notebook_name, is_recording, recording_waiting_to_start, set_recording_states, patch_listeners, export_url }) => {
-    let current_recording_ref = useRef(null)
+    let current_recording_ref = useRef(/** @type{RecordingState?} */ (null))
     let recording_start_time_ref = useRef(0)
 
     useEffect(() => {
@@ -63,6 +81,8 @@ export const RecordingUI = ({ notebook_name, is_recording, recording_waiting_to_
         // initial_html = initial_html.replaceAll("https://cdn.jsdelivr.net/gh/fonsp/Pluto.jl@0.17.3/frontend/", "http://localhost:1234/")
 
         const scroll_handler_direct = () => {
+            if (current_recording_ref.current == null) return
+
             let y = window.scrollY + window.innerHeight / 2
 
             /** @type {Array<HTMLElement>} */
@@ -151,7 +171,7 @@ export const RecordingUI = ({ notebook_name, is_recording, recording_waiting_to_
             document.body.removeChild(element)
         }
 
-        recording_start_time_ref.current = null
+        recording_start_time_ref.current = 0
         current_recording_ref.current = null
 
         set_recording_states({ is_recording: false, recording_waiting_to_start: false })
@@ -198,7 +218,7 @@ export const RecordingUI = ({ notebook_name, is_recording, recording_waiting_to_
 
 let get_scroll_top = ({ cell_id, relative_distance }) => {
     let cell = document.getElementById(cell_id)
-    return cell.offsetTop + relative_distance * cell.offsetHeight - window.innerHeight / 2
+    if (cell) return cell.offsetTop + relative_distance * cell.offsetHeight - window.innerHeight / 2
 }
 
 /**
@@ -219,7 +239,9 @@ export const RecordingPlaybackUI = ({ launch_params, initializing, apply_noteboo
                 if (recording_url) {
                     return unpack(
                         new Uint8Array(
-                            await (await fetch(new Request(recording_url, { integrity: recording_url_integrity })).then(assert_response_ok)).arrayBuffer()
+                            await (
+                                await fetch(new Request(recording_url, { integrity: recording_url_integrity ?? undefined })).then(assert_response_ok)
+                            ).arrayBuffer()
                         )
                     )
                 } else {
@@ -228,18 +250,18 @@ export const RecordingPlaybackUI = ({ launch_params, initializing, apply_noteboo
             }),
         [recording_url]
     )
-    let computed_reverse_patches_ref = useRef(null)
+    let computed_reverse_patches_ref = useRef(/** @type{Array<PatchStep>?} */ (null))
 
     useEffect(() => {
         loaded_recording.then(console.log)
     }, [loaded_recording])
 
-    let audio_element_ref = useRef(/** @type {HTMLAudioElement} */ (null))
+    let audio_element_ref = useRef(/** @type {HTMLAudioElement?} */ (null))
 
     let match_state_to_playback_running_ref = useRef(false)
     let current_state_timestamp_ref = useRef(0)
 
-    let [current_scrollY, set_current_scrollY] = useState(null)
+    let [current_scrollY, set_current_scrollY] = useState(/** @type {number?} */ (null))
     let [following_scroll, set_following_scroll] = useState(true)
     let following_scroll_ref = useRef(following_scroll)
     following_scroll_ref.current = following_scroll
@@ -258,7 +280,7 @@ export const RecordingPlaybackUI = ({ launch_params, initializing, apply_noteboo
 
     let on_scroll = ({ cell_id, relative_distance }, smooth = true) => {
         let scrollY = get_scroll_top({ cell_id, relative_distance })
-
+        if (scrollY == null) return
         set_current_scrollY(scrollY)
         if (following_scroll_ref.current) {
             scroll_window(scrollY, smooth)
@@ -269,14 +291,19 @@ export const RecordingPlaybackUI = ({ launch_params, initializing, apply_noteboo
     match_state_to_playback_ref.current = async () => {
         match_state_to_playback_running_ref.current = true
 
-        const deserialized = await loaded_recording
+        const deserialized = /** @type {RecordingData} */ (await loaded_recording)
 
-        computed_reverse_patches_ref.current = computed_reverse_patches_ref.current ?? deserialized.steps.map(([t, s]) => [t, null])
+        computed_reverse_patches_ref.current = computed_reverse_patches_ref.current ?? deserialized.steps.map(([t, s]) => [t, undefined])
 
         const audio = audio_element_ref.current
+        if (audio == null) return
+
         let new_timestamp = audio.currentTime
         let forward = new_timestamp >= current_state_timestamp_ref.current
-        let directed = forward ? _.identity : _.reverse
+        /**
+         * @param {T} x @template T @return {T}
+         */
+        let directed = (x) => (forward ? x : _.reverse(x))
 
         let lower = Math.min(current_state_timestamp_ref.current, new_timestamp)
         let upper = Math.max(current_state_timestamp_ref.current, new_timestamp)
@@ -289,7 +316,7 @@ export const RecordingPlaybackUI = ({ launch_params, initializing, apply_noteboo
         }
 
         let steps_in_current_direction = forward ? deserialized.steps : computed_reverse_patches_ref.current
-        let steps_and_indices = steps_in_current_direction.map((x, i) => [x, i])
+        let steps_and_indices = steps_in_current_direction.map((x, i) => /** @type{[PatchStep, number]} */ ([x, i]))
         let steps_and_indices_in_time_window = steps_and_indices.filter(([[t, s], i]) => lower < t && t <= upper)
 
         let reverse_patches = []
@@ -324,14 +351,15 @@ export const RecordingPlaybackUI = ({ launch_params, initializing, apply_noteboo
     const event_names = ["seeked", "suspend", "play", "pause", "ended", "waiting"]
 
     useLayoutEffect(() => {
-        if (audio_element_ref.current) {
+        const audio_el = audio_element_ref.current
+        if (audio_el) {
             event_names.forEach((en) => {
-                audio_element_ref.current.addEventListener(en, on_audio_playback_change)
+                audio_el.addEventListener(en, on_audio_playback_change)
             })
 
             return () => {
                 event_names.forEach((en) => {
-                    audio_element_ref.current.removeEventListener(en, on_audio_playback_change)
+                    audio_el.removeEventListener(en, on_audio_playback_change)
                 })
             }
         }
@@ -389,8 +417,10 @@ export const RecordingPlaybackUI = ({ launch_params, initializing, apply_noteboo
                     if (following_scroll_ref.current) {
                         console.warn("Manual scroll detected, no longer following playback scroll", { dt, smooth_dt, e })
 
-                        was_playing_before_scrollout_ref.current = !audio_element_ref.current.paused
-                        audio_element_ref.current.pause()
+                        if (audio_element_ref.current != null) {
+                            was_playing_before_scrollout_ref.current = !audio_element_ref.current.paused
+                            audio_element_ref.current.pause()
+                        }
                         set_following_scroll(false)
                     }
                 }
@@ -423,7 +453,7 @@ export const RecordingPlaybackUI = ({ launch_params, initializing, apply_noteboo
                                     onclick=${() => {
                                         scroll_window(current_scrollY, true)
                                         set_following_scroll(true)
-                                        if (was_playing_before_scrollout_ref.current) audio_element_ref.current.play()
+                                        if (was_playing_before_scrollout_ref.current && audio_element_ref.current) audio_element_ref.current.play()
                                     }}
                                 >
                                     <span>Back to <b>recording</b> <span class="follow-recording-icon pluto-icon"></span></span>
diff --git a/frontend/components/RunArea.js b/frontend/components/RunArea.js
index e158cddfcf..901da42543 100644
--- a/frontend/components/RunArea.js
+++ b/frontend/components/RunArea.js
@@ -18,7 +18,8 @@ const hasBarrier = (a_cell_id, notebook) => {
 export const RunArea = ({ runtime, running, queued, code_differs, on_run, on_interrupt, depends_on_disabled_cells, running_disabled, cell_id }) => {
     const on_save = on_run /* because disabled cells save without running */
 
-    const localTimeRunning = 10e5 * useMillisSinceTruthy(running)
+    const local_time_running_ms = useMillisSinceTruthy(running)
+    const local_time_running_ns = local_time_running_ms == null ? null : 1e6 * local_time_running_ms
     const pluto_actions = useContext(PlutoContext)
 
     const on_jump = () => {
@@ -55,7 +56,7 @@ export const RunArea = ({ runtime, running, queued, code_differs, on_run, on_int
             <button onClick=${fmap[`on_${action}`]} class="runcell" title=${titlemap[action]}>
                 <span></span>
             </button>
-            <span class="runtime">${prettytime(running ? localTimeRunning || runtime : runtime)}</span>
+            <span class="runtime">${prettytime(running ? local_time_running_ns ?? runtime : runtime)}</span>
         </pluto-runarea>
     `
 }
diff --git a/frontend/components/SelectionArea.js b/frontend/components/SelectionArea.js
index d208b3328e..6a0f514c7c 100644
--- a/frontend/components/SelectionArea.js
+++ b/frontend/components/SelectionArea.js
@@ -35,28 +35,34 @@ const in_request_animation_frame = (fn) => {
     }
 }
 
+/**
+ *
+ * @typedef Coordinate2D
+ * @property {number} x
+ * @property {number} y
+ */
+
 export const SelectionArea = ({ on_selection, set_scroller, cell_order }) => {
     const mouse_position_ref = useRef()
     const is_selecting_ref = useRef(false)
-    const element_ref = useRef(/** @type {HTMLElement} */ (null))
+    const element_ref = useRef(/** @type {HTMLElement?} */ (null))
 
-    const [selection_start, set_selection_start] = useState(null)
-    const [selection_end, set_selection_end] = useState(null)
+    const [selection, set_selection] = useState(/** @type {{start: Coordinate2D, end: Coordinate2D}?} */ (null))
 
     useEffect(() => {
-        const event_target_inside_this_notebook = (e) => {
+        const event_target_inside_this_notebook = (/** @type {MouseEvent} */ e) => {
             if (e.target == null) {
                 return false
             }
 
             // this should also work for notebooks inside notebooks!
-            let closest_editor = e.target.closest("pluto-editor")
-            let my_editor = element_ref.current.closest("pluto-editor")
+            let closest_editor = /** @type {HTMLElement} */ (e.target).closest("pluto-editor")
+            let my_editor = element_ref.current?.closest("pluto-editor")
 
             return closest_editor === my_editor
         }
 
-        const onmousedown = (e) => {
+        const onmousedown = (/** @type {MouseEvent} */ e) => {
             // @ts-ignore
             const t = e.target?.tagName
 
@@ -67,16 +73,14 @@ export const SelectionArea = ({ on_selection, set_scroller, cell_order }) => {
                 (t === "PLUTO-EDITOR" || t === "MAIN" || t === "PLUTO-NOTEBOOK" || t === "PREAMBLE")
             ) {
                 on_selection([])
-                set_selection_start({ x: e.pageX, y: e.pageY })
-                set_selection_end({ x: e.pageX, y: e.pageY })
+                set_selection({ start: { x: e.pageX, y: e.pageY }, end: { x: e.pageX, y: e.pageY } })
                 is_selecting_ref.current = true
             }
         }
 
-        const onmouseup = (e) => {
+        const onmouseup = (/** @type {MouseEvent} */ e) => {
             if (is_selecting_ref.current) {
-                set_selection_start(null)
-                set_selection_end(null)
+                set_selection(null)
                 set_scroller({ up: false, down: false })
                 is_selecting_ref.current = false
             } else {
@@ -95,17 +99,17 @@ export const SelectionArea = ({ on_selection, set_scroller, cell_order }) => {
         }
 
         let update_selection = in_request_animation_frame(({ pageX, pageY }) => {
-            if (!is_selecting_ref.current || selection_start == null) return
+            if (!is_selecting_ref.current || selection == null) return
 
             let new_selection_end = { x: pageX, y: pageY }
 
             const cell_nodes = Array.from(document.querySelectorAll("pluto-notebook > pluto-cell"))
 
             let A = {
-                start_left: Math.min(selection_start.x, new_selection_end.x),
-                start_top: Math.min(selection_start.y, new_selection_end.y),
-                end_left: Math.max(selection_start.x, new_selection_end.x),
-                end_top: Math.max(selection_start.y, new_selection_end.y),
+                start_left: Math.min(selection.start.x, new_selection_end.x),
+                start_top: Math.min(selection.start.y, new_selection_end.y),
+                end_left: Math.max(selection.start.x, new_selection_end.x),
+                end_top: Math.max(selection.start.y, new_selection_end.y),
             }
             let in_selection = cell_nodes.filter((cell) => {
                 let cell_position = get_element_position_in_document(cell)
@@ -120,9 +124,9 @@ export const SelectionArea = ({ on_selection, set_scroller, cell_order }) => {
                 return A.start_left < B.end_left && A.end_left > B.start_left && A.start_top < B.end_top && A.end_top > B.start_top
             })
 
-            set_scroller({ up: selection_start.y > new_selection_end.y, down: selection_start.y < new_selection_end.y })
+            set_scroller({ up: selection.start.y > new_selection_end.y, down: selection.start.y < new_selection_end.y })
             on_selection(in_selection.map((x) => x.id))
-            set_selection_end(new_selection_end)
+            set_selection({ start: selection.start, end: new_selection_end })
         })
 
         const onscroll = (e) => {
@@ -149,7 +153,7 @@ export const SelectionArea = ({ on_selection, set_scroller, cell_order }) => {
         const onkeydown = (e) => {
             if (e.key.toLowerCase() === "a" && has_ctrl_or_cmd_pressed(e)) {
                 // if you are not writing text somewhere else
-                if (document.activeElement === document.body && window.getSelection().isCollapsed) {
+                if (document.activeElement === document.body && (window.getSelection()?.isCollapsed ?? true)) {
                     on_selection(cell_order)
                     e.preventDefault()
                 }
@@ -171,14 +175,14 @@ export const SelectionArea = ({ on_selection, set_scroller, cell_order }) => {
             // @ts-ignore
             document.removeEventListener("scroll", onscroll, { passive: true })
         }
-    }, [selection_start])
+    }, [selection])
 
     // let translateY = `translateY(${Math.min(selection_start.y, selection_end.y)}px)`
     // let translateX = `translateX(${Math.min(selection_start.x, selection_end.x)}px)`
     // let scaleX = `scaleX(${Math.abs(selection_start.x - selection_end.x)})`
     // let scaleY = `scaleY(${Math.abs(selection_start.y - selection_end.y)})`
 
-    if (selection_start == null) {
+    if (selection == null) {
         return html`<span ref=${element_ref}></span>`
     }
     return html`
@@ -188,10 +192,10 @@ export const SelectionArea = ({ on_selection, set_scroller, cell_order }) => {
                 position: "absolute",
                 background: "rgba(40, 78, 189, 0.24)",
                 zIndex: 1000000, // Yes, really
-                top: Math.min(selection_start.y, selection_end.y),
-                left: Math.min(selection_start.x, selection_end.x),
-                width: Math.abs(selection_start.x - selection_end.x),
-                height: Math.abs(selection_start.y - selection_end.y),
+                top: Math.min(selection.start.y, selection.end.y),
+                left: Math.min(selection.start.x, selection.end.x),
+                width: Math.abs(selection.start.x - selection.end.x),
+                height: Math.abs(selection.start.y - selection.end.y),
 
                 // Transform could be faster
                 // top: 0,
diff --git a/frontend/components/SlideControls.js b/frontend/components/SlideControls.js
index 0fcc62c6fd..9d7e4f3542 100644
--- a/frontend/components/SlideControls.js
+++ b/frontend/components/SlideControls.js
@@ -1,13 +1,15 @@
 import { html } from "../imports/Preact.js"
 
 export const SlideControls = () => {
-    const calculate_slide_positions = () => {
+    const calculate_slide_positions = (/** @type {Event} */ e) => {
+        const notebook_node = /** @type {HTMLElement?} */ (e.target)?.closest("pluto-notebook")
+        if (!notebook_node) return []
+
         const height = window.innerHeight
-        const headers = Array.from(document.querySelectorAll("pluto-output h1, pluto-output h2"))
+        const headers = Array.from(notebook_node.querySelectorAll("pluto-output h1, pluto-output h2"))
         const pos = headers.map((el) => el.getBoundingClientRect())
         const edges = pos.map((rect) => rect.top + window.pageYOffset)
 
-        const notebook_node = document.querySelector("pluto-notebook")
         edges.push(notebook_node.getBoundingClientRect().bottom + window.pageYOffset)
 
         const scrollPositions = headers.map((el, i) => {
@@ -24,21 +26,18 @@ export const SlideControls = () => {
         return scrollPositions
     }
 
-    const go_previous_slide = (e) => {
-        const positions = calculate_slide_positions()
+    const go_previous_slide = (/** @type {Event} */ e) => {
+        const positions = calculate_slide_positions(e)
+
+        const pos = positions.reverse().find((y) => y < window.pageYOffset - 10)
 
-        window.scrollTo(
-            window.pageXOffset,
-            positions.reverse().find((y) => y < window.pageYOffset - 10)
-        )
+        if (pos) window.scrollTo(window.pageXOffset, pos)
     }
 
-    const go_next_slide = (e) => {
-        const positions = calculate_slide_positions()
-        window.scrollTo(
-            window.pageXOffset,
-            positions.find((y) => y - 10 > window.pageYOffset)
-        )
+    const go_next_slide = (/** @type {Event} */ e) => {
+        const positions = calculate_slide_positions(e)
+        const pos = positions.find((y) => y - 10 > window.pageYOffset)
+        if (pos) window.scrollTo(window.pageXOffset, pos)
     }
 
     // @ts-ignore
diff --git a/frontend/components/TreeView.js b/frontend/components/TreeView.js
index d7ffeaa5ec..4711d59b37 100644
--- a/frontend/components/TreeView.js
+++ b/frontend/components/TreeView.js
@@ -51,17 +51,23 @@ const More = ({ on_click_more }) => {
 const prefix = ({ prefix, prefix_short }) =>
     html`<pluto-tree-prefix><span class="long">${prefix}</span><span class="short">${prefix_short}</span></pluto-tree-prefix>`
 
+const actions_show_more = ({ pluto_actions, cell_id, node_ref, objectid, dim }) => {
+    const actions = pluto_actions ?? node_ref.current.closest("pluto-cell")._internal_pluto_actions
+    actions.reshow_cell(cell_id ?? node_ref.current.closest("pluto-cell").id, objectid, dim)
+}
+
 export const TreeView = ({ mime, body, cell_id, persist_js_state }) => {
     let pluto_actions = useContext(PlutoContext)
-    const node_ref = useRef(null)
+    const node_ref = useRef(/** @type {HTMLElement?} */ (null))
     const onclick = (e) => {
         // TODO: this could be reactified but no rush
         let self = node_ref.current
+        if (!self) return
         let clicked = e.target.closest("pluto-tree-prefix") != null ? e.target.closest("pluto-tree-prefix").parentElement : e.target
         if (clicked !== self && !self.classList.contains("collapsed")) {
             return
         }
-        const parent_tree = self.parentElement.closest("pluto-tree")
+        const parent_tree = self.parentElement?.closest("pluto-tree")
         if (parent_tree != null && parent_tree.classList.contains("collapsed")) {
             return // and bubble upwards
         }
@@ -69,11 +75,16 @@ export const TreeView = ({ mime, body, cell_id, persist_js_state }) => {
         self.classList.toggle("collapsed")
     }
     const on_click_more = () => {
-        if (node_ref.current.closest("pluto-tree.collapsed") != null) {
+        if (node_ref.current == null || node_ref.current.closest("pluto-tree.collapsed") != null) {
             return false
         }
-        const actions = pluto_actions ?? node_ref.current.closest("pluto-cell")._internal_pluto_actions
-        actions.reshow_cell(cell_id ?? node_ref.current.closest("pluto-cell").id, body.objectid, 1)
+        actions_show_more({
+            pluto_actions,
+            cell_id,
+            node_ref,
+            objectid: body.objectid,
+            dim: 1,
+        })
     }
 
     const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${cell_id} mime=${pair[1]} body=${pair[0]} persist_js_state=${persist_js_state} />`
@@ -128,8 +139,13 @@ export const TableView = ({ mime, body, cell_id, persist_js_state }) => {
     const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${cell_id} mime=${pair[1]} body=${pair[0]} persist_js_state=${persist_js_state} />`
     const more = (dim) => html`<${More}
         on_click_more=${() => {
-            const actions = pluto_actions ?? node_ref.current.closest("pluto-cell")._internal_pluto_actions
-            actions.reshow_cell(cell_id ?? node_ref.current.closest("pluto-cell").id, body.objectid, dim)
+            actions_show_more({
+                pluto_actions,
+                cell_id,
+                node_ref,
+                objectid: body.objectid,
+                dim,
+            })
         }}
     />`
 
diff --git a/frontend/components/welcome/Recent.js b/frontend/components/welcome/Recent.js
index 97cfd9e456..7bcfdfca28 100644
--- a/frontend/components/welcome/Recent.js
+++ b/frontend/components/welcome/Recent.js
@@ -51,15 +51,16 @@ const shortest_path = (path, allpaths) => {
  * }} props
  */
 export const Recent = ({ client, connected, remote_notebooks, CustomRecent }) => {
-    const [combined_notebooks, set_combined_notebooks] = useState(/** @type {Array<CombinedNotebook> | null} */ (null))
+    const [combined_notebooks, set_combined_notebooks] = useState(/** @type {Array<CombinedNotebook>?} */ (null))
     const combined_notebooks_ref = useRef(combined_notebooks)
     combined_notebooks_ref.current = combined_notebooks
 
     const set_notebook_state = (path, new_state_props) => {
-        set_combined_notebooks((prevstate) =>
-            prevstate.map((nb) => {
-                return nb.path == path ? { ...nb, ...new_state_props } : nb
-            })
+        set_combined_notebooks(
+            (prevstate) =>
+                prevstate?.map((nb) => {
+                    return nb.path == path ? { ...nb, ...new_state_props } : nb
+                }) ?? null
         )
     }
 
@@ -127,6 +128,7 @@ export const Recent = ({ client, connected, remote_notebooks, CustomRecent }) =>
         }
         const running = nb.notebook_id != null
         if (running) {
+            if (client == null) return
             if (confirm("Shut down notebook process?")) {
                 set_notebook_state(nb.path, {
                     running: false,
diff --git a/frontend/components/welcome/Welcome.js b/frontend/components/welcome/Welcome.js
index 49d75055ab..4c20bd170b 100644
--- a/frontend/components/welcome/Welcome.js
+++ b/frontend/components/welcome/Welcome.js
@@ -21,7 +21,7 @@ import { Recent } from "./Recent.js"
  */
 
 export const Welcome = () => {
-    const [remote_notebooks, set_remote_notebooks] = useState(/** @type {Array<NotebookListEntry>} */ (null))
+    const [remote_notebooks, set_remote_notebooks] = useState(/** @type {Array<NotebookListEntry>} */ ([]))
 
     const [connected, set_connected] = useState(false)
     const [extended_components, set_extended_components] = useState({
diff --git a/tsconfig.json b/tsconfig.json
index 3810a2de99..d1c86b6fa2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,8 @@
         "strict": false,
         "noImplicitThis": true,
         "alwaysStrict": true,
-        "esModuleInterop": true
+        "esModuleInterop": true,
+        "strictNullChecks": true
     },
     "include": ["frontend/**/*.js", "node_modules/**/*.js"],
     "exclude": []

From e14f9f44980cdbc3594a64337a450d6a125ad706 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 25 May 2022 19:46:53 +0200
Subject: [PATCH 330/821] Allow JS state (`this`) inside DivElement (#1995)

---
 frontend/components/CellOutput.js | 2 +-
 frontend/components/TreeView.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 788815810c..cd1d9902a3 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -152,7 +152,7 @@ export const OutputBody = ({ mime, body, cell_id, persist_js_state = false, last
             return html`<div><${ErrorMessage} cell_id=${cell_id} ...${body} /></div>`
             break
         case "application/vnd.pluto.divelement+object":
-            return DivElement({ cell_id, ...body })
+            return DivElement({ cell_id, ...body, persist_js_state })
             break
         case "text/plain":
             if (body) {
diff --git a/frontend/components/TreeView.js b/frontend/components/TreeView.js
index 4711d59b37..4deb354b7e 100644
--- a/frontend/components/TreeView.js
+++ b/frontend/components/TreeView.js
@@ -177,8 +177,8 @@ export const TableView = ({ mime, body, cell_id, persist_js_state }) => {
     </table>`
 }
 
-export let DivElement = ({ cell_id, style, classname, children }) => {
-    const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${cell_id} mime=${pair[1]} body=${pair[0]} persist_js_state=${false} />`
+export let DivElement = ({ cell_id, style, classname, children, persist_js_state = false }) => {
+    const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${cell_id} mime=${pair[1]} body=${pair[0]} persist_js_state=${persist_js_state} />`
 
     return html`<div style=${style} class=${classname}>${children.map(mimepair_output)}</div>`
 }

From cc85468896e946e8ddf8c04ae4de2e885a642904 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 25 May 2022 20:52:13 +0200
Subject: [PATCH 331/821] more type fixes

---
 .../CellInput/awesome_line_wrapping.js        |  6 +--
 .../CellInput/debug_syntax_plugin.js          |  2 +-
 .../CellInput/go_to_definition_plugin.js      | 20 +++++++---
 .../components/CellInput/lezer_template.js    | 37 ++++++++++---------
 4 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/frontend/components/CellInput/awesome_line_wrapping.js b/frontend/components/CellInput/awesome_line_wrapping.js
index a2d41d3007..8abf500853 100644
--- a/frontend/components/CellInput/awesome_line_wrapping.js
+++ b/frontend/components/CellInput/awesome_line_wrapping.js
@@ -161,9 +161,9 @@ let dont_break_before_spaces = StateField.define({
     update(deco, tr) {
         let decorations = []
         let pos = 0
-        for (let line of tr.newDoc) {
-            for (let match of line.matchAll(/[^ \t]+([ \t]|$)+/g)) {
-                if (match.index === 0) continue // Sneaky negative lookbehind
+        for (const line of tr.newDoc) {
+            for (const match of /** @type{string} */ (line).matchAll(/[^ \t]+([ \t]|$)+/g)) {
+                if (match.index == null || match.index === 0) continue // Sneaky negative lookbehind
                 decorations.push(identation_so_dont_break_marker.range(pos + match.index, pos + match.index + match[0].length))
             }
         }
diff --git a/frontend/components/CellInput/debug_syntax_plugin.js b/frontend/components/CellInput/debug_syntax_plugin.js
index 51209cdb40..83d4d6ca5d 100644
--- a/frontend/components/CellInput/debug_syntax_plugin.js
+++ b/frontend/components/CellInput/debug_syntax_plugin.js
@@ -10,7 +10,7 @@ let find_error_nodes = (doc, tree) => {
         tree: tree,
         enter: (cursor) => {
             if (cursor.type.isError) {
-                console.group(`Found error node in ${cursor.node.parent.name}`)
+                console.group(`Found error node in ${cursor.node.parent?.name}`)
                 try {
                     let text_before_cursor = doc.sliceString(cursor.from - 10, cursor.from)
                     let text = doc.sliceString(cursor.from, cursor.to)
diff --git a/frontend/components/CellInput/go_to_definition_plugin.js b/frontend/components/CellInput/go_to_definition_plugin.js
index c5a32ad626..b2bea6aa3c 100644
--- a/frontend/components/CellInput/go_to_definition_plugin.js
+++ b/frontend/components/CellInput/go_to_definition_plugin.js
@@ -12,8 +12,8 @@ import { ScopeStateField } from "./scopestate_statefield.js"
  */
 let get_variable_marks = (state, { scopestate, global_definitions }) => {
     return Decoration.set(
-        scopestate.usages
-            .map(({ definition, usage, name }) => {
+        filter_non_null(
+            scopestate.usages.map(({ definition, usage, name }) => {
                 if (definition == null) {
                     // TODO variables_with_origin_cell should be notebook wide, not just in the current cell
                     // .... Because now it will only show variables after it has run once
@@ -55,14 +55,21 @@ let get_variable_marks = (state, { scopestate, global_definitions }) => {
                             "href": `#`,
                         },
                     }).range(usage.from, usage.to)
-                    return null
                 }
             })
-            .filter((x) => x != null),
+        ),
         true
     )
 }
 
+/**
+ *
+ * @argument {Array<T?>} xs
+ * @template T
+ * @return {Array<T>}
+ */
+const filter_non_null = (xs) => /** @type {Array<T>} */ (xs.filter((x) => x != null))
+
 /**
  * @type {Facet<{ [variable_name: string]: string }, { [variable_name: string]: string }>}
  */
@@ -104,10 +111,13 @@ export const go_to_definition_plugin = ViewPlugin.fromClass(
                     let pluto_variable = event.target.closest("[data-pluto-variable]")
                     if (pluto_variable) {
                         let variable = pluto_variable.getAttribute("data-pluto-variable")
+                        if (variable == null) {
+                            return false
+                        }
 
                         event.preventDefault()
                         let scrollto_selector = `[id='${encodeURI(variable)}']`
-                        document.querySelector(scrollto_selector).scrollIntoView({
+                        document.querySelector(scrollto_selector)?.scrollIntoView({
                             behavior: "smooth",
                             block: "center",
                         })
diff --git a/frontend/components/CellInput/lezer_template.js b/frontend/components/CellInput/lezer_template.js
index 7d4a1614b3..f4f18687a5 100644
--- a/frontend/components/CellInput/lezer_template.js
+++ b/frontend/components/CellInput/lezer_template.js
@@ -131,6 +131,7 @@ export let child_cursors = function* (cursor) {
 /** @param {SyntaxNode} node */
 export let child_nodes = function* (node) {
     if (node.firstChild) {
+        /** @type {SyntaxNode?} */
         let child = node.firstChild
         do {
             yield child
@@ -148,7 +149,7 @@ export let child_nodes = function* (node) {
  *  children: Array<AstTemplate>,
  * } | {
  *  pattern: (
- *      haystack: (TreeCursor | void),
+ *      haystack: (TreeCursor | null),
  *      matches: { [key: string]: any },
  *      verbose?: boolean
  *  ) => boolean,
@@ -156,7 +157,7 @@ export let child_nodes = function* (node) {
  */
 
 /**
- * @param {TreeCursor | void} haystack_cursor
+ * @param {TreeCursor | null} haystack_cursor
  * @param {AstTemplate} template
  * @param {{ [name: string]: any }} matches
  * @param {boolean} verbose
@@ -555,7 +556,7 @@ let memo_first_argument_weakmemo_second = (func) => {
     let fake_weakmap_no_arg = {}
     let per_name_memo = memo((name) => {
         return weak_memo1((arg) => {
-            if (arg === fake_weakmap_no_arg) return func(name)
+            if (arg === fake_weakmap_no_arg) return func(name, undefined)
             return func(name, arg)
         })
     })
@@ -757,8 +758,8 @@ export const t = /** @type {const} */ ({
             template_generator.return()
 
             return {
-                pattern: function something_with_the_same_type_as(cursor, matches, verbose = false) {
-                    return cursor && ast.name === cursor.name
+                pattern: function something_with_the_same_type_as(haystack, matches, verbose = false) {
+                    return haystack != null && ast.name === haystack.name
                 },
             }
         }
@@ -775,12 +776,12 @@ export const t = /** @type {const} */ ({
             let sub_template = yield* to_template(what)
             return {
                 sub_template,
-                pattern: function as(cursor, matches, verbose = false) {
-                    let did_match = match_template(cursor, sub_template, matches, verbose)
+                pattern: function as(haystack, matches, verbose = false) {
+                    let did_match = match_template(haystack, sub_template, matches, verbose)
                     if (did_match === true) {
-                        matches[name] = cursor?.["node"]
+                        matches[name] = haystack?.["node"]
                     }
-                    return cursor && did_match
+                    return haystack != null && did_match
                 },
             }
         }
@@ -790,8 +791,8 @@ export const t = /** @type {const} */ ({
     Identifier: function* Identifier() {
         yield "identifier"
         return {
-            pattern: function Identifier(cursor, matches, verbose = false) {
-                return cursor && narrow_name(cursor) === "Identifier"
+            pattern: function Identifier(haystack, matches, verbose = false) {
+                return haystack != null && narrow_name(haystack) === "Identifier"
             },
         }
     },
@@ -799,8 +800,8 @@ export const t = /** @type {const} */ ({
     Number: function* Number() {
         yield "69"
         return {
-            pattern: function Number(cursor, matches, verbose = false) {
-                return cursor && narrow_name(cursor) === "Number"
+            pattern: function Number(haystack, matches, verbose = false) {
+                return haystack != null && narrow_name(haystack) === "Number"
             },
         }
     },
@@ -808,8 +809,10 @@ export const t = /** @type {const} */ ({
     String: function* String() {
         yield `"A113"`
         return {
-            pattern: function String(cursor, matches, verbose = false) {
-                return cursor && (narrow_name(cursor) === "StringWithoutInterpolation" || narrow_name(cursor) === "TripleStringWithoutInterpolation")
+            pattern: function String(haystack, matches, verbose = false) {
+                return (
+                    haystack != null && (narrow_name(haystack) === "StringWithoutInterpolation" || narrow_name(haystack) === "TripleStringWithoutInterpolation")
+                )
             },
         }
     },
@@ -859,7 +862,7 @@ export let take_little_piece_of_template = weak_memo((template, meta_template) =
         // And for some reason this works?
         // Still feels like it shouldn't... it feels like I conjured some dark magic and I will be swiming in tartarus soon...
 
-        return {
+        return /** @type {Matcher} */ ({
             possible_parents,
             template_description,
             /**
@@ -917,7 +920,7 @@ export let take_little_piece_of_template = weak_memo((template, meta_template) =
                     verbose && console.groupEnd()
                 }
             },
-        }
+        })
     } else {
         console.log(`meta_template:`, meta_template)
         console.log(`template:`, template)

From bd1f3fd9cf15f2eaa6250f2d0892ac2b9c648742 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 25 May 2022 21:00:51 +0200
Subject: [PATCH 332/821] Update test_logging.jl

---
 sample/test_logging.jl | 633 +++++++++++++++++++++++++----------------
 1 file changed, 384 insertions(+), 249 deletions(-)

diff --git a/sample/test_logging.jl b/sample/test_logging.jl
index 0fc9549401..39b23fa226 100644
--- a/sample/test_logging.jl
+++ b/sample/test_logging.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.17.5
+# v0.19.5
 
 using Markdown
 using InteractiveUtils
@@ -20,6 +20,9 @@ using ProgressLogging
 # ╔═╡ eebe1108-588a-4e81-a69c-f2c21e9cbbaa
 using PlutoUI
 
+# ╔═╡ 10c02645-cb3b-42be-8df1-679e8fb05382
+using HypertextLiteral
+
 # ╔═╡ 890b8d1d-1bf0-4497-ac64-9852f68e1577
 using Plots
 
@@ -34,14 +37,15 @@ md"""
 end
 
 # ╔═╡ 3599eb82-0003-11eb-3814-dfd0f5737846
-for i in 1:1000
+for i in 1:10
 	
 	@debug i
 	@info i*100
-	
 	if isodd(i)
-		@warn "Oh no!" i i+1
+		@warn "Oh no!" i
+		@error i
 	end
+	sleep(.1)
 end
 
 # ╔═╡ 54d5c34e-63b5-4b52-91fe-a5fd1b729182
@@ -59,10 +63,10 @@ md"""
 """
 
 # ╔═╡ a22411c8-24e0-4a80-9b91-bc1f0999cc3c
-Dict([1,"asdf"] => (123, [1,[2,3,[4,5, md"# asdf"]]], md"## asdf", DomainError("asdf")))
-
-# ╔═╡ dd183c9d-c070-43bc-95ff-cf64ba27071e
+some_data = Dict([1,"asdf"] => (123, [1,[2,3,[4,5, md"# asdf"]]], md"## asdf", DomainError("asdf")))
 
+# ╔═╡ 091d33fe-fffe-11ea-131f-01f4248b30ea
+@info "23aaa" some_data
 
 # ╔═╡ 5f8496cb-d29e-4c4c-b378-1173242c7a78
 collect(rand(1000))
@@ -79,19 +83,7 @@ let
 end
 
 # ╔═╡ 2d01cdaa-fffe-11ea-09f5-63527a1b0f87
-@bind x TextField(default="asdfassdf")
-
-# ╔═╡ 2883b3d8-fffe-11ea-0a0f-bbd85ec665ea
-begin
-	
-	
-	
-	try
-		sqrt(-1)
-	catch e
-		@error "99" exception=(e, catch_backtrace())
-	end
-end
+x = 233564653
 
 # ╔═╡ 2fbbb413-213f-4556-b5f9-df7cf6331451
 b = @bind hello Slider(1:100)
@@ -107,7 +99,8 @@ hello
 
 # ╔═╡ 5d023cd2-4fe6-4bd0-9a54-7512f52b7916
 begin
-	
+
+	@info "Remeber to use the function Base.alsjdhfkjashdf to also get akjshdfkjashdfkjhasdf."
 	
 	@warn md"""
 	_Writing a notebook is not just about writing the final document — Pluto empowers the experiments and discoveries that are essential to getting there._
@@ -118,6 +111,8 @@ begin
 	-   **_lightweight_** - Pluto is written in pure Julia and is easy to install.
 	-   **_simple_** - no hidden workspace state; friendly UI.
 	"""
+
+	println("Some long text asdflkj asldkjf aslkdfj alskjdf kj")
 end
 
 # ╔═╡ e5f2703b-198c-4926-867e-7f914fa10253
@@ -131,21 +126,6 @@ svg_data = download("https://diffeq.sciml.ai/stable/assets/multiODEplot.png") |>
 # ╔═╡ 52b8c0be-64f7-4950-ab4a-983c6fa50d1a
 cool_plot = Show(MIME"image/png"(), svg_data)
 
-# ╔═╡ 091d33fe-fffe-11ea-131f-01f4248b30ea
-begin
-	@info "23dafs lkjlkjsadf lkj asdflkj asdlkfj alskdjflkasdjflkjasdlfk jsdlkjf sdlkjf   laskjdf lkasdjflkajs df   lkjas dflkjasdlfkjsadf
-	
-	
-	
-	asdf" x [x,x,cool_plot,x]
-	
-	
-	
-	
-	@error "asfdasdf"
-	
-end
-
 # ╔═╡ 504dfdc1-41da-4fcb-ba8e-aa69643d57a1
 plot(args...; kwargs...) = Plots.plot(args...; kwargs..., size=(150,120)) |> as_svg
 
@@ -165,20 +145,32 @@ md"""
 # @bind in logs
 """
 
+# ╔═╡ 9f99c4aa-c4c9-40f7-aad2-fc74dce84bc2
+begin
+	
+	b1 = @bind wowz1 Slider(50:60)
+	b2 = @bind wowz1 TextField()
+
+	@htl("$(b1)$(b2)")
+end
+
+# ╔═╡ dde4c73d-2577-411f-9e14-57988ddd3498
+wowz1, wowz1
+
 # ╔═╡ d48fb1c0-b88a-4a23-8a87-7fdcd74bf3cc
 begin
 	
-	@info @bind wow Slider(1:100)
+	@info @bind wowz Slider(1:100)
 	
 end
 
 # ╔═╡ 6355afae-d4ad-40f4-9917-3f228a63ddaa
-t = collect(1:wow)
+t2 = collect(1:wowz)
 
 # ╔═╡ 70fc79bb-6118-4a0d-ac6e-fbdf1ba9722a
 let
-	result = sin.(t)
-	@info plot(t, result)
+	result = sin.(t2)
+	@info plot(t2, result)
 
 	
 	result
@@ -200,16 +192,6 @@ function f(x)
 	@warn "x might be too large!" x
 end
 
-# ╔═╡ 2ade9e4d-11cc-47ae-aaa6-76864757bd21
-f(123)
-
-
-
-
-
-
-
-
 # ╔═╡ 37108eb9-77db-49fa-b168-f9c1c25955fa
 md"""
 ### Function defined in another file:
@@ -252,79 +234,72 @@ m.g(123)
 # ╔═╡ 0c9de395-19a9-4ec3-a918-ea3f9835ef18
 
 
-# ╔═╡ 091d33fe-fffe-11ea-131f-01f4248b30ea
-@info "23aaa"
+# ╔═╡ f017b4d5-38ac-4498-8e58-770337a0d17d
+md"""
 
-# ╔═╡ e35e35f4-71c8-4f3b-8c72-4b3ffe4766a3
-@info collect(1:100)
+# Hello
 
-# ╔═╡ 2d01cdaa-fffe-11ea-09f5-63527a1b0f87
-x = 233564653
 
-# ╔═╡ c50f7178-8c7d-4319-82d9-b9154e8892d9
-for x in 1:20
-	@info "This is too long."
-end
+I am a footnote $(@info("Inside text!")), how cool is that!
 
-# ╔═╡ e5a8e7bd-5734-4254-914d-6f87670bf7d4
-@bind wow html"<input type=checkbox>"
+But im not working :(
+"""
 
-# ╔═╡ 2883b3d8-fffe-11ea-0a0f-bbd85ec665ea
-begin
-	
-	wow && @info "a"
-	wow && @info "b"
-	wow && @info "c"
-	wow && @info "d"
-	
-	try
-		sqrt(-1)
-	catch e
-		@error "99" exception=(e, catch_backtrace())
-	end
-	nothing
-end
 
-# ╔═╡ 786b7146-8eab-4390-a746-3ccf25d1c4c8
-for i in 1:10
-	@info i
-	@debug i
-	sleep(.05)
+# ╔═╡ 9e27dc8c-0a18-4adb-b3b1-9bdd315caaa9
+with_terminal() do
+	println(123)
 end
 
-# ╔═╡ 3599eb82-0003-11eb-3814-dfd0f5737846
-for i in 1:10
-	
-	@debug i
-	@info i*100
-	if isodd(i)
-		@warn "Oh no!" i
-		@error i
-	end
-	sleep(.1)
+# ╔═╡ 51f4dc20-7cf6-4f08-b500-0c71f6ac01b7
+
+
+# ╔═╡ e68681b0-df0c-4b4d-8304-d600d511cc74
+function f(x,y)
+	sin(3*sqrt(x^2 + y^2)) < 0.0
 end
 
-# ╔═╡ f6147e0c-796f-4f5d-b000-93d790683a54
-@info md"# hello"
+# ╔═╡ 2ade9e4d-11cc-47ae-aaa6-76864757bd21
+f(123)
 
-# ╔═╡ f017b4d5-38ac-4498-8e58-770337a0d17d
-md"""
 
-# Hello
 
 
-I am a footnote $(@info("Inside text!")), how cool is that!
 
-But im not working :(
-"""
 
 
-# ╔═╡ edde2e33-9b83-4502-85d6-13c947589f55
-md"# Logging"
 
-# ╔═╡ e68681b0-df0c-4b4d-8304-d600d511cc74
-function f(x,y)
-	sin(3*sqrt(x^2 + y^2)) < 0.0
+# ╔═╡ f6147e0c-796f-4f5d-b000-93d790683a54
+@info md"# hello"
+
+# ╔═╡ 755e37af-0f21-4612-8c4c-cc294048b527
+for p in readdir(first(DEPOT_PATH))
+	print(p)
+	print("/")
+	print("\t\t")
+	print("(", Base.format_bytes(rand(1:10_000_000)), ")")
+	println()
+	print("  ")
+	print()
+	println()
+end
+
+# ╔═╡ 05461fd2-a7ce-4ed7-a622-102242547874
+import Logging
+
+# ╔═╡ 13c5ce42-4eee-480b-b490-c40ef4bc8cb5
+Logging.@logmsg Logging.LogLevel(-100) "asdf"
+
+# ╔═╡ 3cbaa462-5714-4d7c-83e3-a957763b8d91
+begin
+	print(123)
+	@info 123
+	@info 123
+end
+
+# ╔═╡ c50f7178-8c7d-4319-82d9-b9154e8892d9
+for x in 1:20
+	@info "This is too long."
 end
 
 # ╔═╡ 988f6343-c1b2-41e2-a3f0-b5eb6653087a
@@ -332,6 +307,12 @@ md"""
 ![](https://cdn.vox-cdn.com/thumbor/sgjCRJzWvyufDoVKCPKPrsyhZoA=/1400x0/filters:no_upscale()/cdn.vox-cdn.com/uploads/chorus_asset/file/10161377/iprimus_180205_2248_0003.jpg)
 """
 
+# ╔═╡ eb26cb00-1196-41a7-8e81-92641aa8dbd7
+run(`ls -lha $(first(DEPOT_PATH))`)
+
+# ╔═╡ 1e49c42a-364e-47eb-85d9-42e73fdc2371
+Logging.@logmsg Logging.LogLevel(-10) "asdf"
+
 # ╔═╡ c07a9c5f-3807-431f-a020-8eb127a226dc
 begin
 	println("Here is some ascii art!")
@@ -345,28 +326,38 @@ begin
 	end
 end
 
-# ╔═╡ eb26cb00-1196-41a7-8e81-92641aa8dbd7
-run(`ls -lha $(first(DEPOT_PATH))`)
-
-# ╔═╡ 9e27dc8c-0a18-4adb-b3b1-9bdd315caaa9
-with_terminal() do
-	println(123)
+# ╔═╡ 786b7146-8eab-4390-a746-3ccf25d1c4c8
+for i in 1:10
+	@info i
+	@debug i
+	sleep(.05)
 end
 
-# ╔═╡ 755e37af-0f21-4612-8c4c-cc294048b527
-for p in readdir(first(DEPOT_PATH))
-	print(p)
-	print("/")
-	print("\t\t")
-	print("(", Base.format_bytes(rand(1:10_000_000)), ")")
-	println()
-	print("  ")
-	print()
-	println()
-end
+# ╔═╡ e35e35f4-71c8-4f3b-8c72-4b3ffe4766a3
+@info collect(1:100)
+
+# ╔═╡ b38ae226-0a6c-49e3-b55d-ebdbf0652842
+Logging.@logmsg Logging.LogLevel(-555) "asdf"
 
-# ╔═╡ 51f4dc20-7cf6-4f08-b500-0c71f6ac01b7
 
+# ╔═╡ e5a8e7bd-5734-4254-914d-6f87670bf7d4
+@bind wow html"<input type=checkbox>"
+
+# ╔═╡ 2883b3d8-fffe-11ea-0a0f-bbd85ec665ea
+begin
+	
+	wow && @info "a"
+	wow && @info "b"
+	wow && @info "c"
+	wow && @info "d"
+	
+	try
+		sqrt(-1)
+	catch e
+		@error "99" exception=(e, catch_backtrace())
+	end
+	nothing
+end
 
 # ╔═╡ 94380ba8-247b-4e9c-9c6b-a40b04e2bcfb
 import FileTrees
@@ -374,44 +365,32 @@ import FileTrees
 # ╔═╡ 7dcf9a68-4a73-4301-a1ed-39963309d028
 t = FileTrees.FileTree(joinpath(first(DEPOT_PATH), "environments"))
 
-# ╔═╡ 7a9c4221-27c7-4195-9946-3a7190dfb07f
-FileTrees.load(t) do z
-	rand()
-end
-
 # ╔═╡ 1ea9e96a-ce26-4807-9d80-114638a3952b
 FileTrees.children(t)
 
-# ╔═╡ 05461fd2-a7ce-4ed7-a622-102242547874
-import Logging
-
-# ╔═╡ 3cbaa462-5714-4d7c-83e3-a957763b8d91
-begin
-	print(123)
-	@info 123
-	@info 123
+# ╔═╡ 7a9c4221-27c7-4195-9946-3a7190dfb07f
+FileTrees.load(t) do z
+	rand()
 end
 
-# ╔═╡ 1e49c42a-364e-47eb-85d9-42e73fdc2371
-Logging.@logmsg Logging.LogLevel(-10) "asdf"
-
-# ╔═╡ 13c5ce42-4eee-480b-b490-c40ef4bc8cb5
-Logging.@logmsg Logging.LogLevel(-100) "asdf"
-
-# ╔═╡ b38ae226-0a6c-49e3-b55d-ebdbf0652842
-Logging.@logmsg Logging.LogLevel(-555) "asdf"
-
+# ╔═╡ edde2e33-9b83-4502-85d6-13c947589f55
+md"# Logging"
 
 # ╔═╡ 00000000-0000-0000-0000-000000000001
 PLUTO_PROJECT_TOML_CONTENTS = """
 [deps]
+FileTrees = "72696420-646e-6120-6e77-6f6420746567"
+HypertextLiteral = "ac1192a8-f4b3-4bfe-ba22-af5b92cd3ab2"
+Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
 ProgressLogging = "33c8b6b6-d38a-422a-b730-caa89a2f386c"
 
 [compat]
-Plots = "~1.22.6"
-PlutoUI = "~0.7.16"
+FileTrees = "~0.3.4"
+HypertextLiteral = "~0.9.4"
+Plots = "~1.29.0"
+PlutoUI = "~0.7.39"
 ProgressLogging = "~0.1.4"
 """
 
@@ -419,11 +398,22 @@ ProgressLogging = "~0.1.4"
 PLUTO_MANIFEST_TOML_CONTENTS = """
 # This file is machine-generated - editing it directly is not advised
 
+[[AbstractPlutoDingetjes]]
+deps = ["Pkg"]
+git-tree-sha1 = "8eaf9f1b4921132a4cff3f36a1d9ba923b14a481"
+uuid = "6e696c72-6542-2067-7265-42206c756150"
+version = "1.1.4"
+
+[[AbstractTrees]]
+git-tree-sha1 = "03e0550477d86222521d254b741d470ba17ea0b5"
+uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
+version = "0.3.4"
+
 [[Adapt]]
 deps = ["LinearAlgebra"]
-git-tree-sha1 = "84918055d15b3114ede17ac6a7182f68870c16f7"
+git-tree-sha1 = "af92965fb30777147966f58acb05da51c5616b5f"
 uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
-version = "3.3.1"
+version = "3.3.3"
 
 [[ArgTools]]
 uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
@@ -448,21 +438,33 @@ version = "1.16.1+1"
 
 [[ChainRulesCore]]
 deps = ["Compat", "LinearAlgebra", "SparseArrays"]
-git-tree-sha1 = "8d954297bc51cc64f15937c2093799c3617b73e4"
+git-tree-sha1 = "9489214b993cd42d17f44c36e359bf6a7c919abf"
 uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
-version = "1.10.0"
+version = "1.15.0"
+
+[[ChangesOfVariables]]
+deps = ["ChainRulesCore", "LinearAlgebra", "Test"]
+git-tree-sha1 = "1e315e3f4b0b7ce40feded39c73049692126cf53"
+uuid = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0"
+version = "0.1.3"
 
 [[ColorSchemes]]
-deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random"]
-git-tree-sha1 = "a851fec56cb73cfdf43762999ec72eff5b86882a"
+deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Random"]
+git-tree-sha1 = "7297381ccb5df764549818d9a7d57e45f1057d30"
 uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
-version = "3.15.0"
+version = "3.18.0"
 
 [[ColorTypes]]
 deps = ["FixedPointNumbers", "Random"]
-git-tree-sha1 = "024fe24d83e4a5bf5fc80501a314ce0d1aa35597"
+git-tree-sha1 = "0f4e115f6f34bbe43c19751c90a38b2f380637b9"
 uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
-version = "0.11.0"
+version = "0.11.3"
+
+[[ColorVectorSpace]]
+deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "TensorCore"]
+git-tree-sha1 = "d08c20eef1f2cbc6e60fd3612ac4340b89fea322"
+uuid = "c3611d14-8923-5661-9e6a-0046d554d3a4"
+version = "0.9.9"
 
 [[Colors]]
 deps = ["ColorTypes", "FixedPointNumbers", "Reexport"]
@@ -472,30 +474,42 @@ version = "0.12.8"
 
 [[Compat]]
 deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
-git-tree-sha1 = "31d0151f5716b655421d9d75b7fa74cc4e744df2"
+git-tree-sha1 = "87e84b2293559571802f97dd9c94cfd6be52c5e5"
 uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
-version = "3.39.0"
+version = "3.44.0"
 
 [[CompilerSupportLibraries_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
 
+[[ContextVariablesX]]
+deps = ["Compat", "Logging", "UUIDs"]
+git-tree-sha1 = "8ccaa8c655bc1b83d2da4d569c9b28254ababd6e"
+uuid = "6add18c4-b38d-439d-96f6-d6bc489c04c5"
+version = "0.1.2"
+
 [[Contour]]
 deps = ["StaticArrays"]
 git-tree-sha1 = "9f02045d934dc030edad45944ea80dbd1f0ebea7"
 uuid = "d38c429a-6771-53c6-b99e-75d170b6e991"
 version = "0.5.7"
 
+[[Dagger]]
+deps = ["Colors", "ContextVariablesX", "DataAPI", "Distributed", "LinearAlgebra", "MemPool", "Profile", "Random", "Requires", "SentinelArrays", "Serialization", "SharedArrays", "SparseArrays", "Statistics", "StatsBase", "TableOperations", "Tables", "UUIDs"]
+git-tree-sha1 = "df440c9b3565b897ed59697e43a1125c19ce4eb3"
+uuid = "d58978e5-989f-55fb-8d15-ea34adc7bf54"
+version = "0.14.4"
+
 [[DataAPI]]
-git-tree-sha1 = "cc70b17275652eb47bc9e5f81635981f13cea5c8"
+git-tree-sha1 = "fb5f5316dd3fd4c5e7c30a24d50643b73e37cd40"
 uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
-version = "1.9.0"
+version = "1.10.0"
 
 [[DataStructures]]
 deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
-git-tree-sha1 = "7d9d316f04214f7efdbb6398d545446e246eff02"
+git-tree-sha1 = "d1fff3a548102f48987a52a2e0d114fa97d730f0"
 uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
-version = "0.18.10"
+version = "0.18.13"
 
 [[DataValueInterfaces]]
 git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6"
@@ -516,9 +530,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 
 [[DocStringExtensions]]
 deps = ["LibGit2"]
-git-tree-sha1 = "a32185f5428d3986f47c2ab78b1f216d5e6cc96f"
+git-tree-sha1 = "b19534d1895d702889b219c382a6e18010797f0b"
 uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
-version = "0.8.5"
+version = "0.8.6"
 
 [[Downloads]]
 deps = ["ArgTools", "LibCURL", "NetworkOptions"]
@@ -532,9 +546,9 @@ version = "2.2.3+0"
 
 [[Expat_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "b3bfd02e98aedfa5cf885665493c5598c350cd2f"
+git-tree-sha1 = "bad72f730e9e91c08d9427d5e8db95478a3c323d"
 uuid = "2e619515-83b5-522b-bb60-26c02a35a201"
-version = "2.2.10+0"
+version = "2.4.8+0"
 
 [[FFMPEG]]
 deps = ["FFMPEG_jll"]
@@ -548,6 +562,18 @@ git-tree-sha1 = "d8a578692e3077ac998b50c0217dfd67f21d1e5f"
 uuid = "b22a6f82-2f65-5046-a5b2-351ab43fb4e5"
 version = "4.4.0+0"
 
+[[FilePathsBase]]
+deps = ["Compat", "Dates", "Mmap", "Printf", "Test", "UUIDs"]
+git-tree-sha1 = "129b104185df66e408edd6625d480b7f9e9823a0"
+uuid = "48062228-2e41-5def-b9a4-89aafe57970f"
+version = "0.9.18"
+
+[[FileTrees]]
+deps = ["AbstractTrees", "Dagger", "FilePathsBase", "Glob"]
+git-tree-sha1 = "a2171ed4f59223c729faa42dc560ff65bcd0f902"
+uuid = "72696420-646e-6120-6e77-6f6420746567"
+version = "0.3.4"
+
 [[FixedPointNumbers]]
 deps = ["Statistics"]
 git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc"
@@ -580,27 +606,27 @@ version = "1.0.10+0"
 
 [[GLFW_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Pkg", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll"]
-git-tree-sha1 = "0c603255764a1fa0b61752d2bec14cfbd18f7fe8"
+git-tree-sha1 = "51d2dfe8e590fbd74e7a842cf6d13d8a2f45dc01"
 uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89"
-version = "3.3.5+1"
+version = "3.3.6+0"
 
 [[GR]]
-deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Printf", "Random", "Serialization", "Sockets", "Test", "UUIDs"]
-git-tree-sha1 = "d189c6d2004f63fd3c91748c458b09f26de0efaa"
+deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Printf", "Random", "RelocatableFolders", "Serialization", "Sockets", "Test", "UUIDs"]
+git-tree-sha1 = "b316fd18f5bc025fedcb708332aecb3e13b9b453"
 uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
-version = "0.61.0"
+version = "0.64.3"
 
 [[GR_jll]]
 deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Pkg", "Qt5Base_jll", "Zlib_jll", "libpng_jll"]
-git-tree-sha1 = "cafe0823979a5c9bff86224b3b8de29ea5a44b2e"
+git-tree-sha1 = "1e5490a51b4e9d07e8b04836f6008f46b48aaa87"
 uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
-version = "0.61.0+0"
+version = "0.64.3+0"
 
 [[GeometryBasics]]
 deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"]
-git-tree-sha1 = "58bcdf5ebc057b085e58d95c138725628dd7453c"
+git-tree-sha1 = "83ea630384a13fc4f002b77690bc0afeb4255ac9"
 uuid = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
-version = "0.4.1"
+version = "0.4.2"
 
 [[Gettext_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"]
@@ -614,6 +640,11 @@ git-tree-sha1 = "a32d672ac2c967f3deb8a81d828afc739c838a06"
 uuid = "7746bdde-850d-59dc-9ae8-88ece973131d"
 version = "2.68.3+2"
 
+[[Glob]]
+git-tree-sha1 = "4df9f7e06108728ebf00a0a11edee4b29a482bb2"
+uuid = "c27321d9-0574-5035-807b-f59d2c89b15c"
+version = "1.3.0"
+
 [[Graphite2_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
 git-tree-sha1 = "344bf40dcab1073aca04aa0df4fb092f920e4011"
@@ -627,9 +658,9 @@ version = "1.0.2"
 
 [[HTTP]]
 deps = ["Base64", "Dates", "IniFile", "Logging", "MbedTLS", "NetworkOptions", "Sockets", "URIs"]
-git-tree-sha1 = "14eece7a3308b4d8be910e265c724a6ba51a9798"
+git-tree-sha1 = "0fa77022fe4b511826b39c894c90daf5fce3334a"
 uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
-version = "0.9.16"
+version = "0.9.17"
 
 [[HarfBuzz_jll]]
 deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"]
@@ -644,9 +675,10 @@ uuid = "47d2ed2b-36de-50cf-bf87-49c2cf4b8b91"
 version = "0.0.4"
 
 [[HypertextLiteral]]
-git-tree-sha1 = "f6532909bf3d40b308a0f360b6a0e626c0e263a8"
+deps = ["Tricks"]
+git-tree-sha1 = "c47c5fa4c5308f27ccaac35504858d8914e102f9"
 uuid = "ac1192a8-f4b3-4bfe-ba22-af5b92cd3ab2"
-version = "0.9.1"
+version = "0.9.4"
 
 [[IOCapture]]
 deps = ["Logging", "Random"]
@@ -655,24 +687,29 @@ uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89"
 version = "0.2.2"
 
 [[IniFile]]
-deps = ["Test"]
-git-tree-sha1 = "098e4d2c533924c921f9f9847274f2ad89e018b8"
+git-tree-sha1 = "f550e6e32074c939295eb5ea6de31849ac2c9625"
 uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f"
-version = "0.5.0"
+version = "0.5.1"
 
 [[InteractiveUtils]]
 deps = ["Markdown"]
 uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 
+[[InverseFunctions]]
+deps = ["Test"]
+git-tree-sha1 = "336cc738f03e069ef2cac55a104eb823455dca75"
+uuid = "3587e190-3f89-42d0-90ee-14403ec27112"
+version = "0.1.4"
+
 [[IrrationalConstants]]
 git-tree-sha1 = "7fd44fd4ff43fc60815f8e764c0f352b83c49151"
 uuid = "92d709cd-6900-40b7-9082-c6be49f344b6"
 version = "0.1.1"
 
 [[IterTools]]
-git-tree-sha1 = "05110a2ab1fc5f932622ffea2a003221f4782c18"
+git-tree-sha1 = "fa6287a4469f5e048d763df38279ee729fbd44e5"
 uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
-version = "1.3.0"
+version = "1.4.0"
 
 [[IteratorInterfaceExtensions]]
 git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856"
@@ -681,21 +718,21 @@ version = "1.0.0"
 
 [[JLLWrappers]]
 deps = ["Preferences"]
-git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e"
+git-tree-sha1 = "abc9885a7ca2052a736a600f7fa66209f96506e1"
 uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
-version = "1.3.0"
+version = "1.4.1"
 
 [[JSON]]
 deps = ["Dates", "Mmap", "Parsers", "Unicode"]
-git-tree-sha1 = "8076680b162ada2a031f707ac7b4953e30667a37"
+git-tree-sha1 = "3c837543ddb02250ef42f4738347454f95079d4e"
 uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-version = "0.21.2"
+version = "0.21.3"
 
 [[JpegTurbo_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "d735490ac75c5cb9f1b00d8b5509c11984dc6943"
+git-tree-sha1 = "b53380851c6e6664204efb2e62cd24fa5c47e4ba"
 uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8"
-version = "2.1.0+0"
+version = "2.1.2+0"
 
 [[LAME_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -703,6 +740,12 @@ git-tree-sha1 = "f6250b16881adf048549549fba48b1161acdac8c"
 uuid = "c1c5ebd0-6772-5130-a774-d5fcae4a789d"
 version = "3.100.1+0"
 
+[[LERC_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "bf36f528eec6634efc60d7ec062008f171071434"
+uuid = "88015f11-f218-50d7-93a8-a6af411a945d"
+version = "3.0.0+1"
+
 [[LZO_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
 git-tree-sha1 = "e5b909bcf985c5e2605737d2ce278ed791b89be6"
@@ -710,15 +753,15 @@ uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac"
 version = "2.10.1+0"
 
 [[LaTeXStrings]]
-git-tree-sha1 = "c7f1c695e06c01b95a67f0cd1d34994f3e7db104"
+git-tree-sha1 = "f2355693d6778a178ade15952b7ac47a4ff97996"
 uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
-version = "1.2.1"
+version = "1.3.0"
 
 [[Latexify]]
 deps = ["Formatting", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "Printf", "Requires"]
-git-tree-sha1 = "a4b12a1bd2ebade87891ab7e36fdbce582301a92"
+git-tree-sha1 = "46a39b9c58749eefb5f2dc1178cb8fab5332b1ab"
 uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
-version = "0.15.6"
+version = "0.15.15"
 
 [[LibCURL]]
 deps = ["LibCURL_jll", "MozillaCACerts_jll"]
@@ -776,10 +819,10 @@ uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9"
 version = "2.35.0+0"
 
 [[Libtiff_jll]]
-deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"]
-git-tree-sha1 = "340e257aada13f95f98ee352d316c3bed37c8ab9"
+deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"]
+git-tree-sha1 = "c9551dd26e31ab17b86cbd00c2ede019c08758eb"
 uuid = "89763e89-9b03-5906-acba-b20f662cd828"
-version = "4.3.0+0"
+version = "4.3.0+1"
 
 [[Libuuid_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -792,19 +835,19 @@ deps = ["Libdl", "libblastrampoline_jll"]
 uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [[LogExpFunctions]]
-deps = ["ChainRulesCore", "DocStringExtensions", "IrrationalConstants", "LinearAlgebra"]
-git-tree-sha1 = "34dc30f868e368f8a17b728a1238f3fcda43931a"
+deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"]
+git-tree-sha1 = "09e4b894ce6a976c354a69041a04748180d43637"
 uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
-version = "0.3.3"
+version = "0.3.15"
 
 [[Logging]]
 uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
 
 [[MacroTools]]
 deps = ["Markdown", "Random"]
-git-tree-sha1 = "5a5bc6bf062f0f95e62d0fe0a2d99699fed82dd9"
+git-tree-sha1 = "3d3e902b31198a27340d0bf00d6ac452866021cf"
 uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
-version = "0.5.8"
+version = "0.5.9"
 
 [[Markdown]]
 deps = ["Base64"]
@@ -825,6 +868,12 @@ git-tree-sha1 = "e498ddeee6f9fdb4551ce855a46f54dbd900245f"
 uuid = "442fdcdd-2543-5da2-b0f3-8c86c306513e"
 version = "0.3.1"
 
+[[MemPool]]
+deps = ["DataStructures", "Distributed", "Mmap", "Random", "Serialization", "Sockets"]
+git-tree-sha1 = "b0bbcf9346ef0a60d2a63069dfc8b4d51d682153"
+uuid = "f9f48841-c794-520a-933b-121f7ba6ed94"
+version = "0.3.9"
+
 [[Missings]]
 deps = ["DataAPI"]
 git-tree-sha1 = "bf210ce90b6c9eed32d25dbcae1ebc565df2687f"
@@ -838,9 +887,9 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
 
 [[NaNMath]]
-git-tree-sha1 = "bfe47e760d60b82b66b61d2d44128b62e3a369fb"
+git-tree-sha1 = "737a5957f387b17e74d4ad2f440eb330b39a62c5"
 uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
-version = "0.3.5"
+version = "1.0.0"
 
 [[NetworkOptions]]
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
@@ -855,11 +904,21 @@ version = "1.3.5+1"
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
 uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
 
+[[OpenLibm_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "05823500-19ac-5b8b-9628-191a04bc5112"
+
 [[OpenSSL_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "15003dcb7d8db3c6c857fda14891a539a8f2705a"
+git-tree-sha1 = "ab05aa4cc89736e95915b01e7279e61b1bfe33b8"
 uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
-version = "1.1.10+0"
+version = "1.1.14+0"
+
+[[OpenSpecFun_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1"
+uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e"
+version = "0.5.5+0"
 
 [[Opus_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -880,9 +939,9 @@ version = "8.44.0+0"
 
 [[Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "98f59ff3639b3d9485a03a72f3ab35bab9465720"
+git-tree-sha1 = "1285416549ccfcdf0c50d4997a94331e88d68413"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.0.6"
+version = "2.3.1"
 
 [[Pixman_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -895,39 +954,43 @@ deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markd
 uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[PlotThemes]]
-deps = ["PlotUtils", "Requires", "Statistics"]
-git-tree-sha1 = "a3a964ce9dc7898193536002a6dd892b1b5a6f1d"
+deps = ["PlotUtils", "Statistics"]
+git-tree-sha1 = "8162b2f8547bc23876edd0c5181b27702ae58dce"
 uuid = "ccf2f8ad-2431-5c83-bf29-c5338b663b6a"
-version = "2.0.1"
+version = "3.0.0"
 
 [[PlotUtils]]
 deps = ["ColorSchemes", "Colors", "Dates", "Printf", "Random", "Reexport", "Statistics"]
-git-tree-sha1 = "b084324b4af5a438cd63619fd006614b3b20b87b"
+git-tree-sha1 = "bb16469fd5224100e422f0b027d26c5a25de1200"
 uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043"
-version = "1.0.15"
+version = "1.2.0"
 
 [[Plots]]
-deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs"]
-git-tree-sha1 = "ba43b248a1f04a9667ca4a9f782321d9211aa68e"
+deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "Unzip"]
+git-tree-sha1 = "d457f881ea56bbfa18222642de51e0abf67b9027"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
-version = "1.22.6"
+version = "1.29.0"
 
 [[PlutoUI]]
-deps = ["Base64", "Dates", "Hyperscript", "HypertextLiteral", "IOCapture", "InteractiveUtils", "JSON", "Logging", "Markdown", "Random", "Reexport", "UUIDs"]
-git-tree-sha1 = "4c8a7d080daca18545c56f1cac28710c362478f3"
+deps = ["AbstractPlutoDingetjes", "Base64", "ColorTypes", "Dates", "Hyperscript", "HypertextLiteral", "IOCapture", "InteractiveUtils", "JSON", "Logging", "Markdown", "Random", "Reexport", "UUIDs"]
+git-tree-sha1 = "8d1f54886b9037091edf146b517989fc4a09efec"
 uuid = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
-version = "0.7.16"
+version = "0.7.39"
 
 [[Preferences]]
 deps = ["TOML"]
-git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a"
+git-tree-sha1 = "47e5f437cc0e7ef2ce8406ce1e7e24d44915f88d"
 uuid = "21216c6a-2e73-6563-6e65-726566657250"
-version = "1.2.2"
+version = "1.3.0"
 
 [[Printf]]
 deps = ["Unicode"]
 uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
+[[Profile]]
+deps = ["Printf"]
+uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"
+
 [[ProgressLogging]]
 deps = ["Logging", "SHA", "UUIDs"]
 git-tree-sha1 = "80d919dee55b9c50e8d9e2da5eeafff3fe58b539"
@@ -936,9 +999,9 @@ version = "0.1.4"
 
 [[Qt5Base_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "xkbcommon_jll"]
-git-tree-sha1 = "ad368663a5e20dbb8d6dc2fddeefe4dae0781ae8"
+git-tree-sha1 = "c6c0f690d0cc7caddb74cef7aa847b824a16b256"
 uuid = "ea2cea3b-5b76-57ae-a6ef-0a8af62496e1"
-version = "5.15.3+0"
+version = "5.15.3+1"
 
 [[REPL]]
 deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
@@ -949,26 +1012,32 @@ deps = ["SHA", "Serialization"]
 uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [[RecipesBase]]
-git-tree-sha1 = "44a75aa7a527910ee3d1751d1f0e4148698add9e"
+git-tree-sha1 = "6bf3f380ff52ce0832ddd3a2a7b9538ed1bcca7d"
 uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
-version = "1.1.2"
+version = "1.2.1"
 
 [[RecipesPipeline]]
 deps = ["Dates", "NaNMath", "PlotUtils", "RecipesBase"]
-git-tree-sha1 = "7ad0dfa8d03b7bcf8c597f59f5292801730c55b8"
+git-tree-sha1 = "dc1e451e15d90347a7decc4221842a022b011714"
 uuid = "01d81517-befc-4cb6-b9ec-a95719d0359c"
-version = "0.4.1"
+version = "0.5.2"
 
 [[Reexport]]
 git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b"
 uuid = "189a3867-3050-52da-a836-e630ba90ab69"
 version = "1.2.2"
 
+[[RelocatableFolders]]
+deps = ["SHA", "Scratch"]
+git-tree-sha1 = "cdbd3b1338c72ce29d9584fdbe9e9b70eeb5adca"
+uuid = "05181044-ff0b-4ac5-8273-598c1e38db00"
+version = "0.1.3"
+
 [[Requires]]
 deps = ["UUIDs"]
-git-tree-sha1 = "4036a3bd08ac7e968e27c203d45f5fff15020621"
+git-tree-sha1 = "838a3a4188e2ded87a4f9f184b4b0d78a1e91cb7"
 uuid = "ae029012-a4dd-5104-9daa-d747884805df"
-version = "1.1.3"
+version = "1.3.0"
 
 [[SHA]]
 uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
@@ -979,6 +1048,12 @@ git-tree-sha1 = "0b4b7f1393cff97c33891da2a0bf69c6ed241fda"
 uuid = "6c6a2e73-6563-6170-7368-637461726353"
 version = "1.1.0"
 
+[[SentinelArrays]]
+deps = ["Dates", "Random"]
+git-tree-sha1 = "6a2f7d70512d205ca8c7ee31bfa9f142fe74310c"
+uuid = "91c51154-3ec4-41a3-a24f-3f23e20d615c"
+version = "1.3.12"
+
 [[Serialization]]
 uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 
@@ -1005,37 +1080,50 @@ version = "1.0.1"
 deps = ["LinearAlgebra", "Random"]
 uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
+[[SpecialFunctions]]
+deps = ["ChainRulesCore", "IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"]
+git-tree-sha1 = "bc40f042cfcc56230f781d92db71f0e21496dffd"
+uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
+version = "2.1.5"
+
 [[StaticArrays]]
 deps = ["LinearAlgebra", "Random", "Statistics"]
-git-tree-sha1 = "3c76dde64d03699e074ac02eb2e8ba8254d428da"
+git-tree-sha1 = "cd56bf18ed715e8b09f06ef8c6b781e6cdc49911"
 uuid = "90137ffa-7385-5640-81b9-e52037218182"
-version = "1.2.13"
+version = "1.4.4"
 
 [[Statistics]]
 deps = ["LinearAlgebra", "SparseArrays"]
 uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [[StatsAPI]]
-git-tree-sha1 = "1958272568dc176a1d881acb797beb909c785510"
+deps = ["LinearAlgebra"]
+git-tree-sha1 = "c82aaa13b44ea00134f8c9c89819477bd3986ecd"
 uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0"
-version = "1.0.0"
+version = "1.3.0"
 
 [[StatsBase]]
 deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
-git-tree-sha1 = "eb35dcc66558b2dda84079b9a1be17557d32091a"
+git-tree-sha1 = "8977b17906b0a1cc74ab2e3a05faa16cf08a8291"
 uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
-version = "0.33.12"
+version = "0.33.16"
 
 [[StructArrays]]
 deps = ["Adapt", "DataAPI", "StaticArrays", "Tables"]
-git-tree-sha1 = "2ce41e0d042c60ecd131e9fb7154a3bfadbf50d3"
+git-tree-sha1 = "9abba8f8fb8458e9adf07c8a2377a070674a24f1"
 uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
-version = "0.6.3"
+version = "0.6.8"
 
 [[TOML]]
 deps = ["Dates"]
 uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 
+[[TableOperations]]
+deps = ["SentinelArrays", "Tables", "Test"]
+git-tree-sha1 = "e383c87cf2a1dc41fa30c093b2a19877c83e1bc1"
+uuid = "ab02a1b2-a7df-11e8-156e-fb1833f50b87"
+version = "1.2.0"
+
 [[TableTraits]]
 deps = ["IteratorInterfaceExtensions"]
 git-tree-sha1 = "c06b2f539df1c6efa794486abfb6ed2022561a39"
@@ -1043,19 +1131,30 @@ uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c"
 version = "1.0.1"
 
 [[Tables]]
-deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"]
-git-tree-sha1 = "fed34d0e71b91734bf0a7e10eb1bb05296ddbcd0"
+deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "TableTraits", "Test"]
+git-tree-sha1 = "5ce79ce186cc678bbb5c5681ca3379d1ddae11a1"
 uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
-version = "1.6.0"
+version = "1.7.0"
 
 [[Tar]]
 deps = ["ArgTools", "SHA"]
 uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
 
+[[TensorCore]]
+deps = ["LinearAlgebra"]
+git-tree-sha1 = "1feb45f88d133a655e001435632f019a9a1bcdb6"
+uuid = "62fd8b95-f654-4bbd-a8a5-9c27f68ccd50"
+version = "0.1.1"
+
 [[Test]]
 deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
 uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
+[[Tricks]]
+git-tree-sha1 = "6bac775f2d42a611cdfcd1fb217ee719630c4175"
+uuid = "410a4b4d-49e4-4fbc-ab6d-cb71b17b3775"
+version = "0.1.6"
+
 [[URIs]]
 git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355"
 uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
@@ -1068,6 +1167,17 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 [[Unicode]]
 uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 
+[[UnicodeFun]]
+deps = ["REPL"]
+git-tree-sha1 = "53915e50200959667e78a92a418594b428dffddf"
+uuid = "1cfade01-22cf-5700-b092-accc4b62d6e1"
+version = "0.4.1"
+
+[[Unzip]]
+git-tree-sha1 = "34db80951901073501137bdbc3d5a8e7bbd06670"
+uuid = "41fe7b60-77ed-43a1-b4f0-825fd5a5650d"
+version = "0.1.2"
+
 [[Wayland_jll]]
 deps = ["Artifacts", "Expat_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg", "XML2_jll"]
 git-tree-sha1 = "3e61f0b86f90dacb0bc0e73a0c5a83f6a8636e23"
@@ -1075,10 +1185,10 @@ uuid = "a2964d1f-97da-50d4-b82a-358c7fce9d89"
 version = "1.19.0+0"
 
 [[Wayland_protocols_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Wayland_jll"]
-git-tree-sha1 = "2839f1c1296940218e35df0bbb220f2a79686670"
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "4528479aa01ee1b3b4cd0e6faef0e04cf16466da"
 uuid = "2381bf8a-dfd0-557d-9999-79630e7b1b91"
-version = "1.18.0+4"
+version = "1.25.0+0"
 
 [[XML2_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"]
@@ -1224,9 +1334,9 @@ uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
 
 [[Zstd_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "cc4bf3fdde8b7e3e9fa0351bdeedba1cf3b7f6e6"
+git-tree-sha1 = "e45044cd873ded54b6a5bac0eb5c971392cf1927"
 uuid = "3161d3a3-bdf6-5164-811a-617609db77b4"
-version = "1.5.0+0"
+version = "1.5.2+0"
 
 [[libass_jll]]
 deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "HarfBuzz_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]
@@ -1252,9 +1362,9 @@ version = "1.6.38+0"
 
 [[libvorbis_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"]
-git-tree-sha1 = "c45f4e40e7aafe9d086379e5578947ec8b95a8fb"
+git-tree-sha1 = "b910cb81ef3fe6e78bf6acee440bda86fd6ae00c"
 uuid = "f27f6e37-5d2b-51aa-960f-b287f2bc3b7a"
-version = "1.3.7+0"
+version = "1.3.7+1"
 
 [[nghttp2_jll]]
 deps = ["Artifacts", "Libdl"]
@@ -1294,7 +1404,6 @@ version = "0.9.1+5"
 # ╟─196080df-e8c0-4120-a97c-443cf66295ff
 # ╠═a22411c8-24e0-4a80-9b91-bc1f0999cc3c
 # ╠═091d33fe-fffe-11ea-131f-01f4248b30ea
-# ╠═dd183c9d-c070-43bc-95ff-cf64ba27071e
 # ╠═5f8496cb-d29e-4c4c-b378-1173242c7a78
 # ╠═a93ac790-7a04-418d-8117-01f01e4608c8
 # ╟─88f87c39-89ef-4492-92ae-c6cd33699c59
@@ -1311,6 +1420,9 @@ version = "0.9.1+5"
 # ╠═504dfdc1-41da-4fcb-ba8e-aa69643d57a1
 # ╠═6a7824d0-06e4-4569-9fa8-b9884d299f80
 # ╟─7c7b11a2-69cf-4cd5-b9e5-f2517211579f
+# ╠═10c02645-cb3b-42be-8df1-679e8fb05382
+# ╠═9f99c4aa-c4c9-40f7-aad2-fc74dce84bc2
+# ╠═dde4c73d-2577-411f-9e14-57988ddd3498
 # ╠═d48fb1c0-b88a-4a23-8a87-7fdcd74bf3cc
 # ╠═890b8d1d-1bf0-4497-ac64-9852f68e1577
 # ╠═6355afae-d4ad-40f4-9917-3f228a63ddaa
@@ -1325,5 +1437,28 @@ version = "0.9.1+5"
 # ╠═9cc753a0-f8be-4045-a432-295a05388a4a
 # ╠═1a088b03-ac41-440b-8c82-bd5760590665
 # ╠═0c9de395-19a9-4ec3-a918-ea3f9835ef18
+# ╠═f017b4d5-38ac-4498-8e58-770337a0d17d
+# ╠═9e27dc8c-0a18-4adb-b3b1-9bdd315caaa9
+# ╠═51f4dc20-7cf6-4f08-b500-0c71f6ac01b7
+# ╠═e68681b0-df0c-4b4d-8304-d600d511cc74
+# ╠═f6147e0c-796f-4f5d-b000-93d790683a54
+# ╠═755e37af-0f21-4612-8c4c-cc294048b527
+# ╠═05461fd2-a7ce-4ed7-a622-102242547874
+# ╠═1ea9e96a-ce26-4807-9d80-114638a3952b
+# ╠═13c5ce42-4eee-480b-b490-c40ef4bc8cb5
+# ╠═3cbaa462-5714-4d7c-83e3-a957763b8d91
+# ╠═c50f7178-8c7d-4319-82d9-b9154e8892d9
+# ╠═988f6343-c1b2-41e2-a3f0-b5eb6653087a
+# ╠═eb26cb00-1196-41a7-8e81-92641aa8dbd7
+# ╠═1e49c42a-364e-47eb-85d9-42e73fdc2371
+# ╠═c07a9c5f-3807-431f-a020-8eb127a226dc
+# ╠═7a9c4221-27c7-4195-9946-3a7190dfb07f
+# ╠═786b7146-8eab-4390-a746-3ccf25d1c4c8
+# ╠═e35e35f4-71c8-4f3b-8c72-4b3ffe4766a3
+# ╠═b38ae226-0a6c-49e3-b55d-ebdbf0652842
+# ╠═e5a8e7bd-5734-4254-914d-6f87670bf7d4
+# ╠═94380ba8-247b-4e9c-9c6b-a40b04e2bcfb
+# ╠═7dcf9a68-4a73-4301-a1ed-39963309d028
+# ╠═edde2e33-9b83-4502-85d6-13c947589f55
 # ╟─00000000-0000-0000-0000-000000000001
-# ╟─00000000-0000-0000-0000-000000000002
+# ╟─00000000-0000-0000-0000-000000000002
\ No newline at end of file

From fe7a355cd64e464113bacf677ec669db2b9a4376 Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Thu, 26 May 2022 00:46:14 +0200
Subject: [PATCH 333/821] Upgrade codemirror to 0.20 (#2107)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Παναγιώτης Γεωργακόπουλος <pankgeorg@gmail.com>
---
 frontend/components/CellInput.js              |   62 +-
 .../CellInput/LiveDocsFromCursor.js           |    2 +-
 .../CellInput/comment_mixed_parsers.js        |    3 -
 .../components/CellInput/lezer_template.js    |  136 +-
 frontend/components/CellInput/mixedParsers.js |   96 +-
 .../CellInput/scopestate_statefield.js        |  233 +-
 .../CellInput/tests/scopestate_helpers.js     |    2 +-
 frontend/imports/CodemirrorPlutoSetup.d.ts    | 2428 +++++++----------
 frontend/imports/CodemirrorPlutoSetup.js      |   15 +-
 9 files changed, 1249 insertions(+), 1728 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 2dff27f32a..0fc242b20e 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -47,6 +47,8 @@ import {
     markdownLanguage,
     javascriptLanguage,
     pythonLanguage,
+    syntaxHighlighting,
+    cssLanguage,
 } from "../imports/CodemirrorPlutoSetup.js"
 
 import { markdown, html as htmlLang, javascript, sqlLang, python, julia_mixed } from "./CellInput/mixedParsers.js"
@@ -63,7 +65,22 @@ import { commentKeymap } from "./CellInput/comment_mixed_parsers.js"
 import { debug_syntax_plugin } from "./CellInput/debug_syntax_plugin.js"
 import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
 
-export const ENABLE_CM_MIXED_PARSER = false
+export const ENABLE_CM_MIXED_PARSER = window.localStorage.getItem("ENABLE_CM_MIXED_PARSER") === "true"
+
+if (ENABLE_CM_MIXED_PARSER) {
+    console.log(`YOU ENABLED THE CODEMIRROR MIXED LANGUAGE PARSER
+Thanks! Awesome!
+Please let us know if you find any bugs...
+If enough people do this, we can make it the default parser.
+`)
+}
+
+// Added this so we can have people test the mixed parser, because I LIKE IT SO MUCH - DRAL
+// @ts-ignore
+window.PLUTO_TOGGLE_CM_MIXED_PARSER = () => {
+    window.localStorage.setItem("ENABLE_CM_MIXED_PARSER", String(!ENABLE_CM_MIXED_PARSER))
+    window.location.reload()
+}
 
 export const pluto_syntax_colors = HighlightStyle.define(
     [
@@ -76,6 +93,10 @@ export const pluto_syntax_colors = HighlightStyle.define(
         { tag: tags.literal, color: "var(--cm-builtin-color)", fontWeight: 700 },
         { tag: tags.macroName, color: "var(--cm-macro-color)", fontWeight: 700 },
 
+        // I (ab)use `special(brace)` for interpolations.
+        // lang-javascript does the same so I figure it is "best practice" 😅
+        { tag: tags.special(tags.brace), color: "var(--cm-macro-color)", fontWeight: 700 },
+
         // `nothing` I guess... Any others?
         {
             tag: tags.standard(tags.variableName),
@@ -109,7 +130,7 @@ export const pluto_syntax_colors = HighlightStyle.define(
     ],
     {
         all: { color: `var(--cm-editor-text-color)` },
-        scope: julia_andrey().language.topNode,
+        scope: julia_andrey().language,
     }
 )
 
@@ -155,7 +176,7 @@ export const pluto_syntax_colors_javascript = HighlightStyle.define(
         { tag: tags.comment, color: "var(--cm-comment-color)", fontStyle: "italic", filter: "none" },
     ],
     {
-        scope: javascriptLanguage.topNode,
+        scope: javascriptLanguage,
         all: {
             color: `var(--cm-editor-text-color)`,
             filter: `contrast(0.5)`,
@@ -205,7 +226,7 @@ export const pluto_syntax_colors_python = HighlightStyle.define(
         // PYTHON SPECIFIC
     ],
     {
-        scope: pythonLanguage.topNode,
+        scope: pythonLanguage,
         all: {
             color: "var(--cm-editor-text-color)",
             filter: `contrast(0.5)`,
@@ -231,8 +252,7 @@ export const pluto_syntax_colors_css = HighlightStyle.define(
         { tag: tags.comment, color: "var(--cm-comment-color)", fontStyle: "italic" },
     ],
     {
-        // scope: CSS,
-        // But the css-lang packaged isn't in codemirror pluto setup and I can't be arsed now.
+        scope: cssLanguage,
         all: { color: "var(--cm-css-color)" },
     }
 )
@@ -242,13 +262,13 @@ export const pluto_syntax_colors_html = HighlightStyle.define(
         { tag: tags.tagName, color: "var(--cm-html-accent-color)", fontWeight: 600 },
         { tag: tags.attributeName, color: "var(--cm-html-accent-color)", fontWeight: 600 },
         { tag: tags.attributeValue, color: "var(--cm-html-accent-color)" },
-        { tag: tags.angleBracket, color: "var(--cm-html-accent-color)", fontWeight: 600 },
+        { tag: tags.angleBracket, color: "var(--cm-html-accent-color)", fontWeight: 600, opacity: 0.7 },
         { tag: tags.content, color: "var(--cm-html-color)", fontWeight: 400 },
         { tag: tags.documentMeta, color: "var(--cm-html-accent-color)" },
         { tag: tags.comment, color: "var(--cm-comment-color)", fontStyle: "italic" },
     ],
     {
-        scope: htmlLanguage.topNode,
+        scope: htmlLanguage,
         all: {
             color: "var(--cm-html-color)",
         },
@@ -281,7 +301,7 @@ export const pluto_syntax_colors_markdown = HighlightStyle.define(
         { tag: tags.monospace, color: "var(--cm-md-accent-color)" },
     ],
     {
-        scope: markdownLanguage.topNode,
+        scope: markdownLanguage,
         all: {
             color: "var(--cm-md-color)",
         },
@@ -550,7 +570,6 @@ export const CellInput = ({
         window.tags = tags
         const usesDarkTheme = window.matchMedia("(prefers-color-scheme: dark)").matches
         const newcm = (newcm_ref.current = new EditorView({
-            /** Migration #0: New */
             state: EditorState.create({
                 doc: local_code,
 
@@ -571,12 +590,12 @@ export const CellInput = ({
 
                     pkgBubblePlugin({ pluto_actions, notebook_id }),
                     ScopeStateField,
-                    pluto_syntax_colors,
-                    pluto_syntax_colors_html,
-                    pluto_syntax_colors_markdown,
-                    pluto_syntax_colors_javascript,
-                    pluto_syntax_colors_python,
-                    pluto_syntax_colors_css,
+                    syntaxHighlighting(pluto_syntax_colors),
+                    syntaxHighlighting(pluto_syntax_colors_html),
+                    syntaxHighlighting(pluto_syntax_colors_markdown),
+                    syntaxHighlighting(pluto_syntax_colors_javascript),
+                    syntaxHighlighting(pluto_syntax_colors_python),
+                    syntaxHighlighting(pluto_syntax_colors_css),
                     lineNumbers(),
                     highlightSpecialChars(),
                     history(),
@@ -585,7 +604,6 @@ export const CellInput = ({
                     // Multiple cursors with `alt` instead of the default `ctrl` (which we use for go to definition)
                     EditorView.clickAddsSelectionRange.of((event) => event.altKey && !event.shiftKey),
                     indentOnInput(),
-                    defaultHighlightStyle.fallback,
                     // Experimental: Also add closing brackets for tripple string
                     // TODO also add closing string when typing a string macro
                     EditorState.languageData.of((state, pos, side) => {
@@ -654,21 +672,25 @@ export const CellInput = ({
                     // I put plutoKeyMaps separately because I want make sure we have
                     // higher priority 😈
                     keymap.of(plutoKeyMaps),
-
+                    keymap.of(commentKeymap),
                     // Before default keymaps (because we override some of them)
                     // but after the autocomplete plugin, because we don't want to move cell when scrolling through autocomplete
                     cell_movement_plugin({
                         focus_on_neighbor: ({ cell_delta, line, character }) => on_focus_neighbor(cell_id, cell_delta, line, character),
                     }),
-                    keymap.of([...closeBracketsKeymap, ...defaultKeymap, ...historyKeymap, ...foldKeymap, ...commentKeymap]),
+                    keymap.of([...closeBracketsKeymap, ...defaultKeymap, ...historyKeymap, ...foldKeymap]),
                     placeholder("Enter cell code..."),
 
                     EditorView.lineWrapping,
-                    // Disabled awesome_line_wrapping because it still fails in a lot of cases
+                    // Wowww this has been enabled for some time now... wonder if there are issues about this yet ;) - DRAL
                     awesome_line_wrapping,
 
                     on_change_compartment,
 
+                    // This is my weird-ass extension that checks the AST and shows you where
+                    // there're missing nodes.. I'm not sure if it's a good idea to have it
+                    // show_missing_syntax_plugin(),
+
                     // Enable this plugin if you want to see the lezer tree,
                     // and possible lezer errors and maybe more debug info in the console:
                     // debug_syntax_plugin,
diff --git a/frontend/components/CellInput/LiveDocsFromCursor.js b/frontend/components/CellInput/LiveDocsFromCursor.js
index 341dec361f..17f8dd5738 100644
--- a/frontend/components/CellInput/LiveDocsFromCursor.js
+++ b/frontend/components/CellInput/LiveDocsFromCursor.js
@@ -96,7 +96,7 @@ export let get_selected_doc_from_state = (/** @type {EditorState} */ state, verb
                 iterations = iterations + 1
 
                 // Collect parents in a list so I can compare them easily
-                let parent_cursor = cursor.node.cursor
+                let parent_cursor = cursor.node.cursor()
                 let parents = []
                 while (parent_cursor.parent()) {
                     parents.push(parent_cursor.name)
diff --git a/frontend/components/CellInput/comment_mixed_parsers.js b/frontend/components/CellInput/comment_mixed_parsers.js
index 9f2684c2a5..0ba87618d4 100644
--- a/frontend/components/CellInput/comment_mixed_parsers.js
+++ b/frontend/components/CellInput/comment_mixed_parsers.js
@@ -47,9 +47,6 @@ export const commentKeymap = [
     { key: "Mod-/", run: toggleComment },
     { key: "Alt-A", run: toggleBlockComment },
 ]
-/**
- * @param {EditorState} state
- */
 function getConfig(state, pos = state.selection.main.head) {
     let data = state.languageDataAt("commentTokens", pos)
     return data.length ? data[0] : {}
diff --git a/frontend/components/CellInput/lezer_template.js b/frontend/components/CellInput/lezer_template.js
index f4f18687a5..9be4f144d0 100644
--- a/frontend/components/CellInput/lezer_template.js
+++ b/frontend/components/CellInput/lezer_template.js
@@ -12,6 +12,8 @@ export let julia_to_ast = (julia_code) => {
     return /** @type {any} */ (julia_andrey().language.parser.parse(julia_code).topNode.firstChild)
 }
 
+// When you get errors while creating the templates (stuff related to substitutions),
+// turn this on, and you will get a lot of info you can debug with!
 const TEMPLATE_CREATION_VERBOSE = false
 
 /**
@@ -384,70 +386,97 @@ let substitutions_to_template = (ast, substitutions) => {
     }
 }
 
+let node_to_explorable = (cursor) => {
+    if ("cursor" in cursor) {
+        cursor = cursor.cursor()
+    }
+
+    let children = []
+    if (cursor.firstChild()) {
+        try {
+            do {
+                children.push(node_to_explorable(cursor))
+            } while (cursor.nextSibling())
+        } finally {
+            cursor.parent()
+        }
+    }
+    return {
+        name: cursor.name,
+        from: cursor.from,
+        to: cursor.to,
+        children,
+    }
+}
+
 /**
  * @param {Templatable} julia_code_object
  * @returns {TemplateGenerator}
  */
 export let to_template = function* (julia_code_object) {
-    TEMPLATE_CREATION_VERBOSE && console.log(`to_template(`, julia_code_object, `)`)
-    if (julia_code_object instanceof JuliaCodeObject) {
-        let julia_code_to_parse = ""
-
-        let subsitions = []
-        for (let [string_part, substitution] of lodash.zip(julia_code_object.template, julia_code_object.substitutions)) {
-            julia_code_to_parse += string_part
-
-            if (substitution) {
-                let substitution_generator = to_template(substitution)
+    TEMPLATE_CREATION_VERBOSE && console.group(`to_template(`, typeof julia_code_object === "function" ? julia_code_object.name + "()" : julia_code_object, `)`)
+    try {
+        if (julia_code_object instanceof JuliaCodeObject) {
+            let julia_code_to_parse = ""
 
-                let substitution_code = intermediate_value(substitution_generator.next())
+            let subsitions = []
+            for (let [string_part, substitution] of lodash.zip(julia_code_object.template, julia_code_object.substitutions)) {
+                julia_code_to_parse += string_part
 
-                subsitions.push({
-                    from: julia_code_to_parse.length,
-                    to: julia_code_to_parse.length + substitution_code.length,
-                    generator: substitution_generator,
-                })
-                julia_code_to_parse += substitution_code
-            }
-        }
+                if (substitution) {
+                    let substitution_generator = to_template(substitution)
 
-        let template_node = yield julia_code_to_parse
+                    let substitution_code = intermediate_value(substitution_generator.next())
 
-        let substitution_with_proper_position = subsitions.map((substitution) => {
-            return {
-                from: substitution.from + template_node.from,
-                to: substitution.to + template_node.from,
-                generator: substitution.generator,
-                used: false,
+                    subsitions.push({
+                        from: julia_code_to_parse.length,
+                        to: julia_code_to_parse.length + substitution_code.length,
+                        generator: substitution_generator,
+                    })
+                    julia_code_to_parse += substitution_code
+                }
             }
-        })
 
-        if (TEMPLATE_CREATION_VERBOSE) {
-            console.log(`julia_code_to_parse:`, julia_code_to_parse)
-            console.log(`template_node:`, template_node)
-            console.log(`subsitions:`, subsitions)
-            console.log(`substitution_with_proper_position:`, substitution_with_proper_position)
-        }
+            let template_node = yield julia_code_to_parse
 
-        let result = substitutions_to_template(template_node.node, substitution_with_proper_position)
-        let unused_substitutions = substitution_with_proper_position
-            .filter((substitution) => !substitution.used)
-            .map((x) => {
+            let substitution_with_proper_position = subsitions.map((substitution) => {
                 return {
-                    text: julia_code_to_parse.slice(x.from, x.to),
-                    from: x.from,
-                    to: x.to,
+                    from: substitution.from + template_node.from,
+                    to: substitution.to + template_node.from,
+                    generator: substitution.generator,
+                    used: false,
                 }
             })
-        if (unused_substitutions.length > 0) {
-            throw new Error(`Some substitutions not applied, this means it couldn't be matched to a AST position:`, unused_substitutions)
+
+            if (TEMPLATE_CREATION_VERBOSE) {
+                console.log(`julia_code_to_parse:`, julia_code_to_parse)
+                console.log(`template_node:`, node_to_explorable(template_node.node.cursor()))
+                console.log(`subsitions:`, subsitions)
+                console.log(`substitution_with_proper_position:`, substitution_with_proper_position)
+            }
+
+            let result = substitutions_to_template(template_node.node, substitution_with_proper_position)
+            let unused_substitutions = substitution_with_proper_position
+                .filter((substitution) => !substitution.used)
+                .map((x) => {
+                    return {
+                        text: julia_code_to_parse.slice(x.from, x.to),
+                        from: x.from,
+                        to: x.to,
+                    }
+                })
+            if (unused_substitutions.length > 0) {
+                throw new Error(`Some substitutions not applied, this means it couldn't be matched to a AST position: ${JSON.stringify(unused_substitutions)}`)
+            }
+            return result
+        } else if (typeof julia_code_object === "function") {
+            return yield* julia_code_object()
+        } else {
+            console.log(`julia_code_object:`, julia_code_object)
+            throw new Error("Unknown substition type")
         }
-        return result
-    } else if (typeof julia_code_object === "function") {
-        return yield* julia_code_object()
-    } else {
-        console.log(`julia_code_object:`, julia_code_object)
-        throw new Error("Unknown substition type")
+    } finally {
+        TEMPLATE_CREATION_VERBOSE && console.groupEnd()
     }
 }
 
@@ -517,7 +546,7 @@ export let template = weak_memo1((julia_code_object) => {
             if ("node" in template_description && template_description.node.name !== haystack_cursor.name) return
             if (haystack_cursor.type.isError) return null
 
-            if ("cursor" in haystack_cursor) haystack_cursor = haystack_cursor.cursor
+            if ("cursor" in haystack_cursor) haystack_cursor = haystack_cursor.cursor()
 
             let matches = /** @type {{ [key: string]: MatchResult }} */ ({})
 
@@ -667,6 +696,13 @@ export const t = /** @type {const} */ ({
                     try {
                         let matches_nodes = []
                         while (true) {
+                            // So, big oof here, but I think we shouldn't match error nodes in many
+                            if (cursor.type.isError) {
+                                cursor.prevSibling()
+                                verbose && console.log("✋ I don't do errors - many")
+                                return true // Still we did finish, lets just hope someone else cares about the error
+                            }
+
                             let local_match = {}
                             let did_match = match_template(cursor, sub_template, local_match, verbose)
                             if (!did_match) {
@@ -874,7 +910,7 @@ export let take_little_piece_of_template = weak_memo((template, meta_template) =
                     verbose && console.log(`❌ Short circuiting because haystack(${haystack_cursor.name}) is an error`)
                     return false
                 }
-                if ("cursor" in haystack_cursor) haystack_cursor = haystack_cursor.cursor
+                if ("cursor" in haystack_cursor) haystack_cursor = haystack_cursor.cursor()
 
                 // Should possible parents be all-or-nothing?
                 // So either it matches all the possible parents, or it matches none?
diff --git a/frontend/components/CellInput/mixedParsers.js b/frontend/components/CellInput/mixedParsers.js
index b2434945da..da7e00ae7d 100644
--- a/frontend/components/CellInput/mixedParsers.js
+++ b/frontend/components/CellInput/mixedParsers.js
@@ -17,6 +17,7 @@ import {
 } from "../../imports/CodemirrorPlutoSetup.js"
 
 const htmlParser = htmlLanguage.parser
+// @ts-ignore
 const mdParserExt = markdownLanguage.parser.configure(parseCode({ htmlParser }))
 const postgresParser = PostgreSQL.language.parser
 const sqlLang = sql({ dialect: PostgreSQL })
@@ -55,20 +56,26 @@ const MD_TAGS = ["md", "mermaid", "cm", "markdown", "mdx", "mdl", "markdownliter
 const overlayHack = (overlay, input) => {
     return overlay.flatMap(({ from, to }) => {
         const text = input.read(from, to)
-        const newlines = [...text.matchAll(/\\n/g)].map(({ index }) => ({ from: from + index, to: from + index + 2 }))
-        const escdollars = [...text.matchAll(/\\\$/g)].map(({ index }) => ({ from: from + index, to: from + index + 1 }))
-        const escjuliadollars = [...text.matchAll(/[^\\]\$/g)].map(({ index }) => ({ from: from + index, to: from + index + 2 }))
-        const extraOverlaysNegatives = _.sortBy([...newlines, ...escdollars, ...escjuliadollars], "from")
+        // const newlines = [...text.matchAll(/\\n/g)].map(({ index }) => ({ from: from + index, to: from + index + 2 }))
+        // const escdollars = [...text.matchAll(/\\\$/g)].map(({ index }) => ({ from: from + index, to: from + index + 1 }))
+        // const escjuliadollars = [...text.matchAll(/[^\\]\$/g)].map(({ index }) => ({ from: from + index, to: from + index + 2 }))
+        // const extraOverlaysNegatives = _.sortBy([...newlines, ...escdollars, ...escjuliadollars], "from")
+
+        // For simplicity I removed the newlines stuff and just removed the \$ from the overlays
+        // Curious to see edge cases that this misses - DRAL
 
         const result = []
-        let f = from,
-            t = to
-        extraOverlaysNegatives.forEach(({ from: newFrom, to: newTo }) => {
-            result.push({ from: f, to: newFrom })
-            f = newTo
-        })
-        result.push({ from: f, to: t })
-        // console.log(result, { from, to }, result.map(({ from, to }) => input.read(from, to)).join(" - "))
+        let last_content_start = from
+        for (let { index: relative_escape_start } of text.matchAll(/\\\$/g)) {
+            let next_escape_start = from + relative_escape_start
+            if (last_content_start !== next_escape_start) {
+                result.push({ from: last_content_start, to: next_escape_start })
+            }
+            last_content_start = next_escape_start + 1
+        }
+        if (last_content_start !== to) {
+            result.push({ from: last_content_start, to: to })
+        }
         return result
     })
 }
@@ -90,23 +97,25 @@ const juliaWrapper = parseMixed((node, input) => {
     let is_tripple_string = node.name === "TripleString" || node.name === "TripleStringWithoutInterpolation"
 
     const offset = is_tripple_string ? 3 : 1
-    const defaultOverlay = [{ from: node.from + offset, to: Math.min(node.to - offset, input.length) }]
+    const string_content_from = node.from + offset
+    const string_content_to = Math.min(node.to - offset, input.length)
 
-    if (defaultOverlay[0].from >= defaultOverlay[0].to) {
+    if (string_content_from >= string_content_to) {
         return null
     }
 
-    //Looking for tag OR MacroIdentifier
+    // Looking for tag OR MacroIdentifier
     const tagNode = node.node?.prevSibling || node.node?.parent?.prevSibling
-    if (!tagNode) {
+    if (tagNode == null || (tagNode.name !== "MacroIdentifier" && tagNode.name !== "Prefix")) {
         // If you can't find a tag node, something is broken in the julia syntax,
         // so parse it as Julia. Probably wrong interpolation!
         return null
     }
-    const tag = input.read(tagNode.from, tagNode.to)
-    let parser,
-        overlay = []
 
+    const is_macro = tagNode.name === "MacroIdentifier"
+
+    const tag = input.read(tagNode.from, tagNode.to)
+    let parser = null
     if (tag === "@htl" || tag === "html") {
         parser = htmlParser
     } else if (MD_TAGS.includes(tag)) {
@@ -121,41 +130,36 @@ const juliaWrapper = parseMixed((node, input) => {
         return null
     }
 
-    let from = node.from
-    for (let child = node.node.firstChild; overlay !== defaultOverlay && child !== null && child.to <= node.to; child = child?.nextSibling) {
-        overlay.push({ from, to: child.from })
-        from = child.to
-    }
-
-    // If overlay is not the default and we haven't found anything (=interpolation) inside, use the default
-    if (overlay.length === 0 || node.node.firstChild === null) {
-        overlay = defaultOverlay
-    } else if (
-        // If the overlay is the default, this fix is not needed, as it's already adjusted for limits
-        overlay !== defaultOverlay
-    ) {
-        overlay.push({ from, to: node.to })
-        // Remove quotes from strings
-        if (node.type.name === "TripleString") {
-            // Triple Quote String
-            overlay[0].from += 3
-            overlay[overlay.length - 1].to -= 3
-        } else {
-            // Single quote string
-            overlay[0].from += 1
-            overlay[overlay.length - 1].to -= 1
+    let overlay = []
+    if (node.node.firstChild != null) {
+        let last_content_start = string_content_from
+        let child = node.node.firstChild.cursor()
+
+        do {
+            if (last_content_start !== child.from) {
+                overlay.push({ from: last_content_start, to: child.from })
+            }
+            last_content_start = child.to
+        } while (child.nextSibling())
+        if (last_content_start < string_content_to) {
+            overlay.push({ from: last_content_start, to: string_content_to })
         }
+    } else {
+        overlay = [{ from: string_content_from, to: string_content_to }]
     }
 
-    // If javascript or markdown or htl, we want to unescape some characters
-    // Until the parser is smarter, we remove the selection from the syntax highlighting overlay.
-    if (["@htl", "@javascript", ...MD_TAGS].includes(tag)) {
+    // If it is a macro, thus supports interpolations (prefixed strings only have faux-interpolations) but not raw strings (`\n` will be a newline, for the character `\n` you need to do `\\n`)
+    // we need to remove `\$` (which should just be `$` in the javascript)
+    if (is_macro) {
         overlay = overlayHack(overlay, input)
     }
 
     // No overlays for markdown yet
+    // (They sometimes work, but sometimes also randomly crash when adding an interpolation
+    //  I guess this has something to do with the fact that markdown isn't parsed with lezer,
+    //  but has some custom made thing that emulates lezer.)
     if ([...MD_TAGS].includes(tag)) {
-        return { parser, overlay: defaultOverlay }
+        return { parser, overlay: [{ from: string_content_from, to: string_content_to }] }
     }
 
     return { parser, overlay }
diff --git a/frontend/components/CellInput/scopestate_statefield.js b/frontend/components/CellInput/scopestate_statefield.js
index fbeeb55319..29ac57cc35 100644
--- a/frontend/components/CellInput/scopestate_statefield.js
+++ b/frontend/components/CellInput/scopestate_statefield.js
@@ -118,7 +118,7 @@ let match_function_call_named_argument = make_beautiful_specific_matcher((x) =>
  * @param {TreeCursor | SyntaxNode} cursor
  * @param {any} doc
  * @param {ScopeState} scopestate
- * @param {boolean?} verbose
+ * @param {boolean} [verbose]
  * @returns {ScopeState}
  */
 let explorer_function_definition_argument = (cursor, doc, scopestate, verbose = false) => {
@@ -140,7 +140,7 @@ let explorer_function_definition_argument = (cursor, doc, scopestate, verbose =
         // `function f(x = 10)` => ["x"]
         let { name, value } = match
         scopestate = explore_pattern(name, doc, scopestate, value.to, verbose)
-        scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+        scopestate = explore_variable_usage(value.cursor(), doc, scopestate, verbose)
         return scopestate
     } else if (
         (match = match_function_definition_argument(cursor)`${t.as("name")}::${t.as("type")}`) ??
@@ -150,7 +150,7 @@ let explorer_function_definition_argument = (cursor, doc, scopestate, verbose =
     ) {
         let { name, type } = match
         if (name) scopestate = explore_pattern(name, doc, scopestate, type.to, verbose)
-        if (type) scopestate = explore_variable_usage(type.cursor, doc, scopestate, verbose)
+        if (type) scopestate = explore_variable_usage(type.cursor(), doc, scopestate, verbose)
         return scopestate
     } else {
         verbose && console.warn("UNKNOWN FUNCTION DEFINITION ARGUMENT:", cursor.toString())
@@ -163,64 +163,73 @@ let explorer_function_definition_argument = (cursor, doc, scopestate, verbose =
  * @param {any} doc
  * @param {ScopeState} scopestate
  * @param {number?} valid_from
- * @param {boolean?} verbose
+ * @param {boolean} [verbose]
  * @returns {ScopeState}
  */
 let explore_pattern = (node, doc, scopestate, valid_from = null, verbose = false) => {
     let match = null
 
-    if ((match = match_assignee(node)`${t.Identifier}`)) {
-        return scopestate_add_definition(scopestate, doc, node, valid_from)
-    } else if ((match = match_assignee(node)`${t.as("object")}::${t.as("type")}`)) {
-        let { object, type } = match
-        scopestate = explore_variable_usage(type.cursor, doc, scopestate, verbose)
-        scopestate = scopestate_add_definition(scopestate, doc, object)
-        return scopestate
-    } else if ((match = match_assignee(node)`${t.as("subject")}...`)) {
-        // `x... = [1,2,3]` => ["x"]
-        return explore_pattern(match.subject, doc, scopestate, valid_from, verbose)
-    } else if ((match = match_function_definition_argument(node)`${t.as("name")} = ${t.as("value")}`)) {
-        let { name, value } = match
-        scopestate = explore_pattern(name, doc, scopestate, value.from, verbose)
-        scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
-        return scopestate
-    } else if ((match = match_assignee(node)`${t.as("first")}, ${t.many("rest")}`) ?? (match = match_assignee(node)`(${t.as("first")}, ${t.many("rest")})`)) {
-        // console.warn("Tuple assignment... but the bad one")
-        for (let { node: name } of [{ node: match.first }, ...(match.rest ?? [])]) {
-            scopestate = explore_pattern(name.cursor, doc, scopestate, valid_from, verbose)
-        }
-        return scopestate
-    } else if ((match = match_julia(node)`${t.as("prefix")}${t.as("string", t.String)}`)) {
-        // This one is also a bit enigmatic, but `t.String` renders in the template as `"..."`,
-        // so the template with match things that look like `prefix"..."`
-        let { prefix, string } = match
-        let prefix_string = doc.sliceString(prefix.from, prefix.to)
-
-        if (prefix_string === "var") {
-            let name = doc.sliceString(string.from + 1, string.to - 1)
-            if (name.length !== 0) {
-                scopestate.definitions.set(name, {
-                    from: node.from,
-                    to: node.to,
-                    valid_from: node.to,
-                })
+    verbose && console.group("Explorering pattern:", node.toString())
+    try {
+        if ((match = match_assignee(node)`${t.Identifier}`)) {
+            verbose && console.log("It's an identifier, adding it to the scope")
+            return scopestate_add_definition(scopestate, doc, node, valid_from)
+        } else if ((match = match_assignee(node)`${t.as("object")}::${t.as("type")}`)) {
+            let { object, type } = match
+            scopestate = explore_variable_usage(type.cursor(), doc, scopestate, verbose)
+            scopestate = scopestate_add_definition(scopestate, doc, object)
+            return scopestate
+        } else if ((match = match_assignee(node)`${t.as("subject")}...`)) {
+            // `x... = [1,2,3]` => ["x"]
+            return explore_pattern(match.subject, doc, scopestate, valid_from, verbose)
+        } else if ((match = match_function_definition_argument(node)`${t.as("name")} = ${t.as("value")}`)) {
+            let { name, value } = match
+            scopestate = explore_pattern(name, doc, scopestate, value.from, verbose)
+            scopestate = explore_variable_usage(value.cursor(), doc, scopestate, verbose)
+            return scopestate
+        } else if (
+            (match = match_assignee(node)`${t.as("first")}, ${t.many("rest")}`) ??
+            (match = match_assignee(node)`(${t.as("first")}, ${t.many("rest")})`)
+        ) {
+            // console.warn("Tuple assignment... but the bad one")
+            for (let { node: name } of [{ node: match.first }, ...(match.rest ?? [])]) {
+                scopestate = explore_pattern(name.cursor(), doc, scopestate, valid_from, verbose)
             }
+            return scopestate
+        } else if ((match = match_julia(node)`${t.as("prefix")}${t.as("string", t.String)}`)) {
+            // This one is also a bit enigmatic, but `t.String` renders in the template as `"..."`,
+            // so the template with match things that look like `prefix"..."`
+            let { prefix, string } = match
+            let prefix_string = doc.sliceString(prefix.from, prefix.to)
+
+            if (prefix_string === "var") {
+                let name = doc.sliceString(string.from + 1, string.to - 1)
+                if (name.length !== 0) {
+                    scopestate.definitions.set(name, {
+                        from: node.from,
+                        to: node.to,
+                        valid_from: node.to,
+                    })
+                }
+            } else {
+                scopestate = explore_variable_usage("cursor" in node ? node.cursor() : node, doc, scopestate, verbose)
+            }
+            return scopestate
+        } else if ((match = match_assignee(node)`${t.as("object")}[${t.as("property")}]`)) {
+            let { object, property } = match
+            scopestate = explore_variable_usage(object.cursor(), doc, scopestate, verbose)
+            if (property) scopestate = explore_variable_usage(property.cursor(), doc, scopestate, verbose)
+            return scopestate
+        } else if ((match = match_assignee(node)`${t.as("object")}.${t.as("property")}`)) {
+            let { object, property } = match
+            scopestate = explore_variable_usage(object.cursor(), doc, scopestate, verbose)
+            return scopestate
         } else {
-            scopestate = explore_variable_usage("cursor" in node ? node.cursor : node, doc, scopestate, verbose)
+            verbose && console.warn("UNKNOWN PATTERN:", node.toString(), doc.sliceString(node.from, node.to))
+            return scopestate
         }
-        return scopestate
-    } else if ((match = match_assignee(node)`${t.as("object")}[${t.as("property")}]`)) {
-        let { object, property } = match
-        scopestate = explore_variable_usage(object.cursor, doc, scopestate, verbose)
-        if (property) scopestate = explore_variable_usage(property.cursor, doc, scopestate, verbose)
-        return scopestate
-    } else if ((match = match_assignee(node)`${t.as("object")}.${t.as("property")}`)) {
-        let { object, property } = match
-        scopestate = explore_variable_usage(object.cursor, doc, scopestate, verbose)
-        return scopestate
-    } else {
-        verbose && console.warn("UNKNOWN PATTERN:", node.toString(), doc.sliceString(node.from, node.to))
-        return scopestate
+    } finally {
+        verbose && console.groupEnd()
     }
 }
 
@@ -260,22 +269,22 @@ let explore_definition = function (cursor, doc, scopestate, verbose = false) {
         let { subject, parameters } = match
         let outer = fresh_scope()
         if (subject) {
-            let subject_explored = explore_definition(subject.cursor, doc, scopestate)
+            let subject_explored = explore_definition(subject.cursor(), doc, scopestate)
             outer = subject_explored.outer
             scopestate = subject_explored.inner
         }
         for (let { node: parameter } of parameters) {
             // Yes, when there is a type parameter in the definition itself (so not after `::`),
             // it implies a new type parameter being implicitly instanciated.
-            let { inner: parameter_inner } = explore_definition(parameter.cursor, doc, scopestate)
+            let { inner: parameter_inner } = explore_definition(parameter.cursor(), doc, scopestate)
             scopestate = parameter_inner
         }
         return { inner: scopestate, outer: outer }
     } else if ((match = match_julia(cursor)`${t.as("subject")} <: ${t.maybe(t.as("type"))}`)) {
         let { subject, type } = match
         let outer = fresh_scope()
-        if (subject) ({ outer, inner: scopestate } = explore_definition(subject.cursor, doc, scopestate))
-        if (type) scopestate = explore_variable_usage(type.cursor, doc, scopestate)
+        if (subject) ({ outer, inner: scopestate } = explore_definition(subject.cursor(), doc, scopestate))
+        if (type) scopestate = explore_variable_usage(type.cursor(), doc, scopestate)
         return { inner: scopestate, outer: outer }
     } else {
         verbose && console.warn(`Unknown thing in definition: "${doc.sliceString(cursor.from, cursor.to)}", "${cursor.toString()}"`)
@@ -302,7 +311,7 @@ let explore_macro_identifier = (cursor, doc, scopestate, verbose = false) => {
         let name = doc.sliceString(macro.from, macro.to)
         scopestate.usages.push({
             usage: macro,
-            definition: scopestate.definitions.get(name),
+            definition: scopestate.definitions.get(name) ?? null,
             name: name,
         })
         return scopestate
@@ -311,7 +320,7 @@ let explore_macro_identifier = (cursor, doc, scopestate, verbose = false) => {
         let name = doc.sliceString(object.from, object.to)
         scopestate.usages.push({
             usage: object,
-            definition: scopestate.definitions.get(name),
+            definition: scopestate.definitions.get(name) ?? null,
             name: name,
         })
         return scopestate
@@ -320,12 +329,13 @@ let explore_macro_identifier = (cursor, doc, scopestate, verbose = false) => {
         let name = doc.sliceString(object.from, object.to)
         scopestate.usages.push({
             usage: object,
-            definition: scopestate.definitions.get(name),
+            definition: scopestate.definitions.get(name) ?? null,
             name: name,
         })
         return scopestate
     } else {
         verbose && console.warn("Mwep mweeeep", cursor.toString())
+        return scopestate
     }
 }
 
@@ -364,10 +374,10 @@ let lower_scope = (scopestate) => {
  *
  * @param {ScopeState} nested_scope
  * @param {ScopeState} scopestate
- * @param {number} nested_scope_validity
+ * @param {number} [nested_scope_validity]
  * @returns {ScopeState}
  */
-let raise_scope = (nested_scope, scopestate, nested_scope_validity = null) => {
+let raise_scope = (nested_scope, scopestate, nested_scope_validity = undefined) => {
     return {
         usages: [...scopestate.usages, ...nested_scope.usages],
         definitions: scopestate.definitions,
@@ -411,6 +421,7 @@ let scopestate_add_definition = (scopestate, doc, node, valid_from = null) => {
  * @param {TreeCursor} cursor
  * @param {any} doc
  * @param {ScopeState} scopestate
+ * @param {boolean} [verbose]
  * @returns {ScopeState}
  */
 export let explore_variable_usage = (
@@ -425,7 +436,7 @@ export let explore_variable_usage = (
 ) => {
     if ("cursor" in cursor) {
         // console.trace("`explore_variable_usage()` called with a SyntaxNode, not a TreeCursor")
-        cursor = cursor["cursor"]
+        cursor = cursor["cursor"]()
     }
 
     let start_node = null
@@ -493,7 +504,7 @@ export let explore_variable_usage = (
                     from: cursor.from,
                     to: cursor.to,
                 },
-                definition: scopestate.definitions.get(name),
+                definition: scopestate.definitions.get(name) ?? null,
             })
             return scopestate
         } else if ((match = match_julia(cursor)`:${t.any}`)) {
@@ -507,12 +518,13 @@ export let explore_variable_usage = (
             return scopestate
         } else if ((match = match_julia(cursor)`${t.as("object")}.${t.as("property")}`)) {
             let { object, property } = match
-            if (object) scopestate = explore_variable_usage(object.cursor, doc, scopestate, verbose)
+            if (object) scopestate = explore_variable_usage(object.cursor(), doc, scopestate, verbose)
             return scopestate
         } else if ((match = match_julia(cursor)`${t.as("assignee")} = ${t.maybe(t.as("value"))}`)) {
             let { assignee, value } = match
-            if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
-            if (assignee) scopestate = explore_pattern(assignee.cursor, doc, scopestate, value?.to ?? null, verbose)
+            console.log("Assigned!")
+            if (value) scopestate = explore_variable_usage(value.cursor(), doc, scopestate, verbose)
+            if (assignee) scopestate = explore_pattern(assignee.cursor(), doc, scopestate, value?.to ?? null, verbose)
             return scopestate
         } else if (
             (match = match_julia(cursor)`
@@ -522,14 +534,14 @@ export let explore_variable_usage = (
             `)
         ) {
             let { macro, args = [], do_args, do_expressions } = match
-            if (macro) explore_macro_identifier(macro.cursor, doc, scopestate, verbose)
+            if (macro) explore_macro_identifier(macro.cursor(), doc, scopestate, verbose)
 
             for (let { node: arg } of args) {
                 if ((match = match_function_call_argument(arg)`${t.as("name")} = ${t.as("value")}`)) {
                     let { name, value } = match
-                    if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+                    if (value) scopestate = explore_variable_usage(value.cursor(), doc, scopestate, verbose)
                 } else {
-                    scopestate = explore_variable_usage(arg.cursor, doc, scopestate, verbose)
+                    scopestate = explore_variable_usage(arg.cursor(), doc, scopestate, verbose)
                 }
             }
 
@@ -556,7 +568,7 @@ export let explore_variable_usage = (
                 }
 
                 for (let { node: expression } of do_expressions) {
-                    inner_scope = explore_variable_usage(expression.cursor, doc, inner_scope, verbose)
+                    inner_scope = explore_variable_usage(expression.cursor(), doc, inner_scope, verbose)
                 }
                 return raise_scope(inner_scope, scopestate, cursor.to)
             }
@@ -564,10 +576,10 @@ export let explore_variable_usage = (
             return scopestate
         } else if ((match = match_julia(cursor)`${t.as("macro", t.anything_that_fits(jl`@macro`))} ${t.many("args")}`)) {
             let { macro, args = [] } = match
-            if (macro) explore_macro_identifier(macro.cursor, doc, scopestate, verbose)
+            if (macro) explore_macro_identifier(macro.cursor(), doc, scopestate, verbose)
 
             for (let { node: arg } of args) {
-                scopestate = explore_variable_usage(arg.cursor, doc, scopestate, verbose)
+                scopestate = explore_variable_usage(arg.cursor(), doc, scopestate, verbose)
             }
             return scopestate
         } else if (
@@ -588,7 +600,7 @@ export let explore_variable_usage = (
             let inner_scope = lower_scope(scopestate)
             let outer_scope = fresh_scope()
 
-            if (defined_as) ({ inner: inner_scope, outer: outer_scope } = explore_definition(defined_as.cursor, doc, inner_scope))
+            if (defined_as) ({ inner: inner_scope, outer: outer_scope } = explore_definition(defined_as.cursor(), doc, inner_scope))
 
             // Struct body
             for (let { node: expression } of expressions) {
@@ -597,16 +609,16 @@ export let explore_variable_usage = (
                 } else if ((match = match_julia(expression)`${t.as("subject")}::${t.as("type")}`)) {
                     // We're in X::Y, and Y is a reference
                     let { subject, type } = match
-                    inner_scope = explore_variable_usage(type.cursor, doc, inner_scope, verbose)
+                    inner_scope = explore_variable_usage(type.cursor(), doc, inner_scope, verbose)
                 } else if ((match = match_julia(expression)`${t.as("assignee")} = ${t.as("value")}`)) {
                     let { assignee, value } = match
 
                     // Yeah... we do the same `a::G` check again
                     if ((match = match_julia(assignee)`${t.as("subject")}::${t.as("type")}`)) {
                         let { subject, type } = match
-                        inner_scope = explore_variable_usage(type.cursor, doc, inner_scope, verbose)
+                        inner_scope = explore_variable_usage(type.cursor(), doc, inner_scope, verbose)
                     }
-                    inner_scope = explore_variable_usage(value.cursor, doc, inner_scope, verbose)
+                    inner_scope = explore_variable_usage(value.cursor(), doc, inner_scope, verbose)
                 }
             }
 
@@ -616,7 +628,7 @@ export let explore_variable_usage = (
         } else if ((match = match_julia(cursor)`abstract type ${t.as("name")} end`)) {
             let { name } = match
             if (name) {
-                let { outer } = explore_definition(name.cursor, doc, scopestate)
+                let { outer } = explore_definition(name.cursor(), doc, scopestate)
                 scopestate = merge_scope_state(scopestate, outer)
             }
             return scopestate
@@ -640,7 +652,7 @@ export let explore_variable_usage = (
 
             let module_scope = fresh_scope()
             for (let { node: expression } of expressions) {
-                module_scope = explore_variable_usage(expression.cursor, doc, module_scope)
+                module_scope = explore_variable_usage(expression.cursor(), doc, module_scope)
             }
             // We still merge the module scopestate with the global scopestate, but only the usages that don't escape.
             // (Later we can have also shadowed definitions for the dimming of unused variables)
@@ -651,7 +663,7 @@ export let explore_variable_usage = (
             })
 
             for (let { node: expression } of expressions) {
-                scopestate = explore_variable_usage(expression.cursor, doc, scopestate)
+                scopestate = explore_variable_usage(expression.cursor(), doc, scopestate)
             }
             return scopestate
         } else if ((match = match_julia(cursor)`${t.as("prefix")}${t.as("string", t.String)}`)) {
@@ -687,7 +699,7 @@ export let explore_variable_usage = (
             return scopestate
         } else if ((match = match_julia(cursor)`${t.Number}${t.as("unit")}`)) {
             // This isn't that useful, just wanted to test (and show off) the template
-            return explore_variable_usage(match.unit.cursor, doc, scopestate, verbose)
+            return explore_variable_usage(match.unit.cursor(), doc, scopestate, verbose)
         } else if (
             (match = match_julia(cursor)`import ${t.any}: ${t.many("specifiers")}`) ??
             (match = match_julia(cursor)`using ${t.any}: ${t.many("specifiers")}`)
@@ -702,8 +714,10 @@ export let explore_variable_usage = (
                 } else if ((match = match_selected_import_specifier(specifier)`${t.as("name", t.Identifier)}`)) {
                     let { name } = match
                     scopestate = scopestate_add_definition(scopestate, doc, name)
+                } else if ((match = match_selected_import_specifier(specifier)`@${t.any}`)) {
+                    scopestate = scopestate_add_definition(scopestate, doc, specifier)
                 } else {
-                    verbose && console.warn("Hmmmm, I don't know what to do with this selected import specifier:", specifier)
+                    verbose && console.warn("Hmmmm, I don't know what to do with this selected import specifier:", specifier.toString())
                 }
             }
             return scopestate
@@ -760,7 +774,7 @@ export let explore_variable_usage = (
                     (match = for_loop_binding_match_julia(binding)`${t.as("name")} = ${t.as("range")}`)
                 ) {
                     let { name, range } = match
-                    if (range) inner_scope = explore_variable_usage(range.cursor, doc, inner_scope, verbose)
+                    if (range) inner_scope = explore_variable_usage(range.cursor(), doc, inner_scope, verbose)
                     if (name) inner_scope = explore_pattern(name, doc, inner_scope, range?.to ?? null, verbose)
                 } else {
                     verbose && console.warn("Unrecognized for loop binding", binding.toString())
@@ -768,7 +782,7 @@ export let explore_variable_usage = (
             }
 
             for (let { node: expression } of expressions) {
-                inner_scope = explore_variable_usage(expression.cursor, doc, inner_scope, verbose)
+                inner_scope = explore_variable_usage(expression.cursor(), doc, inner_scope, verbose)
             }
 
             return raise_scope(inner_scope, scopestate, cursor.to)
@@ -784,7 +798,7 @@ export let explore_variable_usage = (
         ) {
             let { callee, args = [], do_args = [], do_expressions = [] } = match
 
-            scopestate = explore_variable_usage(callee.cursor, doc, scopestate, verbose)
+            scopestate = explore_variable_usage(callee.cursor(), doc, scopestate, verbose)
 
             for (let { node: arg } of args) {
                 let match = null
@@ -795,14 +809,14 @@ export let explore_variable_usage = (
                         let match = null
                         if ((match = match_function_call_named_argument(named_arg)`${t.as("name")} = ${t.as("value")}`)) {
                             let { name, value } = match
-                            scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+                            scopestate = explore_variable_usage(value.cursor(), doc, scopestate, verbose)
                         } else {
-                            scopestate = explore_variable_usage(named_arg.cursor, doc, scopestate, verbose)
+                            scopestate = explore_variable_usage(named_arg.cursor(), doc, scopestate, verbose)
                         }
                     }
                 } else if ((match = match_function_call_argument(arg)`${t.as("name")} = ${t.as("value")}`)) {
                     let { name, value } = match
-                    if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+                    if (value) scopestate = explore_variable_usage(value.cursor(), doc, scopestate, verbose)
                 } else if ((match = match_function_call_argument(arg)`${t.as("result")} ${t.many("clauses", t.anything_that_fits(jl`for x = y`))}`)) {
                     let { result, clauses } = match
                     let nested_scope = lower_scope(scopestate)
@@ -818,21 +832,21 @@ export let explore_variable_usage = (
                         ) {
                             let { variable, value } = match
 
-                            if (value) nested_scope = explore_variable_usage(value.cursor, doc, nested_scope, verbose)
+                            if (value) nested_scope = explore_variable_usage(value.cursor(), doc, nested_scope, verbose)
                             if (variable) nested_scope = explore_pattern(variable, doc, nested_scope)
                         } else if ((match = match_for_binding(for_binding)`if ${t.maybe(t.as("if"))}`)) {
                             let { if: node } = match
-                            if (node) nested_scope = explore_variable_usage(node.cursor, doc, nested_scope, verbose)
+                            if (node) nested_scope = explore_variable_usage(node.cursor(), doc, nested_scope, verbose)
                         } else {
                             verbose && console.log("Hmmm, can't parse for binding", for_binding)
                         }
                     }
 
-                    nested_scope = explore_variable_usage(result.cursor, doc, nested_scope, verbose)
+                    nested_scope = explore_variable_usage(result.cursor(), doc, nested_scope, verbose)
 
                     return raise_scope(nested_scope, scopestate, cursor.to)
                 } else {
-                    scopestate = explore_variable_usage(arg.cursor, doc, scopestate, verbose)
+                    scopestate = explore_variable_usage(arg.cursor(), doc, scopestate, verbose)
                 }
             }
 
@@ -842,7 +856,7 @@ export let explore_variable_usage = (
                 inner_scope = explorer_function_definition_argument(arg, doc, inner_scope)
             }
             for (let { node: expression } of do_expressions) {
-                inner_scope = explore_variable_usage(expression.cursor, doc, inner_scope, verbose)
+                inner_scope = explore_variable_usage(expression.cursor(), doc, inner_scope, verbose)
             }
             return raise_scope(inner_scope, scopestate, cursor.to)
         } else if ((match = match_julia(cursor)`(${t.many("tuple_elements")},)`)) {
@@ -861,9 +875,9 @@ export let explore_variable_usage = (
                     let match = null
                     if ((match = match_tuple_element(cursor)`${t.as("name")} = ${t.as("value")}`)) {
                         let { name, value } = match
-                        if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+                        if (value) scopestate = explore_variable_usage(value.cursor(), doc, scopestate, verbose)
                     } else {
-                        scopestate = explore_variable_usage(element.cursor, doc, scopestate, verbose)
+                        scopestate = explore_variable_usage(element.cursor(), doc, scopestate, verbose)
                     }
                 }
             } else {
@@ -873,10 +887,10 @@ export let explore_variable_usage = (
                     if ((match = match_tuple_element(cursor)`${t.as("name")} = ${t.as("value")}`)) {
                         // 🚨 actually an assignment 🚨
                         let { name, value } = match
-                        if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+                        if (value) scopestate = explore_variable_usage(value.cursor(), doc, scopestate, verbose)
                         if (name) scopestate = scopestate_add_definition(scopestate, doc, name, value?.to ?? null)
                     } else {
-                        scopestate = explore_variable_usage(element.cursor, doc, scopestate, verbose)
+                        scopestate = explore_variable_usage(element.cursor(), doc, scopestate, verbose)
                     }
                 }
             }
@@ -961,13 +975,13 @@ export let explore_variable_usage = (
             }
 
             if (return_type) {
-                inner_scope = explore_variable_usage(narrow(return_type).cursor, doc, inner_scope, verbose)
+                inner_scope = explore_variable_usage(narrow(return_type).cursor(), doc, inner_scope, verbose)
             }
             for (let { node: arg } of args) {
-                inner_scope = explorer_function_definition_argument(arg.cursor, doc, inner_scope, verbose)
+                inner_scope = explorer_function_definition_argument(arg.cursor(), doc, inner_scope, verbose)
             }
             for (let { node: expression } of body) {
-                inner_scope = explore_variable_usage(expression.cursor, doc, inner_scope, verbose)
+                inner_scope = explore_variable_usage(expression.cursor(), doc, inner_scope, verbose)
             }
             return raise_scope(inner_scope, scopestate, cursor.to)
         } else if (
@@ -985,11 +999,11 @@ export let explore_variable_usage = (
                 // Explorer lefthandside in inner scope
                 if (assignee) innerscope = explore_pattern(assignee, doc, innerscope, value?.to ?? null, verbose)
                 // Explorer righthandside in the outer scope
-                if (value) scopestate = explore_variable_usage(value.cursor, doc, scopestate, verbose)
+                if (value) scopestate = explore_variable_usage(value.cursor(), doc, scopestate, verbose)
             }
             // Explorer body in innerscope
             for (let { node: line } of body) {
-                innerscope = explore_variable_usage(line.cursor, doc, innerscope, verbose)
+                innerscope = explore_variable_usage(line.cursor(), doc, innerscope, verbose)
             }
             return raise_scope(innerscope, scopestate, cursor.to)
         } else if (
@@ -1002,16 +1016,13 @@ export let explore_variable_usage = (
             // Are there syntax differences between Array or Generator expressions?
             // For now I treat them the same...
             // (Also this is one line because lezer doesn't parse multiline generator expressions yet)
-            (match = match_julia(cursor)`(
-                ${t.as("result")}
-                ${t.many("clauses", t.anything_that_fits(jl`for x = y`))}
-            )`)
+            (match = match_julia(cursor)`(${t.as("result")} ${t.many("clauses", t.anything_that_fits(jl`for x = y`))})`)
         ) {
             let { result, clauses } = match
 
             let nested_scope = lower_scope(scopestate)
 
-            // Because of the `t.anything_that_fits`, we can now match different `for x ? y`'s and `if x`s manually.
+            // Because of the `t.anything_that_fits`, we can now match different `for x in/∈/= y`-s and `if x`-s manually.
             // There might be a way to express this in the template, but this keeps templates a lot simpler yet powerful.
             for (let { node: for_binding } of clauses) {
                 let match = null
@@ -1023,17 +1034,17 @@ export let explore_variable_usage = (
                 ) {
                     let { variable, value } = match
 
-                    if (value) nested_scope = explore_variable_usage(value.cursor, doc, nested_scope, verbose)
+                    if (value) nested_scope = explore_variable_usage(value.cursor(), doc, nested_scope, verbose)
                     if (variable) nested_scope = explore_pattern(variable, doc, nested_scope)
                 } else if ((match = match_for_binding(for_binding)`if ${t.maybe(t.as("if"))}`)) {
                     let { if: node } = match
-                    if (node) nested_scope = explore_variable_usage(node.cursor, doc, nested_scope, verbose)
+                    if (node) nested_scope = explore_variable_usage(node.cursor(), doc, nested_scope, verbose)
                 } else {
                     verbose && console.warn("Hmmm, can't parse for binding", for_binding)
                 }
             }
 
-            nested_scope = explore_variable_usage(result.cursor, doc, nested_scope, verbose)
+            nested_scope = explore_variable_usage(result.cursor(), doc, nested_scope, verbose)
 
             return raise_scope(nested_scope, scopestate, cursor.to)
         } else {
@@ -1077,7 +1088,7 @@ export let ScopeStateField = StateField.define({
         try {
             if (syntaxTree(tr.state) != syntaxTree(tr.startState)) {
                 let cursor = syntaxTree(tr.state).cursor()
-                let scopestate = explore_variable_usage(cursor, tr.state.doc, undefined)
+                let scopestate = explore_variable_usage(cursor, tr.state.doc)
                 return scopestate
             } else {
                 return value
diff --git a/frontend/components/CellInput/tests/scopestate_helpers.js b/frontend/components/CellInput/tests/scopestate_helpers.js
index 2cccbfc3e1..638e376f80 100644
--- a/frontend/components/CellInput/tests/scopestate_helpers.js
+++ b/frontend/components/CellInput/tests/scopestate_helpers.js
@@ -35,7 +35,7 @@ export let test_scopestate = (input, expected) => {
         local_used: [],
         global_used: [],
     }
-    assertEquals(simplify_scopestate(explore_variable_usage(as_node(input).cursor, as_doc(input))), {
+    assertEquals(simplify_scopestate(explore_variable_usage(as_node(input).cursor(), as_doc(input), undefined, false)), {
         defined: new Set(expected.defined),
         local_used: new Set(expected.local_used),
         global_used: new Set(expected.global_used),
diff --git a/frontend/imports/CodemirrorPlutoSetup.d.ts b/frontend/imports/CodemirrorPlutoSetup.d.ts
index 382f4d6f18..bbf0a00b40 100644
--- a/frontend/imports/CodemirrorPlutoSetup.d.ts
+++ b/frontend/imports/CodemirrorPlutoSetup.d.ts
@@ -1,6 +1,6 @@
 /**
 A text iterator iterates over a sequence of strings. When
-iterating over a [`Text`](https://codemirror.net/6/docs/ref/#text.Text) document, result values will
+iterating over a [`Text`](https://codemirror.net/6/docs/ref/#state.Text) document, result values will
 either be lines or line breaks.
 */
 interface TextIterator extends Iterator<string>, Iterable<string> {
@@ -26,7 +26,7 @@ interface TextIterator extends Iterator<string>, Iterable<string> {
     lineBreak: boolean;
 }
 /**
-The data structure for documents.
+The data structure for documents. @nonabstract
 */
 declare abstract class Text implements Iterable<string> {
     /**
@@ -68,8 +68,7 @@ declare abstract class Text implements Iterable<string> {
     /**
     Iterate over the text. When `dir` is `-1`, iteration happens
     from end to start. This will return lines and the breaks between
-    them as separate strings, and for long lines, might split lines
-    themselves into multiple chunks as well.
+    them as separate strings.
     */
     iter(dir?: 1 | -1): TextIterator;
     /**
@@ -87,7 +86,7 @@ declare abstract class Text implements Iterable<string> {
     iterLines(from?: number, to?: number): TextIterator;
     /**
     Convert the document to an array of lines (which can be
-    deserialized again via [`Text.of`](https://codemirror.net/6/docs/ref/#text.Text^of)).
+    deserialized again via [`Text.of`](https://codemirror.net/6/docs/ref/#state.Text^of)).
     */
     toJSON(): string[];
     /**
@@ -107,7 +106,7 @@ declare abstract class Text implements Iterable<string> {
 }
 /**
 This type describes a line in the document. It is created
-on-demand when lines are [queried](https://codemirror.net/6/docs/ref/#text.Text.lineAt).
+on-demand when lines are [queried](https://codemirror.net/6/docs/ref/#state.Text.lineAt).
 */
 declare class Line$1 {
     /**
@@ -174,13 +173,18 @@ declare class ChangeDesc {
     */
     get empty(): boolean;
     /**
-    Iterate over the unchanged parts left by these changes.
+    Iterate over the unchanged parts left by these changes. `posA`
+    provides the position of the range in the old document, `posB`
+    the new position in the changed document.
     */
     iterGaps(f: (posA: number, posB: number, length: number) => void): void;
     /**
     Iterate over the ranges changed by these changes. (See
     [`ChangeSet.iterChanges`](https://codemirror.net/6/docs/ref/#state.ChangeSet.iterChanges) for a
     variant that also provides you with the inserted text.)
+    `fromA`/`toA` provides the extent of the change in the starting
+    document, `fromB`/`toB` the extent of the replacement in the
+    changed document.
     
     When `individual` is true, adjacent changes (which are kept
     separate for [position mapping](https://codemirror.net/6/docs/ref/#state.ChangeDesc.mapPos)) are
@@ -476,9 +480,9 @@ declare type FacetConfig<Input, Output> = {
     /**
     How to combine the input values into a single output value. When
     not given, the array of input values becomes the output. This
-    will immediately be called on creating the facet, with an empty
-    array, to compute the facet's default value when no inputs are
-    present.
+    function will immediately be called on creating the facet, with
+    an empty array, to compute the facet's default value when no
+    inputs are present.
     */
     combine?: (value: readonly Input[]) => Output;
     /**
@@ -494,7 +498,7 @@ declare type FacetConfig<Input, Output> = {
     */
     compareInput?: (a: Input, b: Input) => boolean;
     /**
-    Static facets can not contain dynamic inputs.
+    Forbids dynamic inputs to this facet.
     */
     static?: boolean;
     /**
@@ -511,10 +515,10 @@ A facet is a labeled value that is associated with an editor
 state. It takes inputs from any number of extensions, and combines
 those into a single output value.
 
-Examples of facets are the [theme](https://codemirror.net/6/docs/ref/#view.EditorView^theme) styles
-associated with an editor or the [tab
-size](https://codemirror.net/6/docs/ref/#state.EditorState^tabSize) (which is reduced to a single
-value, using the input with the hightest precedence).
+Examples of uses of facets are the [tab
+size](https://codemirror.net/6/docs/ref/#state.EditorState^tabSize), [editor
+attributes](https://codemirror.net/6/docs/ref/#view.EditorView^editorAttributes), and [update
+listeners](https://codemirror.net/6/docs/ref/#view.EditorView^updateListener).
 */
 declare class Facet<Input, Output = readonly Input[]> {
     private isStatic;
@@ -524,7 +528,7 @@ declare class Facet<Input, Output = readonly Input[]> {
     */
     static define<Input, Output = readonly Input[]>(config?: FacetConfig<Input, Output>): Facet<Input, Output>;
     /**
-    Returns an extension that adds the given value for this facet.
+    Returns an extension that adds the given value to this facet.
     */
     of(value: Input): Extension;
     /**
@@ -533,9 +537,8 @@ declare class Facet<Input, Output = readonly Input[]> {
     this value depends on, since your function is only called again
     for a new state when one of those parts changed.
     
-    In most cases, you'll want to use the
-    [`provide`](https://codemirror.net/6/docs/ref/#state.StateField^define^config.provide) option when
-    defining a field instead.
+    In cases where your value depends only on a single field, you'll
+    want to use the [`from`](https://codemirror.net/6/docs/ref/#state.Facet.from) method instead.
     */
     compute(deps: readonly Slot<any>[], get: (state: EditorState) => Input): Extension;
     /**
@@ -549,7 +552,7 @@ declare class Facet<Input, Output = readonly Input[]> {
     input type, the getter function can be omitted. If given, it
     will be used to retrieve the input from the field value.
     */
-    from(field: StateField<Input>): Extension;
+    from<T extends Input>(field: StateField<T>): Extension;
     from<T>(field: StateField<T>, get: (value: T) => Input): Extension;
 }
 declare type Slot<T> = Facet<any, T> | StateField<T> | "doc" | "selection";
@@ -571,12 +574,12 @@ declare type StateFieldSpec<Value> = {
     */
     compare?: (a: Value, b: Value) => boolean;
     /**
-    Provide values for facets based on the value of this field. The
-    given function will be called once with the initialized field. It
-    will usually want to call some facet's
-    [`from`](https://codemirror.net/6/docs/ref/#state.Facet.from) method to create facet inputs from
-    this field, but can also return other extensions that should be
-    enabled by this field.
+    Provide extensions based on this field. The given function will
+    be called once with the initialized field. It will usually want
+    to call some facet's [`from`](https://codemirror.net/6/docs/ref/#state.Facet.from) method to
+    create facet inputs from this field, but can also return other
+    extensions that should be enabled when the field is present in a
+    configuration.
     */
     provide?: (field: StateField<Value>) => Extension;
     /**
@@ -787,7 +790,7 @@ interface TransactionSpec {
     */
     annotations?: Annotation<any> | readonly Annotation<any>[];
     /**
-    Shorthand for `annotations: `[`Transaction.userEvent`](https://codemirror.net/6/docs/ref/#state.Transaction^userEvent)[`.of(...)`.
+    Shorthand for `annotations:` [`Transaction.userEvent`](https://codemirror.net/6/docs/ref/#state.Transaction^userEvent)`.of(...)`.
     */
     userEvent?: string;
     /**
@@ -799,7 +802,9 @@ interface TransactionSpec {
     By default, transactions can be modified by [change
     filters](https://codemirror.net/6/docs/ref/#state.EditorState^changeFilter) and [transaction
     filters](https://codemirror.net/6/docs/ref/#state.EditorState^transactionFilter). You can set this
-    to `false` to disable that.
+    to `false` to disable that. This can be necessary for
+    transactions that, for example, include annotations that must be
+    kept consistent with their changes.
     */
     filter?: boolean;
     /**
@@ -817,7 +822,9 @@ Changes to the editor state are grouped into transactions.
 Typically, a user action creates a single transaction, which may
 contain any number of document changes, may change the selection,
 or have other effects. Create a transaction by calling
-[`EditorState.update`](https://codemirror.net/6/docs/ref/#state.EditorState.update).
+[`EditorState.update`](https://codemirror.net/6/docs/ref/#state.EditorState.update), or immediately
+dispatch one by calling
+[`EditorView.dispatch`](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch).
 */
 declare class Transaction {
     /**
@@ -860,7 +867,7 @@ declare class Transaction {
     get newSelection(): EditorSelection;
     /**
     The new state created by the transaction. Computed on demand
-    (but retained for subsequent access), so itis recommended not to
+    (but retained for subsequent access), so it is recommended not to
     access it in [transaction
     filters](https://codemirror.net/6/docs/ref/#state.EditorState^transactionFilter) when possible.
     */
@@ -889,7 +896,8 @@ declare class Transaction {
     */
     isUserEvent(event: string): boolean;
     /**
-    Annotation used to store transaction timestamps.
+    Annotation used to store transaction timestamps. Automatically
+    added to every transaction, holding `Date.now()`.
     */
     static time: AnnotationType<number>;
     /**
@@ -963,7 +971,7 @@ interface EditorStateConfig {
     provided either as a plain string (which will be split into
     lines according to the value of the [`lineSeparator`
     facet](https://codemirror.net/6/docs/ref/#state.EditorState^lineSeparator)), or an instance of
-    the [`Text`](https://codemirror.net/6/docs/ref/#text.Text) class (which is what the state will use
+    the [`Text`](https://codemirror.net/6/docs/ref/#state.Text) class (which is what the state will use
     to represent the document).
     */
     doc?: string | Text;
@@ -1025,11 +1033,7 @@ declare class EditorState {
     Create a [transaction spec](https://codemirror.net/6/docs/ref/#state.TransactionSpec) that
     replaces every selection range with the given content.
     */
-    replaceSelection(text: string | Text): {
-        changes: ChangeSet;
-        selection: EditorSelection;
-        effects: readonly StateEffect<any>[];
-    };
+    replaceSelection(text: string | Text): TransactionSpec;
     /**
     Create a set of changes and a new selection by running the given
     function for each range in the active selection. The function
@@ -1059,7 +1063,7 @@ declare class EditorState {
     /**
     Using the state's [line
     separator](https://codemirror.net/6/docs/ref/#state.EditorState^lineSeparator), create a
-    [`Text`](https://codemirror.net/6/docs/ref/#text.Text) instance from the given string.
+    [`Text`](https://codemirror.net/6/docs/ref/#state.Text) instance from the given string.
     */
     toText(string: string): Text;
     /**
@@ -1181,7 +1185,7 @@ declare class EditorState {
     languageDataAt<T>(name: string, pos: number, side?: -1 | 0 | 1): readonly T[];
     /**
     Return a function that can categorize strings (expected to
-    represent a single [grapheme cluster](https://codemirror.net/6/docs/ref/#text.findClusterBreak))
+    represent a single [grapheme cluster](https://codemirror.net/6/docs/ref/#state.findClusterBreak))
     into one of:
     
      - Word (contains an alphanumeric character or a character
@@ -1208,7 +1212,7 @@ declare class EditorState {
     want to do anything, `false` to completely stop the changes in
     the transaction, or a set of ranges in which changes should be
     suppressed. Such ranges are represented as an array of numbers,
-    with each pair of two number indicating the start and end of a
+    with each pair of two numbers indicating the start and end of a
     range. So for example `[10, 20, 100, 110]` suppresses changes
     between 10 and 20, and between 100 and 110.
     */
@@ -1239,12 +1243,12 @@ declare class EditorState {
     which can only add
     [annotations](https://codemirror.net/6/docs/ref/#state.TransactionSpec.annotations) and
     [effects](https://codemirror.net/6/docs/ref/#state.TransactionSpec.effects). _But_, this type
-    of filter runs even the transaction has disabled regular
+    of filter runs even if the transaction has disabled regular
     [filtering](https://codemirror.net/6/docs/ref/#state.TransactionSpec.filter), making it suitable
     for effects that don't need to touch the changes or selection,
     but do want to process every transaction.
     
-    Extenders run _after_ filters, when both are applied.
+    Extenders run _after_ filters, when both are present.
     */
     static transactionExtender: Facet<(tr: Transaction) => Pick<TransactionSpec, "effects" | "annotations"> | null, readonly ((tr: Transaction) => Pick<TransactionSpec, "effects" | "annotations"> | null)[]>;
 }
@@ -1261,15 +1265,259 @@ declare type StateCommand = (target: {
 
 /**
 Utility function for combining behaviors to fill in a config
-object from an array of provided configs. Will, by default, error
+object from an array of provided configs. `defaults` should hold
+default values for all optional fields in `Config`.
+
+The function will, by default, error
 when a field gets two values that aren't `===`-equal, but you can
 provide combine functions per field to do something else.
 */
-declare function combineConfig<Config>(configs: readonly Partial<Config>[], defaults: Partial<Config>, // Should hold only the optional properties of Config, but I haven't managed to express that
+declare function combineConfig<Config extends object>(configs: readonly Partial<Config>[], defaults: Partial<Config>, // Should hold only the optional properties of Config, but I haven't managed to express that
 combine?: {
     [P in keyof Config]?: (first: Config[P], second: Config[P]) => Config[P];
 }): Config;
 
+/**
+Each range is associated with a value, which must inherit from
+this class.
+*/
+declare abstract class RangeValue {
+    /**
+    Compare this value with another value. Used when comparing
+    rangesets. The default implementation compares by identity.
+    Unless you are only creating a fixed number of unique instances
+    of your value type, it is a good idea to implement this
+    properly.
+    */
+    eq(other: RangeValue): boolean;
+    /**
+    The bias value at the start of the range. Determines how the
+    range is positioned relative to other ranges starting at this
+    position. Defaults to 0.
+    */
+    startSide: number;
+    /**
+    The bias value at the end of the range. Defaults to 0.
+    */
+    endSide: number;
+    /**
+    The mode with which the location of the range should be mapped
+    when its `from` and `to` are the same, to decide whether a
+    change deletes the range. Defaults to `MapMode.TrackDel`.
+    */
+    mapMode: MapMode;
+    /**
+    Determines whether this value marks a point range. Regular
+    ranges affect the part of the document they cover, and are
+    meaningless when empty. Point ranges have a meaning on their
+    own. When non-empty, a point range is treated as atomic and
+    shadows any ranges contained in it.
+    */
+    point: boolean;
+    /**
+    Create a [range](https://codemirror.net/6/docs/ref/#state.Range) with this value.
+    */
+    range(from: number, to?: number): Range<this>;
+}
+/**
+A range associates a value with a range of positions.
+*/
+declare class Range<T extends RangeValue> {
+    /**
+    The range's start position.
+    */
+    readonly from: number;
+    /**
+    Its end position.
+    */
+    readonly to: number;
+    /**
+    The value associated with this range.
+    */
+    readonly value: T;
+}
+/**
+Collection of methods used when comparing range sets.
+*/
+interface RangeComparator<T extends RangeValue> {
+    /**
+    Notifies the comparator that a range (in positions in the new
+    document) has the given sets of values associated with it, which
+    are different in the old (A) and new (B) sets.
+    */
+    compareRange(from: number, to: number, activeA: T[], activeB: T[]): void;
+    /**
+    Notification for a changed (or inserted, or deleted) point range.
+    */
+    comparePoint(from: number, to: number, pointA: T | null, pointB: T | null): void;
+}
+/**
+Methods used when iterating over the spans created by a set of
+ranges. The entire iterated range will be covered with either
+`span` or `point` calls.
+*/
+interface SpanIterator<T extends RangeValue> {
+    /**
+    Called for any ranges not covered by point decorations. `active`
+    holds the values that the range is marked with (and may be
+    empty). `openStart` indicates how many of those ranges are open
+    (continued) at the start of the span.
+    */
+    span(from: number, to: number, active: readonly T[], openStart: number): void;
+    /**
+    Called when going over a point decoration. The active range
+    decorations that cover the point and have a higher precedence
+    are provided in `active`. The open count in `openStart` counts
+    the number of those ranges that started before the point and. If
+    the point started before the iterated range, `openStart` will be
+    `active.length + 1` to signal this.
+    */
+    point(from: number, to: number, value: T, active: readonly T[], openStart: number, index: number): void;
+}
+/**
+A range cursor is an object that moves to the next range every
+time you call `next` on it. Note that, unlike ES6 iterators, these
+start out pointing at the first element, so you should call `next`
+only after reading the first range (if any).
+*/
+interface RangeCursor<T> {
+    /**
+    Move the iterator forward.
+    */
+    next: () => void;
+    /**
+    The next range's value. Holds `null` when the cursor has reached
+    its end.
+    */
+    value: T | null;
+    /**
+    The next range's start position.
+    */
+    from: number;
+    /**
+    The next end position.
+    */
+    to: number;
+}
+declare type RangeSetUpdate<T extends RangeValue> = {
+    /**
+    An array of ranges to add. If given, this should be sorted by
+    `from` position and `startSide` unless
+    [`sort`](https://codemirror.net/6/docs/ref/#state.RangeSet.update^updateSpec.sort) is given as
+    `true`.
+    */
+    add?: readonly Range<T>[];
+    /**
+    Indicates whether the library should sort the ranges in `add`.
+    Defaults to `false`.
+    */
+    sort?: boolean;
+    /**
+    Filter the ranges already in the set. Only those for which this
+    function returns `true` are kept.
+    */
+    filter?: (from: number, to: number, value: T) => boolean;
+    /**
+    Can be used to limit the range on which the filter is
+    applied. Filtering only a small range, as opposed to the entire
+    set, can make updates cheaper.
+    */
+    filterFrom?: number;
+    /**
+    The end position to apply the filter to.
+    */
+    filterTo?: number;
+};
+/**
+A range set stores a collection of [ranges](https://codemirror.net/6/docs/ref/#state.Range) in a
+way that makes them efficient to [map](https://codemirror.net/6/docs/ref/#state.RangeSet.map) and
+[update](https://codemirror.net/6/docs/ref/#state.RangeSet.update). This is an immutable data
+structure.
+*/
+declare class RangeSet<T extends RangeValue> {
+    /**
+    The number of ranges in the set.
+    */
+    get size(): number;
+    /**
+    Update the range set, optionally adding new ranges or filtering
+    out existing ones.
+    
+    (Note: The type parameter is just there as a kludge to work
+    around TypeScript variance issues that prevented `RangeSet<X>`
+    from being a subtype of `RangeSet<Y>` when `X` is a subtype of
+    `Y`.)
+    */
+    update<U extends T>(updateSpec: RangeSetUpdate<U>): RangeSet<T>;
+    /**
+    Map this range set through a set of changes, return the new set.
+    */
+    map(changes: ChangeDesc): RangeSet<T>;
+    /**
+    Iterate over the ranges that touch the region `from` to `to`,
+    calling `f` for each. There is no guarantee that the ranges will
+    be reported in any specific order. When the callback returns
+    `false`, iteration stops.
+    */
+    between(from: number, to: number, f: (from: number, to: number, value: T) => void | false): void;
+    /**
+    Iterate over the ranges in this set, in order, including all
+    ranges that end at or after `from`.
+    */
+    iter(from?: number): RangeCursor<T>;
+    /**
+    Iterate over the ranges in a collection of sets, in order,
+    starting from `from`.
+    */
+    static iter<T extends RangeValue>(sets: readonly RangeSet<T>[], from?: number): RangeCursor<T>;
+    /**
+    Iterate over two groups of sets, calling methods on `comparator`
+    to notify it of possible differences.
+    */
+    static compare<T extends RangeValue>(oldSets: readonly RangeSet<T>[], newSets: readonly RangeSet<T>[], 
+    /**
+    This indicates how the underlying data changed between these
+    ranges, and is needed to synchronize the iteration. `from` and
+    `to` are coordinates in the _new_ space, after these changes.
+    */
+    textDiff: ChangeDesc, comparator: RangeComparator<T>, 
+    /**
+    Can be used to ignore all non-point ranges, and points below
+    the given size. When -1, all ranges are compared.
+    */
+    minPointSize?: number): void;
+    /**
+    Compare the contents of two groups of range sets, returning true
+    if they are equivalent in the given range.
+    */
+    static eq<T extends RangeValue>(oldSets: readonly RangeSet<T>[], newSets: readonly RangeSet<T>[], from?: number, to?: number): boolean;
+    /**
+    Iterate over a group of range sets at the same time, notifying
+    the iterator about the ranges covering every given piece of
+    content. Returns the open count (see
+    [`SpanIterator.span`](https://codemirror.net/6/docs/ref/#state.SpanIterator.span)) at the end
+    of the iteration.
+    */
+    static spans<T extends RangeValue>(sets: readonly RangeSet<T>[], from: number, to: number, iterator: SpanIterator<T>, 
+    /**
+    When given and greater than -1, only points of at least this
+    size are taken into account.
+    */
+    minPointSize?: number): number;
+    /**
+    Create a range set for the given range or array of ranges. By
+    default, this expects the ranges to be _sorted_ (by start
+    position and, if two start at the same position,
+    `value.startSide`). You can pass `true` as second argument to
+    cause the method to sort them.
+    */
+    static of<T extends RangeValue>(ranges: readonly Range<T>[] | Range<T>, sort?: boolean): RangeSet<T>;
+    /**
+    The empty set of ranges.
+    */
+    static empty: RangeSet<any>;
+}
+
 interface ChangedRange {
     fromA: number;
     toA: number;
@@ -1375,6 +1623,12 @@ declare class NodeSet {
     constructor(types: readonly NodeType[]);
     extend(...props: NodePropSource[]): NodeSet;
 }
+declare enum IterMode {
+    ExcludeBuffers = 1,
+    IncludeAnonymous = 2,
+    IgnoreMounts = 4,
+    IgnoreOverlays = 8
+}
 declare class Tree {
     readonly type: NodeType;
     readonly children: readonly (Tree | TreeBuffer)[];
@@ -1382,16 +1636,17 @@ declare class Tree {
     readonly length: number;
     constructor(type: NodeType, children: readonly (Tree | TreeBuffer)[], positions: readonly number[], length: number, props?: readonly [NodeProp<any> | number, any][]);
     static empty: Tree;
-    cursor(pos?: number, side?: -1 | 0 | 1): TreeCursor;
-    fullCursor(): TreeCursor;
+    cursor(mode?: IterMode): TreeCursor;
+    cursorAt(pos: number, side?: -1 | 0 | 1, mode?: IterMode): TreeCursor;
     get topNode(): SyntaxNode;
     resolve(pos: number, side?: -1 | 0 | 1): SyntaxNode;
     resolveInner(pos: number, side?: -1 | 0 | 1): SyntaxNode;
     iterate(spec: {
-        enter(type: NodeType, from: number, to: number, get: () => SyntaxNode): false | void;
-        leave?(type: NodeType, from: number, to: number, get: () => SyntaxNode): void;
+        enter(node: SyntaxNodeRef): boolean | void;
+        leave?(node: SyntaxNodeRef): void;
         from?: number;
         to?: number;
+        mode?: IterMode;
     }): void;
     prop<T>(prop: NodeProp<T>): T | undefined;
     get propValues(): readonly [NodeProp<any> | number, any][];
@@ -1426,36 +1681,38 @@ declare class TreeBuffer {
     readonly set: NodeSet;
     constructor(buffer: Uint16Array, length: number, set: NodeSet);
 }
-interface SyntaxNode {
-    type: NodeType;
-    name: string;
-    from: number;
-    to: number;
+interface SyntaxNodeRef {
+    readonly from: number;
+    readonly to: number;
+    readonly type: NodeType;
+    readonly name: string;
+    readonly tree: Tree | null;
+    readonly node: SyntaxNode;
+}
+interface SyntaxNode extends SyntaxNodeRef {
     parent: SyntaxNode | null;
     firstChild: SyntaxNode | null;
     lastChild: SyntaxNode | null;
     childAfter(pos: number): SyntaxNode | null;
     childBefore(pos: number): SyntaxNode | null;
-    enter(pos: number, side: -1 | 0 | 1, overlays?: boolean, buffers?: boolean): SyntaxNode | null;
+    enter(pos: number, side: -1 | 0 | 1, mode?: IterMode): SyntaxNode | null;
     nextSibling: SyntaxNode | null;
     prevSibling: SyntaxNode | null;
-    cursor: TreeCursor;
+    cursor(mode?: IterMode): TreeCursor;
     resolve(pos: number, side?: -1 | 0 | 1): SyntaxNode;
     resolveInner(pos: number, side?: -1 | 0 | 1): SyntaxNode;
     enterUnfinishedNodesBefore(pos: number): SyntaxNode;
-    tree: Tree | null;
     toTree(): Tree;
     getChild(type: string | number, before?: string | number | null, after?: string | number | null): SyntaxNode | null;
     getChildren(type: string | number, before?: string | number | null, after?: string | number | null): SyntaxNode[];
+    matchContext(context: readonly string[]): boolean;
 }
-declare class TreeCursor {
+declare class TreeCursor implements SyntaxNodeRef {
     type: NodeType;
     get name(): string;
     from: number;
     to: number;
-    private buffer;
     private stack;
-    private index;
     private bufferNode;
     private yieldNode;
     private yieldBuf;
@@ -1464,7 +1721,7 @@ declare class TreeCursor {
     lastChild(): boolean;
     childAfter(pos: number): boolean;
     childBefore(pos: number): boolean;
-    enter(pos: number, side: -1 | 0 | 1, overlays?: boolean, buffers?: boolean): boolean;
+    enter(pos: number, side: -1 | 0 | 1, mode?: IterMode): boolean;
     parent(): boolean;
     nextSibling(): boolean;
     prevSibling(): boolean;
@@ -1475,6 +1732,8 @@ declare class TreeCursor {
     moveTo(pos: number, side?: -1 | 0 | 1): this;
     get node(): SyntaxNode;
     get tree(): Tree | null;
+    iterate(enter: (node: SyntaxNodeRef) => boolean | void, leave?: (node: SyntaxNodeRef) => void): void;
+    matchContext(context: readonly string[]): boolean;
 }
 
 interface NestedParse {
@@ -1482,575 +1741,22 @@ interface NestedParse {
     overlay?: readonly {
         from: number;
         to: number;
-    }[] | ((node: TreeCursor) => {
+    }[] | ((node: SyntaxNodeRef) => {
         from: number;
         to: number;
     } | boolean);
 }
-declare function parseMixed(nest: (node: TreeCursor, input: Input) => NestedParse | null): ParseWrapper;
-
-declare class StyleModule {
-  constructor(spec: {[selector: string]: StyleSpec}, options?: {
-    finish?(sel: string): string
-  })
-  getRules(): string
-  static mount(root: Document | ShadowRoot | DocumentOrShadowRoot, module: StyleModule | ReadonlyArray<StyleModule>): void
-  static newName(): string
-}
+declare function parseMixed(nest: (node: SyntaxNodeRef, input: Input) => NestedParse | null): ParseWrapper;
 
-type StyleSpec = {
-  [propOrSelector: string]: string | number | StyleSpec | null
-}
-
-/**
-Highlighting tags are markers that denote a highlighting category.
-They are [associated](https://codemirror.net/6/docs/ref/#highlight.styleTags) with parts of a syntax
-tree by a language mode, and then mapped to an actual CSS style by
-a [highlight style](https://codemirror.net/6/docs/ref/#highlight.HighlightStyle).
-
-Because syntax tree node types and highlight styles have to be
-able to talk the same language, CodeMirror uses a mostly _closed_
-[vocabulary](https://codemirror.net/6/docs/ref/#highlight.tags) of syntax tags (as opposed to
-traditional open string-based systems, which make it hard for
-highlighting themes to cover all the tokens produced by the
-various languages).
-
-It _is_ possible to [define](https://codemirror.net/6/docs/ref/#highlight.Tag^define) your own
-highlighting tags for system-internal use (where you control both
-the language package and the highlighter), but such tags will not
-be picked up by regular highlighters (though you can derive them
-from standard tags to allow highlighters to fall back to those).
-*/
-declare class Tag {
-    /**
-    Define a new tag. If `parent` is given, the tag is treated as a
-    sub-tag of that parent, and [highlight
-    styles](https://codemirror.net/6/docs/ref/#highlight.HighlightStyle) that don't mention this tag
-    will try to fall back to the parent tag (or grandparent tag,
-    etc).
-    */
-    static define(parent?: Tag): Tag;
-    /**
-    Define a tag _modifier_, which is a function that, given a tag,
-    will return a tag that is a subtag of the original. Applying the
-    same modifier to a twice tag will return the same value (`m1(t1)
-    == m1(t1)`) and applying multiple modifiers will, regardless or
-    order, produce the same tag (`m1(m2(t1)) == m2(m1(t1))`).
-    
-    When multiple modifiers are applied to a given base tag, each
-    smaller set of modifiers is registered as a parent, so that for
-    example `m1(m2(m3(t1)))` is a subtype of `m1(m2(t1))`,
-    `m1(m3(t1)`, and so on.
-    */
-    static defineModifier(): (tag: Tag) => Tag;
-}
-/**
-A highlight style associates CSS styles with higlighting
-[tags](https://codemirror.net/6/docs/ref/#highlight.Tag).
-*/
-declare class HighlightStyle {
-    /**
-    Extension that registers this style with an editor. When
-    multiple highlight styles are given, they _all_ apply, assigning
-    the combination of their matching styles to tokens.
-    */
-    readonly extension: Extension;
-    /**
-    An extension that installs this highlighter as a fallback
-    highlight style, which will only be used if no other highlight
-    styles are configured.
-    */
-    readonly fallback: Extension;
-    /**
-    A style module holding the CSS rules for this highlight style.
-    When using [`highlightTree`](https://codemirror.net/6/docs/ref/#highlight.highlightTree), you may
-    want to manually mount this module to show the highlighting.
-    */
-    readonly module: StyleModule | null;
-    private map;
-    private scope;
-    private all;
-    private constructor();
-    /**
-    Returns the CSS class associated with the given tag, if any.
-    This method is bound to the instance by the constructor.
-    */
-    match(tag: Tag, scope: NodeType): string | null;
-    /**
-    Combines an array of highlight styles into a single match
-    function that returns all of the classes assigned by the styles
-    for a given tag.
-    */
-    static combinedMatch(styles: readonly HighlightStyle[]): (tag: Tag, scope: NodeType) => any;
-    /**
-    Create a highlighter style that associates the given styles to
-    the given tags. The spec must be objects that hold a style tag
-    or array of tags in their `tag` property, and either a single
-    `class` property providing a static CSS class (for highlighters
-    like [`classHighlightStyle`](https://codemirror.net/6/docs/ref/#highlight.classHighlightStyle)
-    that rely on external styling), or a
-    [`style-mod`](https://github.com/marijnh/style-mod#documentation)-style
-    set of CSS properties (which define the styling for those tags).
-    
-    The CSS rules created for a highlighter will be emitted in the
-    order of the spec's properties. That means that for elements that
-    have multiple tags associated with them, styles defined further
-    down in the list will have a higher CSS precedence than styles
-    defined earlier.
-    */
-    static define(specs: readonly TagStyle[], options?: {
-        /**
-        By default, highlighters apply to the entire document. You can
-        scope them to a single language by providing the language's
-        [top node](https://codemirror.net/6/docs/ref/#language.Language.topNode) here.
-        */
-        scope?: NodeType;
-        /**
-        Add a style to _all_ content. Probably only useful in
-        combination with `scope`.
-        */
-        all?: string | StyleSpec;
-        /**
-        Specify that this highlight style should only be active then
-        the theme is dark or light. By default, it is active
-        regardless of theme.
-        */
-        themeType?: "dark" | "light";
-    }): HighlightStyle;
-    /**
-    Returns the CSS classes (if any) that the highlight styles
-    active in the given state would assign to the given a style
-    [tag](https://codemirror.net/6/docs/ref/#highlight.Tag) and (optional) language
-    [scope](https://codemirror.net/6/docs/ref/#highlight.HighlightStyle^define^options.scope).
-    */
-    static get(state: EditorState, tag: Tag, scope?: NodeType): string | null;
-}
-/**
-The type of object used in
-[`HighlightStyle.define`](https://codemirror.net/6/docs/ref/#highlight.HighlightStyle^define).
-Assigns a style to one or more highlighting
-[tags](https://codemirror.net/6/docs/ref/#highlight.Tag), which can either be a fixed class name
-(which must be defined elsewhere), or a set of CSS properties, for
-which the library will define an anonymous class.
-*/
-interface TagStyle {
-    /**
-    The tag or tags to target.
-    */
-    tag: Tag | readonly Tag[];
-    /**
-    If given, this maps the tags to a fixed class name.
-    */
-    class?: string;
-    /**
-    Any further properties (if `class` isn't given) will be
-    interpreted as in style objects given to
-    [style-mod](https://github.com/marijnh/style-mod#documentation).
-    The type here is `any` because of TypeScript limitations.
-    */
-    [styleProperty: string]: any;
-}
-/**
-The default set of highlighting [tags](https://codemirror.net/6/docs/ref/#highlight.Tag^define) used
-by regular language packages and themes.
-
-This collection is heavily biased towards programming languages,
-and necessarily incomplete. A full ontology of syntactic
-constructs would fill a stack of books, and be impractical to
-write themes for. So try to make do with this set. If all else
-fails, [open an
-issue](https://github.com/codemirror/codemirror.next) to propose a
-new tag, or [define](https://codemirror.net/6/docs/ref/#highlight.Tag^define) a local custom tag for
-your use case.
-
-Note that it is not obligatory to always attach the most specific
-tag possible to an element—if your grammar can't easily
-distinguish a certain type of element (such as a local variable),
-it is okay to style it as its more general variant (a variable).
-
-For tags that extend some parent tag, the documentation links to
-the parent.
-*/
-declare const tags: {
-    /**
-    A comment.
-    */
-    comment: Tag;
-    /**
-    A line [comment](https://codemirror.net/6/docs/ref/#highlight.tags.comment).
-    */
-    lineComment: Tag;
-    /**
-    A block [comment](https://codemirror.net/6/docs/ref/#highlight.tags.comment).
-    */
-    blockComment: Tag;
-    /**
-    A documentation [comment](https://codemirror.net/6/docs/ref/#highlight.tags.comment).
-    */
-    docComment: Tag;
-    /**
-    Any kind of identifier.
-    */
-    name: Tag;
-    /**
-    The [name](https://codemirror.net/6/docs/ref/#highlight.tags.name) of a variable.
-    */
-    variableName: Tag;
-    /**
-    A type [name](https://codemirror.net/6/docs/ref/#highlight.tags.name).
-    */
-    typeName: Tag;
-    /**
-    A tag name (subtag of [`typeName`](https://codemirror.net/6/docs/ref/#highlight.tags.typeName)).
-    */
-    tagName: Tag;
-    /**
-    A property or field [name](https://codemirror.net/6/docs/ref/#highlight.tags.name).
-    */
-    propertyName: Tag;
-    /**
-    An attribute name (subtag of [`propertyName`](https://codemirror.net/6/docs/ref/#highlight.tags.propertyName)).
-    */
-    attributeName: Tag;
-    /**
-    The [name](https://codemirror.net/6/docs/ref/#highlight.tags.name) of a class.
-    */
-    className: Tag;
-    /**
-    A label [name](https://codemirror.net/6/docs/ref/#highlight.tags.name).
-    */
-    labelName: Tag;
-    /**
-    A namespace [name](https://codemirror.net/6/docs/ref/#highlight.tags.name).
-    */
-    namespace: Tag;
-    /**
-    The [name](https://codemirror.net/6/docs/ref/#highlight.tags.name) of a macro.
-    */
-    macroName: Tag;
-    /**
-    A literal value.
-    */
-    literal: Tag;
-    /**
-    A string [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
-    */
-    string: Tag;
-    /**
-    A documentation [string](https://codemirror.net/6/docs/ref/#highlight.tags.string).
-    */
-    docString: Tag;
-    /**
-    A character literal (subtag of [string](https://codemirror.net/6/docs/ref/#highlight.tags.string)).
-    */
-    character: Tag;
-    /**
-    An attribute value (subtag of [string](https://codemirror.net/6/docs/ref/#highlight.tags.string)).
-    */
-    attributeValue: Tag;
-    /**
-    A number [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
-    */
-    number: Tag;
-    /**
-    An integer [number](https://codemirror.net/6/docs/ref/#highlight.tags.number) literal.
-    */
-    integer: Tag;
-    /**
-    A floating-point [number](https://codemirror.net/6/docs/ref/#highlight.tags.number) literal.
-    */
-    float: Tag;
-    /**
-    A boolean [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
-    */
-    bool: Tag;
-    /**
-    Regular expression [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
-    */
-    regexp: Tag;
-    /**
-    An escape [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal), for example a
-    backslash escape in a string.
-    */
-    escape: Tag;
-    /**
-    A color [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
-    */
-    color: Tag;
-    /**
-    A URL [literal](https://codemirror.net/6/docs/ref/#highlight.tags.literal).
-    */
-    url: Tag;
-    /**
-    A language keyword.
-    */
-    keyword: Tag;
-    /**
-    The [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) for the self or this
-    object.
-    */
-    self: Tag;
-    /**
-    The [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) for null.
-    */
-    null: Tag;
-    /**
-    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) denoting some atomic value.
-    */
-    atom: Tag;
-    /**
-    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) that represents a unit.
-    */
-    unit: Tag;
-    /**
-    A modifier [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword).
-    */
-    modifier: Tag;
-    /**
-    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) that acts as an operator.
-    */
-    operatorKeyword: Tag;
-    /**
-    A control-flow related [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword).
-    */
-    controlKeyword: Tag;
-    /**
-    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) that defines something.
-    */
-    definitionKeyword: Tag;
-    /**
-    A [keyword](https://codemirror.net/6/docs/ref/#highlight.tags.keyword) related to defining or
-    interfacing with modules.
-    */
-    moduleKeyword: Tag;
-    /**
-    An operator.
-    */
-    operator: Tag;
-    /**
-    An [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator) that defines something.
-    */
-    derefOperator: Tag;
-    /**
-    Arithmetic-related [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
-    */
-    arithmeticOperator: Tag;
-    /**
-    Logical [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
-    */
-    logicOperator: Tag;
-    /**
-    Bit [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
-    */
-    bitwiseOperator: Tag;
-    /**
-    Comparison [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
-    */
-    compareOperator: Tag;
-    /**
-    [Operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator) that updates its operand.
-    */
-    updateOperator: Tag;
-    /**
-    [Operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator) that defines something.
-    */
-    definitionOperator: Tag;
-    /**
-    Type-related [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
-    */
-    typeOperator: Tag;
-    /**
-    Control-flow [operator](https://codemirror.net/6/docs/ref/#highlight.tags.operator).
-    */
-    controlOperator: Tag;
-    /**
-    Program or markup punctuation.
-    */
-    punctuation: Tag;
-    /**
-    [Punctuation](https://codemirror.net/6/docs/ref/#highlight.tags.punctuation) that separates
-    things.
-    */
-    separator: Tag;
-    /**
-    Bracket-style [punctuation](https://codemirror.net/6/docs/ref/#highlight.tags.punctuation).
-    */
-    bracket: Tag;
-    /**
-    Angle [brackets](https://codemirror.net/6/docs/ref/#highlight.tags.bracket) (usually `<` and `>`
-    tokens).
-    */
-    angleBracket: Tag;
-    /**
-    Square [brackets](https://codemirror.net/6/docs/ref/#highlight.tags.bracket) (usually `[` and `]`
-    tokens).
-    */
-    squareBracket: Tag;
-    /**
-    Parentheses (usually `(` and `)` tokens). Subtag of
-    [bracket](https://codemirror.net/6/docs/ref/#highlight.tags.bracket).
-    */
-    paren: Tag;
-    /**
-    Braces (usually `{` and `}` tokens). Subtag of
-    [bracket](https://codemirror.net/6/docs/ref/#highlight.tags.bracket).
-    */
-    brace: Tag;
-    /**
-    Content, for example plain text in XML or markup documents.
-    */
-    content: Tag;
-    /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that represents a heading.
-    */
-    heading: Tag;
-    /**
-    A level 1 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
-    */
-    heading1: Tag;
-    /**
-    A level 2 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
-    */
-    heading2: Tag;
-    /**
-    A level 3 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
-    */
-    heading3: Tag;
-    /**
-    A level 4 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
-    */
-    heading4: Tag;
-    /**
-    A level 5 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
-    */
-    heading5: Tag;
-    /**
-    A level 6 [heading](https://codemirror.net/6/docs/ref/#highlight.tags.heading).
-    */
-    heading6: Tag;
-    /**
-    A prose separator (such as a horizontal rule).
-    */
-    contentSeparator: Tag;
-    /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that represents a list.
-    */
-    list: Tag;
-    /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that represents a quote.
-    */
-    quote: Tag;
-    /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that is emphasized.
-    */
-    emphasis: Tag;
-    /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that is styled strong.
-    */
-    strong: Tag;
-    /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that is part of a link.
-    */
-    link: Tag;
-    /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that is styled as code or
-    monospace.
-    */
-    monospace: Tag;
-    /**
-    [Content](https://codemirror.net/6/docs/ref/#highlight.tags.content) that has a strike-through
-    style.
-    */
-    strikethrough: Tag;
-    /**
-    Inserted text in a change-tracking format.
-    */
-    inserted: Tag;
-    /**
-    Deleted text.
-    */
-    deleted: Tag;
-    /**
-    Changed text.
-    */
-    changed: Tag;
-    /**
-    An invalid or unsyntactic element.
-    */
-    invalid: Tag;
-    /**
-    Metadata or meta-instruction.
-    */
-    meta: Tag;
-    /**
-    [Metadata](https://codemirror.net/6/docs/ref/#highlight.tags.meta) that applies to the entire
-    document.
-    */
-    documentMeta: Tag;
-    /**
-    [Metadata](https://codemirror.net/6/docs/ref/#highlight.tags.meta) that annotates or adds
-    attributes to a given syntactic element.
-    */
-    annotation: Tag;
-    /**
-    Processing instruction or preprocessor directive. Subtag of
-    [meta](https://codemirror.net/6/docs/ref/#highlight.tags.meta).
-    */
-    processingInstruction: Tag;
-    /**
-    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that indicates that a
-    given element is being defined. Expected to be used with the
-    various [name](https://codemirror.net/6/docs/ref/#highlight.tags.name) tags.
-    */
-    definition: (tag: Tag) => Tag;
-    /**
-    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that indicates that
-    something is constant. Mostly expected to be used with
-    [variable names](https://codemirror.net/6/docs/ref/#highlight.tags.variableName).
-    */
-    constant: (tag: Tag) => Tag;
-    /**
-    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) used to indicate that
-    a [variable](https://codemirror.net/6/docs/ref/#highlight.tags.variableName) or [property
-    name](https://codemirror.net/6/docs/ref/#highlight.tags.propertyName) is being called or defined
-    as a function.
-    */
-    function: (tag: Tag) => Tag;
-    /**
-    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that can be applied to
-    [names](https://codemirror.net/6/docs/ref/#highlight.tags.name) to indicate that they belong to
-    the language's standard environment.
-    */
-    standard: (tag: Tag) => Tag;
-    /**
-    [Modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that indicates a given
-    [names](https://codemirror.net/6/docs/ref/#highlight.tags.name) is local to some scope.
-    */
-    local: (tag: Tag) => Tag;
-    /**
-    A generic variant [modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) that
-    can be used to tag language-specific alternative variants of
-    some common tag. It is recommended for themes to define special
-    forms of at least the [string](https://codemirror.net/6/docs/ref/#highlight.tags.string) and
-    [variable name](https://codemirror.net/6/docs/ref/#highlight.tags.variableName) tags, since those
-    come up a lot.
-    */
-    special: (tag: Tag) => Tag;
-};
-/**
-A default highlight style (works well with light themes).
-*/
-declare const defaultHighlightStyle: HighlightStyle;
-
-declare class Stack {
-    pos: number;
-    get context(): any;
-    canShift(term: number): boolean;
-    get parser(): LRParser;
-    dialectEnabled(dialectID: number): boolean;
-    private shiftContext;
-    private reduceContext;
-    private updateContext;
+declare class Stack {
+    pos: number;
+    get context(): any;
+    canShift(term: number): boolean;
+    get parser(): LRParser;
+    dialectEnabled(dialectID: number): boolean;
+    private shiftContext;
+    private reduceContext;
+    private updateContext;
 }
 
 declare class InputStream {
@@ -2109,247 +1815,22 @@ declare class LRParser extends Parser {
         to: number;
     }[]): PartialParse;
     configure(config: ParserConfig): LRParser;
+    hasWrappers(): boolean;
     getName(term: number): string;
     get topNode(): NodeType;
 }
 
-/**
-Each range is associated with a value, which must inherit from
-this class.
-*/
-declare abstract class RangeValue {
-    /**
-    Compare this value with another value. The default
-    implementation compares by identity.
-    */
-    eq(other: RangeValue): boolean;
-    /**
-    The bias value at the start of the range. Determines how the
-    range is positioned relative to other ranges starting at this
-    position. Defaults to 0.
-    */
-    startSide: number;
-    /**
-    The bias value at the end of the range. Defaults to 0.
-    */
-    endSide: number;
-    /**
-    The mode with which the location of the range should be mapped
-    when its `from` and `to` are the same, to decide whether a
-    change deletes the range. Defaults to `MapMode.TrackDel`.
-    */
-    mapMode: MapMode;
-    /**
-    Whether this value marks a point range, which is treated as
-    atomic and shadows the ranges contained in it.
-    */
-    point: boolean;
-    /**
-    Create a [range](https://codemirror.net/6/docs/ref/#rangeset.Range) with this value.
-    */
-    range(from: number, to?: number): Range<this>;
-}
-/**
-A range associates a value with a range of positions.
-*/
-declare class Range<T extends RangeValue> {
-    /**
-    The range's start position.
-    */
-    readonly from: number;
-    /**
-    Its end position.
-    */
-    readonly to: number;
-    /**
-    The value associated with this range.
-    */
-    readonly value: T;
-}
-/**
-Collection of methods used when comparing range sets.
-*/
-interface RangeComparator<T extends RangeValue> {
-    /**
-    Notifies the comparator that the given range has the given set
-    of values associated with it.
-    */
-    compareRange(from: number, to: number, activeA: T[], activeB: T[]): void;
-    /**
-    Notification for a point range.
-    */
-    comparePoint(from: number, to: number, byA: T | null, byB: T | null): void;
-}
-/**
-Methods used when iterating over the spans created by a set of
-ranges. The entire iterated range will be covered with either
-`span` or `point` calls.
-*/
-interface SpanIterator<T extends RangeValue> {
-    /**
-    Called for any ranges not covered by point decorations. `active`
-    holds the values that the range is marked with (and may be
-    empty). `openStart` indicates how many of those ranges are open
-    (continued) at the start of the span.
-    */
-    span(from: number, to: number, active: readonly T[], openStart: number): void;
-    /**
-    Called when going over a point decoration. The active range
-    decorations that cover the point and have a higher precedence
-    are provided in `active`. The open count in `openStart` counts
-    the number of those ranges that started before the point and. If
-    the point started before the iterated range, `openStart` will be
-    `active.length + 1` to signal this.
-    */
-    point(from: number, to: number, value: T, active: readonly T[], openStart: number): void;
-    /**
-    When provided, this will be called for each point processed,
-    causing the ones for which it returns false to be ignored.
-    */
-    filterPoint?(from: number, to: number, value: T, index: number): boolean;
-}
-/**
-A range cursor is an object that moves to the next range every
-time you call `next` on it. Note that, unlike ES6 iterators, these
-start out pointing at the first element, so you should call `next`
-only after reading the first range (if any).
-*/
-interface RangeCursor<T> {
-    /**
-    Move the iterator forward.
-    */
-    next: () => void;
-    /**
-    The next range's value. Holds `null` when the cursor has reached
-    its end.
-    */
-    value: T | null;
-    /**
-    The next range's start position.
-    */
-    from: number;
-    /**
-    The next end position.
-    */
-    to: number;
+declare class StyleModule {
+  constructor(spec: {[selector: string]: StyleSpec}, options?: {
+    finish?(sel: string): string
+  })
+  getRules(): string
+  static mount(root: Document | ShadowRoot | DocumentOrShadowRoot, module: StyleModule | ReadonlyArray<StyleModule>): void
+  static newName(): string
 }
-declare type RangeSetUpdate<T extends RangeValue> = {
-    /**
-    An array of ranges to add. If given, this should be sorted by
-    `from` position and `startSide` unless
-    [`sort`](https://codemirror.net/6/docs/ref/#rangeset.RangeSet.update^updateSpec.sort) is given as
-    `true`.
-    */
-    add?: readonly Range<T>[];
-    /**
-    Indicates whether the library should sort the ranges in `add`.
-    Defaults to `false`.
-    */
-    sort?: boolean;
-    /**
-    Filter the ranges already in the set. Only those for which this
-    function returns `true` are kept.
-    */
-    filter?: (from: number, to: number, value: T) => boolean;
-    /**
-    Can be used to limit the range on which the filter is
-    applied. Filtering only a small range, as opposed to the entire
-    set, can make updates cheaper.
-    */
-    filterFrom?: number;
-    /**
-    The end position to apply the filter to.
-    */
-    filterTo?: number;
-};
-/**
-A range set stores a collection of [ranges](https://codemirror.net/6/docs/ref/#rangeset.Range) in a
-way that makes them efficient to [map](https://codemirror.net/6/docs/ref/#rangeset.RangeSet.map) and
-[update](https://codemirror.net/6/docs/ref/#rangeset.RangeSet.update). This is an immutable data
-structure.
-*/
-declare class RangeSet<T extends RangeValue> {
-    /**
-    The number of ranges in the set.
-    */
-    get size(): number;
-    /**
-    Update the range set, optionally adding new ranges or filtering
-    out existing ones.
-    
-    (The extra type parameter is just there as a kludge to work
-    around TypeScript variance issues that prevented `RangeSet<X>`
-    from being a subtype of `RangeSet<Y>` when `X` is a subtype of
-    `Y`.)
-    */
-    update<U extends T>(updateSpec: RangeSetUpdate<U>): RangeSet<T>;
-    /**
-    Map this range set through a set of changes, return the new set.
-    */
-    map(changes: ChangeDesc): RangeSet<T>;
-    /**
-    Iterate over the ranges that touch the region `from` to `to`,
-    calling `f` for each. There is no guarantee that the ranges will
-    be reported in any specific order. When the callback returns
-    `false`, iteration stops.
-    */
-    between(from: number, to: number, f: (from: number, to: number, value: T) => void | false): void;
-    /**
-    Iterate over the ranges in this set, in order, including all
-    ranges that end at or after `from`.
-    */
-    iter(from?: number): RangeCursor<T>;
-    /**
-    Iterate over the ranges in a collection of sets, in order,
-    starting from `from`.
-    */
-    static iter<T extends RangeValue>(sets: readonly RangeSet<T>[], from?: number): RangeCursor<T>;
-    /**
-    Iterate over two groups of sets, calling methods on `comparator`
-    to notify it of possible differences.
-    */
-    static compare<T extends RangeValue>(oldSets: readonly RangeSet<T>[], newSets: readonly RangeSet<T>[], 
-    /**
-    This indicates how the underlying data changed between these
-    ranges, and is needed to synchronize the iteration. `from` and
-    `to` are coordinates in the _new_ space, after these changes.
-    */
-    textDiff: ChangeDesc, comparator: RangeComparator<T>, 
-    /**
-    Can be used to ignore all non-point ranges, and points below
-    the given size. When -1, all ranges are compared.
-    */
-    minPointSize?: number): void;
-    /**
-    Compare the contents of two groups of range sets, returning true
-    if they are equivalent in the given range.
-    */
-    static eq<T extends RangeValue>(oldSets: readonly RangeSet<T>[], newSets: readonly RangeSet<T>[], from?: number, to?: number): boolean;
-    /**
-    Iterate over a group of range sets at the same time, notifying
-    the iterator about the ranges covering every given piece of
-    content. Returns the open count (see
-    [`SpanIterator.span`](https://codemirror.net/6/docs/ref/#rangeset.SpanIterator.span)) at the end
-    of the iteration.
-    */
-    static spans<T extends RangeValue>(sets: readonly RangeSet<T>[], from: number, to: number, iterator: SpanIterator<T>, 
-    /**
-    When given and greater than -1, only points of at least this
-    size are taken into account.
-    */
-    minPointSize?: number): number;
-    /**
-    Create a range set for the given range or array of ranges. By
-    default, this expects the ranges to be _sorted_ (by start
-    position and, if two start at the same position,
-    `value.startSide`). You can pass `true` as second argument to
-    cause the method to sort them.
-    */
-    static of<T extends RangeValue>(ranges: readonly Range<T>[] | Range<T>, sort?: boolean): RangeSet<T>;
-    /**
-    The empty set of ranges.
-    */
-    static empty: RangeSet<any>;
+
+type StyleSpec = {
+  [propOrSelector: string]: string | number | StyleSpec | null
 }
 
 declare type Attrs = {
@@ -2385,9 +1866,10 @@ interface MarkDecorationSpec {
     class?: string;
     /**
     Add a wrapping element around the text in the marked range. Note
-    that there will not be a single element covering the entire
-    range—content is split on mark starts and ends, and each piece
-    gets its own element.
+    that there will not necessarily be a single element covering the
+    entire range—other decorations with lower precedence might split
+    this one if they partially overlap it, and line breaks always
+    end decoration elements.
     */
     tagName?: string;
     /**
@@ -2478,7 +1960,7 @@ interface LineDecorationSpec {
 Widgets added to the content are described by subclasses of this
 class. Using a description object like that makes it possible to
 delay creating of the DOM structure for a widget until it is
-needed, and to avoid redrawing widgets even when the decorations
+needed, and to avoid redrawing widgets even if the decorations
 that define them are recreated.
 */
 declare abstract class WidgetType {
@@ -2495,7 +1977,7 @@ declare abstract class WidgetType {
     returns `false`, which will cause new instances of the widget to
     always be redrawn.
     */
-    eq(_widget: WidgetType): boolean;
+    eq(widget: WidgetType): boolean;
     /**
     Update a DOM element created by a widget of the same type (but
     different, non-`eq` content) to reflect this widget. May return
@@ -2503,7 +1985,7 @@ declare abstract class WidgetType {
     couldn't (in which case the widget will be redrawn). The default
     implementation just returns false.
     */
-    updateDOM(_dom: HTMLElement): boolean;
+    updateDOM(dom: HTMLElement): boolean;
     /**
     The estimated height this widget will have, to be used when
     estimating the height of content that hasn't been drawn. May
@@ -2516,17 +1998,17 @@ declare abstract class WidgetType {
     should be ignored by the editor. The default is to ignore all
     events.
     */
-    ignoreEvent(_event: Event): boolean;
+    ignoreEvent(event: Event): boolean;
     /**
     This is called when the an instance of the widget is removed
     from the editor view.
     */
-    destroy(_dom: HTMLElement): void;
+    destroy(dom: HTMLElement): void;
 }
 /**
 A decoration set represents a collection of decorated ranges,
 organized for efficient access and mapping. See
-[`RangeSet`](https://codemirror.net/6/docs/ref/#rangeset.RangeSet) for its methods.
+[`RangeSet`](https://codemirror.net/6/docs/ref/#state.RangeSet) for its methods.
 */
 declare type DecorationSet = RangeSet<Decoration>;
 /**
@@ -2553,7 +2035,8 @@ declare enum BlockType {
 /**
 A decoration provides information on how to draw or style a piece
 of content. You'll usually use it wrapped in a
-[`Range`](https://codemirror.net/6/docs/ref/#rangeset.Range), which adds a start and end position.
+[`Range`](https://codemirror.net/6/docs/ref/#state.Range), which adds a start and end position.
+@nonabstract
 */
 declare abstract class Decoration extends RangeValue {
     /**
@@ -2562,21 +2045,39 @@ declare abstract class Decoration extends RangeValue {
     your decoration.
     */
     readonly spec: any;
+    protected constructor(
+    /**
+    @internal
+    */
+    startSide: number, 
+    /**
+    @internal
+    */
+    endSide: number, 
+    /**
+    @internal
+    */
+    widget: WidgetType | null, 
+    /**
+    The config object used to create this decoration. You can
+    include additional properties in there to store metadata about
+    your decoration.
+    */
+    spec: any);
     abstract eq(other: Decoration): boolean;
     /**
     Create a mark decoration, which influences the styling of the
     content in its range. Nested mark decorations will cause nested
     DOM elements to be created. Nesting order is determined by
-    precedence of the [facet](https://codemirror.net/6/docs/ref/#view.EditorView^decorations) or
-    (below the facet-provided decorations) [view
-    plugin](https://codemirror.net/6/docs/ref/#view.PluginSpec.decorations). Such elements are split
-    on line boundaries and on the boundaries of higher-precedence
-    decorations.
+    precedence of the [facet](https://codemirror.net/6/docs/ref/#view.EditorView^decorations), with
+    the higher-precedence decorations creating the inner DOM nodes.
+    Such elements are split on line boundaries and on the boundaries
+    of lower-precedence decorations.
     */
     static mark(spec: MarkDecorationSpec): Decoration;
     /**
-    Create a widget decoration, which adds an element at the given
-    position.
+    Create a widget decoration, which displays a DOM element at the
+    given position.
     */
     static widget(spec: WidgetDecorationSpec): Decoration;
     /**
@@ -2623,7 +2124,7 @@ declare type Command = (target: EditorView) => boolean;
 /**
 This is the interface plugin objects conform to.
 */
-interface PluginValue {
+interface PluginValue extends Object {
     /**
     Notifies the plugin of an update that happened in the view. This
     is called _before_ the view updates its own DOM. It is
@@ -2634,75 +2135,13 @@ interface PluginValue {
     [`requestMeasure`](https://codemirror.net/6/docs/ref/#view.EditorView.requestMeasure) to schedule
     your code in a DOM reading phase if you need to.
     */
-    update?(_update: ViewUpdate): void;
+    update?(update: ViewUpdate): void;
     /**
     Called when the plugin is no longer going to be used. Should
     revert any changes the plugin made to the DOM.
     */
     destroy?(): void;
 }
-declare const isFieldProvider: unique symbol;
-/**
-Used to [declare](https://codemirror.net/6/docs/ref/#view.PluginSpec.provide) which
-[fields](https://codemirror.net/6/docs/ref/#view.PluginValue) a [view plugin](https://codemirror.net/6/docs/ref/#view.ViewPlugin)
-provides.
-*/
-declare class PluginFieldProvider<V> {
-    private [isFieldProvider];
-}
-/**
-Plugin fields are a mechanism for allowing plugins to provide
-values that can be retrieved through the
-[`pluginField`](https://codemirror.net/6/docs/ref/#view.EditorView.pluginField) view method.
-*/
-declare class PluginField<T> {
-    /**
-    Create a [provider](https://codemirror.net/6/docs/ref/#view.PluginFieldProvider) for this field,
-    to use with a plugin's [provide](https://codemirror.net/6/docs/ref/#view.PluginSpec.provide)
-    option.
-    */
-    from<V extends PluginValue>(get: (value: V) => T): PluginFieldProvider<V>;
-    /**
-    Define a new plugin field.
-    */
-    static define<T>(): PluginField<T>;
-    /**
-    This field can be used by plugins to provide
-    [decorations](https://codemirror.net/6/docs/ref/#view.Decoration).
-    
-    **Note**: For reasons of data flow (plugins are only updated
-    after the viewport is computed), decorations produced by plugins
-    are _not_ taken into account when predicting the vertical layout
-    structure of the editor. They **must not** introduce block
-    widgets (that will raise an error) or replacing decorations that
-    cover line breaks (these will be ignored if they occur). Such
-    decorations, or others that cause a large amount of vertical
-    size shift compared to the undecorated content, should be
-    provided through the state-level [`decorations`
-    facet](https://codemirror.net/6/docs/ref/#view.EditorView^decorations) instead.
-    */
-    static decorations: PluginField<DecorationSet>;
-    /**
-    Used to provide ranges that should be treated as atoms as far as
-    cursor motion is concerned. This causes methods like
-    [`moveByChar`](https://codemirror.net/6/docs/ref/#view.EditorView.moveByChar) and
-    [`moveVertically`](https://codemirror.net/6/docs/ref/#view.EditorView.moveVertically) (and the
-    commands built on top of them) to skip across such regions when
-    a selection endpoint would enter them. This does _not_ prevent
-    direct programmatic [selection
-    updates](https://codemirror.net/6/docs/ref/#state.TransactionSpec.selection) from moving into such
-    regions.
-    */
-    static atomicRanges: PluginField<RangeSet<any>>;
-    /**
-    Plugins can provide additional scroll margins (space around the
-    sides of the scrolling element that should be considered
-    invisible) through this field. This can be useful when the
-    plugin introduces elements that cover part of that element (for
-    example a horizontally fixed gutter).
-    */
-    static scrollMargins: PluginField<Partial<Rect> | null>;
-}
 /**
 Provides additional information when defining a [view
 plugin](https://codemirror.net/6/docs/ref/#view.ViewPlugin).
@@ -2716,20 +2155,18 @@ interface PluginSpec<V extends PluginValue> {
     */
     eventHandlers?: DOMEventHandlers<V>;
     /**
-    Allow the plugin to provide decorations. When given, this should
-    a function that take the plugin value and return a [decoration
-    set](https://codemirror.net/6/docs/ref/#view.DecorationSet). See also the caveat about
-    [layout-changing decorations](https://codemirror.net/6/docs/ref/#view.PluginField^decorations)
-    from plugins.
+    Specify that the plugin provides additional extensions when
+    added to an editor configuration.
     */
-    decorations?: (value: V) => DecorationSet;
+    provide?: (plugin: ViewPlugin<V>) => Extension;
     /**
-    Specify that the plugin provides [plugin
-    field](https://codemirror.net/6/docs/ref/#view.PluginField) values. Use a field's
-    [`from`](https://codemirror.net/6/docs/ref/#view.PluginField.from) method to create these
-    providers.
+    Allow the plugin to provide decorations. When given, this should
+    be a function that take the plugin value and return a
+    [decoration set](https://codemirror.net/6/docs/ref/#view.DecorationSet). See also the caveat about
+    [layout-changing decorations](https://codemirror.net/6/docs/ref/#view.EditorView^decorations) that
+    depend on the view.
     */
-    provide?: PluginFieldProvider<V> | readonly PluginFieldProvider<V>[];
+    decorations?: (value: V) => DecorationSet;
 }
 /**
 View plugins associate stateful values with a view. They can
@@ -2746,12 +2183,12 @@ declare class ViewPlugin<V extends PluginValue> {
     Define a plugin from a constructor function that creates the
     plugin's value, given an editor view.
     */
-    static define<V extends PluginValue & object>(create: (view: EditorView) => V, spec?: PluginSpec<V>): ViewPlugin<V>;
+    static define<V extends PluginValue>(create: (view: EditorView) => V, spec?: PluginSpec<V>): ViewPlugin<V>;
     /**
     Create a plugin for a class whose constructor takes a single
     editor view as argument.
     */
-    static fromClass<V extends PluginValue & object>(cls: {
+    static fromClass<V extends PluginValue>(cls: {
         new (view: EditorView): V;
     }, spec?: PluginSpec<V>): ViewPlugin<V>;
 }
@@ -2798,6 +2235,7 @@ declare class ViewUpdate {
     The previous editor state.
     */
     readonly startState: EditorState;
+    private constructor();
     /**
     Tells you whether the [viewport](https://codemirror.net/6/docs/ref/#view.EditorView.viewport) or
     [visible ranges](https://codemirror.net/6/docs/ref/#view.EditorView.visibleRanges) changed in this
@@ -2805,8 +2243,8 @@ declare class ViewUpdate {
     */
     get viewportChanged(): boolean;
     /**
-    Indicates whether the height of an element in the editor changed
-    in this update.
+    Indicates whether the height of a block element in the editor
+    changed in this update.
     */
     get heightChanged(): boolean;
     /**
@@ -2862,6 +2300,43 @@ interface MouseSelectionStyle {
 }
 declare type MakeSelectionStyle = (view: EditorView, event: MouseEvent) => MouseSelectionStyle | null;
 
+/**
+Record used to represent information about a block-level element
+in the editor view.
+*/
+declare class BlockInfo {
+    /**
+    The start of the element in the document.
+    */
+    readonly from: number;
+    /**
+    The length of the element.
+    */
+    readonly length: number;
+    /**
+    The top position of the element (relative to the top of the
+    document).
+    */
+    readonly top: number;
+    /**
+    Its height.
+    */
+    readonly height: number;
+    /**
+    The type of element this is. When querying lines, this may be
+    an array of all the blocks that make up the line.
+    */
+    readonly type: BlockType | readonly BlockInfo[];
+    /**
+    The end of the element as a document position.
+    */
+    get to(): number;
+    /**
+    The bottom position of the element.
+    */
+    get bottom(): number;
+}
+
 /**
 Used to indicate [text direction](https://codemirror.net/6/docs/ref/#view.EditorView.textDirection).
 */
@@ -2902,43 +2377,6 @@ declare class BidiSpan {
     get dir(): Direction;
 }
 
-/**
-Record used to represent information about a block-level element
-in the editor view.
-*/
-declare class BlockInfo {
-    /**
-    The start of the element in the document.
-    */
-    readonly from: number;
-    /**
-    The length of the element.
-    */
-    readonly length: number;
-    /**
-    The top position of the element (relative to the top of the
-    document).
-    */
-    readonly top: number;
-    /**
-    Its height.
-    */
-    readonly height: number;
-    /**
-    The type of element this is. When querying lines, this may be
-    an array of all the blocks that make up the line.
-    */
-    readonly type: BlockType | readonly BlockInfo[];
-    /**
-    The end of the element as a document position.
-    */
-    get to(): number;
-    /**
-    The bottom position of the element.
-    */
-    get bottom(): number;
-}
-
 interface EditorConfig {
     /**
     The view's initial state. Defaults to an extension-less state
@@ -2946,6 +2384,12 @@ interface EditorConfig {
     */
     state?: EditorState;
     /**
+    When given, the editor is immediately appended to the given
+    element on creation. (Otherwise, you'll have to place the view's
+    [`dom`](https://codemirror.net/6/docs/ref/#view.EditorView.dom) element in the document yourself.)
+    */
+    parent?: Element | DocumentFragment;
+    /**
     If the view is going to be mounted in a shadow root or document
     other than the one held by the global variable `document` (the
     default), you should pass it here. If you provide `parent`, but
@@ -2961,12 +2405,6 @@ interface EditorConfig {
     method](https://codemirror.net/6/docs/ref/#view.EditorView.update).
     */
     dispatch?: (tr: Transaction) => void;
-    /**
-    When given, the editor is immediately appended to the given
-    element on creation. (Otherwise, you'll have to place the view's
-    [`dom`](https://codemirror.net/6/docs/ref/#view.EditorView.dom) element in the document yourself.)
-    */
-    parent?: Element | DocumentFragment;
 }
 /**
 An editor view represents the editor's user interface. It holds
@@ -3052,9 +2490,9 @@ declare class EditorView {
     private bidiCache;
     private destroyed;
     /**
-    Construct a new view. You'll usually want to put `view.dom` into
-    your document after creating a view, so that the user can see
-    it.
+    Construct a new view. You'll want to either provide a `parent`
+    option, or put `view.dom` into your document after creating a
+    view, so that the user can see the editor.
     */
     constructor(
     /**
@@ -3106,12 +2544,7 @@ declare class EditorView {
     drawing done by other components is synchronized, avoiding
     unnecessary DOM layout computations.
     */
-    requestMeasure<T>(request?: MeasureRequest<T>): void;
-    /**
-    Collect all values provided by the active plugins for a given
-    field.
-    */
-    pluginField<T>(field: PluginField<T>): readonly T[];
+    requestMeasure<T>(request?: MeasureRequest<T>): void;
     /**
     Get the value of a specific plugin, if present. Note that
     plugins that crash can be dropped from a view, so even when you
@@ -3133,55 +2566,18 @@ declare class EditorView {
         bottom: number;
     };
     /**
-    Find the line or block widget at the given vertical position.
-    
-    By default, this position is interpreted as a screen position,
-    meaning `docTop` is set to the DOM top position of the editor
-    content (forcing a layout). You can pass a different `docTop`
-    value—for example 0 to interpret `height` as a document-relative
-    position, or a precomputed document top
-    (`view.contentDOM.getBoundingClientRect().top`) to limit layout
-    queries.
-    
-    *Deprecated: use `elementAtHeight` instead.*
-    */
-    blockAtHeight(height: number, docTop?: number): BlockInfo;
-    /**
     Find the text line or block widget at the given vertical
     position (which is interpreted as relative to the [top of the
     document](https://codemirror.net/6/docs/ref/#view.EditorView.documentTop)
     */
     elementAtHeight(height: number): BlockInfo;
     /**
-    Find information for the visual line (see
-    [`visualLineAt`](https://codemirror.net/6/docs/ref/#view.EditorView.visualLineAt)) at the given
-    vertical position. The resulting block info might hold another
-    array of block info structs in its `type` field if this line
-    consists of more than one block.
-    
-    Defaults to treating `height` as a screen position. See
-    [`blockAtHeight`](https://codemirror.net/6/docs/ref/#view.EditorView.blockAtHeight) for the
-    interpretation of the `docTop` parameter.
-    
-    *Deprecated: use `lineBlockAtHeight` instead.*
-    */
-    visualLineAtHeight(height: number, docTop?: number): BlockInfo;
-    /**
     Find the line block (see
     [`lineBlockAt`](https://codemirror.net/6/docs/ref/#view.EditorView.lineBlockAt) at the given
     height.
     */
     lineBlockAtHeight(height: number): BlockInfo;
     /**
-    Iterate over the height information of the visual lines in the
-    viewport. The heights of lines are reported relative to the
-    given document top, which defaults to the screen position of the
-    document (forcing a layout).
-    
-    *Deprecated: use `viewportLineBlocks` instead.*
-    */
-    viewportLines(f: (line: BlockInfo) => void, docTop?: number): void;
-    /**
     Get the extent and vertical position of all [line
     blocks](https://codemirror.net/6/docs/ref/#view.EditorView.lineBlockAt) in the viewport. Positions
     are relative to the [top of the
@@ -3189,22 +2585,9 @@ declare class EditorView {
     */
     get viewportLineBlocks(): BlockInfo[];
     /**
-    Find the extent and height of the visual line (a range delimited
-    on both sides by either non-[hidden](https://codemirror.net/6/docs/ref/#view.Decoration^range)
-    line breaks, or the start/end of the document) at the given position.
-    
-    Vertical positions are computed relative to the `docTop`
-    argument, which defaults to 0 for this method. You can pass
-    `view.contentDOM.getBoundingClientRect().top` here to get screen
-    coordinates.
-    
-    *Deprecated: use `lineBlockAt` instead.*
-    */
-    visualLineAt(pos: number, docTop?: number): BlockInfo;
-    /**
     Find the line block around the given document position. A line
     block is a range delimited on both sides by either a
-    non-[hidden](https://codemirror.net/6/docs/ref/#view.Decoration^range) line breaks, or the
+    non-[hidden](https://codemirror.net/6/docs/ref/#view.Decoration^replace) line breaks, or the
     start/end of the document. It will usually just hold a line of
     text, but may be broken into multiple textblocks by block
     widgets.
@@ -3216,13 +2599,13 @@ declare class EditorView {
     get contentHeight(): number;
     /**
     Move a cursor position by [grapheme
-    cluster](https://codemirror.net/6/docs/ref/#text.findClusterBreak). `forward` determines whether
-    the motion is away from the line start, or towards it. Motion in
-    bidirectional text is in visual order, in the editor's [text
-    direction](https://codemirror.net/6/docs/ref/#view.EditorView.textDirection). When the start
-    position was the last one on the line, the returned position
-    will be across the line break. If there is no further line, the
-    original position is returned.
+    cluster](https://codemirror.net/6/docs/ref/#state.findClusterBreak). `forward` determines whether
+    the motion is away from the line start, or towards it. In
+    bidirectional text, the line is traversed in visual order, using
+    the editor's [text direction](https://codemirror.net/6/docs/ref/#view.EditorView.textDirection).
+    When the start position was the last one on the line, the
+    returned position will be across the line break. If there is no
+    further line, the original position is returned.
     
     By default, this method moves over a single cluster. The
     optional `by` argument can be used to move across more. It will
@@ -3259,7 +2642,6 @@ declare class EditorView {
     used.
     */
     moveVertically(start: SelectionRange, forward: boolean, distance?: number): SelectionRange;
-    scrollPosIntoView(pos: number): void;
     /**
     Find the DOM parent node and offset (child offset if `node` is
     an element, character offset when it is a text node) at the
@@ -3317,10 +2699,20 @@ declare class EditorView {
     /**
     The text direction
     ([`direction`](https://developer.mozilla.org/en-US/docs/Web/CSS/direction)
-    CSS property) of the editor.
+    CSS property) of the editor's content element.
     */
     get textDirection(): Direction;
     /**
+    Find the text direction of the block at the given position, as
+    assigned by CSS. If
+    [`perLineTextDirection`](https://codemirror.net/6/docs/ref/#view.EditorView^perLineTextDirection)
+    isn't enabled, or the given position is outside of the viewport,
+    this will always return the same as
+    [`textDirection`](https://codemirror.net/6/docs/ref/#view.EditorView.textDirection). Note that
+    this may trigger a DOM layout.
+    */
+    textDirectionAt(pos: number): Direction;
+    /**
     Whether this editor [wraps lines](https://codemirror.net/6/docs/ref/#view.EditorView.lineWrapping)
     (as determined by the
     [`white-space`](https://developer.mozilla.org/en-US/docs/Web/CSS/white-space)
@@ -3352,20 +2744,6 @@ declare class EditorView {
     */
     destroy(): void;
     /**
-    Effect that can be [added](https://codemirror.net/6/docs/ref/#state.TransactionSpec.effects) to a
-    transaction to make it scroll the given range into view.
-    
-    *Deprecated*. Use [`scrollIntoView`](https://codemirror.net/6/docs/ref/#view.EditorView^scrollIntoView) instead.
-    */
-    static scrollTo: StateEffectType<SelectionRange>;
-    /**
-    Effect that makes the editor scroll the given range to the
-    center of the visible view.
-    
-    *Deprecated*. Use [`scrollIntoView`](https://codemirror.net/6/docs/ref/#view.EditorView^scrollIntoView) instead.
-    */
-    static centerOn: StateEffectType<SelectionRange>;
-    /**
     Returns an effect that can be
     [added](https://codemirror.net/6/docs/ref/#state.TransactionSpec.effects) to a transaction to
     cause it to scroll the given position or range into view.
@@ -3405,16 +2783,16 @@ declare class EditorView {
     */
     static styleModule: Facet<StyleModule, readonly StyleModule[]>;
     /**
-    Facet that can be used to add DOM event handlers. The value
-    should be an object mapping event names to handler functions. The
-    first such function to return true will be assumed to have handled
-    that event, and no other handlers or built-in behavior will be
-    activated for it.
-    These are registered on the [content
-    element](https://codemirror.net/6/docs/ref/#view.EditorView.contentDOM), except for `scroll`
-    handlers, which will be called any time the editor's [scroll
-    element](https://codemirror.net/6/docs/ref/#view.EditorView.scrollDOM) or one of its parent nodes
-    is scrolled.
+    Returns an extension that can be used to add DOM event handlers.
+    The value should be an object mapping event names to handler
+    functions. For any given event, such functions are ordered by
+    extension precedence, and the first handler to return true will
+    be assumed to have handled that event, and no other handlers or
+    built-in behavior will be activated for it. These are registered
+    on the [content element](https://codemirror.net/6/docs/ref/#view.EditorView.contentDOM), except
+    for `scroll` handlers, which will be called any time the
+    editor's [scroll element](https://codemirror.net/6/docs/ref/#view.EditorView.scrollDOM) or one of
+    its parent nodes is scrolled.
     */
     static domEventHandlers(handlers: DOMEventHandlers<any>): Extension;
     /**
@@ -3426,6 +2804,13 @@ declare class EditorView {
     */
     static inputHandler: Facet<(view: EditorView, from: number, to: number, text: string) => boolean, readonly ((view: EditorView, from: number, to: number, text: string) => boolean)[]>;
     /**
+    By default, the editor assumes all its content has the same
+    [text direction](https://codemirror.net/6/docs/ref/#view.Direction). Configure this with a `true`
+    value to make it read the text direction of every (rendered)
+    line separately.
+    */
+    static perLineTextDirection: Facet<boolean, boolean>;
+    /**
     Allows you to provide a function that should be called when the
     library catches an exception from an extension (mostly from view
     plugins, but may be used by other extensions to route exceptions
@@ -3441,9 +2826,9 @@ declare class EditorView {
     /**
     Facet that controls whether the editor content DOM is editable.
     When its highest-precedence value is `false`, the element will
-    not longer have its `contenteditable` attribute set. (Note that
-    this doesn't affect API calls that change the editor content,
-    even when those are bound to keys or buttons. See the
+    not have its `contenteditable` attribute set. (Note that this
+    doesn't affect API calls that change the editor content, even
+    when those are bound to keys or buttons. See the
     [`readOnly`](https://codemirror.net/6/docs/ref/#state.EditorState.readOnly) facet for that.)
     */
     static editable: Facet<boolean, boolean>;
@@ -3462,17 +2847,44 @@ declare class EditorView {
     */
     static dragMovesSelection: Facet<(event: MouseEvent) => boolean, readonly ((event: MouseEvent) => boolean)[]>;
     /**
-    Facet used to configure whether a given selecting click adds
-    a new range to the existing selection or replaces it entirely.
+    Facet used to configure whether a given selecting click adds a
+    new range to the existing selection or replaces it entirely. The
+    default behavior is to check `event.metaKey` on macOS, and
+    `event.ctrlKey` elsewhere.
     */
     static clickAddsSelectionRange: Facet<(event: MouseEvent) => boolean, readonly ((event: MouseEvent) => boolean)[]>;
     /**
     A facet that determines which [decorations](https://codemirror.net/6/docs/ref/#view.Decoration)
-    are shown in the view. See also [view
-    plugins](https://codemirror.net/6/docs/ref/#view.EditorView^decorations), which have a separate
-    mechanism for providing decorations.
+    are shown in the view. Decorations can be provided in two
+    ways—directly, or via a function that takes an editor view.
+    
+    Only decoration sets provided directly are allowed to influence
+    the editor's vertical layout structure. The ones provided as
+    functions are called _after_ the new viewport has been computed,
+    and thus **must not** introduce block widgets or replacing
+    decorations that cover line breaks.
+    */
+    static decorations: Facet<DecorationSet | ((view: EditorView) => DecorationSet), readonly (DecorationSet | ((view: EditorView) => DecorationSet))[]>;
+    /**
+    Used to provide ranges that should be treated as atoms as far as
+    cursor motion is concerned. This causes methods like
+    [`moveByChar`](https://codemirror.net/6/docs/ref/#view.EditorView.moveByChar) and
+    [`moveVertically`](https://codemirror.net/6/docs/ref/#view.EditorView.moveVertically) (and the
+    commands built on top of them) to skip across such regions when
+    a selection endpoint would enter them. This does _not_ prevent
+    direct programmatic [selection
+    updates](https://codemirror.net/6/docs/ref/#state.TransactionSpec.selection) from moving into such
+    regions.
+    */
+    static atomicRanges: Facet<(view: EditorView) => RangeSet<any>, readonly ((view: EditorView) => RangeSet<any>)[]>;
+    /**
+    Facet that allows extensions to provide additional scroll
+    margins (space around the sides of the scrolling element that
+    should be considered invisible). This can be useful when the
+    plugin introduces elements that cover part of that element (for
+    example a horizontally fixed gutter).
     */
-    static decorations: Facet<DecorationSet, readonly DecorationSet[]>;
+    static scrollMargins: Facet<(view: EditorView) => Partial<Rect> | null, readonly ((view: EditorView) => Partial<Rect> | null)[]>;
     /**
     Create a theme extension. The first argument can be a
     [`style-mod`](https://github.com/marijnh/style-mod#documentation)
@@ -3574,7 +2986,7 @@ Modifiers can be given in any order. `Shift-` (or `s-`), `Alt-` (or
 
 When a key binding contains multiple key names separated by
 spaces, it represents a multi-stroke binding, which will fire when
-the user presses the given keys after each other order.
+the user presses the given keys after each other.
 
 You can use `Mod-` as a shorthand for `Cmd-` on Mac and `Ctrl-` on
 other platforms. So `Mod-b` is `Ctrl-b` on Linux but `Cmd-b` on
@@ -3618,8 +3030,8 @@ interface KeyBinding {
     content (the `"editor"` scope). Some extensions, mostly those
     that define their own panels, might want to allow you to
     register bindings local to that panel. Such bindings should use
-    a custom scope name. You may also set multiple scope names,
-    separated by spaces.
+    a custom scope name. You may also assign multiple scope names to
+    a binding, separating them by spaces.
     */
     scope?: string;
     /**
@@ -3719,29 +3131,154 @@ to show when the editor is empty.
 */
 declare function placeholder(content: string | HTMLElement): Extension;
 
+/**
+Create an extension that enables rectangular selections. By
+default, it will react to left mouse drag with the Alt key held
+down. When such a selection occurs, the text within the rectangle
+that was dragged over will be selected, as one selection
+[range](https://codemirror.net/6/docs/ref/#state.SelectionRange) per line.
+*/
+declare function rectangularSelection(options?: {
+    /**
+    A custom predicate function, which takes a `mousedown` event and
+    returns true if it should be used for rectangular selection.
+    */
+    eventFilter?: (event: MouseEvent) => boolean;
+}): Extension;
+declare type Handlers$1 = {
+    [event: string]: (view: EditorView, line: BlockInfo, event: Event) => boolean;
+};
+interface LineNumberConfig {
+    /**
+    How to display line numbers. Defaults to simply converting them
+    to string.
+    */
+    formatNumber?: (lineNo: number, state: EditorState) => string;
+    /**
+    Supply event handlers for DOM events on this gutter.
+    */
+    domEventHandlers?: Handlers$1;
+}
+/**
+Create a line number gutter extension.
+*/
+declare function lineNumbers(config?: LineNumberConfig): Extension;
+
+declare class Tag {
+    readonly set: Tag[];
+    static define(parent?: Tag): Tag;
+    static defineModifier(): (tag: Tag) => Tag;
+}
+interface Highlighter {
+    style(tags: readonly Tag[]): string | null;
+    scope?(node: NodeType): boolean;
+}
+declare const tags: {
+    comment: Tag;
+    lineComment: Tag;
+    blockComment: Tag;
+    docComment: Tag;
+    name: Tag;
+    variableName: Tag;
+    typeName: Tag;
+    tagName: Tag;
+    propertyName: Tag;
+    attributeName: Tag;
+    className: Tag;
+    labelName: Tag;
+    namespace: Tag;
+    macroName: Tag;
+    literal: Tag;
+    string: Tag;
+    docString: Tag;
+    character: Tag;
+    attributeValue: Tag;
+    number: Tag;
+    integer: Tag;
+    float: Tag;
+    bool: Tag;
+    regexp: Tag;
+    escape: Tag;
+    color: Tag;
+    url: Tag;
+    keyword: Tag;
+    self: Tag;
+    null: Tag;
+    atom: Tag;
+    unit: Tag;
+    modifier: Tag;
+    operatorKeyword: Tag;
+    controlKeyword: Tag;
+    definitionKeyword: Tag;
+    moduleKeyword: Tag;
+    operator: Tag;
+    derefOperator: Tag;
+    arithmeticOperator: Tag;
+    logicOperator: Tag;
+    bitwiseOperator: Tag;
+    compareOperator: Tag;
+    updateOperator: Tag;
+    definitionOperator: Tag;
+    typeOperator: Tag;
+    controlOperator: Tag;
+    punctuation: Tag;
+    separator: Tag;
+    bracket: Tag;
+    angleBracket: Tag;
+    squareBracket: Tag;
+    paren: Tag;
+    brace: Tag;
+    content: Tag;
+    heading: Tag;
+    heading1: Tag;
+    heading2: Tag;
+    heading3: Tag;
+    heading4: Tag;
+    heading5: Tag;
+    heading6: Tag;
+    contentSeparator: Tag;
+    list: Tag;
+    quote: Tag;
+    emphasis: Tag;
+    strong: Tag;
+    link: Tag;
+    monospace: Tag;
+    strikethrough: Tag;
+    inserted: Tag;
+    deleted: Tag;
+    changed: Tag;
+    invalid: Tag;
+    meta: Tag;
+    documentMeta: Tag;
+    annotation: Tag;
+    processingInstruction: Tag;
+    definition: (tag: Tag) => Tag;
+    constant: (tag: Tag) => Tag;
+    function: (tag: Tag) => Tag;
+    standard: (tag: Tag) => Tag;
+    local: (tag: Tag) => Tag;
+    special: (tag: Tag) => Tag;
+};
+
 /**
 A language object manages parsing and per-language
 [metadata](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt). Parse data is
-managed as a [Lezer](https://lezer.codemirror.net) tree. You'll
-want to subclass this class for custom parsers, or use the
-[`LRLanguage`](https://codemirror.net/6/docs/ref/#language.LRLanguage) or
-[`StreamLanguage`](https://codemirror.net/6/docs/ref/#stream-parser.StreamLanguage) abstractions for
-[Lezer](https://lezer.codemirror.net/) or stream parsers.
+managed as a [Lezer](https://lezer.codemirror.net) tree. The class
+can be used directly, via the [`LRLanguage`](https://codemirror.net/6/docs/ref/#language.LRLanguage)
+subclass for [Lezer](https://lezer.codemirror.net/) LR parsers, or
+via the [`StreamLanguage`](https://codemirror.net/6/docs/ref/#language.StreamLanguage) subclass
+for stream parsers.
 */
 declare class Language {
     /**
-    The [language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) data
-    facet used for this language.
+    The [language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) facet
+    used for this language.
     */
     readonly data: Facet<{
         [name: string]: any;
     }>;
     /**
-    The node type of the top node of trees produced by this parser.
-    */
-    readonly topNode: NodeType;
-    /**
-    The extension value to install this provider.
+    The extension value to install this as the document language.
     */
     readonly extension: Extension;
     /**
@@ -3750,23 +3287,20 @@ declare class Language {
     */
     parser: Parser;
     /**
-    Construct a language object. You usually don't need to invoke
-    this directly. But when you do, make sure you use
-    [`defineLanguageFacet`](https://codemirror.net/6/docs/ref/#language.defineLanguageFacet) to create
-    the first argument.
+    Construct a language object. If you need to invoke this
+    directly, first define a data facet with
+    [`defineLanguageFacet`](https://codemirror.net/6/docs/ref/#language.defineLanguageFacet), and then
+    configure your parser to [attach](https://codemirror.net/6/docs/ref/#language.languageDataProp) it
+    to the language's outer syntax node.
     */
     constructor(
     /**
-    The [language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) data
-    facet used for this language.
+    The [language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) facet
+    used for this language.
     */
     data: Facet<{
         [name: string]: any;
-    }>, parser: Parser, 
-    /**
-    The node type of the top node of trees produced by this parser.
-    */
-    topNode: NodeType, extraExtensions?: Extension[]);
+    }>, parser: Parser, extraExtensions?: Extension[]);
     /**
     Query whether this language is active at the given position.
     */
@@ -3821,8 +3355,9 @@ declare class LRLanguage extends Language {
 }
 /**
 Get the syntax tree for a state, which is the current (possibly
-incomplete) parse tree of active [language](https://codemirror.net/6/docs/ref/#language.Language),
-or the empty tree if there is no language available.
+incomplete) parse tree of the active
+[language](https://codemirror.net/6/docs/ref/#language.Language), or the empty tree if there is no
+language available.
 */
 declare function syntaxTree(state: EditorState): Tree;
 /**
@@ -3830,13 +3365,13 @@ Queries whether there is a full syntax tree available up to the
 given document position. If there isn't, the background parse
 process _might_ still be working and update the tree further, but
 there is no guarantee of that—the parser will [stop
-working](https://codemirror.net/6/docs/ref/#language.syntaxParserStopped) when it has spent a
+working](https://codemirror.net/6/docs/ref/#language.syntaxParserRunning) when it has spent a
 certain amount of time or has moved beyond the visible viewport.
 Always returns false if no language has been enabled.
 */
 declare function syntaxTreeAvailable(state: EditorState, upto?: number): boolean;
 /**
-This class bundles a [language object](https://codemirror.net/6/docs/ref/#language.Language) with an
+This class bundles a [language](https://codemirror.net/6/docs/ref/#language.Language) with an
 optional set of supporting extensions. Language packages are
 encouraged to export a function that optionally takes a
 configuration object and returns a `LanguageSupport` instance, as
@@ -3861,7 +3396,7 @@ declare class LanguageSupport {
     */
     extension: Extension;
     /**
-    Create a support object.
+    Create a language support object.
     */
     constructor(
     /**
@@ -3968,93 +3503,6 @@ entirely of tabs. When not set, this defaults to 2 spaces.
 */
 declare const indentUnit: Facet<string, string>;
 /**
-Indentation contexts are used when calling [indentation
-services](https://codemirror.net/6/docs/ref/#language.indentService). They provide helper utilities
-useful in indentation logic, and can selectively override the
-indentation reported for some lines.
-*/
-declare class IndentContext {
-    /**
-    The editor state.
-    */
-    readonly state: EditorState;
-    /**
-    The indent unit (number of columns per indentation level).
-    */
-    unit: number;
-    /**
-    Create an indent context.
-    */
-    constructor(
-    /**
-    The editor state.
-    */
-    state: EditorState, 
-    /**
-    @internal
-    */
-    options?: {
-        /**
-        Override line indentations provided to the indentation
-        helper function, which is useful when implementing region
-        indentation, where indentation for later lines needs to refer
-        to previous lines, which may have been reindented compared to
-        the original start state. If given, this function should
-        return -1 for lines (given by start position) that didn't
-        change, and an updated indentation otherwise.
-        */
-        overrideIndentation?: (pos: number) => number;
-        /**
-        Make it look, to the indent logic, like a line break was
-        added at the given position (which is mostly just useful for
-        implementing something like
-        [`insertNewlineAndIndent`](https://codemirror.net/6/docs/ref/#commands.insertNewlineAndIndent)).
-        */
-        simulateBreak?: number;
-        /**
-        When `simulateBreak` is given, this can be used to make the
-        simulate break behave like a double line break.
-        */
-        simulateDoubleBreak?: boolean;
-    });
-    /**
-    Get a description of the line at the given position, taking
-    [simulated line
-    breaks](https://codemirror.net/6/docs/ref/#language.IndentContext.constructor^options.simulateBreak)
-    into account. If there is such a break at `pos`, the `bias`
-    argument determines whether the part of the line line before or
-    after the break is used.
-    */
-    lineAt(pos: number, bias?: -1 | 1): {
-        text: string;
-        from: number;
-    };
-    /**
-    Get the text directly after `pos`, either the entire line
-    or the next 100 characters, whichever is shorter.
-    */
-    textAfterPos(pos: number, bias?: -1 | 1): string;
-    /**
-    Find the column for the given position.
-    */
-    column(pos: number, bias?: -1 | 1): number;
-    /**
-    Find the column position (taking tabs into account) of the given
-    position in the given string.
-    */
-    countColumn(line: string, pos?: number): number;
-    /**
-    Find the indentation column of the line at the given point.
-    */
-    lineIndent(pos: number, bias?: -1 | 1): number;
-    /**
-    Returns the [simulated line
-    break](https://codemirror.net/6/docs/ref/#language.IndentContext.constructor^options.simulateBreak)
-    for this context, if any.
-    */
-    get simulatedBreak(): number | null;
-}
-/**
 Enables reindentation on input. When a language defines an
 `indentOnInput` field in its [language
 data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt), which must hold a regular
@@ -4068,196 +3516,209 @@ For example, `/^\s*\}$/` will reindent when a closing brace is
 added at the start of a line.
 */
 declare function indentOnInput(): Extension;
-
 /**
-Encapsulates a single line of input. Given to stream syntax code,
-which uses it to tokenize the content.
+Default fold-related key bindings.
+
+ - Ctrl-Shift-[ (Cmd-Alt-[ on macOS): [`foldCode`](https://codemirror.net/6/docs/ref/#language.foldCode).
+ - Ctrl-Shift-] (Cmd-Alt-] on macOS): [`unfoldCode`](https://codemirror.net/6/docs/ref/#language.unfoldCode).
+ - Ctrl-Alt-[: [`foldAll`](https://codemirror.net/6/docs/ref/#language.foldAll).
+ - Ctrl-Alt-]: [`unfoldAll`](https://codemirror.net/6/docs/ref/#language.unfoldAll).
 */
-declare class StringStream {
-    /**
-    The line.
-    */
-    string: string;
-    private tabSize;
-    /**
-    The current indent unit size.
-    */
-    indentUnit: number;
-    /**
-    The current position on the line.
-    */
-    pos: number;
-    /**
-    The start position of the current token.
-    */
-    start: number;
-    private lastColumnPos;
-    private lastColumnValue;
-    /**
-    True if we are at the end of the line.
-    */
-    eol(): boolean;
-    /**
-    True if we are at the start of the line.
-    */
-    sol(): boolean;
-    /**
-    Get the next code unit after the current position, or undefined
-    if we're at the end of the line.
-    */
-    peek(): string | undefined;
-    /**
-    Read the next code unit and advance `this.pos`.
-    */
-    next(): string | void;
+declare const foldKeymap: readonly KeyBinding[];
+declare type Handlers = {
+    [event: string]: (view: EditorView, line: BlockInfo, event: Event) => boolean;
+};
+interface FoldGutterConfig {
     /**
-    Match the next character against the given string, regular
-    expression, or predicate. Consume and return it if it matches.
+    A function that creates the DOM element used to indicate a
+    given line is folded or can be folded.
+    When not given, the `openText`/`closeText` option will be used instead.
     */
-    eat(match: string | RegExp | ((ch: string) => boolean)): string | void;
+    markerDOM?: ((open: boolean) => HTMLElement) | null;
     /**
-    Continue matching characters that match the given string,
-    regular expression, or predicate function. Return true if any
-    characters were consumed.
+    Text used to indicate that a given line can be folded.
+    Defaults to `"⌄"`.
     */
-    eatWhile(match: string | RegExp | ((ch: string) => boolean)): boolean;
+    openText?: string;
     /**
-    Consume whitespace ahead of `this.pos`. Return true if any was
-    found.
+    Text used to indicate that a given line is folded.
+    Defaults to `"›"`.
     */
-    eatSpace(): boolean;
+    closedText?: string;
     /**
-    Move to the end of the line.
+    Supply event handlers for DOM events on this gutter.
     */
-    skipToEnd(): void;
+    domEventHandlers?: Handlers;
+}
+/**
+Create an extension that registers a fold gutter, which shows a
+fold status indicator before foldable lines (which can be clicked
+to fold or unfold the line).
+*/
+declare function foldGutter(config?: FoldGutterConfig): Extension;
+
+/**
+A highlight style associates CSS styles with higlighting
+[tags](https://lezer.codemirror.net/docs/ref#highlight.Tag).
+*/
+declare class HighlightStyle implements Highlighter {
     /**
-    Move to directly before the given character, if found on the
-    current line.
+    A style module holding the CSS rules for this highlight style.
+    When using
+    [`highlightTree`](https://lezer.codemirror.net/docs/ref#highlight.highlightTree)
+    outside of the editor, you may want to manually mount this
+    module to show the highlighting.
     */
-    skipTo(ch: string): boolean | void;
+    readonly module: StyleModule | null;
+    readonly style: (tags: readonly Tag[]) => string | null;
+    readonly scope: ((type: NodeType) => boolean) | undefined;
+    private constructor();
     /**
-    Move back `n` characters.
+    Create a highlighter style that associates the given styles to
+    the given tags. The specs must be objects that hold a style tag
+    or array of tags in their `tag` property, and either a single
+    `class` property providing a static CSS class (for highlighter
+    that rely on external styling), or a
+    [`style-mod`](https://github.com/marijnh/style-mod#documentation)-style
+    set of CSS properties (which define the styling for those tags).
+    
+    The CSS rules created for a highlighter will be emitted in the
+    order of the spec's properties. That means that for elements that
+    have multiple tags associated with them, styles defined further
+    down in the list will have a higher CSS precedence than styles
+    defined earlier.
     */
-    backUp(n: number): void;
+    static define(specs: readonly TagStyle[], options?: {
+        /**
+        By default, highlighters apply to the entire document. You can
+        scope them to a single language by providing the language
+        object or a language's top node type here.
+        */
+        scope?: Language | NodeType;
+        /**
+        Add a style to _all_ content. Probably only useful in
+        combination with `scope`.
+        */
+        all?: string | StyleSpec;
+        /**
+        Specify that this highlight style should only be active then
+        the theme is dark or light. By default, it is active
+        regardless of theme.
+        */
+        themeType?: "dark" | "light";
+    }): HighlightStyle;
+}
+/**
+Wrap a highlighter in an editor extension that uses it to apply
+syntax highlighting to the editor content.
+
+When multiple (non-fallback) styles are provided, the styling
+applied is the union of the classes they emit.
+*/
+declare function syntaxHighlighting(highlighter: Highlighter, options?: {
     /**
-    Get the column position at `this.pos`.
+    When enabled, this marks the highlighter as a fallback, which
+    only takes effect if no other highlighters are registered.
     */
-    column(): number;
+    fallback: boolean;
+}): Extension;
+/**
+The type of object used in
+[`HighlightStyle.define`](https://codemirror.net/6/docs/ref/#language.HighlightStyle^define).
+Assigns a style to one or more highlighting
+[tags](https://lezer.codemirror.net/docs/ref#highlight.Tag), which can either be a fixed class name
+(which must be defined elsewhere), or a set of CSS properties, for
+which the library will define an anonymous class.
+*/
+interface TagStyle {
     /**
-    Get the indentation column of the current line.
+    The tag or tags to target.
     */
-    indentation(): number;
+    tag: Tag | readonly Tag[];
     /**
-    Match the input against the given string or regular expression
-    (which should start with a `^`). Return true or the regexp match
-    if it matches.
-    
-    Unless `consume` is set to `false`, this will move `this.pos`
-    past the matched text.
-    
-    When matching a string `caseInsensitive` can be set to true to
-    make the match case-insensitive.
+    If given, this maps the tags to a fixed class name.
     */
-    match(pattern: string | RegExp, consume?: boolean, caseInsensitive?: boolean): boolean | RegExpMatchArray | null;
+    class?: string;
     /**
-    Get the current token.
+    Any further properties (if `class` isn't given) will be
+    interpreted as in style objects given to
+    [style-mod](https://github.com/marijnh/style-mod#documentation).
+    (The type here is `any` because of TypeScript limitations.)
     */
-    current(): string;
+    [styleProperty: string]: any;
 }
-
 /**
-A stream parser parses or tokenizes content from start to end,
-emitting tokens as it goes over it. It keeps a mutable (but
-copyable) object with state, in which it can store information
-about the current context.
+A default highlight style (works well with light themes).
 */
-interface StreamParser<State> {
-    /**
-    Read one token, advancing the stream past it, and returning a
-    string indicating the token's style tag—either the name of one
-    of the tags in [`tags`](https://codemirror.net/6/docs/ref/#highlight.tags), or such a name
-    suffixed by one or more tag
-    [modifier](https://codemirror.net/6/docs/ref/#highlight.Tag^defineModifier) names, separated by
-    spaces. For example `"keyword"` or "`variableName.constant"`.
-    
-    It is okay to return a zero-length token, but only if that
-    updates the state so that the next call will return a non-empty
-    token again.
-    */
-    token(stream: StringStream, state: State): string | null;
+declare const defaultHighlightStyle: HighlightStyle;
+
+interface Config {
     /**
-    This notifies the parser of a blank line in the input. It can
-    update its state here if it needs to.
+    Whether the bracket matching should look at the character after
+    the cursor when matching (if the one before isn't a bracket).
+    Defaults to true.
     */
-    blankLine?(state: State, indentUnit: number): void;
+    afterCursor?: boolean;
     /**
-    Produce a start state for the parser.
+    The bracket characters to match, as a string of pairs. Defaults
+    to `"()[]{}"`. Note that these are only used as fallback when
+    there is no [matching
+    information](https://lezer.codemirror.net/docs/ref/#common.NodeProp^closedBy)
+    in the syntax tree.
     */
-    startState?(indentUnit: number): State;
+    brackets?: string;
     /**
-    Copy a given state. By default, a shallow object copy is done
-    which also copies arrays held at the top level of the object.
+    The maximum distance to scan for matching brackets. This is only
+    relevant for brackets not encoded in the syntax tree. Defaults
+    to 10 000.
     */
-    copyState?(state: State): State;
+    maxScanDistance?: number;
     /**
-    Compute automatic indentation for the line that starts with the
-    given state and text.
+    Can be used to configure the way in which brackets are
+    decorated. The default behavior is to add the
+    `cm-matchingBracket` class for matching pairs, and
+    `cm-nonmatchingBracket` for mismatched pairs or single brackets.
     */
-    indent?(state: State, textAfter: string, context: IndentContext): number | null;
+    renderMatch?: (match: MatchResult, state: EditorState) => readonly Range<Decoration>[];
+}
+/**
+Create an extension that enables bracket matching. Whenever the
+cursor is next to a bracket, that bracket and the one it matches
+are highlighted. Or, when no matching bracket is found, another
+highlighting style is used to indicate this.
+*/
+declare function bracketMatching(config?: Config): Extension;
+/**
+The result returned from `matchBrackets`.
+*/
+interface MatchResult {
     /**
-    Default [language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) to
-    attach to this language.
+    The extent of the bracket token found.
     */
-    languageData?: {
-        [name: string]: any;
+    start: {
+        from: number;
+        to: number;
     };
     /**
-    Extra tokens to use in this parser. When the tokenizer returns a
-    token name that exists as a property in this object, the
-    corresponding tag will be assigned to the token.
+    The extent of the matched token, if any was found.
     */
-    tokenTable?: {
-        [name: string]: Tag;
+    end?: {
+        from: number;
+        to: number;
     };
-}
-/**
-A [language](https://codemirror.net/6/docs/ref/#language.Language) class based on a streaming
-parser.
-*/
-declare class StreamLanguage<State> extends Language {
-    private constructor();
-    static define<State>(spec: StreamParser<State>): StreamLanguage<State>;
-    private getIndent;
-    get allowsNesting(): boolean;
+    /**
+    Whether the tokens match. This can be false even when `end` has
+    a value, if that token doesn't match the opening token.
+    */
+    matched: boolean;
 }
 
-declare const julia$1: StreamParser<unknown>
-
 declare type JuliaLanguageConfig = {
     /** Enable keyword completion */
     enableKeywordCompletion?: boolean;
 };
 declare function julia(config?: JuliaLanguageConfig): LanguageSupport;
 
-declare type Handlers$1 = {
-    [event: string]: (view: EditorView, line: BlockInfo, event: Event) => boolean;
-};
-interface LineNumberConfig {
-    /**
-    How to display line numbers. Defaults to simply converting them
-    to string.
-    */
-    formatNumber?: (lineNo: number, state: EditorState) => string;
-    /**
-    Supply event handlers for DOM events on this gutter.
-    */
-    domEventHandlers?: Handlers$1;
-}
-/**
-Create a line number gutter extension.
-*/
-declare function lineNumbers(config?: LineNumberConfig): Extension;
-
 interface HistoryConfig {
     /**
     The minimum depth (amount of events) to store. Defaults to 100.
@@ -4276,13 +3737,12 @@ declare function history(config?: HistoryConfig): Extension;
 /**
 Default key bindings for the undo history.
 
-- Mod-z: [`undo`](https://codemirror.net/6/docs/ref/#history.undo).
-- Mod-y (Mod-Shift-z on macOS): [`redo`](https://codemirror.net/6/docs/ref/#history.redo).
-- Mod-u: [`undoSelection`](https://codemirror.net/6/docs/ref/#history.undoSelection).
-- Alt-u (Mod-Shift-u on macOS): [`redoSelection`](https://codemirror.net/6/docs/ref/#history.redoSelection).
+- Mod-z: [`undo`](https://codemirror.net/6/docs/ref/#commands.undo).
+- Mod-y (Mod-Shift-z on macOS): [`redo`](https://codemirror.net/6/docs/ref/#commands.redo).
+- Mod-u: [`undoSelection`](https://codemirror.net/6/docs/ref/#commands.undoSelection).
+- Alt-u (Mod-Shift-u on macOS): [`redoSelection`](https://codemirror.net/6/docs/ref/#commands.redoSelection).
 */
 declare const historyKeymap: readonly KeyBinding[];
-
 /**
 Add a [unit](https://codemirror.net/6/docs/ref/#language.indentUnit) of indentation to all selected
 lines.
@@ -4312,109 +3772,11 @@ The default keymap. Includes all bindings from
 - Ctrl-Alt-\\ (Cmd-Alt-\\ on macOS): [`indentSelection`](https://codemirror.net/6/docs/ref/#commands.indentSelection)
 - Shift-Ctrl-k (Shift-Cmd-k on macOS): [`deleteLine`](https://codemirror.net/6/docs/ref/#commands.deleteLine)
 - Shift-Ctrl-\\ (Shift-Cmd-\\ on macOS): [`cursorMatchingBracket`](https://codemirror.net/6/docs/ref/#commands.cursorMatchingBracket)
+- Ctrl-/ (Cmd-/ on macOS): [`toggleComment`](https://codemirror.net/6/docs/ref/#commands.toggleComment).
+- Shift-Alt-a: [`toggleBlockComment`](https://codemirror.net/6/docs/ref/#commands.toggleBlockComment).
 */
 declare const defaultKeymap: readonly KeyBinding[];
 
-/**
-Create an extension that enables rectangular selections. By
-default, it will react to left mouse drag with the Alt key held
-down. When such a selection occurs, the text within the rectangle
-that was dragged over will be selected, as one selection
-[range](https://codemirror.net/6/docs/ref/#state.SelectionRange) per line.
-*/
-declare function rectangularSelection(options?: {
-    /**
-    A custom predicate function, which takes a `mousedown` event and
-    returns true if it should be used for rectangular selection.
-    */
-    eventFilter?: (event: MouseEvent) => boolean;
-}): Extension;
-
-/**
-Default fold-related key bindings.
-
- - Ctrl-Shift-[ (Cmd-Alt-[ on macOS): [`foldCode`](https://codemirror.net/6/docs/ref/#fold.foldCode).
- - Ctrl-Shift-] (Cmd-Alt-] on macOS): [`unfoldCode`](https://codemirror.net/6/docs/ref/#fold.unfoldCode).
- - Ctrl-Alt-[: [`foldAll`](https://codemirror.net/6/docs/ref/#fold.foldAll).
- - Ctrl-Alt-]: [`unfoldAll`](https://codemirror.net/6/docs/ref/#fold.unfoldAll).
-*/
-declare const foldKeymap: readonly KeyBinding[];
-declare type Handlers = {
-    [event: string]: (view: EditorView, line: BlockInfo, event: Event) => boolean;
-};
-interface FoldGutterConfig {
-    /**
-    A function that creates the DOM element used to indicate a
-    given line is folded or can be folded.
-    When not given, the `openText`/`closeText` option will be used instead.
-    */
-    markerDOM?: ((open: boolean) => HTMLElement) | null;
-    /**
-    Text used to indicate that a given line can be folded.
-    Defaults to `"⌄"`.
-    */
-    openText?: string;
-    /**
-    Text used to indicate that a given line is folded.
-    Defaults to `"›"`.
-    */
-    closedText?: string;
-    /**
-    Supply event handlers for DOM events on this gutter.
-    */
-    domEventHandlers?: Handlers;
-}
-/**
-Create an extension that registers a fold gutter, which shows a
-fold status indicator before foldable lines (which can be clicked
-to fold or unfold the line).
-*/
-declare function foldGutter(config?: FoldGutterConfig): Extension;
-
-interface Config {
-    /**
-    Whether the bracket matching should look at the character after
-    the cursor when matching (if the one before isn't a bracket).
-    Defaults to true.
-    */
-    afterCursor?: boolean;
-    /**
-    The bracket characters to match, as a string of pairs. Defaults
-    to `"()[]{}"`. Note that these are only used as fallback when
-    there is no [matching
-    information](https://lezer.codemirror.net/docs/ref/#common.NodeProp^closedBy)
-    in the syntax tree.
-    */
-    brackets?: string;
-    /**
-    The maximum distance to scan for matching brackets. This is only
-    relevant for brackets not encoded in the syntax tree. Defaults
-    to 10 000.
-    */
-    maxScanDistance?: number;
-}
-/**
-Create an extension that enables bracket matching. Whenever the
-cursor is next to a bracket, that bracket and the one it matches
-are highlighted. Or, when no matching bracket is found, another
-highlighting style is used to indicate this.
-*/
-declare function bracketMatching(config?: Config): Extension;
-
-/**
-Extension to enable bracket-closing behavior. When a closeable
-bracket is typed, its closing bracket is immediately inserted
-after the cursor. When closing a bracket directly in front of a
-closing bracket inserted by the extension, the cursor moves over
-that bracket.
-*/
-declare function closeBrackets(): Extension;
-/**
-Close-brackets related key bindings. Binds Backspace to
-[`deleteBracketPair`](https://codemirror.net/6/docs/ref/#closebrackets.deleteBracketPair).
-*/
-declare const closeBracketsKeymap: readonly KeyBinding[];
-
 interface CompletionConfig {
     /**
     When enabled (defaults to true), autocompletion will start
@@ -4430,6 +3792,11 @@ interface CompletionConfig {
     */
     override?: readonly CompletionSource[] | null;
     /**
+    Determines whether the completion tooltip is closed when the
+    editor loses focus. Defaults to true.
+    */
+    closeOnBlur?: boolean;
+    /**
     The maximum number of options to render to the DOM.
     */
     maxRenderedOptions?: number;
@@ -4464,8 +3831,7 @@ interface CompletionConfig {
     completion, and should produce a DOM node to show. `position`
     determines where in the DOM the result appears, relative to
     other added widgets and the standard content. The default icons
-    have position 20, the label position 50, and the detail position
-    70.
+    have position 20, the label position 50, and the detail position 70.
     */
     addToOptions?: {
         render: (completion: Completion, state: EditorState) => Node | null;
@@ -4638,23 +4004,40 @@ interface CompletionResult {
     */
     options: readonly Completion[];
     /**
-    When given, further input that causes the part of the document
-    between ([mapped](https://codemirror.net/6/docs/ref/#state.ChangeDesc.mapPos)) `from` and `to` to
-    match this regular expression will not query the completion
-    source again, but continue with this list of options. This can
-    help a lot with responsiveness, since it allows the completion
-    list to be updated synchronously.
+    When given, further typing or deletion that causes the part of
+    the document between ([mapped](https://codemirror.net/6/docs/ref/#state.ChangeDesc.mapPos)) `from`
+    and `to` to match this regular expression or predicate function
+    will not query the completion source again, but continue with
+    this list of options. This can help a lot with responsiveness,
+    since it allows the completion list to be updated synchronously.
     */
-    span?: RegExp;
+    validFor?: RegExp | ((text: string, from: number, to: number, state: EditorState) => boolean);
     /**
     By default, the library filters and scores completions. Set
     `filter` to `false` to disable this, and cause your completions
     to all be included, in the order they were given. When there are
     other sources, unfiltered completions appear at the top of the
-    list of completions. `span` must not be given when `filter` is
-    `false`, because it only works when filtering.
+    list of completions. `validFor` must not be given when `filter`
+    is `false`, because it only works when filtering.
     */
     filter?: boolean;
+    /**
+    When [`filter`](https://codemirror.net/6/docs/ref/#autocomplete.CompletionResult.filter) is set to
+    `false`, this may be provided to compute the ranges on the label
+    that match the input. Should return an array of numbers where
+    each pair of adjacent numbers provide the start and end of a
+    range.
+    */
+    getMatch?: (completion: Completion) => readonly number[];
+    /**
+    Synchronously update the completion result after typing or
+    deletion. If given, this should not do any expensive work, since
+    it will be called during editor state updates. The function
+    should make sure (similar to
+    [`validFor`](https://codemirror.net/6/docs/ref/#autocomplete.CompletionResult.validFor)) that the
+    completion still applies in the new state.
+    */
+    update?: (current: CompletionResult, from: number, to: number, context: CompletionContext) => CompletionResult | null;
 }
 /**
 This annotation is added to transactions that are produced by
@@ -4663,8 +4046,9 @@ picking a completion.
 declare const pickedCompletion: AnnotationType<Completion>;
 
 /**
-Convert a snippet template to a function that can apply it.
-Snippets are written using syntax like this:
+Convert a snippet template to a function that can
+[apply](https://codemirror.net/6/docs/ref/#autocomplete.Completion.apply) it. Snippets are written
+using syntax like this:
 
     "for (let ${index} = 0; ${index} < ${end}; ${index}++) {\n\t${}\n}"
 
@@ -4743,6 +4127,56 @@ return those as completions.
 */
 declare const completeAnyWord: CompletionSource;
 
+/**
+Configures bracket closing behavior for a syntax (via
+[language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt)) using the `"closeBrackets"`
+identifier.
+*/
+interface CloseBracketConfig {
+    /**
+    The opening brackets to close. Defaults to `["(", "[", "{", "'",
+    '"']`. Brackets may be single characters or a triple of quotes
+    (as in `"''''"`).
+    */
+    brackets?: string[];
+    /**
+    Characters in front of which newly opened brackets are
+    automatically closed. Closing always happens in front of
+    whitespace. Defaults to `")]}:;>"`.
+    */
+    before?: string;
+}
+/**
+Extension to enable bracket-closing behavior. When a closeable
+bracket is typed, its closing bracket is immediately inserted
+after the cursor. When closing a bracket directly in front of a
+closing bracket inserted by the extension, the cursor moves over
+that bracket.
+*/
+declare function closeBrackets(): Extension;
+/**
+Command that implements deleting a pair of matching brackets when
+the cursor is between them.
+*/
+declare const deleteBracketPair: StateCommand;
+/**
+Close-brackets related key bindings. Binds Backspace to
+[`deleteBracketPair`](https://codemirror.net/6/docs/ref/#autocomplete.deleteBracketPair).
+*/
+declare const closeBracketsKeymap: readonly KeyBinding[];
+/**
+Implements the extension's behavior on text insertion. If the
+given string counts as a bracket in the language around the
+selection, and replacing the selection with it requires custom
+behavior (inserting a closing version or skipping past a
+previously-closed bracket), this function returns a transaction
+representing that custom behavior. (You only need this if you want
+to programmatically insert brackets—the
+[`closeBrackets`](https://codemirror.net/6/docs/ref/#autocomplete.closeBrackets) extension will
+take care of running this for user input.)
+*/
+declare function insertBracket(state: EditorState, bracket: string): Transaction | null;
+
 /**
 Returns an extension that enables autocompletion.
 */
@@ -4785,6 +4219,7 @@ the currently selected completion.
 */
 declare function setSelectedCompletion(index: number): StateEffect<unknown>;
 
+type index_CloseBracketConfig = CloseBracketConfig;
 type index_Completion = Completion;
 type index_CompletionContext = CompletionContext;
 declare const index_CompletionContext: typeof CompletionContext;
@@ -4793,14 +4228,18 @@ type index_CompletionSource = CompletionSource;
 declare const index_acceptCompletion: typeof acceptCompletion;
 declare const index_autocompletion: typeof autocompletion;
 declare const index_clearSnippet: typeof clearSnippet;
+declare const index_closeBrackets: typeof closeBrackets;
+declare const index_closeBracketsKeymap: typeof closeBracketsKeymap;
 declare const index_closeCompletion: typeof closeCompletion;
 declare const index_completeAnyWord: typeof completeAnyWord;
 declare const index_completeFromList: typeof completeFromList;
 declare const index_completionKeymap: typeof completionKeymap;
 declare const index_completionStatus: typeof completionStatus;
 declare const index_currentCompletions: typeof currentCompletions;
+declare const index_deleteBracketPair: typeof deleteBracketPair;
 declare const index_ifIn: typeof ifIn;
 declare const index_ifNotIn: typeof ifNotIn;
+declare const index_insertBracket: typeof insertBracket;
 declare const index_moveCompletionSelection: typeof moveCompletionSelection;
 declare const index_nextSnippetField: typeof nextSnippetField;
 declare const index_pickedCompletion: typeof pickedCompletion;
@@ -4814,6 +4253,7 @@ declare const index_snippetKeymap: typeof snippetKeymap;
 declare const index_startCompletion: typeof startCompletion;
 declare namespace index {
   export {
+    index_CloseBracketConfig as CloseBracketConfig,
     index_Completion as Completion,
     index_CompletionContext as CompletionContext,
     index_CompletionResult as CompletionResult,
@@ -4821,14 +4261,18 @@ declare namespace index {
     index_acceptCompletion as acceptCompletion,
     index_autocompletion as autocompletion,
     index_clearSnippet as clearSnippet,
+    index_closeBrackets as closeBrackets,
+    index_closeBracketsKeymap as closeBracketsKeymap,
     index_closeCompletion as closeCompletion,
     index_completeAnyWord as completeAnyWord,
     index_completeFromList as completeFromList,
     index_completionKeymap as completionKeymap,
     index_completionStatus as completionStatus,
     index_currentCompletions as currentCompletions,
+    index_deleteBracketPair as deleteBracketPair,
     index_ifIn as ifIn,
     index_ifNotIn as ifNotIn,
+    index_insertBracket as insertBracket,
     index_moveCompletionSelection as moveCompletionSelection,
     index_nextSnippetField as nextSnippetField,
     index_pickedCompletion as pickedCompletion,
@@ -4882,14 +4326,6 @@ Default search-related key bindings.
 */
 declare const searchKeymap: readonly KeyBinding[];
 
-/**
-Default key bindings for this package.
-
- - Ctrl-/ (Cmd-/ on macOS): [`toggleComment`](https://codemirror.net/6/docs/ref/#comment.toggleComment).
- - Shift-Alt-a: [`toggleBlockComment`](https://codemirror.net/6/docs/ref/#comment.toggleBlockComment).
-*/
-declare const commentKeymap: readonly KeyBinding[];
-
 declare class LeafBlock {
     readonly start: number;
     content: string;
@@ -4940,6 +4376,9 @@ interface NodeSpec {
     name: string;
     block?: boolean;
     composite?(cx: BlockContext, line: Line, value: number): boolean;
+    style?: Tag | readonly Tag[] | {
+        [selector: string]: Tag | readonly Tag[];
+    };
 }
 interface InlineParser {
     name: string;
@@ -5088,6 +4527,17 @@ declare function javascript(config?: {
     typescript?: boolean;
 }): LanguageSupport;
 
+/**
+A language provider based on the [Lezer CSS
+parser](https://github.com/lezer-parser/css), extended with
+highlighting and indentation information.
+*/
+declare const cssLanguage: LRLanguage;
+/**
+Language support for CSS.
+*/
+declare function css(): LanguageSupport;
+
 declare type SQLDialectSpec = {
     /**
     A space-separated list of keywords for the dialect.
@@ -5240,4 +4690,4 @@ Create an instance of the collaborative editing plugin.
 */
 declare function collab(config?: CollabConfig): Extension;
 
-export { Annotation, Compartment, Decoration, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, StreamLanguage, Text, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, commentKeymap, completionKeymap, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, julia$1 as julia_legacy, keymap, lineNumbers, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, rectangularSelection, searchKeymap, sql, syntaxTree, syntaxTreeAvailable, tags };
+export { Annotation, Compartment, Decoration, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, Text, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, completionKeymap, css, cssLanguage, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, keymap, lineNumbers, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, rectangularSelection, searchKeymap, sql, syntaxHighlighting, syntaxTree, syntaxTreeAvailable, tags };
diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index b247463ece..5641b8816e 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -4,13 +4,12 @@ import {
     Compartment,
     EditorView,
     placeholder,
-    julia_legacy,
     julia_andrey,
     keymap,
+    syntaxHighlighting,
     history,
     historyKeymap,
     defaultKeymap,
-    StreamLanguage,
     indentMore,
     indentLess,
     tags,
@@ -28,7 +27,7 @@ import {
     closeBracketsKeymap,
     searchKeymap,
     foldKeymap,
-    commentKeymap,
+    // commentKeymap,
     syntaxTree,
     syntaxTreeAvailable,
     Decoration,
@@ -57,7 +56,9 @@ import {
     javascript,
     python,
     Text,
-} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.27.0/dist/index.es.min.js"
+    css,
+    cssLanguage,
+} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.28.0/dist/index.es.min.js"
 
 export {
     EditorState,
@@ -65,13 +66,11 @@ export {
     Compartment,
     EditorView,
     placeholder,
-    julia_legacy,
     julia_andrey,
     keymap,
     history,
     historyKeymap,
     defaultKeymap,
-    StreamLanguage,
     indentMore,
     indentLess,
     tags,
@@ -89,7 +88,6 @@ export {
     closeBracketsKeymap,
     searchKeymap,
     foldKeymap,
-    commentKeymap,
     syntaxTree,
     syntaxTreeAvailable,
     Decoration,
@@ -115,7 +113,10 @@ export {
     PostgreSQL,
     pythonLanguage,
     sql,
+    syntaxHighlighting,
     javascript,
     python,
     Text,
+    css,
+    cssLanguage,
 }

From 9637c9d59e3e5fac7211f69d9a7a0dbd8b90046b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 26 May 2022 11:17:03 +0200
Subject: [PATCH 334/821] frontmatter input: special UI for "url" and "color"

---
 frontend/components/FrontmatterInput.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index 2505c193ef..f49d2f237b 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -27,7 +27,7 @@ export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter })
         set_frontmatter((fm) => ({ ...fm, [key]: value }))
     }
 
-    const dialog_ref = useRef(/** @type {HTMLDialogElement} */ (null))
+    const dialog_ref = useRef(/** @type {HTMLDialogElement?} */ (null))
     useLayoutEffect(() => {
         dialogPolyfill.registerDialog(dialog_ref.current)
     })
@@ -55,7 +55,7 @@ export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter })
 
     useLayoutEffect(() => {
         const listener = (e) => {
-            if (dialog_ref.current.contains(e.target)) if (e.key === "Enter" && has_ctrl_or_cmd_pressed(e)) submit()
+            if (dialog_ref.current != null) if (dialog_ref.current.contains(e.target)) if (e.key === "Enter" && has_ctrl_or_cmd_pressed(e)) submit()
         }
         window.addEventListener("keydown", listener)
         return () => {
@@ -110,7 +110,7 @@ export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter })
     </dialog>`
 }
 
-const special_field_names = ["tags", "date", "license"]
+const special_field_names = ["tags", "date", "license", "url", "color"]
 
 const field_type = (name) => {
     for (const t of special_field_names) {

From 69121543fac663afa47833793b6ec777ed9466a4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 26 May 2022 12:08:20 +0200
Subject: [PATCH 335/821] Create TypeScriptCheck.yml (#2134)

---
 .github/workflows/TypeScriptCheck.yml | 31 +++++++++++++++++++++++++++
 tsconfig.json                         |  5 +++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/TypeScriptCheck.yml

diff --git a/.github/workflows/TypeScriptCheck.yml b/.github/workflows/TypeScriptCheck.yml
new file mode 100644
index 0000000000..5b3112dc43
--- /dev/null
+++ b/.github/workflows/TypeScriptCheck.yml
@@ -0,0 +1,31 @@
+name: Run TypeScript checks
+
+on:
+    push:
+        paths:
+            - "**.js"
+            - "**.ts"
+        branches:
+            - main
+            - release
+    pull_request:
+        paths:
+            - "**.js"
+            - "**.ts"
+        branches-ignore:
+            - release
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      
+      - uses: actions/setup-node@v1
+        with:
+          node-version: "18.x"
+
+      - run: npm install typescript -g
+      
+      - name: Run TypeScript checks on frontend/
+        run: tsc --noEmit --strictNullChecks false
diff --git a/tsconfig.json b/tsconfig.json
index d1c86b6fa2..2f93cd9f1c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,8 +10,9 @@
         "noImplicitThis": true,
         "alwaysStrict": true,
         "esModuleInterop": true,
-        "strictNullChecks": true
+        "strictNullChecks": true,
+        "skipDefaultLibCheck": true
     },
     "include": ["frontend/**/*.js", "node_modules/**/*.js"],
-    "exclude": []
+    "exclude": ["frontend/components/CellInput/tests/"]
 }

From 20f030de06058326beaf2fde20f2936075a2feb7 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 26 May 2022 12:55:08 +0200
Subject: [PATCH 336/821] fix some type issues

---
 frontend/common/Binder.js                | 2 +-
 frontend/common/Polyfill.js              | 2 ++
 frontend/components/PasteHandler.js      | 2 +-
 frontend/components/RecordingUI.js       | 2 +-
 frontend/imports/CodemirrorPlutoSetup.js | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/common/Binder.js b/frontend/common/Binder.js
index fb4247d00e..29f9a91c1b 100644
--- a/frontend/common/Binder.js
+++ b/frontend/common/Binder.js
@@ -121,7 +121,7 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
 
         /// PART 2: Using Pluto's REST API to open the notebook file. We either upload the notebook with a POST request, or we let the server open by giving it the filename/URL.
 
-        let open_response
+        let open_response = new Response()
 
         if (launch_params.notebookfile.startsWith("data:")) {
             open_response = await fetch(with_token(new URL("notebookupload", binder_session_url)), {
diff --git a/frontend/common/Polyfill.js b/frontend/common/Polyfill.js
index 9764bda7b8..932b1e9eaa 100644
--- a/frontend/common/Polyfill.js
+++ b/frontend/common/Polyfill.js
@@ -27,5 +27,7 @@ if (Blob.prototype.arrayBuffer == null) {
     }
 }
 
+//@ts-ignore
 import { polyfill as scroll_polyfill } from "https://esm.sh/seamless-scroll-polyfill@2.1.8/lib/polyfill.js"
+
 scroll_polyfill()
diff --git a/frontend/components/PasteHandler.js b/frontend/components/PasteHandler.js
index 061ea51f50..ace7666f76 100644
--- a/frontend/components/PasteHandler.js
+++ b/frontend/components/PasteHandler.js
@@ -36,7 +36,7 @@ const readFile = (file) =>
         fr.onloadstart = () => {}
         fr.onprogress = ({ loaded, total }) => {}
         fr.onload = () => {}
-        fr.onloadend = ({ target: { result } }) => resolve({ file: result, name, type })
+        fr.onloadend = () => resolve({ file: fr.result, name, type })
         fr.readAsText(file)
     })
 
diff --git a/frontend/components/RecordingUI.js b/frontend/components/RecordingUI.js
index cc49d53e2a..f05c42cacb 100644
--- a/frontend/components/RecordingUI.js
+++ b/frontend/components/RecordingUI.js
@@ -23,7 +23,7 @@ let run = (x) => x()
  * @typedef {RecordingData & {
  *   initial_html: string,
  * scroll_handler: (x: number) => void,
- * audio_recorder: {start: () => void, stop: () => void}?
+ * audio_recorder: {start: () => void, stop: () => Promise<string>}?
  * }} RecordingState
  */
 
diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index 5641b8816e..cb48aa8802 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -58,6 +58,7 @@ import {
     Text,
     css,
     cssLanguage,
+    //@ts-ignore
 } from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.28.0/dist/index.es.min.js"
 
 export {

From 4347e0804fd7bcb27e1514ea70f68fd7e3f3d8e0 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 26 May 2022 12:55:22 +0200
Subject: [PATCH 337/821] more codemirror 0.20 migration

---
 frontend/components/CellOutput.js |  6 ++--
 frontend/components/FilePicker.js | 58 +++++++++++++++----------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index cd1d9902a3..ee42b891df 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -17,7 +17,7 @@ import { observablehq_for_cells } from "../common/SetupCellEnvironment.js"
 import { PlutoBondsContext, PlutoContext, PlutoJSInitializingContext } from "../common/PlutoContext.js"
 import register from "../imports/PreactCustomElement.js"
 
-import { EditorState, EditorView, defaultHighlightStyle } from "../imports/CodemirrorPlutoSetup.js"
+import { EditorState, EditorView, defaultHighlightStyle, syntaxHighlighting } from "../imports/CodemirrorPlutoSetup.js"
 
 import { pluto_syntax_colors, ENABLE_CM_MIXED_PARSER } from "./CellInput.js"
 
@@ -563,8 +563,8 @@ export let highlight = (code_element, language) => {
                         .replace(/Main.workspace#(\d+)/, 'Main.var"workspace#$1"'),
 
                     extensions: [
-                        pluto_syntax_colors,
-                        defaultHighlightStyle.fallback,
+                        syntaxHighlighting(pluto_syntax_colors),
+                        syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
                         EditorState.tabSize.of(4),
                         // TODO Other languages possibly?
                         ...(language === "julia" ? [ENABLE_CM_MIXED_PARSER ? julia_mixed() : julia_andrey()] : []),
diff --git a/frontend/components/FilePicker.js b/frontend/components/FilePicker.js
index cc760dd3be..29c530bc35 100644
--- a/frontend/components/FilePicker.js
+++ b/frontend/components/FilePicker.js
@@ -13,6 +13,7 @@ import {
     autocomplete,
     drawSelection,
     Compartment,
+    StateEffect,
 } from "../imports/CodemirrorPlutoSetup.js"
 
 let { autocompletion, completionKeymap } = autocomplete
@@ -29,6 +30,24 @@ const assert_not_null = (x) => {
     }
 }
 
+const set_cm_value = (/** @type{EditorView} */ cm, /** @type {string} */ value, scroll = true) => {
+    cm.dispatch({
+        changes: { from: 0, to: cm.state.doc.length, insert: value },
+        selection: EditorSelection.cursor(value.length),
+        // effects: scroll ? EditorView.scrollIntoView(value.length,) : undefined,
+    })
+
+    // a long path like /Users/fons/Documents/article-test-1/asdfasdfasdfsadf.jl does not fit in the little box, so we scroll it to the left so that you can see the filename easily.
+    if (scroll) {
+        // We do a manual `scrollLeft` instead of `EditorView.scrollIntoView(value.length)` because `scrollIntoView` will also scroll the page *vertically* to move the filepicker into view. We only want to scroll the internal overflow box *horizontally* to the left, without affecting the vertical page scroll position.
+        cm.scrollDOM.scrollLeft = 100000
+        setTimeout(() => {
+            // TODO: do we need this?
+            cm.scrollDOM.scrollLeft = 100000
+        }, 100)
+    }
+}
+
 /**
  * @typedef FilePickerProps
  * @type {{
@@ -56,10 +75,7 @@ export class FilePicker extends Component {
             const suggest = this.props.suggest_new_file
             if (suggest != null && this.cm.state.doc.length === 0) {
                 // this.cm.focus()
-                this.cm.dispatch({
-                    changes: { from: 0, to: this.cm.state.doc.length, insert: suggest.base },
-                    selection: EditorSelection.cursor(suggest.base.length),
-                })
+                set_cm_value(this.cm, suggest.base, false)
                 this.request_path_completions()
             }
             window.dispatchEvent(new CustomEvent("collapse_cell_selection", {}))
@@ -80,10 +96,8 @@ export class FilePicker extends Component {
                     await this.props.on_submit(cm.state.doc.toString())
                     cm.dom.blur()
                 } catch (error) {
-                    cm.dispatch({
-                        changes: { from: 0, to: cm.state.doc.length, insert: this.props.value },
-                        selection: EditorSelection.cursor(this.props.value.length),
-                    })
+                    set_cm_value(cm, this.props.value, true)
+                    cm.dom.blur()
                 }
             })
             return true
@@ -93,18 +107,8 @@ export class FilePicker extends Component {
         if (this.forced_value != this.props.value) {
             if (!this.cm) return
             const cm = this.cm
-            cm.dispatch({
-                changes: { from: 0, to: cm.state.doc.length, insert: this.props.value },
-                selection: EditorSelection.cursor(this.props.value.length),
-            })
+            set_cm_value(cm, this.props.value, true)
             this.forced_value = this.props.value
-
-            // a long path like /Users/fons/Documents/article-test-1/asdfasdfasdfsadf.jl does not fit in the little box, so we scroll it to the left so that you can see the filename easily.
-            cm.scrollDOM.scrollLeft = 100000
-            setTimeout(() => {
-                // TODO: do we need this?
-                cm.scrollDOM.scrollLeft = 100000
-            }, 100)
         }
     }
     componentDidMount() {
@@ -128,15 +132,7 @@ export class FilePicker extends Component {
                         blur: (event, cm) => {
                             setTimeout(() => {
                                 if (!cm.hasFocus) {
-                                    cm.dispatch({
-                                        changes: { from: 0, to: cm.state.doc.length, insert: this.props.value },
-                                        selection: EditorSelection.cursor(this.props.value.length),
-                                    })
-                                    cm.scrollPosIntoView(this.props.value.length)
-
-                                    setTimeout(() => {
-                                        this.cm?.scrollPosIntoView(this.props.value.length)
-                                    }, 100)
+                                    set_cm_value(cm, this.props.value, true)
                                 }
                             }, 200)
                         },
@@ -178,7 +174,10 @@ export class FilePicker extends Component {
                         update.transactions.forEach((transaction) => {
                             const completion = transaction.annotation(autocomplete.pickedCompletion)
                             if (completion != null) {
-                                update.view.scrollPosIntoView(update.state.doc.length)
+                                update.view.dispatch({
+                                    effects: EditorView.scrollIntoView(update.state.doc.length),
+                                    selection: EditorSelection.cursor(update.state.doc.length),
+                                })
 
                                 this.request_path_completions()
                             }
@@ -202,6 +201,7 @@ export class FilePicker extends Component {
                                 cm.dispatch({
                                     changes: { from: 0, to: cm.state.doc.length, insert: this.props.value },
                                     selection: EditorSelection.cursor(this.props.value.length),
+                                    effects: EditorView.scrollIntoView(this.props.value.length),
                                 })
                                 // @ts-ignore
                                 document.activeElement.blur()

From 0880fe7cb31a2c175de5fc19c0c8265732fc4414 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Fri, 27 May 2022 19:44:21 +0200
Subject: [PATCH 338/821] Refactor `load_notebook_nobackup` (#2137)

---
 src/notebook/Notebook.jl           |  2 +-
 src/notebook/saving and loading.jl | 66 ++++++++++++++++++------------
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/src/notebook/Notebook.jl b/src/notebook/Notebook.jl
index 6c32708738..473d480773 100644
--- a/src/notebook/Notebook.jl
+++ b/src/notebook/Notebook.jl
@@ -26,7 +26,7 @@ const ProcessStatus = (
 Base.@kwdef mutable struct Notebook
     "Cells are ordered in a `Notebook`, and this order can be changed by the user. Cells will always have a constant UUID."
     cells_dict::Dict{UUID,Cell}
-    cell_order::Array{UUID,1}
+    cell_order::Vector{UUID}
 
     path::String
     notebook_id::UUID=uuid1()
diff --git a/src/notebook/saving and loading.jl b/src/notebook/saving and loading.jl
index b1d7fa46bf..19de180031 100644
--- a/src/notebook/saving and loading.jl	
+++ b/src/notebook/saving and loading.jl	
@@ -143,13 +143,8 @@ save_notebook(notebook::Notebook) = save_notebook(notebook, notebook.path)
 # LOADING
 ###
 
-
-"Load a notebook without saving it or creating a backup; returns a `Notebook`. REMEMBER TO CHANGE THE NOTEBOOK PATH after loading it to prevent it from autosaving and overwriting the original file."
-function load_notebook_nobackup(@nospecialize(io::IO), @nospecialize(path::AbstractString))::Notebook
-    
-    ## HEADER
-    
-    firstline = String(readline(io))
+function _notebook_metadata!(@nospecialize(io::IO))
+    firstline = String(readline(io))::String
 
     if firstline != _notebook_header
         error("File is not a Pluto.jl notebook")
@@ -159,27 +154,27 @@ function load_notebook_nobackup(@nospecialize(io::IO), @nospecialize(path::Abstr
     if file_VERSION_STR != PLUTO_VERSION_STR
         # @info "Loading a notebook saved with Pluto $(file_VERSION_STR). This is Pluto $(PLUTO_VERSION_STR)."
     end
-    
+
     # Read all remaining file contents before the first cell delimiter.
     header_content = readuntil(io, _cell_id_delimiter)
     header_lines = split(header_content, "\n")
-    
+
     nb_prefix_length = ncodeunits(_notebook_metadata_prefix)
     nb_metadata_toml_lines = String[
         line[begin+nb_prefix_length:end]
         for line in header_lines if startswith(line, _notebook_metadata_prefix)
     ]
-    
+
     notebook_metadata = try
         create_notebook_metadata(TOML.parse(join(nb_metadata_toml_lines, "\n")))
     catch e
         @error "Failed to parse embedded TOML content" exception=(e, catch_backtrace())
         DEFAULT_NOTEBOOK_METADATA
     end
+    return notebook_metadata
+end
 
-    
-    ### CELLS
-    
+function _notebook_collected_cells!(@nospecialize(io::IO))
     collected_cells = Dict{UUID,Cell}()
     while !eof(io)
         cell_id_str = String(readline(io))
@@ -187,7 +182,7 @@ function load_notebook_nobackup(@nospecialize(io::IO), @nospecialize(path::Abstr
             break
         else
             cell_id = UUID(cell_id_str)
-            
+
             metadata_toml_lines = String[]
             initial_code_line = ""
             while !eof(io)
@@ -223,7 +218,10 @@ function load_notebook_nobackup(@nospecialize(io::IO), @nospecialize(path::Abstr
             collected_cells[cell_id] = read_cell
         end
     end
+    return collected_cells
+end
 
+function _notebook_cell_order!(@nospecialize(io::IO), collected_cells)
     cell_order = UUID[]
     while !eof(io)
         cell_id_str = String(readline(io))
@@ -240,16 +238,19 @@ function load_notebook_nobackup(@nospecialize(io::IO), @nospecialize(path::Abstr
             break
         end
     end
+    return cell_order
+end
 
-    read_package = 
-        _ptoml_cell_id ∈ cell_order && 
-        _mtoml_cell_id ∈ cell_order && 
-        haskey(collected_cells, _ptoml_cell_id) && 
+function _notebook_nbpkg_ctx(cell_order::Vector{UUID}, collected_cells::Dict{Base.UUID, Cell})
+    read_package =
+        _ptoml_cell_id ∈ cell_order &&
+        _mtoml_cell_id ∈ cell_order &&
+        haskey(collected_cells, _ptoml_cell_id) &&
         haskey(collected_cells, _mtoml_cell_id)
 
     nbpkg_ctx = if read_package
-        ptoml_code = collected_cells[_ptoml_cell_id].code
-        mtoml_code = collected_cells[_mtoml_cell_id].code
+        ptoml_code = string(collected_cells[_ptoml_cell_id].code)::String
+        mtoml_code = string(collected_cells[_mtoml_cell_id].code)::String
 
         ptoml_contents = lstrip(split(ptoml_code, "\"\"\"")[2])
         mtoml_contents = lstrip(split(mtoml_code, "\"\"\"")[2])
@@ -273,27 +274,40 @@ function load_notebook_nobackup(@nospecialize(io::IO), @nospecialize(path::Abstr
     else
         PkgCompat.create_empty_ctx()
     end
+    return nbpkg_ctx
+end
 
-    appeared_order = setdiff!(
+function _notebook_appeared_order!(cell_order::Vector{UUID}, collected_cells::Dict{Base.UUID, Cell})
+    setdiff!(
         union!(
             # don't include cells that only appear in the order, but no code was given
             intersect!(cell_order, keys(collected_cells)),
             # add cells that appeared in code, but not in the order.
             keys(collected_cells)
-        ), 
+        ),
         # remove Pkg cells
         (_ptoml_cell_id, _mtoml_cell_id)
     )
+end
+
+"Load a notebook without saving it or creating a backup; returns a `Notebook`. REMEMBER TO CHANGE THE NOTEBOOK PATH after loading it to prevent it from autosaving and overwriting the original file."
+function load_notebook_nobackup(@nospecialize(io::IO), @nospecialize(path::AbstractString))::Notebook
+    notebook_metadata = _notebook_metadata!(io)
+
+    collected_cells = _notebook_collected_cells!(io)
+    cell_order = _notebook_cell_order!(io, collected_cells)
+    nbpkg_ctx = _notebook_nbpkg_ctx(cell_order, collected_cells)
+    appeared_order = _notebook_appeared_order!(cell_order, collected_cells)
     appeared_cells_dict = filter(collected_cells) do (k, v)
         k ∈ appeared_order
     end
 
     Notebook(;
-        cells_dict=appeared_cells_dict, 
+        cells_dict=appeared_cells_dict,
         cell_order=appeared_order,
         topology=_initial_topology(appeared_cells_dict, appeared_order),
-        path=path, 
-        nbpkg_ctx=nbpkg_ctx, 
+        path=path,
+        nbpkg_ctx=nbpkg_ctx,
         nbpkg_installed_versions_cache=nbpkg_cache(nbpkg_ctx),
         metadata=notebook_metadata,
     )
@@ -379,4 +393,4 @@ function move_notebook!(notebook::Notebook, newpath::String; disable_writing_not
         mv("$oldpath_tame.assets", "$newpath_tame.assets")
     end
     notebook
-end
\ No newline at end of file
+end

From 24d2e052faae4d25b89827ffbd3eff61f37ef8dd Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Sat, 28 May 2022 20:03:00 +0200
Subject: [PATCH 339/821] Replace all `Array{T,1}` by `Vector{T}` (#2138)

---
 sample/Tower of Hanoi.jl           | 2 +-
 src/analysis/ExpressionExplorer.jl | 4 ++--
 src/analysis/Parse.jl              | 2 +-
 src/runner/PlutoRunner.jl          | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sample/Tower of Hanoi.jl b/sample/Tower of Hanoi.jl
index b22f1e6787..d6ad6a8ffb 100644
--- a/sample/Tower of Hanoi.jl	
+++ b/sample/Tower of Hanoi.jl	
@@ -165,7 +165,7 @@ This is where we can check a solution. We start with a function that takes our r
 function run_solution(solver::Function, start = starting_stacks)
 	moves = solver(deepcopy(start)) #apply the solver
 	
-	all_states = Array{Any,1}(undef, length(moves) + 1)
+	all_states = Vector{Any}(undef, length(moves) + 1)
 	all_states[1] = start
 	
 	for (i, m) in enumerate(moves)
diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 15bb421cf1..03c955b93c 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -9,7 +9,7 @@ import Base: union, union!, ==, push!
 # TWO STATE OBJECTS
 ###
 
-const FunctionName = Array{Symbol,1}
+const FunctionName = Vector{Symbol}
 
 struct FunctionNameSignaturePair
     name::FunctionName
@@ -113,7 +113,7 @@ function will_assign_global(assignee::Symbol, scopestate::ScopeState)::Bool
     (scopestate.inglobalscope || assignee ∈ scopestate.exposedglobals) && (assignee ∉ scopestate.hiddenglobals || assignee ∈ scopestate.definedfuncs)
 end
 
-function will_assign_global(assignee::Array{Symbol,1}, scopestate::ScopeState)::Bool
+function will_assign_global(assignee::Vector{Symbol}, scopestate::ScopeState)::Bool
     if length(assignee) == 0
         false
     elseif length(assignee) > 1
diff --git a/src/analysis/Parse.jl b/src/analysis/Parse.jl
index 8fa7f10804..470a2545bd 100644
--- a/src/analysis/Parse.jl
+++ b/src/analysis/Parse.jl
@@ -81,7 +81,7 @@ fix_linenumbernodes!(::Any, actual_filename) = nothing
 `expression_boundaries("sqrt(1)\n\n123") == [ncodeunits("sqrt(1)\n\n") + 1, ncodeunits("sqrt(1)\n\n123") + 1]`
 
 """
-function expression_boundaries(code::String, start=1)::Array{<:Integer,1}
+function expression_boundaries(code::String, start=1)::Vector{<:Integer}
     expr, next = Meta.parse(code, start, raise=false)
     if next <= ncodeunits(code)
         [next, expression_boundaries(code, next)...]
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index c78689a570..93d79d7535 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1105,7 +1105,7 @@ pluto_showable(m::MIME, @nospecialize(x))::Bool = Base.invokelatest(showable, m,
 
 
 # We invent our own MIME _because we can_ but don't use it somewhere else because it might change :)
-pluto_showable(::MIME"application/vnd.pluto.tree+object", x::AbstractArray{<:Any,1}) = eltype(eachindex(x)) === Int
+pluto_showable(::MIME"application/vnd.pluto.tree+object", x::AbstractVector{<:Any}) = eltype(eachindex(x)) === Int
 pluto_showable(::MIME"application/vnd.pluto.tree+object", ::AbstractSet{<:Any}) = true
 pluto_showable(::MIME"application/vnd.pluto.tree+object", ::AbstractDict{<:Any,<:Any}) = true
 pluto_showable(::MIME"application/vnd.pluto.tree+object", ::Tuple) = true
@@ -1454,7 +1454,7 @@ const integrations = Integration[
                 # not enumerate(rows) because of some silliness
                 # not rows[i] because `getindex` is not guaranteed to exist
                 L = truncate_rows ? my_row_limit : length(rows)
-                row_data = Array{Any,1}(undef, L)
+                row_data = Vector{Any}(undef, L)
                 for (i, row) in zip(1:L,rows)
                     row_data[i] = (i, row_data_for(row))
                 end
@@ -1486,7 +1486,7 @@ const integrations = Integration[
             pluto_showable(::MIME"application/vnd.pluto.table+object", t::Type) = false
             pluto_showable(::MIME"application/vnd.pluto.table+object", t::AbstractVector{<:NamedTuple}) = false
             pluto_showable(::MIME"application/vnd.pluto.table+object", t::AbstractVector{<:Dict{Symbol,<:Any}}) = false
-            pluto_showable(::MIME"application/vnd.pluto.table+object", t::AbstractArray{Union{}, 1}) = false
+            pluto_showable(::MIME"application/vnd.pluto.table+object", t::AbstractVector{Union{}}) = false
 
         end,
     ),

From 5ea8939035b2c885c33896d468c2e7704932d636 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 1 Jun 2022 17:05:49 +0200
Subject: [PATCH 340/821] dev: Add docs&types&autocomplete for lodash import
 yay (#2135)

* Add types for lodash import yay

* Update TypeScriptCheck.yml

* type fixes thanksss
---
 .github/workflows/TypeScriptCheck.yml | 3 +++
 .gitignore                            | 1 +
 frontend/components/CellInput.js      | 2 +-
 frontend/components/RecordingUI.js    | 9 +++------
 frontend/imports/lodash.d.ts          | 2 ++
 frontend/package.json                 | 6 ++++++
 6 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 frontend/imports/lodash.d.ts
 create mode 100644 frontend/package.json

diff --git a/.github/workflows/TypeScriptCheck.yml b/.github/workflows/TypeScriptCheck.yml
index 5b3112dc43..c88be06aeb 100644
--- a/.github/workflows/TypeScriptCheck.yml
+++ b/.github/workflows/TypeScriptCheck.yml
@@ -27,5 +27,8 @@ jobs:
 
       - run: npm install typescript -g
       
+      - run: npm install
+        working-directory: frontend
+      
       - name: Run TypeScript checks on frontend/
         run: tsc --noEmit --strictNullChecks false
diff --git a/.gitignore b/.gitignore
index d3f6b91a7b..83001189e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ node_modules
 frontend/dist
 .net
 net
+frontend/package-lock.json
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 0fc242b20e..67fadb6a9e 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -729,7 +729,7 @@ export const CellInput = ({
         if (lines_wrapper_dom_node) {
             const lines_wrapper_resize_observer = new ResizeObserver(() => {
                 const line_nodes = lines_wrapper_dom_node.children
-                const tops = _.map(line_nodes, (c) => c.offsetTop)
+                const tops = _.map(line_nodes, (c) => /** @type{HTMLElement} */ (c).offsetTop)
                 const diffs = tops.slice(1).map((y, i) => y - tops[i])
                 const heights = [...diffs, 15]
                 on_line_heights(heights)
diff --git a/frontend/components/RecordingUI.js b/frontend/components/RecordingUI.js
index f05c42cacb..2d773f7581 100644
--- a/frontend/components/RecordingUI.js
+++ b/frontend/components/RecordingUI.js
@@ -300,19 +300,16 @@ export const RecordingPlaybackUI = ({ launch_params, initializing, apply_noteboo
 
         let new_timestamp = audio.currentTime
         let forward = new_timestamp >= current_state_timestamp_ref.current
-        /**
-         * @param {T} x @template T @return {T}
-         */
-        let directed = (x) => (forward ? x : _.reverse(x))
+        let directed = forward ? _.identity : _.reverse
 
         let lower = Math.min(current_state_timestamp_ref.current, new_timestamp)
         let upper = Math.max(current_state_timestamp_ref.current, new_timestamp)
 
         let scrolls_in_time_window = deserialized.scrolls.filter(([t, s]) => lower < t && t <= upper)
         if (scrolls_in_time_window.length > 0) {
-            let scroll_state = _.last(directed(scrolls_in_time_window))[1]
+            let scroll_state = _.last(directed(scrolls_in_time_window))?.[1]
 
-            on_scroll(scroll_state)
+            if (scroll_state) on_scroll(scroll_state)
         }
 
         let steps_in_current_direction = forward ? deserialized.steps : computed_reverse_patches_ref.current
diff --git a/frontend/imports/lodash.d.ts b/frontend/imports/lodash.d.ts
new file mode 100644
index 0000000000..de0d3a58f4
--- /dev/null
+++ b/frontend/imports/lodash.d.ts
@@ -0,0 +1,2 @@
+import _ from "lodash-es"
+export default _
diff --git a/frontend/package.json b/frontend/package.json
new file mode 100644
index 0000000000..6191135789
--- /dev/null
+++ b/frontend/package.json
@@ -0,0 +1,6 @@
+{
+  "devDependencies": {
+    "@types/lodash": "^4.14.182",
+    "@types/lodash-es": "^4.17.6"
+  }
+}

From 6ab02b1334ea202830a8fe881becaf6c743011eb Mon Sep 17 00:00:00 2001
From: Hirumal Priyashan <57571152+HirumalPriyashan@users.noreply.github.com>
Date: Wed, 1 Jun 2022 21:18:18 +0530
Subject: [PATCH 341/821] Fix freezing for `a = a` (#2142)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/Editor.js       | 10 +++---
 frontend/components/ErrorMessage.js | 48 +++++++++++++++++++----------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 9124c4dd56..a0bb77b0e2 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -154,12 +154,10 @@ const first_true_key = (obj) => {
 
 /**
  * @typedef CellDependencyData
- * @type {{
- *  cell_id: string,
- *  downstream_cells_map: { [symbol: string]: Array<string>},
- *  upstream_cells_map: { [symbol: string]: Array<string>},
- *  precedence_heuristic: number,
- * }}
+ * @property {string} cell_id
+ * @property {Map<string, Array<string>>} downstream_cells_map A map where the keys are the variables *defined* by this cell, and a value is the list of cell IDs that reference a variable.
+ * @property {Map<string, Array<string>>} upstream_cells_map A map where the keys are the variables *referenced* by this cell, and a value is the list of cell IDs that define a variable.
+ * @property {number} precedence_heuristic
  */
 
 /**
diff --git a/frontend/components/ErrorMessage.js b/frontend/components/ErrorMessage.js
index b192c5a4d4..2ab27f272e 100644
--- a/frontend/components/ErrorMessage.js
+++ b/frontend/components/ErrorMessage.js
@@ -150,7 +150,7 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
                     Object.keys(map.downstream_cells_map).includes(sym)
                 )
 
-                if (!erred_upstreams || !undefvar_is_from_upstream) {
+                if (Object.keys(erred_upstreams).length === 0 || !undefvar_is_from_upstream) {
                     return html`<p>${x}</p>`
                 }
 
@@ -166,7 +166,10 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
                 // const plural = symbol_links.length > 1
                 return html`<p><em>Another cell defining ${insert_commas_and_and(symbol_links)} contains errors.</em></p>`
             },
-            show_stacktrace: () => get_erred_upstreams(pluto_actions.get_notebook(), cell_id) == null,
+            show_stacktrace: () => {
+                const erred_upstreams = get_erred_upstreams(pluto_actions.get_notebook(), cell_id)
+                return Object.keys(erred_upstreams).length === 0
+            },
         },
         default_rewriter,
     ]
@@ -193,19 +196,32 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
     </jlerror>`
 }
 
-const get_erred_upstreams = (/** @type {import("./Editor.js").NotebookData?} */ notebook, /** @type {string} */ cell_id) => {
-    let erred_upstreams = null
-    if (notebook != null && notebook?.cell_results?.[cell_id]?.errored)
-        Object.keys(notebook.cell_dependencies[cell_id]?.upstream_cells_map).forEach((key) => {
-            notebook.cell_dependencies[cell_id]?.upstream_cells_map[key].forEach((upstream_cell_id) => {
-                let upstream_cells = get_erred_upstreams(notebook, upstream_cell_id) ?? {}
-                erred_upstreams = { ...erred_upstreams, ...upstream_cells }
-                // if upstream got no errors and current cell is errored
-                // then current cell is responsible for errors
-                if (!upstream_cells && notebook.cell_results[upstream_cell_id].errored) {
-                    erred_upstreams[key] = upstream_cell_id
-                }
-            })
+const get_erred_upstreams = (
+    /** @type {import("./Editor.js").NotebookData?} */ notebook,
+    /** @type {string} */ cell_id,
+    /** @type {string[]} */ visited_edges = []
+) => {
+    let erred_upstreams = {}
+    if (notebook != null && notebook?.cell_results?.[cell_id]?.errored) {
+        const referenced_variables = Object.keys(notebook.cell_dependencies[cell_id]?.upstream_cells_map)
+
+        referenced_variables.forEach((key) => {
+            if (!visited_edges.includes(key)) {
+                visited_edges.push(key)
+                const cells_that_define_this_variable = notebook.cell_dependencies[cell_id]?.upstream_cells_map[key]
+
+                cells_that_define_this_variable.forEach((upstream_cell_id) => {
+                    let upstream_errored_cells = get_erred_upstreams(notebook, upstream_cell_id, visited_edges) ?? {}
+
+                    erred_upstreams = { ...erred_upstreams, ...upstream_errored_cells }
+                    // if upstream got no errors and current cell is errored
+                    // then current cell is responsible for errors
+                    if (Object.keys(upstream_errored_cells).length === 0 && notebook.cell_results[upstream_cell_id].errored && upstream_cell_id !== cell_id) {
+                        erred_upstreams[key] = upstream_cell_id
+                    }
+                })
+            }
         })
-    return erred_upstreams == null || Object.keys(erred_upstreams).length === 0 ? null : erred_upstreams
+    }
+    return erred_upstreams
 }

From dabe816dc76db55b0a7ec573e89dd5bc754795e4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 1 Jun 2022 17:48:36 +0200
Subject: [PATCH 342/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index ceff28be18..a566002514 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.5"
+version = "0.19.6"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 7782b54007a6ed2005d410786d69005fd9522564 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 1 Jun 2022 18:20:15 +0200
Subject: [PATCH 343/821] remove console log

---
 frontend/components/CellInput/scopestate_statefield.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/components/CellInput/scopestate_statefield.js b/frontend/components/CellInput/scopestate_statefield.js
index 29ac57cc35..dc4d0dfcbc 100644
--- a/frontend/components/CellInput/scopestate_statefield.js
+++ b/frontend/components/CellInput/scopestate_statefield.js
@@ -522,7 +522,6 @@ export let explore_variable_usage = (
             return scopestate
         } else if ((match = match_julia(cursor)`${t.as("assignee")} = ${t.maybe(t.as("value"))}`)) {
             let { assignee, value } = match
-            console.log("Assigned!")
             if (value) scopestate = explore_variable_usage(value.cursor(), doc, scopestate, verbose)
             if (assignee) scopestate = explore_pattern(assignee.cursor(), doc, scopestate, value?.to ?? null, verbose)
             return scopestate

From 997f313a851bc01c9b261445ceb34d34933ce940 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 2 Jun 2022 13:05:48 +0200
Subject: [PATCH 344/821] PlutoRunner comments

---
 src/runner/PlutoRunner.jl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 93d79d7535..8b1eec4bf3 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -6,6 +6,13 @@
 # So when reading this file, pretend that you are living in process 2, and you are communicating with Pluto's server, who lives in process 1.
 # The package environment that this file is loaded with is the NotebookProcessProject.toml file in this directory.
 
+# SOME EXTRA NOTES
+
+# 1. The entire PlutoRunner should be a single file.
+# 2. We restrict the communication between this PlutoRunner and the Pluto server to only use *Base Julia types*, like `String`, `Dict`, `NamedTuple`, etc. 
+
+# These restriction are there to allow flexibility in the way that this file is loaded on a runner process, which is something that we might want to change in the future, like when we make the transition to our own Distributed.
+
 module PlutoRunner
 
 # import these two so that they can be imported from Main on the worker process if it launches without the stdlibs in its LOAD_PATH

From 584fd7b8afe86b5c9a9d98f136a1b88c234d1b05 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Thu, 2 Jun 2022 14:16:30 +0200
Subject: [PATCH 345/821] Document serialization and reduce duplication in
 `PlutoRunner` (#2145)

Co-authored-by: Paul Berg <paul@plutojl.org>
---
 src/evaluation/WorkspaceManager.jl | 34 ++++++-------
 src/notebook/Cell.jl               |  2 +-
 src/runner/PlutoRunner.jl          | 76 +++++++++++++++---------------
 test/WorkspaceManager.jl           |  3 +-
 4 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index f9238fe5ee..1736e0c5a5 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -379,16 +379,16 @@ end
 
 `expr` has to satisfy `ExpressionExplorer.is_toplevel_expr`."
 function eval_format_fetch_in_workspace(
-    session_notebook::Union{SN,Workspace},
-    expr::Expr,
-    cell_id::UUID;
-    ends_with_semicolon::Bool=false,
-    function_wrapped_info::Union{Nothing,Tuple}=nothing,
-    forced_expr_id::Union{PlutoRunner.ObjectID,Nothing}=nothing,
-    known_published_objects::Vector{String}=String[],
-    user_requested_run::Bool=true,
-    capture_stdout::Bool=true,
-)::PlutoRunner.FormattedCellResult
+        session_notebook::Union{SN,Workspace},
+        expr::Expr,
+        cell_id::UUID;
+        ends_with_semicolon::Bool=false,
+        function_wrapped_info::Union{Nothing,Tuple}=nothing,
+        forced_expr_id::Union{PlutoRunner.ObjectID,Nothing}=nothing,
+        known_published_objects::Vector{String}=String[],
+        user_requested_run::Bool=true,
+        capture_stdout::Bool=true,
+    )::PlutoRunner.FormattedCellResult
 
     workspace = get_workspace(session_notebook)
     
@@ -440,14 +440,14 @@ function eval_in_workspace(session_notebook::Union{SN,Workspace}, expr)
 end
 
 function format_fetch_in_workspace(
-    session_notebook::Union{SN,Workspace}, 
-    cell_id, 
-    ends_with_semicolon, 
-    known_published_objects::Vector{String}=String[],
-    showmore_id::Union{PlutoRunner.ObjectDimPair,Nothing}=nothing,
-)::PlutoRunner.FormattedCellResult
+        session_notebook::Union{SN,Workspace},
+        cell_id,
+        ends_with_semicolon,
+        known_published_objects::Vector{String}=String[],
+        showmore_id::Union{PlutoRunner.ObjectDimPair,Nothing}=nothing,
+    )::PlutoRunner.FormattedCellResult
     workspace = get_workspace(session_notebook)
-    
+
     # instead of fetching the output value (which might not make sense in our context, since the user can define structs, types, functions, etc), we format the cell output on the worker, and fetch the formatted output.
     withtoken(workspace.dowork_token) do
         try
diff --git a/src/notebook/Cell.jl b/src/notebook/Cell.jl
index 23b2c3dcac..a76411ae27 100644
--- a/src/notebook/Cell.jl
+++ b/src/notebook/Cell.jl
@@ -55,7 +55,7 @@ Base.@kwdef mutable struct Cell
     metadata::Dict{String,Any}=copy(DEFAULT_CELL_METADATA)
 end
 
-Cell(cell_id, code) = Cell(cell_id=cell_id, code=code)
+Cell(cell_id, code) = Cell(; cell_id, code)
 Cell(code) = Cell(uuid1(), code)
 
 cell_id(cell::Cell) = cell.cell_id
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 8b1eec4bf3..e3f0f7cdbb 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1,7 +1,7 @@
 # Will be evaluated _inside_ the workspace process.
 
 # Pluto does most things on process 1 (the server), and it uses little workspace processes to evaluate notebook code in.
-# These baby processes don't import Pluto, they only import this module. Functions from this module are called by WorkspaceManager.jl, using Distributed
+# These baby processes don't import Pluto, they only import this module. Functions from this module are called by WorkspaceManager.jl via Distributed
 
 # So when reading this file, pretend that you are living in process 2, and you are communicating with Pluto's server, who lives in process 1.
 # The package environment that this file is loaded with is the NotebookProcessProject.toml file in this directory.
@@ -31,7 +31,9 @@ import Logging
 
 export @bind
 
-MimedOutput = Tuple{Union{String,Vector{UInt8},Dict{Symbol,Any}},MIME}
+# This is not a struct to make it easier to pass these objects between distributed processes.
+const MimedOutput = Tuple{Union{String,Vector{UInt8},Dict{Symbol,Any}},MIME}
+
 const ObjectID = typeof(objectid("hello computer"))
 const ObjectDimPair = Tuple{ObjectID,Int64}
 
@@ -830,6 +832,7 @@ const table_column_display_limit_increase = 30
 
 const tree_display_extra_items = Dict{UUID,Dict{ObjectDimPair,Int64}}()
 
+# This is not a struct to make it easier to pass these objects between distributed processes.
 const FormattedCellResult = NamedTuple{(:output_formatted, :errored, :interrupted, :process_exited, :runtime, :published_objects, :has_pluto_hook_features),Tuple{PlutoRunner.MimedOutput,Bool,Bool,Bool,Union{UInt64,Nothing},Dict{String,Any},Bool}}
 
 function formatted_result_of(
@@ -871,14 +874,14 @@ function formatted_result_of(
         end
     end
     
-    return (
-        output_formatted = output_formatted,
-        errored = errored, 
-        interrupted = false, 
-        process_exited = false, 
+    return (;
+        output_formatted,
+        errored,
+        interrupted = false,
+        process_exited = false,
         runtime = get(cell_runtimes, cell_id, nothing),
-        published_objects = published_objects,
-        has_pluto_hook_features = has_pluto_hook_features,
+        published_objects,
+        has_pluto_hook_features,
     )
 end
 
@@ -937,7 +940,7 @@ See [`allmimes`](@ref) for the ordered list of supported MIME types.
 """
 function format_output_default(@nospecialize(val), @nospecialize(context=default_iocontext))::MimedOutput
     try
-        io_sprinted, (value, mime) = show_richest_withreturned(val; context)
+        io_sprinted, (value, mime) = show_richest_withreturned(context, val)
         if value === nothing
             if mime ∈ imagemimes
                 (io_sprinted, mime)
@@ -1027,9 +1030,9 @@ function pretty_stackcall(frame::Base.StackFrame, linfo::Core.MethodInstance)
 end
 
 "Return a `(String, Any)` tuple containing function output as the second entry."
-function show_richest_withreturned(@nospecialize(args...); context=nothing, sizehint::Integer=0)
-    buffer = IOBuffer(; sizehint)
-    val = show_richest(IOContext(buffer, context), args...)
+function show_richest_withreturned(context::IOContext, @nospecialize(args))
+    buffer = IOBuffer(; sizehint=0)
+    val = show_richest(IOContext(buffer, context), args)
     return (resize!(buffer.data, buffer.size), val)
 end
 
@@ -1167,12 +1170,18 @@ function get_my_display_limit(@nospecialize(x), dim::Integer, depth::Integer, co
     end
 end
 
+objectid2str(@nospecialize(x)) = string(objectid(x); base=16)::String
+
+function circular(@nospecialize(x))
+    return Dict{Symbol,Any}(
+        :objectid => objectid2str(x),
+        :type => :circular
+    )
+end
+
 function tree_data(@nospecialize(x::AbstractSet{<:Any}), context::Context)
     if Base.show_circular(context, x)
-        Dict{Symbol,Any}(
-            :objectid => string(objectid(x), base=16),
-            :type => :circular,
-        )
+        return circular(x)
     else
         depth = get(context, :tree_viewer_depth, 0)
         recur_io = IOContext(context, Pair{Symbol,Any}(:SHOWN_SET, x), Pair{Symbol,Any}(:tree_viewer_depth, depth + 1))
@@ -1195,7 +1204,7 @@ function tree_data(@nospecialize(x::AbstractSet{<:Any}), context::Context)
         Dict{Symbol,Any}(
             :prefix => string(typeof(x)),
             :prefix_short => string(typeof(x) |> trynameof),
-            :objectid => string(objectid(x), base=16),
+            :objectid => objectid2str(x),
             :type => :Set,
             :elements => elements
         )
@@ -1204,10 +1213,7 @@ end
 
 function tree_data(@nospecialize(x::AbstractVector{<:Any}), context::Context)
     if Base.show_circular(context, x)
-        Dict{Symbol,Any}(
-            :objectid => string(objectid(x), base=16)::String,
-            :type => :circular,
-        )
+        return circular(x)
     else
         depth = get(context, :tree_viewer_depth, 0)::Int
         recur_io = IOContext(context, Pair{Symbol,Any}(:SHOWN_SET, x), Pair{Symbol,Any}(:tree_viewer_depth, depth + 1))
@@ -1232,7 +1238,7 @@ function tree_data(@nospecialize(x::AbstractVector{<:Any}), context::Context)
         Dict{Symbol,Any}(
             :prefix => prefix,
             :prefix_short => x isa Vector ? "" : prefix, # if not abstract
-            :objectid => string(objectid(x), base=16),
+            :objectid => objectid2str(x),
             :type => :Array,
             :elements => elements
         )
@@ -1249,7 +1255,7 @@ function tree_data(@nospecialize(x::Tuple), context::Context)
         push!(elements, out)
     end
     Dict{Symbol,Any}(
-        :objectid => string(objectid(x), base=16),
+        :objectid => objectid2str(x),
         :type => :Tuple,
         :elements => collect(enumerate(elements)),
     )
@@ -1257,10 +1263,7 @@ end
 
 function tree_data(@nospecialize(x::AbstractDict{<:Any,<:Any}), context::Context)
     if Base.show_circular(context, x)
-        Dict{Symbol,Any}(
-            :objectid => string(objectid(x), base=16),
-            :type => :circular,
-        )
+        return circular(x)
     else
         depth = get(context, :tree_viewer_depth, 0)
         recur_io = IOContext(context, Pair{Symbol,Any}(:SHOWN_SET, x), Pair{Symbol,Any}(:tree_viewer_depth, depth + 1))
@@ -1283,7 +1286,7 @@ function tree_data(@nospecialize(x::AbstractDict{<:Any,<:Any}), context::Context
         Dict{Symbol,Any}(
             :prefix => string(typeof(x)),
             :prefix_short => string(typeof(x) |> trynameof),
-            :objectid => string(objectid(x), base=16),
+            :objectid => objectid2str(x),
             :type => :Dict,
             :elements => elements
         )
@@ -1308,7 +1311,7 @@ function tree_data(@nospecialize(x::NamedTuple), context::Context)
         push!(elements, data)
     end
     Dict{Symbol,Any}(
-        :objectid => string(objectid(x), base=16),
+        :objectid => objectid2str(x),
         :type => :NamedTuple,
         :elements => elements
     )
@@ -1317,7 +1320,7 @@ end
 function tree_data(@nospecialize(x::Pair), context::Context)
     k, v = x
     Dict{Symbol,Any}(
-        :objectid => string(objectid(x), base=16),
+        :objectid => objectid2str(x),
         :type => :Pair,
         :key_value => (format_output_default(k, context), format_output_default(v, context)),
     )
@@ -1326,10 +1329,7 @@ end
 # Based on Julia source code but without writing to IO
 function tree_data(@nospecialize(x::Any), context::Context)
     if Base.show_circular(context, x)
-        Dict{Symbol,Any}(
-            :objectid => string(objectid(x), base=16),
-            :type => :circular,
-        )
+        return circular(x)
     else
         depth = get(context, :tree_viewer_depth, 0)
         recur_io = IOContext(context, 
@@ -1358,7 +1358,7 @@ function tree_data(@nospecialize(x::Any), context::Context)
         Dict{Symbol,Any}(
             :prefix => repr(t; context),
             :prefix_short => string(trynameof(t)),
-            :objectid => string(objectid(x), base=16)::String,
+            :objectid => objectid2str(x),
             :type => :struct,
             :elements => elements,
         )
@@ -1482,7 +1482,7 @@ const integrations = Integration[
                 )
 
                 Dict{Symbol,Any}(
-                    :objectid => string(objectid(x), base=16),
+                    :objectid => objectid2str(x),
                     :schema => schema_data,
                     :rows => row_data,
                 )
@@ -1892,7 +1892,7 @@ function _publish(x, id_start)::String
     return id
 end
 
-_publish(x) = _publish(x, string(objectid(x), base=16))
+_publish(x) = _publish(x, objectid2str(x))
 
 # TODO? Possibly move this to it's own package, with fallback that actually msgpack?
 # ..... Ideally we'd make this require `await` on the javascript side too...
diff --git a/test/WorkspaceManager.jl b/test/WorkspaceManager.jl
index b86f76d632..218587e1e6 100644
--- a/test/WorkspaceManager.jl
+++ b/test/WorkspaceManager.jl
@@ -83,7 +83,8 @@ import Distributed
             s = Pluto.ServerSession()
             """),
             Cell("""
-            nb = Pluto.SessionActions.open(s, Pluto.project_relative_path("sample", "Tower of Hanoi.jl"); run_async=false, as_sample=true)"""),
+            nb = Pluto.SessionActions.open(s, Pluto.project_relative_path("sample", "Tower of Hanoi.jl"); run_async=false, as_sample=true)
+            """),
             Cell("length(nb.cells)"),
             Cell(""),
         ])

From 45bb8aa5aa3adf9b55580a48c0ebf7760e11e96f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 2 Jun 2022 21:09:44 +0200
Subject: [PATCH 346/821] =?UTF-8?q?=F0=9F=93=96=20js:=20improve=20docstrin?=
 =?UTF-8?q?gs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/common/Bond.js             |  4 ++--
 frontend/common/PlutoContext.js     | 19 +++++++++++++++----
 frontend/components/Cell.js         |  6 +++---
 frontend/components/CellInput.js    |  6 +++---
 frontend/components/CellOutput.js   |  4 ++--
 frontend/components/Editor.js       | 26 ++++++++++++++++++--------
 frontend/components/ErrorMessage.js |  4 ++--
 frontend/components/LiveDocs.js     |  4 ++--
 frontend/components/Notebook.js     |  4 ++--
 frontend/components/Popup.js        |  4 ++--
 frontend/components/Preamble.js     |  4 ++--
 frontend/components/RunArea.js      |  4 ++--
 frontend/components/TreeView.js     |  6 +++---
 13 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/frontend/common/Bond.js b/frontend/common/Bond.js
index c62ea609b9..0b116a6788 100644
--- a/frontend/common/Bond.js
+++ b/frontend/common/Bond.js
@@ -129,7 +129,7 @@ export const set_input_value = (input, new_value) => {
 
 /**
  * @param {NodeListOf<Element>} bond_nodes
- * @param {{[name: string]: any}} bond_values
+ * @param {import("../components/Editor.js").BondValuesDict} bond_values
  */
 export const set_bound_elements_to_their_value = (bond_nodes, bond_values) => {
     bond_nodes.forEach((bond_node) => {
@@ -180,7 +180,7 @@ export const add_bonds_disabled_message_handler = (bond_nodes, invalidation) =>
 /**
  * @param {NodeListOf<Element>} bond_nodes
  * @param {(name: string, value: any) => Promise} on_bond_change
- * @param {{[name: string]: any}} known_values Object of variable names that already have a value in the state, which we may not want to send the initial bond value for. When reloading the page, bonds are set to their values from the state, and we don't want to trigger a change event for those.
+ * @param {import("../components/Editor.js").BondValuesDict} known_values Object of variable names that already have a value in the state, which we may not want to send the initial bond value for. When reloading the page, bonds are set to their values from the state, and we don't want to trigger a change event for those.
  * @param {Promise<void>} invalidation
  */
 export const add_bonds_listener = (bond_nodes, on_bond_change, known_values, invalidation) => {
diff --git a/frontend/common/PlutoContext.js b/frontend/common/PlutoContext.js
index 2cb2eb66ba..08de61d19b 100644
--- a/frontend/common/PlutoContext.js
+++ b/frontend/common/PlutoContext.js
@@ -1,16 +1,27 @@
 import { createContext } from "../imports/Preact.js"
 
-export let PlutoContext = createContext()
-export let PlutoBondsContext = createContext(/** @type {{ [key: string]: { value: any } }} */ (null))
-export let PlutoJSInitializingContext = createContext()
+export let PlutoActionsContext = createContext()
+export let PlutoBondsContext = createContext(/** @type {import("../components/Editor.js").BondValuesDict?} */ (null))
+export let PlutoJSInitializingContext = createContext(/** @type {SetWithEmptyCallback<HTMLElement>?} */ (null))
 
-// Create a class like the built-in `Set` class, but with a callback that is fired when the set becomes empty.
+// Hey copilot, create a class like the built-in `Set` class, but with a callback that is fired when the set becomes empty.
+/**
+ * A class like the built-in `Set` class, but with a callback that is fired when the set becomes empty.
+ * @template T
+ * @extends {Set<T>}
+ */
 export class SetWithEmptyCallback extends Set {
+    /**
+     * @param {() => void} callback
+     */
     constructor(callback) {
         super()
         this.callback = callback
     }
 
+    /**
+     * @param {T} value
+     */
     delete(value) {
         let result = super.delete(value)
         if (result && this.size === 0) {
diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 22ce10990b..644dd143f8 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -6,7 +6,7 @@ import { CellInput } from "./CellInput.js"
 import { Logs } from "./Logs.js"
 import { RunArea, useDebouncedTruth } from "./RunArea.js"
 import { cl } from "../common/ClassTable.js"
-import { PlutoContext } from "../common/PlutoContext.js"
+import { PlutoActionsContext } from "../common/PlutoContext.js"
 
 const useCellApi = (node_ref, published_object_keys, pluto_actions) => {
     const [cell_api_ready, set_cell_api_ready] = useState(false)
@@ -56,7 +56,7 @@ export const Cell = ({
     global_definition_locations,
 }) => {
     const { show_logs, disabled: running_disabled } = metadata
-    let pluto_actions = useContext(PlutoContext)
+    let pluto_actions = useContext(PlutoActionsContext)
     const on_update_doc_query = pluto_actions.set_doc_query
     const on_focus_neighbor = pluto_actions.focus_on_neighbor
     const on_change = useCallback((val) => pluto_actions.set_local_cell(cell_id, val), [cell_id, pluto_actions])
@@ -252,7 +252,7 @@ export const Cell = ({
  * */
 export const IsolatedCell = ({ cell_input: { cell_id, metadata }, cell_result: { logs, output, published_object_keys }, hidden }) => {
     const node_ref = useRef(null)
-    let pluto_actions = useContext(PlutoContext)
+    let pluto_actions = useContext(PlutoActionsContext)
     const cell_api_ready = useCellApi(node_ref, published_object_keys, pluto_actions)
     const { show_logs } = metadata
 
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 67fadb6a9e..c017af934e 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -3,7 +3,7 @@ import observablehq_for_myself from "../common/SetupCellEnvironment.js"
 import _ from "../imports/lodash.js"
 
 import { utf8index_to_ut16index } from "../common/UnicodeTools.js"
-import { PlutoContext } from "../common/PlutoContext.js"
+import { PlutoActionsContext } from "../common/PlutoContext.js"
 import { get_selected_doc_from_state } from "./CellInput/LiveDocsFromCursor.js"
 import { go_to_definition_plugin, GlobalDefinitionsFacet } from "./CellInput/go_to_definition_plugin.js"
 import { detect_deserializer } from "../common/Serialization.js"
@@ -374,7 +374,7 @@ export const CellInput = ({
     metadata,
     global_definition_locations,
 }) => {
-    let pluto_actions = useContext(PlutoContext)
+    let pluto_actions = useContext(PlutoActionsContext)
     const { disabled: running_disabled } = metadata
 
     const newcm_ref = useRef(/** @type {EditorView?} */ (null))
@@ -825,7 +825,7 @@ export const CellInput = ({
 
 const InputContextMenu = ({ on_delete, cell_id, run_cell, running_disabled, any_logs, show_logs, set_show_logs }) => {
     const timeout = useRef(null)
-    let pluto_actions = useContext(PlutoContext)
+    let pluto_actions = useContext(PlutoActionsContext)
     const [open, setOpen] = useState(false)
     const mouseenter = () => {
         if (timeout.current) clearTimeout(timeout.current)
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index ee42b891df..c05efb0051 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -14,7 +14,7 @@ import {
 import { cl } from "../common/ClassTable.js"
 
 import { observablehq_for_cells } from "../common/SetupCellEnvironment.js"
-import { PlutoBondsContext, PlutoContext, PlutoJSInitializingContext } from "../common/PlutoContext.js"
+import { PlutoBondsContext, PlutoActionsContext, PlutoJSInitializingContext } from "../common/PlutoContext.js"
 import register from "../imports/PreactCustomElement.js"
 
 import { EditorState, EditorView, defaultHighlightStyle, syntaxHighlighting } from "../imports/CodemirrorPlutoSetup.js"
@@ -439,7 +439,7 @@ let declarative_shadow_dom_polyfill = (template) => {
 }
 
 export let RawHTMLContainer = ({ body, className = "", persist_js_state = false, last_run_timestamp }) => {
-    let pluto_actions = useContext(PlutoContext)
+    let pluto_actions = useContext(PlutoActionsContext)
     let pluto_bonds = useContext(PlutoBondsContext)
     let js_init_set = useContext(PlutoJSInitializingContext)
     let previous_results_map = useRef(new Map())
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index a0bb77b0e2..3c2779385e 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -22,7 +22,7 @@ import { Popup } from "./Popup.js"
 
 import { slice_utf8, length_utf8 } from "../common/UnicodeTools.js"
 import { has_ctrl_or_cmd_pressed, ctrl_or_cmd_name, is_mac_keyboard, in_textarea_or_input } from "../common/KeyboardShortcuts.js"
-import { PlutoContext, PlutoBondsContext, PlutoJSInitializingContext, SetWithEmptyCallback } from "../common/PlutoContext.js"
+import { PlutoActionsContext, PlutoBondsContext, PlutoJSInitializingContext, SetWithEmptyCallback } from "../common/PlutoContext.js"
 import { start_binder, BackendLaunchPhase, count_stat } from "../common/Binder.js"
 import { setup_mathjax } from "../common/SetupMathJax.js"
 import { BinderButton } from "./BinderButton.js"
@@ -192,6 +192,16 @@ const first_true_key = (obj) => {
  * }}
  */
 
+/**
+ * @typedef BondValueContainer
+ * @type {{ value: any }}
+ */
+
+/**
+ * @typedef BondValuesDict
+ * @type {{ [name: string]: BondValueContainer }}
+ */
+
 /**
  * @typedef NotebookData
  * @type {{
@@ -208,7 +218,7 @@ const first_true_key = (obj) => {
  *  cell_order: Array<string>,
  *  cell_execution_order: Array<string>,
  *  published_objects: { [objectid: string]: any},
- *  bonds: { [name: string]: any },
+ *  bonds: BondValuesDict,
  *  nbpkg: NotebookPkgData?,
  *  metadata: object,
  * }}
@@ -569,8 +579,8 @@ export class Editor extends Component {
             },
             /**
              *
-             * @param {string} name         | bond name
-             * @param {*} value             | bond value
+             * @param {string} name name of bound variable
+             * @param {*} value value (not in wrapper object)
              */
             set_bond: async (name, value) => {
                 await update_notebook((notebook) => {
@@ -1238,7 +1248,7 @@ patch: ${JSON.stringify(
 
         if (status.isolated_cell_view) {
             return html`
-                <${PlutoContext.Provider} value=${this.actions}>
+                <${PlutoActionsContext.Provider} value=${this.actions}>
                     <${PlutoBondsContext.Provider} value=${this.state.notebook.bonds}>
                         <${PlutoJSInitializingContext.Provider} value=${this.js_init_set}>
                             <${ProgressBar} notebook=${this.state.notebook} backend_launch_phase=${this.state.backend_launch_phase} status=${status}/>
@@ -1255,7 +1265,7 @@ patch: ${JSON.stringify(
                             </div>
                         </${PlutoJSInitializingContext.Provider}>
                     </${PlutoBondsContext.Provider}>
-                </${PlutoContext.Provider}>
+                </${PlutoActionsContext.Provider}>
             `
         }
 
@@ -1276,7 +1286,7 @@ patch: ${JSON.stringify(
         return html`
             ${this.state.disable_ui === false && html`<${HijackExternalLinksToOpenInNewTab} />`}
             
-            <${PlutoContext.Provider} value=${this.actions}>
+            <${PlutoActionsContext.Provider} value=${this.actions}>
                 <${PlutoBondsContext.Provider} value=${this.state.notebook.bonds}>
                     <${PlutoJSInitializingContext.Provider} value=${this.js_init_set}>
                     <${Scroller} active=${this.state.scroller} />
@@ -1471,7 +1481,7 @@ patch: ${JSON.stringify(
                     </footer>
                 </${PlutoJSInitializingContext.Provider}>
                 </${PlutoBondsContext.Provider}>
-            </${PlutoContext.Provider}>
+            </${PlutoActionsContext.Provider}>
         `
     }
 }
diff --git a/frontend/components/ErrorMessage.js b/frontend/components/ErrorMessage.js
index 2ab27f272e..0ef5344eed 100644
--- a/frontend/components/ErrorMessage.js
+++ b/frontend/components/ErrorMessage.js
@@ -1,4 +1,4 @@
-import { PlutoContext } from "../common/PlutoContext.js"
+import { PlutoActionsContext } from "../common/PlutoContext.js"
 import { html, useContext, useState } from "../imports/Preact.js"
 
 const StackFrameFilename = ({ frame, cell_id }) => {
@@ -39,7 +39,7 @@ const Funccall = ({ frame }) => {
 const insert_commas_and_and = (/** @type {any[]} */ xs) => xs.flatMap((x, i) => (i === xs.length - 1 ? [x] : i === xs.length - 2 ? [x, " and "] : [x, ", "]))
 
 export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
-    let pluto_actions = useContext(PlutoContext)
+    let pluto_actions = useContext(PlutoActionsContext)
     const default_rewriter = {
         pattern: /.?/,
         display: (/** @type{string} */ x) => x.split("\n").map((line) => html`<p>${line}</p>`),
diff --git a/frontend/components/LiveDocs.js b/frontend/components/LiveDocs.js
index 3e5559b4f2..ba75d01b4c 100644
--- a/frontend/components/LiveDocs.js
+++ b/frontend/components/LiveDocs.js
@@ -4,7 +4,7 @@ import observablehq from "../common/SetupCellEnvironment.js"
 import { cl } from "../common/ClassTable.js"
 
 import { RawHTMLContainer, highlight } from "./CellOutput.js"
-import { PlutoContext } from "../common/PlutoContext.js"
+import { PlutoActionsContext } from "../common/PlutoContext.js"
 
 const without_workspace_stuff = (str) =>
     str
@@ -13,7 +13,7 @@ const without_workspace_stuff = (str) =>
         .replace(/#&#61;&#61;#[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\:\d+/g, "") // remove UUIDs from filenames
 
 export let LiveDocs = ({ desired_doc_query, on_update_doc_query, notebook }) => {
-    let pluto_actions = useContext(PlutoContext)
+    let pluto_actions = useContext(PlutoActionsContext)
     let container_ref = useRef()
     let live_doc_search_ref = useRef()
     let [state, set_state] = useState({
diff --git a/frontend/components/Notebook.js b/frontend/components/Notebook.js
index 26052bd5c9..d208b225a7 100644
--- a/frontend/components/Notebook.js
+++ b/frontend/components/Notebook.js
@@ -1,4 +1,4 @@
-import { PlutoContext } from "../common/PlutoContext.js"
+import { PlutoActionsContext } from "../common/PlutoContext.js"
 import { html, useContext, useEffect, useMemo, useRef, useState } from "../imports/Preact.js"
 
 import { Cell } from "./Cell.js"
@@ -116,7 +116,7 @@ const render_cell_outputs_minimum = 20
  * }} props
  * */
 export const Notebook = ({ notebook, cell_inputs_local, last_created_cell, selected_cells, is_initializing, is_process_ready, disable_input }) => {
-    let pluto_actions = useContext(PlutoContext)
+    let pluto_actions = useContext(PlutoActionsContext)
 
     // Add new cell when the last cell gets deleted
     useEffect(() => {
diff --git a/frontend/components/Popup.js b/frontend/components/Popup.js
index d6375310ce..7b142e08fe 100644
--- a/frontend/components/Popup.js
+++ b/frontend/components/Popup.js
@@ -4,7 +4,7 @@ import observablehq from "../common/SetupCellEnvironment.js"
 import { cl } from "../common/ClassTable.js"
 
 import { RawHTMLContainer, highlight } from "./CellOutput.js"
-import { PlutoContext } from "../common/PlutoContext.js"
+import { PlutoActionsContext } from "../common/PlutoContext.js"
 import { package_status, nbpkg_fingerprint_without_terminal } from "./PkgStatusMark.js"
 import { PkgTerminalView } from "./PkgTerminalView.js"
 import { useDebouncedTruth } from "./RunArea.js"
@@ -103,7 +103,7 @@ export const Popup = ({ notebook }) => {
  * }} props
  */
 const PkgPopup = ({ notebook, recent_event, clear_recent_event }) => {
-    let pluto_actions = useContext(PlutoContext)
+    let pluto_actions = useContext(PlutoActionsContext)
     const [pkg_status, set_pkg_status] = useState(/** @type{import("./PkgStatusMark.js").PackageStatus?} */ (null))
 
     useEffect(() => {
diff --git a/frontend/components/Preamble.js b/frontend/components/Preamble.js
index c4cf7cc611..a1db9afd3a 100644
--- a/frontend/components/Preamble.js
+++ b/frontend/components/Preamble.js
@@ -1,6 +1,6 @@
 import { html, useEffect, useState, useContext, useRef, useMemo } from "../imports/Preact.js"
 import { cl } from "../common/ClassTable.js"
-import { PlutoContext } from "../common/PlutoContext.js"
+import { PlutoActionsContext } from "../common/PlutoContext.js"
 import { is_mac_keyboard } from "../common/KeyboardShortcuts.js"
 
 const await_focus = () =>
@@ -15,7 +15,7 @@ const await_focus = () =>
           })
 
 export const Preamble = ({ any_code_differs, last_update_time, last_hot_reload_time, connected }) => {
-    let pluto_actions = useContext(PlutoContext)
+    let pluto_actions = useContext(PlutoActionsContext)
 
     const [state, set_state] = useState("")
     const [reload_state, set_reload_state] = useState("")
diff --git a/frontend/components/RunArea.js b/frontend/components/RunArea.js
index 901da42543..8552b9bc37 100644
--- a/frontend/components/RunArea.js
+++ b/frontend/components/RunArea.js
@@ -2,7 +2,7 @@ import _ from "../imports/lodash.js"
 import { html, useContext, useEffect, useMemo, useState } from "../imports/Preact.js"
 
 import { in_textarea_or_input } from "../common/KeyboardShortcuts.js"
-import { PlutoContext } from "../common/PlutoContext.js"
+import { PlutoActionsContext } from "../common/PlutoContext.js"
 
 const upstream_of = (a_cell_id, notebook) => Object.values(notebook?.cell_dependencies?.[a_cell_id]?.upstream_cells_map || {}).flatMap((x) => x)
 
@@ -20,7 +20,7 @@ export const RunArea = ({ runtime, running, queued, code_differs, on_run, on_int
 
     const local_time_running_ms = useMillisSinceTruthy(running)
     const local_time_running_ns = local_time_running_ms == null ? null : 1e6 * local_time_running_ms
-    const pluto_actions = useContext(PlutoContext)
+    const pluto_actions = useContext(PlutoActionsContext)
 
     const on_jump = () => {
         const notebook = pluto_actions.get_notebook() || {}
diff --git a/frontend/components/TreeView.js b/frontend/components/TreeView.js
index 4deb354b7e..9d7c266b55 100644
--- a/frontend/components/TreeView.js
+++ b/frontend/components/TreeView.js
@@ -1,7 +1,7 @@
 import { html, useRef, useState, useContext } from "../imports/Preact.js"
 
 import { OutputBody, PlutoImage, RawHTMLContainer } from "./CellOutput.js"
-import { PlutoContext } from "../common/PlutoContext.js"
+import { PlutoActionsContext } from "../common/PlutoContext.js"
 
 // this is different from OutputBody because:
 // it does not wrap in <div>. We want to do that in OutputBody for reasons that I forgot (feel free to try and remove it), but we dont want it here
@@ -57,7 +57,7 @@ const actions_show_more = ({ pluto_actions, cell_id, node_ref, objectid, dim })
 }
 
 export const TreeView = ({ mime, body, cell_id, persist_js_state }) => {
-    let pluto_actions = useContext(PlutoContext)
+    let pluto_actions = useContext(PlutoActionsContext)
     const node_ref = useRef(/** @type {HTMLElement?} */ (null))
     const onclick = (e) => {
         // TODO: this could be reactified but no rush
@@ -133,7 +133,7 @@ export const TreeView = ({ mime, body, cell_id, persist_js_state }) => {
 }
 
 export const TableView = ({ mime, body, cell_id, persist_js_state }) => {
-    let pluto_actions = useContext(PlutoContext)
+    let pluto_actions = useContext(PlutoActionsContext)
     const node_ref = useRef(null)
 
     const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${cell_id} mime=${pair[1]} body=${pair[0]} persist_js_state=${persist_js_state} />`

From a8a3cc03cc875cece3c44961f12074ba5162157a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 2 Jun 2022 21:17:09 +0200
Subject: [PATCH 347/821] fix some null types around bonds

---
 frontend/common/Bond.js           | 46 ++++++++++++++++---------------
 frontend/components/CellOutput.js |  6 ++--
 frontend/components/Editor.js     |  4 +++
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/frontend/common/Bond.js b/frontend/common/Bond.js
index 0b116a6788..a3a89af925 100644
--- a/frontend/common/Bond.js
+++ b/frontend/common/Bond.js
@@ -24,7 +24,7 @@ export function get_input_value(input) {
             case "checkbox":
                 return input.checked
             case "file":
-                return input.multiple ? input.files : input.files[0]
+                return input.multiple ? input.files : input.files?.[0]
             default:
                 return input.value
         }
@@ -134,7 +134,7 @@ export const set_input_value = (input, new_value) => {
 export const set_bound_elements_to_their_value = (bond_nodes, bond_values) => {
     bond_nodes.forEach((bond_node) => {
         let bond_name = bond_node.getAttribute("def")
-        if (bond_node.firstElementChild != null && bond_values[bond_name] != null) {
+        if (bond_name != null && bond_node.firstElementChild != null && bond_values[bond_name] != null) {
             let val = bond_values[bond_name].value
             try {
                 set_input_value(bond_node.firstElementChild, val)
@@ -193,30 +193,32 @@ export const add_bonds_listener = (bond_nodes, on_bond_change, known_values, inv
 
     bond_nodes.forEach(async (bond_node) => {
         const name = bond_node.getAttribute("def")
-        const initial_value = get_input_value(bond_node.firstElementChild)
+        const bound_element_node = bond_node.firstElementChild
+        if (name != null && bound_element_node != null) {
+            const initial_value = get_input_value(bound_element_node)
 
-        let skip_initialize = Object.keys(known_values).includes(name) && _.isEqual(known_values[name]?.value, initial_value)
-        // Initialize the bond. This will send the data to the backend for the first time. If it's already there, and the value is the same, cells won't rerun.
-        const init_promise = skip_initialize ? null : on_bond_change(name, initial_value).catch(console.error)
+            let skip_initialize = Object.keys(known_values).includes(name) && _.isEqual(known_values[name]?.value, initial_value)
+            // Initialize the bond. This will send the data to the backend for the first time. If it's already there, and the value is the same, cells won't rerun.
+            const init_promise = skip_initialize ? null : on_bond_change(name, initial_value).catch(console.error)
 
-        // see the docs on Generators.input from observablehq/stdlib
-        let skippped_first = false
-        const bound_element_node = bond_node.firstElementChild
-        for (let val of input_generator(bound_element_node)) {
-            if (node_is_invalidated) break
+            // see the docs on Generators.input from observablehq/stdlib
+            let skippped_first = false
+            for (let val of input_generator(bound_element_node)) {
+                if (node_is_invalidated) break
 
-            if (skippped_first === false) {
-                skippped_first = true
-                continue
-            }
-            // wait for a new input value. If a value is ready, then this promise resolves immediately
-            const to_send = await transformed_val(await val)
+                if (skippped_first === false) {
+                    skippped_first = true
+                    continue
+                }
+                // wait for a new input value. If a value is ready, then this promise resolves immediately
+                const to_send = await transformed_val(await val)
 
-            // send to the Pluto back-end (have a look at set_bond in Editor.js)
-            // await the setter to avoid collisions
-            //TODO : get this from state
-            await init_promise
-            await on_bond_change(name, to_send).catch(console.error)
+                // send to the Pluto back-end (have a look at set_bond in Editor.js)
+                // await the setter to avoid collisions
+                //TODO : get this from state
+                await init_promise
+                await on_bond_change(name, to_send).catch(console.error)
+            }
         }
     })
 }
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index c05efb0051..5808ee4f32 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -449,7 +449,7 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
     let container_ref = useRef(/** @type {HTMLElement?} */ (null))
 
     useLayoutEffect(() => {
-        if (container_ref.current) set_bound_elements_to_their_value(container_ref.current.querySelectorAll("bond"), pluto_bonds)
+        if (container_ref.current && pluto_bonds) set_bound_elements_to_their_value(container_ref.current.querySelectorAll("bond"), pluto_bonds)
     }, [body, persist_js_state, pluto_actions, pluto_bonds])
 
     useLayoutEffect(() => {
@@ -491,8 +491,8 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
 
                 if (pluto_actions != null) {
                     const bond_nodes = container.querySelectorAll("bond")
-                    set_bound_elements_to_their_value(bond_nodes, pluto_bonds)
-                    add_bonds_listener(bond_nodes, pluto_actions.set_bond, pluto_bonds, invalidation)
+                    set_bound_elements_to_their_value(bond_nodes, pluto_bonds ?? {})
+                    add_bonds_listener(bond_nodes, pluto_actions.set_bond, pluto_bonds ?? {}, invalidation)
                     add_bonds_disabled_message_handler(bond_nodes, invalidation)
                 }
 
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 3c2779385e..827536113a 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -862,6 +862,10 @@ patch: ${JSON.stringify(
         this.waiting_for_bond_to_trigger_execution = false
         /** Number of local updates that have not yet been applied to the server's state. */
         this.pending_local_updates = 0
+        /**
+         * User scripts that are currently running (possibly async).
+         * @type {SetWithEmptyCallback<HTMLElement>}
+         */
         this.js_init_set = new SetWithEmptyCallback(() => {
             // console.info("All scripts finished!")
             this.send_queued_bond_changes()

From 90fa2c6a0e78403d2a7a4dc9074166038bd54c61 Mon Sep 17 00:00:00 2001
From: Hirumal Priyashan <57571152+HirumalPriyashan@users.noreply.github.com>
Date: Fri, 3 Jun 2022 01:47:18 +0530
Subject: [PATCH 348/821] Add default formatter (#2146)

---
 .vscode/settings.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 800e828e01..80f29ab483 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -16,9 +16,11 @@
     
     "editor.formatOnSave": false,
     "[javascript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
         "editor.formatOnSave": true
     },
     "[css]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
         "editor.formatOnSave": true
     }
 }

From 0e151293e3870468eac72a570332fcc5140f03ad Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 2 Jun 2022 22:33:09 +0200
Subject: [PATCH 349/821] Automatically generate SRI attributes in bundle
 (#2132)

---
 frontend-bundler/add_sri.js        |  33 ++++++
 frontend-bundler/package-lock.json | 184 +++++++++++++++++++++++++----
 frontend-bundler/package.json      |   6 +-
 3 files changed, 199 insertions(+), 24 deletions(-)
 create mode 100644 frontend-bundler/add_sri.js

diff --git a/frontend-bundler/add_sri.js b/frontend-bundler/add_sri.js
new file mode 100644
index 0000000000..3ba88d6fd6
--- /dev/null
+++ b/frontend-bundler/add_sri.js
@@ -0,0 +1,33 @@
+// Go through all the CSS/JS imports in an HTML file, and add SRI attributes. More info here:
+// https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity#examples
+
+// I really really tried to do this using a parcel plugin but it's "not possible". So right now this is just a separate script that you run with the html filenames as arguments.
+
+let path = require("path")
+let fs = require("fs/promises")
+let posthtml = require("posthtml")
+let posthtmlSri = require("posthtml-sri")
+
+let f = async () => {
+    // Read file given as command line arugment
+    for (let i = 2; i < process.argv.length; i++) {
+        let file = process.argv[i]
+        let contents = await fs.readFile(file, "utf8")
+
+        const plugins = [
+            posthtmlSri({
+                algorithms: ["sha384"],
+                basePath: path.dirname(file),
+            }),
+        ]
+
+        const result = await posthtml(plugins).process(contents)
+        // console.log(result)
+
+        // Write to file
+        await fs.writeFile(file, result.html)
+        console.log("✅ SRI added to ", file)
+    }
+}
+
+f()
diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index 7d6ca6c481..aeecbbe6b4 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -21,7 +21,9 @@
             "devDependencies": {
                 "@parcel/optimizer-data-url": "^2.0.0",
                 "@parcel/transformer-inline-string": "^2.0.0",
-                "@types/node": "^16.11.6"
+                "@types/node": "^16.11.6",
+                "posthtml": "^0.16.6",
+                "posthtml-sri": "^1.2.0"
             }
         },
         "node_modules/@babel/code-frame": {
@@ -1596,21 +1598,21 @@
             }
         },
         "node_modules/@parcel/transformer-posthtml": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.0.0.tgz",
-            "integrity": "sha512-jaiymnLQshy99zNxp9JLvFWFGm41LWULFRwjHep1ALGyphcxPiw/zq4o0K7pvc8shlAXvE2M/3Q2SGFyCwe+zA==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.5.0.tgz",
+            "integrity": "sha512-AZxg1XD8OXOS4bEGEmBBR+X9T9qoFdVsbVUg498zzejYSka1ZQHF7TgLI/+pUnE+ZVYNIp7/G0xXqsRVKMKmdQ==",
             "dependencies": {
-                "@parcel/plugin": "^2.0.0",
-                "@parcel/utils": "^2.0.0",
+                "@parcel/plugin": "2.5.0",
+                "@parcel/utils": "2.5.0",
                 "nullthrows": "^1.1.1",
                 "posthtml": "^0.16.5",
                 "posthtml-parser": "^0.10.1",
                 "posthtml-render": "^3.0.0",
-                "semver": "^5.4.1"
+                "semver": "^5.7.1"
             },
             "engines": {
                 "node": ">= 12.0.0",
-                "parcel": "^2.0.0"
+                "parcel": "^2.5.0"
             },
             "funding": {
                 "type": "opencollective",
@@ -4567,6 +4569,18 @@
                 "node": "*"
             }
         },
+        "node_modules/minipass": {
+            "version": "3.1.6",
+            "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
+            "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
+            "dev": true,
+            "dependencies": {
+                "yallist": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/mkdirp": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -5677,11 +5691,11 @@
             "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
         },
         "node_modules/posthtml": {
-            "version": "0.16.5",
-            "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.16.5.tgz",
-            "integrity": "sha512-1qOuPsywVlvymhTFIBniDXwUDwvlDri5KUQuBqjmCc8Jj4b/HDSVWU//P6rTWke5rzrk+vj7mms2w8e1vD0nnw==",
+            "version": "0.16.6",
+            "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.16.6.tgz",
+            "integrity": "sha512-JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ==",
             "dependencies": {
-                "posthtml-parser": "^0.10.0",
+                "posthtml-parser": "^0.11.0",
                 "posthtml-render": "^3.0.0"
             },
             "engines": {
@@ -5710,6 +5724,30 @@
                 "node": ">=12"
             }
         },
+        "node_modules/posthtml-sri": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/posthtml-sri/-/posthtml-sri-1.2.0.tgz",
+            "integrity": "sha512-2PFUHkDMJIOX5AoljGVLgJLleDyUz779Czn9R0MoxSnpmTcheGHM85bt/6bZ33Dm20gQTWyPbiSmfIfz1d3tIg==",
+            "dev": true,
+            "dependencies": {
+                "node-fetch": "^2.6.1",
+                "ssri": "^8.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/posthtml/node_modules/posthtml-parser": {
+            "version": "0.11.0",
+            "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.11.0.tgz",
+            "integrity": "sha512-QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw==",
+            "dependencies": {
+                "htmlparser2": "^7.1.1"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/prelude-ls": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -6181,6 +6219,18 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/ssri": {
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+            "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+            "dev": true,
+            "dependencies": {
+                "minipass": "^3.1.1"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
         "node_modules/stable": {
             "version": "0.1.8",
             "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
@@ -6915,6 +6965,12 @@
             "resolved": "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-0.4.2.tgz",
             "integrity": "sha512-/eyHVRJQCirEkSZ1agRSCwriMhwlyUcFkXD5TPVSLP+IPzjsqMVzZwdoczLp1SoQU0R3dxz1RpIK+4YNQbCVOA=="
         },
+        "node_modules/yallist": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+            "dev": true
+        },
         "node_modules/yaml": {
             "version": "1.10.2",
             "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
@@ -6923,6 +6979,19 @@
                 "node": ">= 6"
             }
         },
+        "parcel-optimizer-sri": {
+            "version": "1.0.0",
+            "extraneous": true,
+            "license": "ISC",
+            "dependencies": {
+                "@parcel/node-resolver-core": "^2.0.0",
+                "@parcel/plugin": "^2.0.0",
+                "node-fetch": "^2.6.5"
+            },
+            "engines": {
+                "parcel": "2.x"
+            }
+        },
         "parcel-resolver-like-a-browser": {
             "version": "1.0.0",
             "license": "ISC",
@@ -6934,6 +7003,33 @@
             "engines": {
                 "parcel": "2.x"
             }
+        },
+        "parcel-sri": {
+            "version": "1.0.0",
+            "extraneous": true,
+            "license": "ISC",
+            "dependencies": {
+                "@parcel/node-resolver-core": "^2.0.0",
+                "@parcel/plugin": "^2.0.0",
+                "node-fetch": "^2.6.5"
+            },
+            "engines": {
+                "parcel": "2.x"
+            }
+        },
+        "parcel-transformer-sri": {
+            "version": "1.0.0",
+            "extraneous": true,
+            "license": "ISC",
+            "dependencies": {
+                "@parcel/node-resolver-core": "^2.0.0",
+                "@parcel/plugin": "^2.0.0",
+                "node-fetch": "^2.6.5",
+                "posthtml": "^0.16.6"
+            },
+            "engines": {
+                "parcel": "2.x"
+            }
         }
     },
     "dependencies": {
@@ -7977,17 +8073,17 @@
             }
         },
         "@parcel/transformer-posthtml": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.0.0.tgz",
-            "integrity": "sha512-jaiymnLQshy99zNxp9JLvFWFGm41LWULFRwjHep1ALGyphcxPiw/zq4o0K7pvc8shlAXvE2M/3Q2SGFyCwe+zA==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.5.0.tgz",
+            "integrity": "sha512-AZxg1XD8OXOS4bEGEmBBR+X9T9qoFdVsbVUg498zzejYSka1ZQHF7TgLI/+pUnE+ZVYNIp7/G0xXqsRVKMKmdQ==",
             "requires": {
-                "@parcel/plugin": "^2.0.0",
-                "@parcel/utils": "^2.0.0",
+                "@parcel/plugin": "2.5.0",
+                "@parcel/utils": "2.5.0",
                 "nullthrows": "^1.1.1",
                 "posthtml": "^0.16.5",
                 "posthtml-parser": "^0.10.1",
                 "posthtml-render": "^3.0.0",
-                "semver": "^5.4.1"
+                "semver": "^5.7.1"
             }
         },
         "@parcel/transformer-raw": {
@@ -10212,6 +10308,15 @@
                 "brace-expansion": "^1.1.7"
             }
         },
+        "minipass": {
+            "version": "3.1.6",
+            "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
+            "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
+            "dev": true,
+            "requires": {
+                "yallist": "^4.0.0"
+            }
+        },
         "mkdirp": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -10964,12 +11069,22 @@
             "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
         },
         "posthtml": {
-            "version": "0.16.5",
-            "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.16.5.tgz",
-            "integrity": "sha512-1qOuPsywVlvymhTFIBniDXwUDwvlDri5KUQuBqjmCc8Jj4b/HDSVWU//P6rTWke5rzrk+vj7mms2w8e1vD0nnw==",
+            "version": "0.16.6",
+            "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.16.6.tgz",
+            "integrity": "sha512-JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ==",
             "requires": {
-                "posthtml-parser": "^0.10.0",
+                "posthtml-parser": "^0.11.0",
                 "posthtml-render": "^3.0.0"
+            },
+            "dependencies": {
+                "posthtml-parser": {
+                    "version": "0.11.0",
+                    "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.11.0.tgz",
+                    "integrity": "sha512-QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw==",
+                    "requires": {
+                        "htmlparser2": "^7.1.1"
+                    }
+                }
             }
         },
         "posthtml-parser": {
@@ -10988,6 +11103,16 @@
                 "is-json": "^2.0.1"
             }
         },
+        "posthtml-sri": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/posthtml-sri/-/posthtml-sri-1.2.0.tgz",
+            "integrity": "sha512-2PFUHkDMJIOX5AoljGVLgJLleDyUz779Czn9R0MoxSnpmTcheGHM85bt/6bZ33Dm20gQTWyPbiSmfIfz1d3tIg==",
+            "dev": true,
+            "requires": {
+                "node-fetch": "^2.6.1",
+                "ssri": "^8.0.0"
+            }
+        },
         "prelude-ls": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -11323,6 +11448,15 @@
                 "tweetnacl": "~0.14.0"
             }
         },
+        "ssri": {
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+            "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+            "dev": true,
+            "requires": {
+                "minipass": "^3.1.1"
+            }
+        },
         "stable": {
             "version": "0.1.8",
             "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
@@ -11904,6 +12038,12 @@
             "resolved": "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-0.4.2.tgz",
             "integrity": "sha512-/eyHVRJQCirEkSZ1agRSCwriMhwlyUcFkXD5TPVSLP+IPzjsqMVzZwdoczLp1SoQU0R3dxz1RpIK+4YNQbCVOA=="
         },
+        "yallist": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+            "dev": true
+        },
         "yaml": {
             "version": "1.10.2",
             "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
diff --git a/frontend-bundler/package.json b/frontend-bundler/package.json
index 142e61c333..4af06e52fa 100644
--- a/frontend-bundler/package.json
+++ b/frontend-bundler/package.json
@@ -7,7 +7,7 @@
     "description": "",
     "scripts": {
         "start": "cd ../frontend && parcel --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html sample.html",
-        "build": "cd ../frontend && parcel build --no-source-maps --public-url . --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html sample.html",
+        "build": "cd ../frontend && parcel build --no-source-maps --public-url . --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html sample.html && node ../frontend-bundler/add_sri.js ../frontend-dist/editor.html ../frontend-dist/index.html ../frontend-dist/error.jl.html ../frontend-dist/sample.html",
         "test": "echo \"Error: no test specified\" && exit 1"
     },
     "author": "",
@@ -22,6 +22,8 @@
     "devDependencies": {
         "@parcel/optimizer-data-url": "^2.0.0",
         "@parcel/transformer-inline-string": "^2.0.0",
-        "@types/node": "^16.11.6"
+        "@types/node": "^16.11.6",
+        "posthtml": "^0.16.6",
+        "posthtml-sri": "^1.2.0"
     }
 }

From 40b4d7d727783fe8e1a19f27f349939b1a804aab Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 2 Jun 2022 22:41:57 +0200
Subject: [PATCH 350/821] Fix high-frequency, complex bond combinations causing
 a stall (#2147)

---
 frontend/components/Editor.js | 24 ++++++++++++++++++++----
 frontend/imports/immer.d.ts   |  2 +-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 827536113a..d203df9c0d 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -858,7 +858,7 @@ patch: ${JSON.stringify(
                 })
             }
         }
-        /** Whether we just set a bond value which will trigger a cell to run, but we are still waiting for the server to process the bond value (and run the cell). See https://github.com/fonsp/Pluto.jl/issues/1891 for more info. */
+        /** Whether we just set a bond value which will trigger a cell to run, but we are still waiting for the server to process the bond value (and run the cell). During this time, we won't send new bond values. See https://github.com/fonsp/Pluto.jl/issues/1891 for more info. */
         this.waiting_for_bond_to_trigger_execution = false
         /** Number of local updates that have not yet been applied to the server's state. */
         this.pending_local_updates = 0
@@ -885,7 +885,7 @@ patch: ${JSON.stringify(
         this.is_process_ready = () =>
             this.state.notebook.process_status === ProcessStatus.starting || this.state.notebook.process_status === ProcessStatus.ready
 
-        let bond_will_trigger_evaluation = (/** @type {string|PropertyKey} */ sym) =>
+        const bond_will_trigger_evaluation = (/** @type {string|PropertyKey} */ sym) =>
             Object.entries(this.state.notebook.cell_dependencies).some(([cell_id, deps]) => {
                 // if the other cell depends on the variable `sym`...
                 if (deps.upstream_cells_map.hasOwnProperty(sym)) {
@@ -895,6 +895,23 @@ patch: ${JSON.stringify(
                 }
             })
 
+        /**
+         * We set `waiting_for_bond_to_trigger_execution` to `true` if it is *guaranteed* that this bond change will trigger something to happen (i.e. a cell to run). See https://github.com/fonsp/Pluto.jl/pull/1892 for more info about why.
+         *
+         * This is guaranteed if there is a cell in the notebook that references the bound variable. We use our copy of the notebook's toplogy to check this.
+         *
+         * # Gotchas:
+         * 1. We (the frontend) might have an out-of-date copy of the notebook's topology: this bond might have dependents *right now*, but the backend might already be processing a code change that removes that dependency.
+         *
+         *     However, this change in topology will result in a patch, which will set `waiting_for_bond_to_trigger_execution` back to `false`.
+         *
+         * 2. The backend has a "first value" mechanism: if bond values are being set for the first time *and* this value is already set on the backend, then the value will be skipped. See https://github.com/fonsp/Pluto.jl/issues/275. If all bond values are skipped, then we might get zero patches back (because no cells will run).
+         *
+         *     A bond value is considered a "first value" if it is sent using an `"add"` patch. This is why we require `x.op === "replace"`.
+         */
+        const bond_patch_will_trigger_evaluation = (/** @type {Patch} */ x) =>
+            x.op === "replace" && x.path.length >= 1 && bond_will_trigger_evaluation(x.path[1])
+
         let last_update_notebook_task = Promise.resolve()
         /** @param {(notebook: NotebookData) => void} mutate_fn */
         let update_notebook = (mutate_fn) => {
@@ -936,8 +953,7 @@ patch: ${JSON.stringify(
                 }
                 if (is_idle) {
                     this.waiting_for_bond_to_trigger_execution =
-                        this.waiting_for_bond_to_trigger_execution ||
-                        changes_involving_bonds.some((x) => x.path.length >= 1 && bond_will_trigger_evaluation(x.path[1]))
+                        this.waiting_for_bond_to_trigger_execution || changes_involving_bonds.some(bond_patch_will_trigger_evaluation)
                 }
                 this.pending_local_updates++
                 this.on_patches_hook(changes)
diff --git a/frontend/imports/immer.d.ts b/frontend/imports/immer.d.ts
index 479635f1f4..35884f8800 100644
--- a/frontend/imports/immer.d.ts
+++ b/frontend/imports/immer.d.ts
@@ -1,6 +1,6 @@
 export type Patch = {
     path: Array<string | number>
-    op: "add" | "replace"
+    op: "add" | "replace" | "remove"
     value: any
 }
 

From 54d43560f24174841e75cc974fb22c7190b35a3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Fri, 3 Jun 2022 00:34:13 +0300
Subject: [PATCH 351/821] Update Embedding section of JavaScript sample
 notebook (#2124)

Co-authored-by: Rik Huijzer <rikhuijzer@pm.me>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 sample/JavaScript.jl | 62 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 15 deletions(-)

diff --git a/sample/JavaScript.jl b/sample/JavaScript.jl
index 0a77ab805a..507078e35d 100644
--- a/sample/JavaScript.jl
+++ b/sample/JavaScript.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.19.3
+# v0.19.5
 
 using Markdown
 using InteractiveUtils
@@ -292,13 +292,6 @@ my_data = [
 	</script>
 """)
 
-# ╔═╡ 7d9d6c28-131a-4b2a-84f8-5c085f387e85
-md"""
-#### Future: directly embedding data
-
-In the future, you will be able to embed data directly into JavaScript, using Pluto's built-in, optimized data transfer. See [the Pull Request](https://github.com/fonsp/Pluto.jl/pull/1124) for more info.
-"""
-
 # ╔═╡ 0866afc2-fd42-42b7-a572-9d824cf8b83b
 md"""
 ## Custom `@bind` output
@@ -753,6 +746,39 @@ state = Dict(
 	
 """)
 
+# ╔═╡ 7d9d6c28-131a-4b2a-84f8-5c085f387e85
+md"""
+## Embedding Julia data directly into JavaScript!
+
+You can use `Main.PlutoRunner.publish_to_js` to embed data directly into JavaScript, using Pluto's built-in, optimized data transfer. See [the Pull Request](https://github.com/fonsp/Pluto.jl/pull/1124) for more info.
+
+Example usage:
+
+```julia
+let
+	x = rand(UInt8, 10_000)
+	
+	d = Dict(
+		"some_raw_data" => x,
+		"wow" => 1000,
+	)
+	
+	@htl(\"\"\"
+	<script>
+		
+	const d = $(Main.PlutoRunner.publish_to_js(d))
+	console.log(d)
+	
+	</script>
+	\"\"\")
+end
+```
+
+In this example, the `const d` is populated from a hook into Pluto's data transfer. For large amounts of typed vector data (e.g. `Vector{UInt8}` or `Vector{Float64}`), this is *much* more efficient than interpolating the data directly with HypertextLiteral using `$(d)`, which would use a JSON-like string serialization.
+
+**Note:** this API is still *experimental*, and might change in the future.
+"""
+
 # ╔═╡ da7091f5-8ba2-498b-aa8d-bbf3b4505b81
 md"""
 # Appendix
@@ -1090,9 +1116,9 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
 [[ColorTypes]]
 deps = ["FixedPointNumbers", "Random"]
-git-tree-sha1 = "024fe24d83e4a5bf5fc80501a314ce0d1aa35597"
+git-tree-sha1 = "0f4e115f6f34bbe43c19751c90a38b2f380637b9"
 uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
-version = "0.11.0"
+version = "0.11.3"
 
 [[Dates]]
 deps = ["Printf"]
@@ -1115,9 +1141,10 @@ uuid = "47d2ed2b-36de-50cf-bf87-49c2cf4b8b91"
 version = "0.0.4"
 
 [[HypertextLiteral]]
-git-tree-sha1 = "2b078b5a615c6c0396c77810d92ee8c6f470d238"
+deps = ["Tricks"]
+git-tree-sha1 = "c47c5fa4c5308f27ccaac35504858d8914e102f9"
 uuid = "ac1192a8-f4b3-4bfe-ba22-af5b92cd3ab2"
-version = "0.9.3"
+version = "0.9.4"
 
 [[IOCapture]]
 deps = ["Logging", "Random"]
@@ -1190,9 +1217,9 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[PlutoUI]]
 deps = ["AbstractPlutoDingetjes", "Base64", "ColorTypes", "Dates", "Hyperscript", "HypertextLiteral", "IOCapture", "InteractiveUtils", "JSON", "Logging", "Markdown", "Random", "Reexport", "UUIDs"]
-git-tree-sha1 = "670e559e5c8e191ded66fa9ea89c97f10376bb4c"
+git-tree-sha1 = "8d1f54886b9037091edf146b517989fc4a09efec"
 uuid = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
-version = "0.7.38"
+version = "0.7.39"
 
 [[Printf]]
 deps = ["Unicode"]
@@ -1240,6 +1267,11 @@ uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
 deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
 uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
+[[Tricks]]
+git-tree-sha1 = "6bac775f2d42a611cdfcd1fb217ee719630c4175"
+uuid = "410a4b4d-49e4-4fbc-ab6d-cb71b17b3775"
+version = "0.1.6"
+
 [[UUIDs]]
 deps = ["Random", "SHA"]
 uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
@@ -1297,7 +1329,6 @@ uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
 # ╠═00d97588-d591-4dad-9f7d-223c237deefd
 # ╠═21f57310-9ceb-423c-a9ce-5beb1060a5a3
 # ╟─94561cb1-2325-49b6-8b22-943923fdd91b
-# ╟─7d9d6c28-131a-4b2a-84f8-5c085f387e85
 # ╟─0866afc2-fd42-42b7-a572-9d824cf8b83b
 # ╟─75e1a973-7ef0-4ac5-b3e2-5edb63577927
 # ╠═e8d8a60e-489b-467a-b49c-1fa844807751
@@ -1337,6 +1368,7 @@ uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
 # ╠═9e37c18c-3ebb-443a-9663-bb4064391d6e
 # ╟─05d28aa2-9622-4e62-ab39-ca4c7dde6eb4
 # ╠═3266f9e6-42ad-4103-8db3-b87d2c315290
+# ╟─7d9d6c28-131a-4b2a-84f8-5c085f387e85
 # ╟─ebec177c-4c33-45a4-bdbd-f16944631aff
 # ╟─da7091f5-8ba2-498b-aa8d-bbf3b4505b81
 # ╠═64cbf19c-a4e3-4cdb-b4ec-1fbe24be55ad

From d05bccc6dd60434dfae15756a3a5fd25bd800444 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 2 Jun 2022 23:34:25 +0200
Subject: [PATCH 352/821] Use bundled editor.html for static export if possible
 (#2133)

---
 Project.toml           |  2 +
 src/notebook/Export.jl | 87 +++++++++++++++++++++++++++++++++---------
 test/Configuration.jl  |  9 +++--
 3 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/Project.toml b/Project.toml
index a566002514..cdb482049f 100644
--- a/Project.toml
+++ b/Project.toml
@@ -25,6 +25,7 @@ RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
+URIs = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
@@ -37,6 +38,7 @@ MsgPack = "1.1"
 PrecompileSignatures = "3"
 RelocatableFolders = "0.1, 0.2, 0.3"
 Tables = "1"
+URIs = "1.3"
 julia = "^1.6"
 
 [extras]
diff --git a/src/notebook/Export.jl b/src/notebook/Export.jl
index 95862d0575..445179bee7 100644
--- a/src/notebook/Export.jl
+++ b/src/notebook/Export.jl
@@ -1,6 +1,7 @@
 import Pkg
 using Base64
 using HypertextLiteral
+import URIs
 
 const default_binder_url = "https://mybinder.org/v2/gh/fonsp/pluto-on-binder/v$(string(PLUTO_VERSION))"
 
@@ -11,6 +12,41 @@ if cdn_version_override !== nothing
     @warn "Reminder to fonsi: Using a development version of Pluto for CDN assets. The binder button might not work. You should not see this on a released version of Pluto." cdn_version_override
 end
 
+function cdnified_editor_html(;
+        version::Union{Nothing,VersionNumber,AbstractString}=nothing, 
+        pluto_cdn_root::Union{Nothing,AbstractString}=nothing,
+    )
+    should_use_bundled_cdn = version ∈ (nothing, PLUTO_VERSION) && pluto_cdn_root === nothing
+    
+    something(
+        if should_use_bundled_cdn
+            try
+                original = read(project_relative_path("frontend-dist", "editor.html"), String)
+    
+                replace_with_cdn(original) do url
+                    # Because parcel creates filenames with a hash in them, we can check if the file exists locally to make sure that everything is in order.
+                    @assert isfile(project_relative_path("frontend-dist", url))
+                    
+                    URIs.resolvereference("https://cdn.jsdelivr.net/gh/fonsp/Pluto.jl@$(string(PLUTO_VERSION))/frontend-dist/", url) |> string
+                end
+            catch e
+                @warn "Could not use bundled CDN version of editor.html. You should only see this message if you are using a fork of Pluto." exception=(e,catch_backtrace())
+                nothing
+            end
+        end,
+        let
+            original = read(project_relative_path("frontend", "editor.html"), String)
+
+            cdn_root = something(pluto_cdn_root, "https://cdn.jsdelivr.net/gh/fonsp/Pluto.jl@$(something(cdn_version_override, string(something(version, PLUTO_VERSION))))/frontend/")
+            @debug "Using CDN for Pluto assets:" cdn_root
+    
+            replace_with_cdn(original) do url
+                URIs.resolvereference(cdn_root, url) |> string
+            end
+        end
+    )
+end
+
 """
 See [PlutoSliderServer.jl](https://github.com/JuliaPluto/PlutoSliderServer.jl) if you are interested in exporting notebooks programatically.
 """
@@ -32,25 +68,7 @@ function generate_html(;
         header_html::AbstractString="",
     )::String
 
-    # Here we don't use frontend-dist (bundled code) yet, might want to
-    # use a separate Parcel pipeline to make UBER-BUNDLED html exports (TODO DRAL)
-    original = read(project_relative_path("frontend", "editor.html"), String)
-
-    cdn_root = if pluto_cdn_root === nothing
-        if version === nothing
-            version = PLUTO_VERSION
-        end
-        "https://cdn.jsdelivr.net/gh/fonsp/Pluto.jl@$(something(cdn_version_override, string(PLUTO_VERSION)))/frontend/"
-    else
-        pluto_cdn_root
-    end
-
-    @debug "Using CDN for Pluto assets:" cdn_root
-
-    cdnified = replace(
-        replace(original, 
-        "href=\"./" => "href=\"$(cdn_root)"),
-        "src=\"./" => "src=\"$(cdn_root)")
+    cdnified = cdnified_editor_html(; version, pluto_cdn_root)
 
     result = replace_at_least_once(
         replace_at_least_once(cdnified, 
@@ -147,3 +165,34 @@ function frontmatter_html(frontmatter::Dict{String,Any}; default_frontmatter::Di
             for (key, val) in d if key in _og_properties
         ))"""))
 end
+
+
+
+
+
+replace_substring(s::String, sub::SubString, newval::AbstractString) = *(
+	SubString(s, 1, prevind(s, sub.offset + 1, 1)), 
+	newval, 
+	SubString(s, nextind(s, sub.offset + sub.ncodeunits))
+)
+
+const source_pattern = r"\s(?:src|href)=\"(.+?)\""
+
+function replace_with_cdn(cdnify::Function, s::String, idx::Integer=1)
+	next_match = match(source_pattern, s, idx)
+	if next_match === nothing
+		s
+	else
+		url = only(next_match.captures)
+		if occursin("//", url)
+			# skip this one
+			replace_with_cdn(cdnify, s, nextind(s, next_match.offset))
+		else
+			replace_with_cdn(cdnify, replace_substring(
+				s,
+				url,
+				cdnify(url)
+			))
+		end
+	end
+end
diff --git a/test/Configuration.jl b/test/Configuration.jl
index d460f4a4a3..c45d0751d0 100644
--- a/test/Configuration.jl
+++ b/test/Configuration.jl
@@ -5,6 +5,7 @@ using Pluto: ServerSession, ClientSession, SessionActions
 using Pluto.Configuration
 using Pluto.Configuration: notebook_path_suggestion, from_flat_kwargs, _convert_to_flags
 using Pluto.WorkspaceManager: poll
+import URIs
 
 @testset "Configurations" begin
 
@@ -97,10 +98,10 @@ end
     effect_routes = [
         ("new", "GET"),
         ("new", "POST"),
-        ("open?url=$(HTTP.URIs.escapeuri("https://raw.githubusercontent.com/fonsp/Pluto.jl/v0.14.5/sample/Basic.jl"))", "GET"),
-        ("open?url=$(HTTP.URIs.escapeuri("https://raw.githubusercontent.com/fonsp/Pluto.jl/v0.14.5/sample/Basic.jl"))", "POST"),
-        ("open?path=$(HTTP.URIs.escapeuri(Pluto.project_relative_path("sample", "Basic.jl") |> tempcopy))", "GET"),
-        ("open?path=$(HTTP.URIs.escapeuri(Pluto.project_relative_path("sample", "Basic.jl") |> tempcopy))", "POST"),
+        ("open?url=$(URIs.escapeuri("https://raw.githubusercontent.com/fonsp/Pluto.jl/v0.14.5/sample/Basic.jl"))", "GET"),
+        ("open?url=$(URIs.escapeuri("https://raw.githubusercontent.com/fonsp/Pluto.jl/v0.14.5/sample/Basic.jl"))", "POST"),
+        ("open?path=$(URIs.escapeuri(Pluto.project_relative_path("sample", "Basic.jl") |> tempcopy))", "GET"),
+        ("open?path=$(URIs.escapeuri(Pluto.project_relative_path("sample", "Basic.jl") |> tempcopy))", "POST"),
         ("sample/Basic.jl", "GET"),
         ("sample/Basic.jl", "POST"),
         ("notebookupload", "POST"),

From 316103bd80b3d0eef051ad8d21d6fd088e44214e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 3 Jun 2022 00:16:40 +0200
Subject: [PATCH 353/821] Fall back to text/plain when tree viewer display
 fails (#2109)

---
 src/runner/PlutoRunner.jl | 16 +++++++++++++---
 test/RichOutput.jl        | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index e3f0f7cdbb..b50ac73a57 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1080,9 +1080,19 @@ function show_richest(io::IO, @nospecialize(x))::Tuple{<:Any,MIME}
     if mime isa MIME"text/plain" && use_tree_viewer_for_struct(x)
         tree_data(x, io), MIME"application/vnd.pluto.tree+object"()
     elseif mime isa MIME"application/vnd.pluto.tree+object"
-        tree_data(x, IOContext(io, :compact => true)), mime
+        try
+            tree_data(x, IOContext(io, :compact => true)), mime
+        catch
+            show(io, MIME"text/plain"(), x)
+            nothing, MIME"text/plain"()
+        end
     elseif mime isa MIME"application/vnd.pluto.table+object"
-        table_data(x, IOContext(io, :compact => true)), mime
+        try
+            table_data(x, IOContext(io, :compact => true)), mime
+        catch
+            show(io, MIME"text/plain"(), x)
+            nothing, MIME"text/plain"()
+        end
     elseif mime isa MIME"application/vnd.pluto.divelement+object"
         tree_data(x, io), mime
     elseif mime ∈ imagemimes
@@ -1115,7 +1125,7 @@ pluto_showable(m::MIME, @nospecialize(x))::Bool = Base.invokelatest(showable, m,
 
 
 # We invent our own MIME _because we can_ but don't use it somewhere else because it might change :)
-pluto_showable(::MIME"application/vnd.pluto.tree+object", x::AbstractVector{<:Any}) = eltype(eachindex(x)) === Int
+pluto_showable(::MIME"application/vnd.pluto.tree+object", x::AbstractVector{<:Any}) = try eltype(eachindex(x)) === Int; catch; false; end
 pluto_showable(::MIME"application/vnd.pluto.tree+object", ::AbstractSet{<:Any}) = true
 pluto_showable(::MIME"application/vnd.pluto.tree+object", ::AbstractDict{<:Any,<:Any}) = true
 pluto_showable(::MIME"application/vnd.pluto.tree+object", ::Tuple) = true
diff --git a/test/RichOutput.jl b/test/RichOutput.jl
index c0892f543d..26d1abb445 100644
--- a/test/RichOutput.jl
+++ b/test/RichOutput.jl
@@ -143,6 +143,35 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
             notebook = Notebook([
                 Cell("using OffsetArrays"),
                 Cell("OffsetArray(zeros(3), 20:22)"),
+                
+                Cell("""
+                begin
+                    struct BadImplementation <: AbstractVector{Int64}
+                    end
+                    function Base.show(io::IO, ::MIME"text/plain", b::BadImplementation)
+                        write(io, "fallback")
+                    end
+                end
+                """),
+                
+                Cell("""
+                begin
+                    struct OneTwoThree <: AbstractVector{Int64}
+                    end
+                
+                    
+                    function Base.show(io::IO, ::MIME"text/plain", b::OneTwoThree)
+                        write(io, "fallback")
+                    end
+                
+                    Base.size(::OneTwoThree) = (3,)
+                    Base.getindex(::OneTwoThree, i) = 100 + i
+                end
+                """),
+                
+                Cell("BadImplementation()"),
+                Cell("OneTwoThree()"),
+                
             ])
             fakeclient.connected_notebook = notebook
 
@@ -155,6 +184,16 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
             # once in the prefix, once as index
             @test count("22", s) >= 2
             
+            @test notebook.cells[5].output.mime isa MIME"text/plain"
+            @test notebook.cells[5].output.body == "fallback"
+            
+            @test notebook.cells[6].output.mime isa MIME"application/vnd.pluto.tree+object"
+            s = string(notebook.cells[6].output.body)
+            @test occursin("OneTwoThree", s)
+            @test occursin("101", s)
+            @test occursin("102", s)
+            @test occursin("103", s)
+            
             WorkspaceManager.unmake_workspace((🍭, notebook))
             🍭.options.evaluation.workspace_use_distributed = false
         end

From d1ebadef5689dbacf158e347d342def237e39c8c Mon Sep 17 00:00:00 2001
From: Hirumal Priyashan <57571152+HirumalPriyashan@users.noreply.github.com>
Date: Fri, 3 Jun 2022 04:14:47 +0530
Subject: [PATCH 354/821] ANSI colored output in captured stdout (#2148)

* add ansi_up

* stdout_color

* create new AnsiUp instance for each render

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/Logs.js            | 14 +++++++++++++-
 frontend/components/PkgTerminalView.js |  2 +-
 frontend/imports/AnsiUp.js             |  2 +-
 src/runner/PlutoRunner.jl              |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
index db2cb1e76d..80126d2728 100644
--- a/frontend/components/Logs.js
+++ b/frontend/components/Logs.js
@@ -3,6 +3,7 @@ import { cl } from "../common/ClassTable.js"
 import { html, useState, useEffect, useLayoutEffect, useRef, useMemo } from "../imports/Preact.js"
 import { SimpleOutputBody } from "./TreeView.js"
 import { help_circle_icon, open_pluto_popup } from "./Popup.js"
+import AnsiUp from "../imports/AnsiUp.js"
 
 // Defined in editor.css
 const GRID_WIDTH = 10
@@ -176,7 +177,7 @@ const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
                                             >${"(It is not the "}<em>return value</em>${" of the cell.)"}</span
                                         >`}
                                 />
-                                <pre>${msg[0]}</pre>`
+                                <${LogViewAnsiUp} value=${msg[0]} />`
                           : html`${mimepair_output(msg)}${kwargs.map(
                                 ([k, v]) =>
                                     html`
@@ -206,3 +207,14 @@ const MoreInfo = (/** @type{{body: import("../imports/Preact.js").ReactElement}}
         ><img alt="❔" src=${help_circle_icon} width="17"
     /></a>`
 }
+
+const LogViewAnsiUp = (/** @type {{value: string}} */ { value }) => {
+    const node_ref = useRef(/** @type {HTMLElement?} */ (null))
+
+    useEffect(() => {
+        if (!node_ref.current) return
+        node_ref.current.innerHTML = new AnsiUp().ansi_to_html(value)
+    }, [node_ref.current, value])
+
+    return html`<pre ref=${node_ref}></pre>`
+}
diff --git a/frontend/components/PkgTerminalView.js b/frontend/components/PkgTerminalView.js
index a467dd6ac7..6c13c6538f 100644
--- a/frontend/components/PkgTerminalView.js
+++ b/frontend/components/PkgTerminalView.js
@@ -6,7 +6,7 @@ const TerminalViewAnsiUp = ({ value }) => {
 
     useEffect(() => {
         if (!node_ref.current) return
-        node_ref.current.innerHTML = AnsiUp.ansi_to_html(value)
+        node_ref.current.innerHTML = new AnsiUp().ansi_to_html(value)
         const parent = node_ref.current.parentElement
         if (parent) parent.scrollTop = 1e5
     }, [node_ref.current, value])
diff --git a/frontend/imports/AnsiUp.js b/frontend/imports/AnsiUp.js
index e7f6abb905..4678c273fe 100644
--- a/frontend/imports/AnsiUp.js
+++ b/frontend/imports/AnsiUp.js
@@ -1,3 +1,3 @@
 // @ts-ignore
-export default AnsiUp = new window.AnsiUp()
+export default AnsiUp = window.AnsiUp
 // export default window.AnsiUp
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index b50ac73a57..2094bdcfe3 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -920,7 +920,7 @@ Base.IOContext(io::IOContext, ::Nothing) = io
 "The `IOContext` used for converting arbitrary objects to pretty strings."
 const default_iocontext = IOContext(devnull, :color => false, :limit => true, :displaysize => (18, 88), :is_pluto => true, :pluto_supported_integration_features => supported_integration_features)
 
-const default_stdout_iocontext = IOContext(devnull, :color => false, :limit => true, :displaysize => (18, 75), :is_pluto => false)
+const default_stdout_iocontext = IOContext(devnull, :color => true, :limit => true, :displaysize => (18, 75), :is_pluto => false)
 
 const imagemimes = [MIME"image/svg+xml"(), MIME"image/png"(), MIME"image/jpg"(), MIME"image/jpeg"(), MIME"image/bmp"(), MIME"image/gif"()]
 # in descending order of coolness

From 92a195af40f81713365a58210a1b58ebaa418878 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 3 Jun 2022 00:51:56 +0200
Subject: [PATCH 355/821] update sample notebook envs

---
 sample/Plots.jl.jl   | 64 +++++++++++++++++++-------------------------
 sample/PlutoUI.jl.jl | 22 +++++++++------
 2 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/sample/Plots.jl.jl b/sample/Plots.jl.jl
index d06ef34be9..2da3ddba77 100644
--- a/sample/Plots.jl.jl
+++ b/sample/Plots.jl.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.19.3
+# v0.19.5
 
 using Markdown
 using InteractiveUtils
@@ -251,15 +251,15 @@ version = "1.16.1+1"
 
 [[ChainRulesCore]]
 deps = ["Compat", "LinearAlgebra", "SparseArrays"]
-git-tree-sha1 = "9950387274246d08af38f6eef8cb5480862a435f"
+git-tree-sha1 = "9489214b993cd42d17f44c36e359bf6a7c919abf"
 uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
-version = "1.14.0"
+version = "1.15.0"
 
 [[ChangesOfVariables]]
 deps = ["ChainRulesCore", "LinearAlgebra", "Test"]
-git-tree-sha1 = "bf98fa45a0a4cee295de98d4c1462be26345b9a1"
+git-tree-sha1 = "1e315e3f4b0b7ce40feded39c73049692126cf53"
 uuid = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0"
-version = "0.1.2"
+version = "0.1.3"
 
 [[ColorSchemes]]
 deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Random"]
@@ -269,15 +269,15 @@ version = "3.18.0"
 
 [[ColorTypes]]
 deps = ["FixedPointNumbers", "Random"]
-git-tree-sha1 = "024fe24d83e4a5bf5fc80501a314ce0d1aa35597"
+git-tree-sha1 = "0f4e115f6f34bbe43c19751c90a38b2f380637b9"
 uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
-version = "0.11.0"
+version = "0.11.3"
 
 [[ColorVectorSpace]]
 deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "TensorCore"]
-git-tree-sha1 = "3f1f500312161f1ae067abe07d13b40f78f32e07"
+git-tree-sha1 = "d08c20eef1f2cbc6e60fd3612ac4340b89fea322"
 uuid = "c3611d14-8923-5661-9e6a-0046d554d3a4"
-version = "0.9.8"
+version = "0.9.9"
 
 [[Colors]]
 deps = ["ColorTypes", "FixedPointNumbers", "Reexport"]
@@ -286,10 +286,10 @@ uuid = "5ae59095-9a9b-59fe-a467-6f913c188581"
 version = "0.12.8"
 
 [[Compat]]
-deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
-git-tree-sha1 = "b153278a25dd42c65abbf4e62344f9d22e59191b"
+deps = ["Dates", "LinearAlgebra", "UUIDs"]
+git-tree-sha1 = "924cdca592bc16f14d2f7006754a621735280b74"
 uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
-version = "3.43.0"
+version = "4.1.0"
 
 [[CompilerSupportLibraries_jll]]
 deps = ["Artifacts", "Libdl"]
@@ -308,9 +308,9 @@ version = "1.10.0"
 
 [[DataStructures]]
 deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
-git-tree-sha1 = "cc1a8e22627f33c789ab60b36a9132ac050bbf75"
+git-tree-sha1 = "d1fff3a548102f48987a52a2e0d114fa97d730f0"
 uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
-version = "0.18.12"
+version = "0.18.13"
 
 [[DataValueInterfaces]]
 git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6"
@@ -325,10 +325,6 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
 deps = ["Mmap"]
 uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
 
-[[Distributed]]
-deps = ["Random", "Serialization", "Sockets"]
-uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
-
 [[DocStringExtensions]]
 deps = ["LibGit2"]
 git-tree-sha1 = "b19534d1895d702889b219c382a6e18010797f0b"
@@ -401,15 +397,15 @@ version = "3.3.6+0"
 
 [[GR]]
 deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Printf", "Random", "RelocatableFolders", "Serialization", "Sockets", "Test", "UUIDs"]
-git-tree-sha1 = "af237c08bda486b74318c8070adb96efa6952530"
+git-tree-sha1 = "b316fd18f5bc025fedcb708332aecb3e13b9b453"
 uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
-version = "0.64.2"
+version = "0.64.3"
 
 [[GR_jll]]
 deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Pkg", "Qt5Base_jll", "Zlib_jll", "libpng_jll"]
-git-tree-sha1 = "cd6efcf9dc746b06709df14e462f0a3fe0786b1e"
+git-tree-sha1 = "1e5490a51b4e9d07e8b04836f6008f46b48aaa87"
 uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
-version = "0.64.2+0"
+version = "0.64.3+0"
 
 [[GeometryBasics]]
 deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"]
@@ -586,9 +582,9 @@ version = "2.35.0+0"
 
 [[Libtiff_jll]]
 deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"]
-git-tree-sha1 = "c9551dd26e31ab17b86cbd00c2ede019c08758eb"
+git-tree-sha1 = "3eb79b0ca5764d4799c06699573fd8f533259713"
 uuid = "89763e89-9b03-5906-acba-b20f662cd828"
-version = "4.3.0+1"
+version = "4.4.0+0"
 
 [[Libuuid_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -602,9 +598,9 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [[LogExpFunctions]]
 deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"]
-git-tree-sha1 = "76c987446e8d555677f064aaac1145c4c17662f8"
+git-tree-sha1 = "09e4b894ce6a976c354a69041a04748180d43637"
 uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
-version = "0.3.14"
+version = "0.3.15"
 
 [[Logging]]
 uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -791,10 +787,6 @@ version = "1.1.0"
 [[Serialization]]
 uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 
-[[SharedArrays]]
-deps = ["Distributed", "Mmap", "Random", "Serialization"]
-uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
-
 [[Showoff]]
 deps = ["Dates", "Grisu"]
 git-tree-sha1 = "91eddf657aca81df9ae6ceb20b959ae5653ad1de"
@@ -816,9 +808,9 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [[SpecialFunctions]]
 deps = ["ChainRulesCore", "IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"]
-git-tree-sha1 = "5ba658aeecaaf96923dce0da9e703bd1fe7666f9"
+git-tree-sha1 = "a9e798cae4867e3a41cae2dd9eb60c047f1212db"
 uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
-version = "2.1.4"
+version = "2.1.6"
 
 [[StaticArrays]]
 deps = ["LinearAlgebra", "Random", "Statistics"]
@@ -844,9 +836,9 @@ version = "0.33.16"
 
 [[StructArrays]]
 deps = ["Adapt", "DataAPI", "StaticArrays", "Tables"]
-git-tree-sha1 = "e75d82493681dfd884a357952bbd7ab0608e1dc3"
+git-tree-sha1 = "9abba8f8fb8458e9adf07c8a2377a070674a24f1"
 uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
-version = "0.6.7"
+version = "0.6.8"
 
 [[TOML]]
 deps = ["Dates"]
@@ -915,9 +907,9 @@ version = "1.25.0+0"
 
 [[XML2_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"]
-git-tree-sha1 = "1acf5bdf07aa0907e0a37d3718bb88d4b687b74a"
+git-tree-sha1 = "58443b63fb7e465a8a7210828c91c08b92132dff"
 uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a"
-version = "2.9.12+0"
+version = "2.9.14+0"
 
 [[XSLT_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Libgpg_error_jll", "Libiconv_jll", "Pkg", "XML2_jll", "Zlib_jll"]
diff --git a/sample/PlutoUI.jl.jl b/sample/PlutoUI.jl.jl
index 29a81b33d7..5eb8139421 100644
--- a/sample/PlutoUI.jl.jl
+++ b/sample/PlutoUI.jl.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.19.3
+# v0.19.5
 
 using Markdown
 using InteractiveUtils
@@ -620,7 +620,7 @@ PLUTO_PROJECT_TOML_CONTENTS = """
 PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
 
 [compat]
-PlutoUI = "~0.7.38"
+PlutoUI = "~0.7.39"
 """
 
 # ╔═╡ 00000000-0000-0000-0000-000000000002
@@ -644,9 +644,9 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
 [[ColorTypes]]
 deps = ["FixedPointNumbers", "Random"]
-git-tree-sha1 = "024fe24d83e4a5bf5fc80501a314ce0d1aa35597"
+git-tree-sha1 = "0f4e115f6f34bbe43c19751c90a38b2f380637b9"
 uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
-version = "0.11.0"
+version = "0.11.3"
 
 [[Dates]]
 deps = ["Printf"]
@@ -669,9 +669,10 @@ uuid = "47d2ed2b-36de-50cf-bf87-49c2cf4b8b91"
 version = "0.0.4"
 
 [[HypertextLiteral]]
-git-tree-sha1 = "2b078b5a615c6c0396c77810d92ee8c6f470d238"
+deps = ["Tricks"]
+git-tree-sha1 = "c47c5fa4c5308f27ccaac35504858d8914e102f9"
 uuid = "ac1192a8-f4b3-4bfe-ba22-af5b92cd3ab2"
-version = "0.9.3"
+version = "0.9.4"
 
 [[IOCapture]]
 deps = ["Logging", "Random"]
@@ -744,9 +745,9 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [[PlutoUI]]
 deps = ["AbstractPlutoDingetjes", "Base64", "ColorTypes", "Dates", "Hyperscript", "HypertextLiteral", "IOCapture", "InteractiveUtils", "JSON", "Logging", "Markdown", "Random", "Reexport", "UUIDs"]
-git-tree-sha1 = "670e559e5c8e191ded66fa9ea89c97f10376bb4c"
+git-tree-sha1 = "8d1f54886b9037091edf146b517989fc4a09efec"
 uuid = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
-version = "0.7.38"
+version = "0.7.39"
 
 [[Printf]]
 deps = ["Unicode"]
@@ -794,6 +795,11 @@ uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
 deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
 uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
+[[Tricks]]
+git-tree-sha1 = "6bac775f2d42a611cdfcd1fb217ee719630c4175"
+uuid = "410a4b4d-49e4-4fbc-ab6d-cb71b17b3775"
+version = "0.1.6"
+
 [[UUIDs]]
 deps = ["Random", "SHA"]
 uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

From 349b5519f36067fd7870f7d5dcf4e2f5b438fe92 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 3 Jun 2022 00:52:10 +0200
Subject: [PATCH 356/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index cdb482049f..02f9a67237 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.6"
+version = "0.19.7"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 32922b7b878519c5baa740a4fd5ad497187943c0 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 3 Jun 2022 02:06:24 +0200
Subject: [PATCH 357/821] disable auto SRI oops

---
 Project.toml                  | 2 +-
 frontend-bundler/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Project.toml b/Project.toml
index 02f9a67237..f0011d8b9c 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.7"
+version = "0.19.8"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
diff --git a/frontend-bundler/package.json b/frontend-bundler/package.json
index 4af06e52fa..aebe1947e7 100644
--- a/frontend-bundler/package.json
+++ b/frontend-bundler/package.json
@@ -7,7 +7,7 @@
     "description": "",
     "scripts": {
         "start": "cd ../frontend && parcel --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html sample.html",
-        "build": "cd ../frontend && parcel build --no-source-maps --public-url . --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html sample.html && node ../frontend-bundler/add_sri.js ../frontend-dist/editor.html ../frontend-dist/index.html ../frontend-dist/error.jl.html ../frontend-dist/sample.html",
+        "build": "cd ../frontend && parcel build --no-source-maps --public-url . --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html sample.html",
         "test": "echo \"Error: no test specified\" && exit 1"
     },
     "author": "",

From 525660e84de5b499e896e42643522eb713812459 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 3 Jun 2022 12:08:46 +0200
Subject: [PATCH 358/821] Prevent creating a notebook process during complete,
 docs, etc (#2149)

---
 src/evaluation/WorkspaceManager.jl | 32 ++++++++++++++++++++++--------
 src/webserver/Dynamic.jl           |  2 +-
 src/webserver/REPLTools.jl         | 10 +++++-----
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 1736e0c5a5..e972505e54 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -277,26 +277,36 @@ function create_workspaceprocess(;compiler_options=CompilerOptions())::Integer
     pid
 end
 
-"Return the `Workspace` of `notebook`; will be created if none exists yet."
-function get_workspace(session_notebook::SN)::Workspace
+"""
+Return the `Workspace` of `notebook`; will be created if none exists yet.
+
+If `allow_creation=false`, then `nothing` is returned if no workspace exists, instead of creating one.
+"""
+function get_workspace(session_notebook::SN; allow_creation::Bool=true)::Union{Nothing,Workspace}
     session, notebook = session_notebook
     if notebook.notebook_id in discarded_workspaces
         @debug "This should not happen" notebook.process_status
         error("Cannot run code in this notebook: it has already shut down.")
     end
     
-    task = get!(workspaces, notebook.notebook_id) do
-        Task(() -> make_workspace(session_notebook))
-    end
+    task = !allow_creation ? 
+        get(workspaces, notebook.notebook_id, nothing) :
+        get!(workspaces, notebook.notebook_id) do
+            Task(() -> make_workspace(session_notebook))
+        end
+    
+    isnothing(task) && return nothing
+    
     istaskstarted(task) || schedule(task)
     fetch(task)
 end
-get_workspace(workspace::Workspace)::Workspace = workspace
+get_workspace(workspace::Workspace; kwargs...)::Workspace = workspace
 
 "Try our best to delete the workspace. `Workspace` will have its worker process terminated."
 function unmake_workspace(session_notebook::SN; async::Bool=false, verbose::Bool=true, allow_restart::Bool=true)
     session, notebook = session_notebook
-    workspace = get_workspace(session_notebook)
+    workspace = get_workspace(session_notebook; allow_creation=false)
+    workspace === nothing && return
     workspace.discarded = true
     allow_restart || push!(discarded_workspaces, notebook.notebook_id)
 
@@ -318,6 +328,7 @@ function unmake_workspace(session_notebook::SN; async::Bool=false, verbose::Bool
             @warn "Cannot unmake a workspace running inside the same process: the notebook might still be running. If you are sure that your code is not running the notebook async, then you can use the `verbose=false` keyword argument to disable this message."
         end
     end
+    nothing
 end
 
 function distributed_exception_result(ex::Base.IOError, workspace::Workspace)
@@ -574,7 +585,12 @@ end
 
 "Force interrupt (SIGINT) a workspace, return whether successful"
 function interrupt_workspace(session_notebook::Union{SN,Workspace}; verbose=true)::Bool
-    workspace = get_workspace(session_notebook)
+    workspace = get_workspace(session_notebook; allow_creation=false)
+    
+    if !(workspace isa Workspace)
+        # verbose && @info "Can't interrupt this notebook: it is not running."
+        return false
+    end
 
     if poll(() -> isready(workspace.dowork_token), 2.0, 5/100)
         verbose && println("Cell finished, other cells cancelled!")
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index a74a09b762..cbf38a0f67 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -422,7 +422,7 @@ responses[:interrupt_all] = function response_interrupt_all(🙋::ClientRequest)
     require_notebook(🙋)
 
     session_notebook = (🙋.session, 🙋.notebook)
-    workspace = WorkspaceManager.get_workspace(session_notebook)
+    workspace = WorkspaceManager.get_workspace(session_notebook; allow_creation=false)
 
     already_interrupting = 🙋.notebook.wants_to_interrupt
     anything_running = !isready(workspace.dowork_token)
diff --git a/src/webserver/REPLTools.jl b/src/webserver/REPLTools.jl
index e80a8c2444..d1147bb8de 100644
--- a/src/webserver/REPLTools.jl
+++ b/src/webserver/REPLTools.jl
@@ -73,14 +73,14 @@ responses[:complete] = function response_complete(🙋::ClientRequest)
     query = 🙋.body["query"]
     pos = lastindex(query) # the query is cut at the cursor position by the front-end, so the cursor position is just the last legal index
 
-    workspace = WorkspaceManager.get_workspace((🙋.session, 🙋.notebook))
-
     results, loc, found = if package_name_to_complete(query) !== nothing
         p = package_name_to_complete(query)
         cs = package_completions(p) |> sort
         [(c,"package",true) for c in cs], (nextind(query, pos-length(p)):pos), true
     else
-        if will_run_code(🙋.notebook) && isready(workspace.dowork_token)
+        workspace = WorkspaceManager.get_workspace((🙋.session, 🙋.notebook); allow_creation=false)
+        
+        if will_run_code(🙋.notebook) && workspace isa WorkspaceManager.Workspace && isready(workspace.dowork_token)
             # we don't use eval_format_fetch_in_workspace because we don't want the output to be string-formatted.
             # This works in this particular case, because the return object, a `Completion`, exists in this scope too.
             Distributed.remotecall_eval(Main, workspace.pid, :(PlutoRunner.completion_fetcher(
@@ -122,9 +122,9 @@ responses[:docs] = function response_docs(🙋::ClientRequest)
         doc_md = REPL.lookup_doc(Symbol(query))
         (repr(MIME("text/html"), doc_md), :👍)
     else
-        workspace = WorkspaceManager.get_workspace((🙋.session, 🙋.notebook))
+        workspace = WorkspaceManager.get_workspace((🙋.session, 🙋.notebook); allow_creation=false)
 
-        if will_run_code(🙋.notebook) && isready(workspace.dowork_token)
+        if will_run_code(🙋.notebook) && workspace isa WorkspaceManager.Workspace && isready(workspace.dowork_token)
             Distributed.remotecall_eval(Main, workspace.pid, :(PlutoRunner.doc_fetcher(
                 $query,
                 getfield(Main, $(QuoteNode(workspace.module_name))),

From bbfb3419f87d6b8824923fa29567a24df00f17b9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 3 Jun 2022 13:32:19 +0200
Subject: [PATCH 359/821] Add crossorigin to auto generated SRI (#2150)

---
 frontend-bundler/add_sri.js        |  4 ++++
 frontend-bundler/package-lock.json | 16 ++++++++++++++++
 frontend-bundler/package.json      |  3 ++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/frontend-bundler/add_sri.js b/frontend-bundler/add_sri.js
index 3ba88d6fd6..1cbb85baff 100644
--- a/frontend-bundler/add_sri.js
+++ b/frontend-bundler/add_sri.js
@@ -7,6 +7,7 @@ let path = require("path")
 let fs = require("fs/promises")
 let posthtml = require("posthtml")
 let posthtmlSri = require("posthtml-sri")
+let posthtmlCrossorigin = require("@plutojl/posthtml-crossorigin")
 
 let f = async () => {
     // Read file given as command line arugment
@@ -19,6 +20,9 @@ let f = async () => {
                 algorithms: ["sha384"],
                 basePath: path.dirname(file),
             }),
+            posthtmlCrossorigin({
+                value: () => "anonymous",
+            }),
         ]
 
         const result = await posthtml(plugins).process(contents)
diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index aeecbbe6b4..be027bfeb3 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -21,6 +21,7 @@
             "devDependencies": {
                 "@parcel/optimizer-data-url": "^2.0.0",
                 "@parcel/transformer-inline-string": "^2.0.0",
+                "@plutojl/posthtml-crossorigin": "^1.0.0",
                 "@types/node": "^16.11.6",
                 "posthtml": "^0.16.6",
                 "posthtml-sri": "^1.2.0"
@@ -1814,6 +1815,15 @@
                 "@parcel/core": "^2.5.0"
             }
         },
+        "node_modules/@plutojl/posthtml-crossorigin": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/@plutojl/posthtml-crossorigin/-/posthtml-crossorigin-1.0.0.tgz",
+            "integrity": "sha512-Rblfw7JRp11OVON1bKFBfz+N+kE6T3eYLaqUTSrT7W2+UyLDJJC63U8iJhjbs12Eo6f3XMe77ktM6hE0quzqgQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
         "node_modules/@swc/helpers": {
             "version": "0.2.13",
             "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.2.13.tgz",
@@ -8213,6 +8223,12 @@
                 "nullthrows": "^1.1.1"
             }
         },
+        "@plutojl/posthtml-crossorigin": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/@plutojl/posthtml-crossorigin/-/posthtml-crossorigin-1.0.0.tgz",
+            "integrity": "sha512-Rblfw7JRp11OVON1bKFBfz+N+kE6T3eYLaqUTSrT7W2+UyLDJJC63U8iJhjbs12Eo6f3XMe77ktM6hE0quzqgQ==",
+            "dev": true
+        },
         "@swc/helpers": {
             "version": "0.2.13",
             "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.2.13.tgz",
diff --git a/frontend-bundler/package.json b/frontend-bundler/package.json
index aebe1947e7..0ee5bd1416 100644
--- a/frontend-bundler/package.json
+++ b/frontend-bundler/package.json
@@ -7,7 +7,7 @@
     "description": "",
     "scripts": {
         "start": "cd ../frontend && parcel --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html sample.html",
-        "build": "cd ../frontend && parcel build --no-source-maps --public-url . --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html sample.html",
+        "build": "cd ../frontend && parcel build --no-source-maps --public-url . --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html sample.html && node ../frontend-bundler/add_sri.js ../frontend-dist/editor.html",
         "test": "echo \"Error: no test specified\" && exit 1"
     },
     "author": "",
@@ -22,6 +22,7 @@
     "devDependencies": {
         "@parcel/optimizer-data-url": "^2.0.0",
         "@parcel/transformer-inline-string": "^2.0.0",
+        "@plutojl/posthtml-crossorigin": "^1.0.0",
         "@types/node": "^16.11.6",
         "posthtml": "^0.16.6",
         "posthtml-sri": "^1.2.0"

From 3f89c307762d02cd48c58941ef86073d719f85d0 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 3 Jun 2022 20:10:14 +0200
Subject: [PATCH 360/821] =?UTF-8?q?larger=20=F0=9F=91=81=20button=20hitbox?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/editor.css | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 524aac3e78..704ffcacdb 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1257,10 +1257,8 @@ pluto-shoulder:hover {
 pluto-shoulder > button {
     flex: 0 0 auto;
     position: sticky;
-    top: 0px;
-    margin-top: 4px;
-    margin-right: 5px;
-    padding: 0px 1px;
+    top: 0;
+    padding: 5px;
 }
 
 pluto-cell:focus-within > pluto-shoulder > button {

From 129cf25e191b257b19c12d5246103d0d0d15e53e Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Sat, 4 Jun 2022 16:21:59 +0200
Subject: [PATCH 361/821] Make compute_symbolreferences signature concrete
 (#2154)

---
 src/analysis/ExpressionExplorer.jl |  4 ++--
 src/runner/PlutoRunner.jl          | 19 +++++++++++--------
 test/ExpressionExplorer.jl         |  3 ++-
 test/helpers.jl                    |  2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 03c955b93c..80a352f8ca 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -1117,7 +1117,7 @@ hide_argument_name(x::Any) = x
 ###
 
 "Get the global references, assignment, function calls and function defintions inside an arbitrary expression."
-function compute_symbolreferences(ex::Any)::SymbolsState
+function compute_symbolreferences(ex::Expr)::SymbolsState
     symstate = explore!(ex, ScopeState())
 
     # We do something special to account for recursive functions:
@@ -1132,7 +1132,7 @@ function compute_symbolreferences(ex::Any)::SymbolsState
     symstate
 end
 
-function try_compute_symbolreferences(ex::Any)::SymbolsState
+function try_compute_symbolreferences(ex::Expr)::SymbolsState
     try
         compute_symbolreferences(ex)
     catch e
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 2094bdcfe3..735e12f982 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1061,6 +1061,16 @@ function use_tree_viewer_for_struct(@nospecialize(x::T))::Bool where T
     end
 end
 
+"Return the first mimetype in `allmimes` which can show `x`."
+function mimetype(x)
+    # ugly code to fix an ugly performance problem
+    for m in allmimes
+        if pluto_showable(m, x)
+            return m
+        end
+    end
+end
+
 """
 Like two-argument `Base.show`, except:
 1. the richest MIME type available to Pluto will be used
@@ -1068,14 +1078,7 @@ Like two-argument `Base.show`, except:
 3. if the first returned element is `nothing`, then we wrote our data to `io`. If it is something else (a Dict), then that object will be the cell's output, instead of the buffered io stream. This allows us to output rich objects to the frontend that are not necessarily strings or byte streams
 """
 function show_richest(io::IO, @nospecialize(x))::Tuple{<:Any,MIME}
-    # ugly code to fix an ugly performance problem
-    local mime = nothing
-    for m in allmimes
-        if pluto_showable(m, x)
-            mime = m
-            break
-        end
-    end
+    mime = mimetype(x)
 
     if mime isa MIME"text/plain" && use_tree_viewer_for_struct(x)
         tree_data(x, io), MIME"application/vnd.pluto.tree+object"()
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index cf5e3fbd79..eb9dd590f1 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -21,7 +21,8 @@ Some of these @test_broken lines are commented out to prevent printing to the te
     @inferred Pluto.ExpressionExplorer.maybe_macroexpand(:(@time 1))
 
     @testset "Basics" begin
-        @test testee(:(a), [:a], [], [], [])
+        # Using :toplevel to ensure that the type is an Expr.
+        @test testee(Expr(:toplevel, :a), [:a], [], [], [])
         @test testee(:(1 + 1), [], [], [:+], [])
         @test testee(:(sqrt(1)), [], [], [:sqrt], [])
         @test testee(:(x = 3), [], [:x], [], [])
diff --git a/test/helpers.jl b/test/helpers.jl
index 2a81f44010..a7811436e3 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -64,7 +64,7 @@ julia> @test testee(:(
 true
 ```
 "
-function testee(expr, expected_references, expected_definitions, expected_funccalls, expected_funcdefs, expected_macrocalls = []; verbose::Bool=true)
+function testee(expr::Expr, expected_references, expected_definitions, expected_funccalls, expected_funcdefs, expected_macrocalls = []; verbose::Bool=true)
     expected = easy_symstate(expected_references, expected_definitions, expected_funccalls, expected_funcdefs, expected_macrocalls)
 
     original_hash = Pluto.PlutoRunner.expr_hash(expr)

From 0c59877d0bf5edb39cd36af6793c9a95936f5cb0 Mon Sep 17 00:00:00 2001
From: Hirumal Priyashan <57571152+HirumalPriyashan@users.noreply.github.com>
Date: Mon, 6 Jun 2022 20:24:34 +0530
Subject: [PATCH 362/821] up up ansi up (#2152)

---
 frontend/editor.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/editor.html b/frontend/editor.html
index 99df972e44..5db5e29fd4 100644
--- a/frontend/editor.html
+++ b/frontend/editor.html
@@ -26,7 +26,7 @@
     <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.20/lodash.min.js" defer></script>
     <script src="https://cdn.jsdelivr.net/npm/@observablehq/stdlib@3.3.1/dist/stdlib.js" defer></script>
     <script src="https://cdn.jsdelivr.net/npm/iframe-resizer@4.2.11/js/iframeResizer.min.js" defer></script>
-    <script src="https://cdn.jsdelivr.net/npm/ansi_up@5.0.1/ansi_up.min.js" defer></script>
+    <script src="https://cdn.jsdelivr.net/npm/ansi_up@5.1.0/ansi_up.min.js" defer></script>
 
     <!-- This doesn't do anything unless activated, and it makes sure parcel bundles this -->
     <script id="iframe-resizer-content-window-script" src="https://cdn.jsdelivr.net/npm/iframe-resizer@4.2.11/js/iframeResizer.contentWindow.min.js" crossorigin="anonymous" defer></script>

From db0623dd0ab195e7241655821d252c4a2289c90b Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Tue, 7 Jun 2022 18:36:22 +0200
Subject: [PATCH 363/821] Also trigger compilation for Unicode (#2161)

* Also trigger compilation for Unicode

* Remove outdated comment
---
 frontend/components/Editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index d203df9c0d..bf002bd4d5 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -777,9 +777,9 @@ patch: ${JSON.stringify(
                 backend_launch_phase: this.state.backend_launch_phase == null ? null : BackendLaunchPhase.ready,
             })
 
-            // do one autocomplete to trigger its precompilation
             // TODO Do this from julia itself
             this.client.send("complete", { query: "sq" }, { notebook_id: this.state.notebook.notebook_id })
+            this.client.send("complete", { query: "\sq" }, { notebook_id: this.state.notebook.notebook_id })
 
             setTimeout(init_feedback, 2 * 1000) // 2 seconds - load feedback a little later for snappier UI
         }

From a781b7951bceff40cbcf57e75dc524c6dd920846 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Tue, 7 Jun 2022 18:37:39 +0200
Subject: [PATCH 364/821] Revert making `compute_symbolreferences` concrete
 (#2158)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 src/analysis/ExpressionExplorer.jl | 11 ++++++++---
 test/ExpressionExplorer.jl         |  3 ++-
 test/helpers.jl                    |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 80a352f8ca..2a8c41baaa 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -1116,8 +1116,13 @@ hide_argument_name(x::Any) = x
 # UTILITY FUNCTIONS
 ###
 
-"Get the global references, assignment, function calls and function defintions inside an arbitrary expression."
-function compute_symbolreferences(ex::Expr)::SymbolsState
+"""
+    compute_symbolreferences(ex::Any)::SymbolsState
+
+Return the global references, assignment, function calls and function definitions inside an arbitrary expression.
+Inside Pluto, `ex` is always an `Expr`. However, we still accept `Any` to allow people outside Pluto to use this to do syntax analysis.
+"""
+function compute_symbolreferences(ex::Any)::SymbolsState
     symstate = explore!(ex, ScopeState())
 
     # We do something special to account for recursive functions:
@@ -1132,7 +1137,7 @@ function compute_symbolreferences(ex::Expr)::SymbolsState
     symstate
 end
 
-function try_compute_symbolreferences(ex::Expr)::SymbolsState
+function try_compute_symbolreferences(ex::Any)::SymbolsState
     try
         compute_symbolreferences(ex)
     catch e
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index eb9dd590f1..ecb61dddf0 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -21,7 +21,8 @@ Some of these @test_broken lines are commented out to prevent printing to the te
     @inferred Pluto.ExpressionExplorer.maybe_macroexpand(:(@time 1))
 
     @testset "Basics" begin
-        # Using :toplevel to ensure that the type is an Expr.
+        # Note that Meta.parse(x) is not always an Expr.
+        @test testee(:(a), [:a], [], [], [])
         @test testee(Expr(:toplevel, :a), [:a], [], [], [])
         @test testee(:(1 + 1), [], [], [:+], [])
         @test testee(:(sqrt(1)), [], [], [:sqrt], [])
diff --git a/test/helpers.jl b/test/helpers.jl
index a7811436e3..62bde6cc6f 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -64,7 +64,7 @@ julia> @test testee(:(
 true
 ```
 "
-function testee(expr::Expr, expected_references, expected_definitions, expected_funccalls, expected_funcdefs, expected_macrocalls = []; verbose::Bool=true)
+function testee(expr::Any, expected_references, expected_definitions, expected_funccalls, expected_funcdefs, expected_macrocalls = []; verbose::Bool=true)
     expected = easy_symstate(expected_references, expected_definitions, expected_funccalls, expected_funcdefs, expected_macrocalls)
 
     original_hash = Pluto.PlutoRunner.expr_hash(expr)

From 3ef6a1bd8cfcac0a6cbca82d34a1ddd279e88fa8 Mon Sep 17 00:00:00 2001
From: Hirumal Priyashan <57571152+HirumalPriyashan@users.noreply.github.com>
Date: Tue, 7 Jun 2022 22:09:55 +0530
Subject: [PATCH 365/821] Add `Copy output` button to cell context menu (#2160)

* Add copy output

* rename classes

* remove emphasis
---
 frontend/components/CellInput.js | 16 ++++++++++++++++
 frontend/editor.css              |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index c017af934e..346c1b418f 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -842,6 +842,21 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, running_disabled, any_
     }
     const toggle_logs = () => set_show_logs(!show_logs)
 
+    const is_copy_output_supported = () => {
+        let notebook = /** @type{import("./Editor.js").NotebookData?} */ (pluto_actions.get_notebook())
+        let cell_result = notebook?.cell_results?.[cell_id]
+        return !!cell_result && !cell_result.errored && !cell_result.queued && cell_result.output.mime === "text/plain" && cell_result.output.body
+    }
+
+    const copy_output = () => {
+        let notebook = /** @type{import("./Editor.js").NotebookData?} */ (pluto_actions.get_notebook())
+        let cell_output = notebook?.cell_results?.[cell_id]?.output.body ?? ""
+        cell_output &&
+            navigator.clipboard.writeText(cell_output).catch((err) => {
+                alert(`Error copying cell output`)
+            })
+    }
+
     return html` <button
         onClick=${() => setOpen(!open)}
         onBlur=${() => setOpen(false)}
@@ -869,6 +884,7 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, running_disabled, any_
                                 : html`<span class="show_logs ctx_icon" /><span>Show logs</span>`}
                         </li>`
                       : null}
+                  ${is_copy_output_supported() ? html`<li title="" onClick=${copy_output}><span class="copy_output ctx_icon" />Copy output</li>` : null}
                   <li class="coming_soon" title=""><span class="bandage ctx_icon" /><em>Coming soon…</em></li>
               </ul>`
             : html``}
diff --git a/frontend/editor.css b/frontend/editor.css
index 704ffcacdb..3e7ae556a2 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1628,6 +1628,10 @@ pluto-input > button.input_context_menu ul {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-circle-outline.svg");
 }
 
+.ctx_icon.copy_output {
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/copy-outline.svg");
+}
+
 pluto-input > button.input_context_menu {
     /* top: 3px; */
     /* left: -26px; */

From 2d7e85fe42004e2d49779b24d2a3221713f1b95e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 7 Jun 2022 20:03:28 +0200
Subject: [PATCH 366/821] whitespace

---
 src/runner/PlutoRunner.jl | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 735e12f982..4ac9d070ab 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -918,9 +918,20 @@ end
 Base.IOContext(io::IOContext, ::Nothing) = io
 
 "The `IOContext` used for converting arbitrary objects to pretty strings."
-const default_iocontext = IOContext(devnull, :color => false, :limit => true, :displaysize => (18, 88), :is_pluto => true, :pluto_supported_integration_features => supported_integration_features)
+const default_iocontext = IOContext(devnull, 
+    :color => false, 
+    :limit => true, 
+    :displaysize => (18, 88), 
+    :is_pluto => true, 
+    :pluto_supported_integration_features => supported_integration_features,
+)
 
-const default_stdout_iocontext = IOContext(devnull, :color => true, :limit => true, :displaysize => (18, 75), :is_pluto => false)
+const default_stdout_iocontext = IOContext(devnull, 
+    :color => true, 
+    :limit => true, 
+    :displaysize => (18, 75), 
+    :is_pluto => false,
+)
 
 const imagemimes = [MIME"image/svg+xml"(), MIME"image/png"(), MIME"image/jpg"(), MIME"image/jpeg"(), MIME"image/bmp"(), MIME"image/gif"()]
 # in descending order of coolness

From b63886017acab71ed1b67b60be48b94878749262 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Wed, 8 Jun 2022 09:54:55 +0200
Subject: [PATCH 367/821] Refactor `ExpressionExplorer.explore!` (#2155)

Co-authored-by: Paul Berg <paul@plutojl.org>
---
 src/analysis/ExpressionExplorer.jl | 858 ++++++++++++++++-------------
 src/evaluation/Run.jl              |   2 +-
 test/ExpressionExplorer.jl         |  37 +-
 3 files changed, 515 insertions(+), 382 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 2a8c41baaa..6512209936 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -1,4 +1,5 @@
 module ExpressionExplorer
+
 export compute_symbolreferences, try_compute_symbolreferences, compute_usings_imports, SymbolsState, FunctionName, join_funcname_parts
 
 import ..PlutoRunner
@@ -97,14 +98,6 @@ Base.push!(x::Set) = x
 # HELPER FUNCTIONS
 ###
 
-function explore_inner_scoped(ex::Expr, scopestate::ScopeState)::SymbolsState
-    # Because we are entering a new scope, we create a copy of the current scope state, and run it through the expressions.
-    innerscopestate = deepcopy(scopestate)
-    innerscopestate.inglobalscope = false
-
-    return mapfoldl(a -> explore!(a, innerscopestate), union!, ex.args, init = SymbolsState())
-end
-
 # from the source code: https://github.com/JuliaLang/julia/blob/master/src/julia-parser.scm#L9
 const modifiers = [:(+=), :(-=), :(*=), :(/=), :(//=), :(^=), :(÷=), :(%=), :(<<=), :(>>=), :(>>>=), :(&=), :(⊻=), :(≔), :(⩴), :(≕)]
 const modifiers_dotprefixed = [Symbol('.' * String(m)) for m in modifiers]
@@ -344,419 +337,522 @@ Returns whether or not an assignment Expr(:(=),...) is assigning to a new functi
   * f(x)::V = ...
   * f(::T) where {T} = ...
 """
-is_function_assignment(ex::Expr) = ex.args[1] isa Expr && (ex.args[1].head == :call || ex.args[1].head == :where || (ex.args[1].head == :(::) && ex.args[1].args[1] isa Expr && ex.args[1].args[1].head == :call))
+is_function_assignment(ex::Expr)::Bool = ex.args[1] isa Expr && (ex.args[1].head == :call || ex.args[1].head == :where || (ex.args[1].head == :(::) && ex.args[1].args[1] isa Expr && ex.args[1].args[1].head == :call))
 
 anonymous_name() = Symbol("anon", rand(UInt64))
 
-# General recursive method. Is never a leaf.
-# Modifies the `scopestate`.
-function explore!(ex::Expr, scopestate::ScopeState)::SymbolsState
-    if ex.head == :(=)
-        # Does not create scope
+function explore_assignment!(ex::Expr, scopestate::ScopeState)::SymbolsState
+    # Does not create scope
 
-        if is_function_assignment(ex)
-            # f(x, y) = x + y
-            # Rewrite to:
-            # function f(x, y) x + y end
-            return explore!(Expr(:function, ex.args...), scopestate)
-        end
+    if is_function_assignment(ex)
+        # f(x, y) = x + y
+        # Rewrite to:
+        # function f(x, y) x + y end
+        return explore!(Expr(:function, ex.args...), scopestate)
+    end
 
-        val = ex.args[2]
-        # Handle generic types assignments A{B} = C{B, Int}
-        if ex.args[1] isa Expr && ex.args[1].head == :curly
-            assignees, symstate = explore_funcdef!(ex.args[1], scopestate)
-            innersymstate = union!(symstate, explore!(val, scopestate))
-        else
-            assignees = get_assignees(ex.args[1])
-            symstate = innersymstate = explore!(val, scopestate)
+    val = ex.args[2]
+    # Handle generic types assignments A{B} = C{B, Int}
+    if ex.args[1] isa Expr && ex.args[1].head::Symbol == :curly
+        assignees, symstate = explore_funcdef!(ex.args[1], scopestate)::Tuple{Vector{Symbol}, SymbolsState}
+        innersymstate = union!(symstate, explore!(val, scopestate))
+    else
+        assignees = get_assignees(ex.args[1])
+        symstate = innersymstate = explore!(val, scopestate)
+    end
+
+    global_assignees = get_global_assignees(assignees, scopestate)
+
+    # If we are _not_ assigning a global variable, then this symbol hides any global definition with that name
+    push!(scopestate.hiddenglobals, setdiff(assignees, global_assignees)...)
+    assigneesymstate = explore!(ex.args[1], scopestate)
+
+    push!(scopestate.hiddenglobals, global_assignees...)
+    push!(symstate.assignments, global_assignees...)
+    push!(symstate.references, setdiff(assigneesymstate.references, global_assignees)...)
+    filter!(!all_underscores, symstate.references)  # Never record _ as a reference
+
+    return symstate
+end
+
+function explore_modifiers!(ex::Expr, scopestate::ScopeState)
+    # We change: a[1] += 123
+    # to:        a[1] = a[1] + 123
+    # We transform the modifier back to its operator
+    # for when users redefine the + function
+
+    operator = let
+        s = string(ex.head)
+        Symbol(s[1:prevind(s, lastindex(s))])
+    end
+    expanded_expr = Expr(:(=), ex.args[1], Expr(:call, operator, ex.args[1], ex.args[2]))
+    return explore!(expanded_expr, scopestate)
+end
+
+function explore_dotprefixed_modifiers!(ex::Expr, scopestate::ScopeState)
+    # We change: a[1] .+= 123
+    # to:        a[1] .= a[1] + 123
+
+    operator = Symbol(string(ex.head)[2:end-1])
+    expanded_expr = Expr(:(.=), ex.args[1], Expr(:call, operator, ex.args[1], ex.args[2]))
+    return explore!(expanded_expr, scopestate)
+end
+
+"Unspecialized mapfoldl."
+function umapfoldl(@nospecialize(f::Function), itr::Vector; init=SymbolsState())
+    if isempty(itr)
+        return init
+    else
+        out = init
+        for e in itr
+            union!(out, f(e))
         end
+        return out
+    end
+end
 
-        global_assignees = get_global_assignees(assignees, scopestate)
+function explore_inner_scoped(ex::Expr, scopestate::ScopeState)::SymbolsState
+    # Because we are entering a new scope, we create a copy of the current scope state, and run it through the expressions.
+    innerscopestate = deepcopy(scopestate)
+    innerscopestate.inglobalscope = false
 
-        # If we are _not_ assigning a global variable, then this symbol hides any global definition with that name
-        push!(scopestate.hiddenglobals, setdiff(assignees, global_assignees)...)
-        assigneesymstate = explore!(ex.args[1], scopestate)
+    return umapfoldl(a -> explore!(a, innerscopestate), ex.args)
+end
 
-        push!(scopestate.hiddenglobals, global_assignees...)
-        push!(symstate.assignments, global_assignees...)
-        push!(symstate.references, setdiff(assigneesymstate.references, global_assignees)...)
-        filter!(!all_underscores, symstate.references)  # Never record _ as a reference
+function explore_filter!(ex::Expr, scopestate::ScopeState)
+    # In a filter, the assignment is the second expression, the condition the first
+    args = collect(reverse(ex.args))
+    umapfoldl(a -> explore!(a, scopestate), args)::SymbolsState
+end
 
-        return symstate
-    elseif ex.head in modifiers
-        # We change: a[1] += 123
-        # to:        a[1] = a[1] + 123
-        # We transform the modifier back to its operator
-        # for when users redefine the + function
-
-        operator = let
-            s = string(ex.head)
-            Symbol(s[1:prevind(s, lastindex(s))])
+function explore_generator!(ex::Expr, scopestate::ScopeState)
+    # Creates local scope
+
+    # In a `generator`, a single expression is followed by the iterator assignments.
+    # In a `for`, this expression comes at the end.
+
+    # This is not strictly the normal form of a `for` but that's okay
+    return explore!(Expr(:for, Iterators.reverse(ex.args[2:end])..., ex.args[1]), scopestate)
+end
+
+function explore_macrocall!(ex::Expr, scopestate::ScopeState)
+    # Early stopping, this expression will have to be re-explored once
+    # the macro is expanded in the notebook process.
+    macro_name = split_funcname(ex.args[1])
+    symstate = SymbolsState(macrocalls = Set{FunctionName}([macro_name]))
+
+    # Because it sure wouldn't break anything,
+    # I'm also going to blatantly assume that any macros referenced in here...
+    # will end up in the code after the macroexpansion 🤷‍♀️
+    # "You should make a new function for that" they said, knowing I would take the lazy route.
+    for arg in ex.args[begin+1:end]
+        macro_symstate = explore!(arg, ScopeState())
+
+        # Also, when this macro has something special inside like `Pkg.activate()`,
+        # we're going to treat it as normal code (so these heuristics trigger later)
+        # (Might want to also not let this to @eval macro, as an extra escape hatch if you
+        #    really don't want pluto to see your Pkg.activate() call)
+        if arg isa Expr && MacroHasSpecialHeuristicInside.macro_has_special_heuristic_inside(symstate = macro_symstate, expr = arg)
+            union!(symstate, macro_symstate)
+        else
+            union!(symstate, SymbolsState(macrocalls = macro_symstate.macrocalls))
         end
-        expanded_expr = Expr(:(=), ex.args[1], Expr(:call, operator, ex.args[1], ex.args[2]))
-        return explore!(expanded_expr, scopestate)
-    elseif ex.head in modifiers_dotprefixed
-        # We change: a[1] .+= 123
-        # to:        a[1] .= a[1] + 123
+    end
 
-        operator = Symbol(string(ex.head)[2:end-1])
-        expanded_expr = Expr(:(.=), ex.args[1], Expr(:call, operator, ex.args[1], ex.args[2]))
-        return explore!(expanded_expr, scopestate)
-    elseif ex.head == :let || ex.head == :for || ex.head == :while
-        # Creates local scope
-        return explore_inner_scoped(ex, scopestate)
-    elseif ex.head == :filter
-        # In a filter, the assignment is the second expression, the condition the first
-        return mapfoldr(a -> explore!(a, scopestate), union!, ex.args, init = SymbolsState())
-    elseif ex.head == :generator
-        # Creates local scope
+    # Some macros can be expanded on the server process
+    if join_funcname_parts(macro_name) ∈ can_macroexpand
+        new_ex = maybe_macroexpand(ex)
+        union!(symstate, explore!(new_ex, scopestate))
+    end
 
-        # In a `generator`, a single expression is followed by the iterator assignments.
-        # In a `for`, this expression comes at the end.
+    return symstate
+end
 
-        # This is not strictly the normal form of a `for` but that's okay
-        return explore!(Expr(:for, Iterators.reverse(ex.args[2:end])..., ex.args[1]), scopestate)
-    elseif ex.head == :macrocall
-        # Early stopping, this expression will have to be re-explored once
-        # the macro is expanded in the notebook process.
-        macro_name = split_funcname(ex.args[1])
-        symstate = SymbolsState(macrocalls = Set{FunctionName}([macro_name]))
-
-        # Because it sure wouldn't break anything,
-        # I'm also going to blatantly assume that any macros referenced in here...
-        # will end up in the code after the macroexpansion 🤷‍♀️
-        # "You should make a new function for that" they said, knowing I would take the lazy route.
-        for arg in ex.args[begin+1:end]
-            macro_symstate = explore!(arg, ScopeState())
-
-            # Also, when this macro has something special inside like `Pkg.activate()`,
-            # we're going to treat it as normal code (so these heuristics trigger later)
-            # (Might want to also not let this to @eval macro, as an extra escape hatch if you
-            #    really don't want pluto to see your Pkg.activate() call)
-            if arg isa Expr && MacroHasSpecialHeuristicInside.macro_has_special_heuristic_inside(symstate = macro_symstate, expr = arg)
-                union!(symstate, macro_symstate)
-            else
-                union!(symstate, SymbolsState(macrocalls = macro_symstate.macrocalls))
-            end
+function funcname_symstate!(funcname::FunctionName, scopestate::ScopeState)::SymbolsState
+    if length(funcname) == 0
+        explore!(ex.args[1], scopestate)
+    elseif length(funcname) == 1
+        if funcname[1] ∈ scopestate.hiddenglobals
+            SymbolsState()
+        else
+            SymbolsState(funccalls = Set{FunctionName}([funcname]))
         end
+    elseif funcname[1] ∈ scopestate.hiddenglobals
+        SymbolsState()
+    else
+        SymbolsState(references = Set{Symbol}([funcname[1]]), funccalls = Set{FunctionName}([funcname]))
+    end
+end
 
-        # Some macros can be expanded on the server process
-        if join_funcname_parts(macro_name) ∈ can_macroexpand
-            new_ex = maybe_macroexpand(ex)
-            union!(symstate, explore!(new_ex, scopestate))
+function explore_call!(ex::Expr, scopestate::ScopeState)::SymbolsState
+    # Does not create scope
+
+    if is_just_dots(ex.args[1])
+        funcname = split_funcname(ex.args[1])::FunctionName
+        symstate = funcname_symstate!(funcname, scopestate)
+
+        # Explore code inside function arguments:
+        union!(symstate, explore!(Expr(:block, ex.args[2:end]...), scopestate))
+
+        # Make `@macroexpand` and `Base.macroexpand` reactive by referencing the first macro in the second
+        # argument to the call.
+        if (all_iters_eq((:Base, :macroexpand), funcname) || all_iters_eq((:macroexpand,), funcname)) &&
+           length(ex.args) >= 3 &&
+           ex.args[3] isa QuoteNode &&
+           Meta.isexpr(ex.args[3].value, :macrocall)
+            expanded_macro = split_funcname(ex.args[3].value.args[1])
+            union!(symstate, SymbolsState(macrocalls = Set{FunctionName}([expanded_macro])))
+        elseif all_iters_eq((:BenchmarkTools, :generate_benchmark_definition), funcname) &&
+            length(ex.args) == 10
+            block = Expr(:block,
+                 map(ex.args[[8,7,9]]) do child
+                    if (Meta.isexpr(child, :copyast, 1) && child.args[1] isa QuoteNode && child.args[1].value isa Expr)
+                        child.args[1].value
+                    else
+                        nothing
+                    end
+                end...
+            )
+            union!(symstate, explore_inner_scoped(block, scopestate))
         end
 
         return symstate
-    elseif ex.head == :call
-        # Does not create scope
-
-        if is_just_dots(ex.args[1])
-            funcname = ex.args[1] |> split_funcname
-            symstate = if length(funcname) == 0
-                explore!(ex.args[1], scopestate)
-            elseif length(funcname) == 1
-                if funcname[1] ∈ scopestate.hiddenglobals
-                    SymbolsState()
-                else
-                    SymbolsState(funccalls = Set{FunctionName}([funcname]))
-                end
-            elseif funcname[1] ∈ scopestate.hiddenglobals
-                SymbolsState()
-            else
-                SymbolsState(references = Set{Symbol}([funcname[1]]), funccalls = Set{FunctionName}([funcname]))
-            end
+    else
+        return explore!(Expr(:block, ex.args...), scopestate)
+    end
+end
 
-            # Explore code inside function arguments:
-            union!(symstate, explore!(Expr(:block, ex.args[2:end]...), scopestate))
-
-            # Make `@macroexpand` and `Base.macroexpand` reactive by referencing the first macro in the second
-            # argument to the call.
-            if (all_iters_eq((:Base, :macroexpand), funcname) || all_iters_eq((:macroexpand,), funcname)) &&
-               length(ex.args) >= 3 &&
-               ex.args[3] isa QuoteNode &&
-               Meta.isexpr(ex.args[3].value, :macrocall)
-                expanded_macro = split_funcname(ex.args[3].value.args[1])
-                union!(symstate, SymbolsState(macrocalls = Set{FunctionName}([expanded_macro])))
-            elseif all_iters_eq((:BenchmarkTools, :generate_benchmark_definition), funcname) &&
-                length(ex.args) == 10
-                block = Expr(:block,
-                     map(ex.args[[8,7,9]]) do child
-                        if (Meta.isexpr(child, :copyast, 1) && child.args[1] isa QuoteNode && child.args[1].value isa Expr)
-                            child.args[1].value
-                        else
-                            nothing
-                        end
-                    end...
-                )
-                union!(symstate, explore_inner_scoped(block, scopestate))
-            end
+function explore_struct!(ex::Expr, scopestate::ScopeState)
+    # Creates local scope
 
-            return symstate
-        else
-            return explore!(Expr(:block, ex.args...), scopestate)
-        end
-    elseif Meta.isexpr(ex, :parameters)
-        return mapfoldl(a -> explore!(to_kw(a), scopestate), union!, ex.args, init = SymbolsState())
-    elseif ex.head == :kw
-        return explore!(ex.args[2], scopestate)
-    elseif ex.head == :struct
-        # Creates local scope
+    structnameexpr = ex.args[2]
+    structfields = ex.args[3].args
 
-        structnameexpr = ex.args[2]
-        structfields = ex.args[3].args
+    equiv_func = Expr(:function, Expr(:call, structnameexpr, structfields...), Expr(:block, nothing))
 
-        equiv_func = Expr(:function, Expr(:call, structnameexpr, structfields...), Expr(:block, nothing))
+    # struct should always be in Global state
+    globalscopestate = deepcopy(scopestate)
+    globalscopestate.inglobalscope = true
 
-        # struct should always be in Global state
-        globalscopestate = deepcopy(scopestate)
-        globalscopestate.inglobalscope = true
+    # we register struct definitions as both a variable and a function. This is because deleting a struct is trickier than just deleting its methods.
+    # Due to this, outer constructors have to be defined in the same cell where the struct is defined.
+    # See https://github.com/fonsp/Pluto.jl/issues/732 for more details
+    inner_symstate = explore!(equiv_func, globalscopestate)
 
-        # we register struct definitions as both a variable and a function. This is because deleting a struct is trickier than just deleting its methods.
-        # Due to this, outer constructors have to be defined in the same cell where the struct is defined.
-        # See https://github.com/fonsp/Pluto.jl/issues/732 for more details
-        inner_symstate = explore!(equiv_func, globalscopestate)
+    structname = first(keys(inner_symstate.funcdefs)).name |> join_funcname_parts
+    push!(inner_symstate.assignments, structname)
+    return inner_symstate
+end
 
-        structname = first(keys(inner_symstate.funcdefs)).name |> join_funcname_parts
-        push!(inner_symstate.assignments, structname)
-        return inner_symstate
-    elseif ex.head == :abstract
-        equiv_func = Expr(:function, ex.args...)
-        inner_symstate = explore!(equiv_func, scopestate)
+function explore_abstract!(ex::Expr, scopestate::ScopeState)
+    equiv_func = Expr(:function, ex.args...)
+    inner_symstate = explore!(equiv_func, scopestate)
 
-        abstracttypename = first(keys(inner_symstate.funcdefs)).name |> join_funcname_parts
-        push!(inner_symstate.assignments, abstracttypename)
-        return inner_symstate
-    elseif ex.head == :function || ex.head == :macro
-        symstate = SymbolsState()
-        # Creates local scope
+    abstracttypename = first(keys(inner_symstate.funcdefs)).name |> join_funcname_parts
+    push!(inner_symstate.assignments, abstracttypename)
+    return inner_symstate
+end
 
-        funcroot = ex.args[1]
+function explore_function_macro!(ex::Expr, scopestate::ScopeState)
+    symstate = SymbolsState()
+    # Creates local scope
 
-        # Because we are entering a new scope, we create a copy of the current scope state, and run it through the expressions.
-        innerscopestate = deepcopy(scopestate)
-        innerscopestate.inglobalscope = false
-
-        funcname, innersymstate = explore_funcdef!(funcroot, innerscopestate)
-
-        # Macro are called using @funcname, but defined with funcname. We need to change that in our scopestate
-        # (The `!= 0` is for when the function named couldn't be parsed)
-        if ex.head == :macro && length(funcname) != 0
-            funcname = Symbol[Symbol("@$(funcname[1])")]
-            push!(innerscopestate.hiddenglobals, only(funcname))
-        elseif length(funcname) == 1
-            push!(scopestate.definedfuncs, funcname[end])
-            push!(scopestate.hiddenglobals, funcname[end])
-        elseif length(funcname) > 1
-            push!(symstate.references, funcname[end-1]) # reference the module of the extended function
-            push!(scopestate.hiddenglobals, funcname[end-1])
-        end
+    funcroot = ex.args[1]
 
-        union!(innersymstate, explore!(Expr(:block, ex.args[2:end]...), innerscopestate))
-        funcnamesig = FunctionNameSignaturePair(funcname, canonalize(funcroot))
+    # Because we are entering a new scope, we create a copy of the current scope state, and run it through the expressions.
+    innerscopestate = deepcopy(scopestate)
+    innerscopestate.inglobalscope = false
 
-        if will_assign_global(funcname, scopestate)
-            symstate.funcdefs[funcnamesig] = innersymstate
-        else
-            # The function is not defined globally. However, the function can still modify the global scope or reference globals, e.g.
+    funcname, innersymstate = explore_funcdef!(funcroot, innerscopestate)::Tuple{FunctionName,SymbolsState}
+
+    # Macro are called using @funcname, but defined with funcname. We need to change that in our scopestate
+    # (The `!= 0` is for when the function named couldn't be parsed)
+    if ex.head == :macro && length(funcname) != 0
+        funcname = Symbol[Symbol("@$(funcname[1])")]
+        push!(innerscopestate.hiddenglobals, only(funcname))
+    elseif length(funcname) == 1
+        push!(scopestate.definedfuncs, funcname[end])
+        push!(scopestate.hiddenglobals, funcname[end])
+    elseif length(funcname) > 1
+        push!(symstate.references, funcname[end-1]) # reference the module of the extended function
+        push!(scopestate.hiddenglobals, funcname[end-1])
+    end
 
-            # let
-            #     function f(x)
-            #         global z = x + a
-            #     end
-            #     f(2)
-            # end
+    union!(innersymstate, explore!(Expr(:block, ex.args[2:end]...), innerscopestate))
+    funcnamesig = FunctionNameSignaturePair(funcname, canonalize(funcroot))
 
-            # so we insert the function's inner symbol state here, as if it was a `let` block.
-            symstate = innersymstate
-        end
+    if will_assign_global(funcname, scopestate)
+        symstate.funcdefs[funcnamesig] = innersymstate
+    else
+        # The function is not defined globally. However, the function can still modify the global scope or reference globals, e.g.
 
-        return symstate
-    elseif ex.head == :try
-        symstate = SymbolsState()
+        # let
+        #     function f(x)
+        #         global z = x + a
+        #     end
+        #     f(2)
+        # end
 
-        # Handle catch first
-        if ex.args[3] != false
-            union!(symstate, explore_inner_scoped(ex.args[3], scopestate))
-            # If we catch a symbol, it could shadow a global reference, remove it
-            if ex.args[2] != false
-                setdiff!(symstate.references, Symbol[ex.args[2]])
-            end
-        end
+        # so we insert the function's inner symbol state here, as if it was a `let` block.
+        symstate = innersymstate
+    end
+
+    return symstate
+end
 
-        # Handle the try block
-        union!(symstate, explore_inner_scoped(ex.args[1], scopestate))
+function explore_try!(ex::Expr, scopestate::ScopeState)
+    symstate = SymbolsState()
 
-        # Finally, handle finally
-        if length(ex.args) == 4
-            union!(symstate, explore_inner_scoped(ex.args[4], scopestate))
+    # Handle catch first
+    if ex.args[3] != false
+        union!(symstate, explore_inner_scoped(ex.args[3], scopestate))
+        # If we catch a symbol, it could shadow a global reference, remove it
+        if ex.args[2] != false
+            setdiff!(symstate.references, Symbol[ex.args[2]])
         end
+    end
 
-        return symstate
-    elseif ex.head == :(->)
-        # Creates local scope
+    # Handle the try block
+    union!(symstate, explore_inner_scoped(ex.args[1], scopestate))
 
-        tempname = anonymous_name()
+    # Finally, handle finally
+    if length(ex.args) == 4
+        union!(symstate, explore_inner_scoped(ex.args[4], scopestate))
+    end
 
-        # We will rewrite this to a normal function definition, with a temporary name
-        funcroot = ex.args[1]
-        args_ex = if funcroot isa Symbol || (funcroot isa Expr && funcroot.head == :(::))
-            [funcroot]
-        elseif funcroot.head == :tuple || funcroot.head == :(...) || funcroot.head == :block
-            funcroot.args
-        else
-            @error "Unknown lambda type"
-        end
+    return symstate
+end
 
-        equiv_func = Expr(:function, Expr(:call, tempname, args_ex...), ex.args[2])
+function explore_anonymous_function!(ex::Expr, scopestate::ScopeState)
+    # Creates local scope
 
-        return explore!(equiv_func, scopestate)
-    elseif ex.head == :global
-        # Does not create scope
+    tempname = anonymous_name()
 
-        # global x, y, z
-        if length(ex.args) > 1
-            return mapfoldl(arg -> explore!(Expr(:global, arg), scopestate), union!, ex.args; init = SymbolsState())
-        end
+    # We will rewrite this to a normal function definition, with a temporary name
+    funcroot = ex.args[1]
+    args_ex = if funcroot isa Symbol || (funcroot isa Expr && funcroot.head == :(::))
+        [funcroot]
+    elseif funcroot.head == :tuple || funcroot.head == :(...) || funcroot.head == :block
+        funcroot.args
+    else
+        @error "Unknown lambda type"
+    end
 
-        # We have one of:
-        # global x;
-        # global x = 1;
-        # global x += 1;
-
-        # where x can also be a tuple:
-        # global a,b = 1,2
-
-        globalisee = ex.args[1]
-
-        if isa(globalisee, Symbol)
-            push!(scopestate.exposedglobals, globalisee)
-            return SymbolsState()
-        elseif isa(globalisee, Expr)
-            # temporarily set inglobalscope to true
-            old = scopestate.inglobalscope
-            scopestate.inglobalscope = true
-            result = explore!(globalisee, scopestate)
-            scopestate.inglobalscope = old
-            return result
-        else
-            @error "unknown global use" ex
-            return explore!(globalisee, scopestate)
-        end
+    equiv_func = Expr(:function, Expr(:call, tempname, args_ex...), ex.args[2])
 
-        return symstate
-    elseif ex.head == :local
-        # Does not create scope
+    return explore!(equiv_func, scopestate)
+end
 
-        # Turn `local x, y` in `local x; local y
-        if length(ex.args) > 1
-            return mapfoldl(arg -> explore!(Expr(:local, arg), scopestate), union!, ex.args; init = SymbolsState())
-        end
+function explore_global!(ex::Expr, scopestate::ScopeState)::SymbolsState
+    # Does not create scope
 
-        localisee = ex.args[1]
+    # global x, y, z
+    if length(ex.args) > 1
+        return umapfoldl(arg -> explore!(Expr(:global, arg), scopestate), ex.args)
+    end
 
-        if isa(localisee, Symbol)
-            push!(scopestate.hiddenglobals, localisee)
-            return SymbolsState()
-        elseif isa(localisee, Expr) && (localisee.head == :(=) || localisee.head in modifiers)
-            push!(scopestate.hiddenglobals, get_assignees(localisee.args[1])...)
-            return explore!(localisee, scopestate)
-        else
-            @warn "unknown local use" ex
-            return explore!(localisee, scopestate)
-        end
-    elseif ex.head == :tuple
-        # Does not create scope
-
-        # There are three (legal) cases:
-        # 1. Creating a tuple:
-        #   (a, b, c)
-
-        # 2. Creating a named tuple:
-        #   (a=1, b=2, c=3)
-
-        # 3. Multiple assignments
-        # a,b,c = 1,2,3
-        # This parses to:
-        # head = :tuple
-        # args = [:a, :b, :(c=1), :2, :3]
-        # 
-        # 🤔
-        # we turn it into two expressions:
-        # 
-        # (a, b) = (2, 3)
-        # (c = 1)
-        # 
-        # and explore those :)
-
-        indexoffirstassignment = findfirst(a -> isa(a, Expr) && a.head == :(=), ex.args)
-        if indexoffirstassignment !== nothing
-            # we have one of two cases, see next `if`
-            indexofsecondassignment = findnext(a -> isa(a, Expr) && a.head == :(=), ex.args, indexoffirstassignment + 1)
-
-            if length(ex.args) == 1 || indexofsecondassignment !== nothing
-                # 2.
-                # we have a named tuple, e.g. (a=1, b=2)
-                new_args = map(ex.args) do a
-                    (a isa Expr && a.head == :(=)) ? a.args[2] : a
-                end
-                return explore!(Expr(:block, new_args...), scopestate)
-            else
-                # 3. 
-                # we have a tuple assignment, e.g. `a, (b, c) = [1, [2, 3]]`
-                before = ex.args[1:indexoffirstassignment-1]
-                after = ex.args[indexoffirstassignment+1:end]
+    # We have one of:
+    # global x;
+    # global x = 1;
+    # global x += 1;
+
+    # where x can also be a tuple:
+    # global a,b = 1,2
+
+    globalisee = ex.args[1]
+
+    if isa(globalisee, Symbol)
+        push!(scopestate.exposedglobals, globalisee)
+        return SymbolsState()
+    elseif isa(globalisee, Expr)
+        # temporarily set inglobalscope to true
+        old = scopestate.inglobalscope
+        scopestate.inglobalscope = true
+        result = explore!(globalisee, scopestate)
+        scopestate.inglobalscope = old
+        return result::SymbolsState
+    else
+        @error "unknown global use" ex
+        return explore!(globalisee, scopestate)::SymbolsState
+    end
+end
+
+function explore_local!(ex::Expr, scopestate::ScopeState)::SymbolsState
+    # Does not create scope
+
+    # Turn `local x, y` in `local x; local y
+    if length(ex.args) > 1
+        return umapfoldl(arg -> explore!(Expr(:local, arg), scopestate), ex.args)
+    end
 
-                symstate_middle = explore!(ex.args[indexoffirstassignment], scopestate)
-                symstate_outer = explore!(Expr(:(=), Expr(:tuple, before...), Expr(:block, after...)), scopestate)
+    localisee = ex.args[1]
+
+    if isa(localisee, Symbol)
+        push!(scopestate.hiddenglobals, localisee)
+        return SymbolsState()
+    elseif isa(localisee, Expr) && (localisee.head == :(=) || localisee.head in modifiers)
+        push!(scopestate.hiddenglobals, get_assignees(localisee.args[1])...)
+        return explore!(localisee, scopestate)::SymbolsState
+    else
+        @warn "unknown local use" ex
+        return explore!(localisee, scopestate)::SymbolsState
+    end
+end
 
-                return union!(symstate_middle, symstate_outer)
+function explore_tuple!(ex::Expr, scopestate::ScopeState)::SymbolsState
+    # Does not create scope
+
+    # There are three (legal) cases:
+    # 1. Creating a tuple:
+    #   (a, b, c)
+
+    # 2. Creating a named tuple:
+    #   (a=1, b=2, c=3)
+
+    # 3. Multiple assignments
+    # a,b,c = 1,2,3
+    # This parses to:
+    # head = :tuple
+    # args = [:a, :b, :(c=1), :2, :3]
+    # 
+    # 🤔
+    # we turn it into two expressions:
+    # 
+    # (a, b) = (2, 3)
+    # (c = 1)
+    # 
+    # and explore those :)
+
+    indexoffirstassignment = findfirst(a -> isa(a, Expr) && a.head == :(=), ex.args)
+    if indexoffirstassignment !== nothing
+        # we have one of two cases, see next `if`
+        indexofsecondassignment = findnext(a -> isa(a, Expr) && a.head == :(=), ex.args, indexoffirstassignment + 1)
+
+        if length(ex.args) == 1 || indexofsecondassignment !== nothing
+            # 2.
+            # we have a named tuple, e.g. (a=1, b=2)
+            new_args = map(ex.args) do a
+                (a isa Expr && a.head == :(=)) ? a.args[2] : a
             end
+            return explore!(Expr(:block, new_args...), scopestate)
         else
-            # 1.
-            # good ol' tuple
-            return explore!(Expr(:block, ex.args...), scopestate)
-        end
-    elseif Meta.isexpr(ex, :(.), 2) && ex.args[2] isa Expr && ex.args[2].head == :tuple
-        # pointwise function call, e.g. sqrt.(nums)
-        # we rewrite to a regular call
+            # 3. 
+            # we have a tuple assignment, e.g. `a, (b, c) = [1, [2, 3]]`
+            before = ex.args[1:indexoffirstassignment-1]
+            after = ex.args[indexoffirstassignment+1:end]
 
-        return explore!(Expr(:call, ex.args[1], ex.args[2].args...), scopestate)
-    elseif ex.head == :using || ex.head == :import
-        imports = if ex.args[1].head == :(:)
-            ex.args[1].args[2:end]
-        else
-            ex.args
+            symstate_middle = explore!(ex.args[indexoffirstassignment], scopestate)
+            symstate_outer = explore!(Expr(:(=), Expr(:tuple, before...), Expr(:block, after...)), scopestate)
+
+            return union!(symstate_middle, symstate_outer)
         end
+    else
+        # 1.
+        # good ol' tuple
+        return explore!(Expr(:block, ex.args...), scopestate)
+    end
+end
+
+function explore_broadcast!(ex::Expr, scopestate::ScopeState)
+    # pointwise function call, e.g. sqrt.(nums)
+    # we rewrite to a regular call
+
+    return explore!(Expr(:call, ex.args[1], ex.args[2].args...), scopestate)
+end
 
-        packagenames = map(e -> e.args[end], imports)
+function explore_load!(ex::Expr, scopestate::ScopeState)
+    imports = if ex.args[1].head == :(:)
+        ex.args[1].args[2:end]
+    else
+        ex.args
+    end
+
+    packagenames = map(e -> e.args[end], imports)
+
+    return SymbolsState(assignments = Set{Symbol}(packagenames))::SymbolsState
+end
+
+function explore_quote!(ex::Expr, scopestate::ScopeState)
+    # Look through the quote and only returns explore! deeper into :$'s
+    # I thought we need to handle strings in the same way,
+    #   but strings do just fine with the catch all at the end
+    #   and actually strings don't always have a :$ expression, sometimes just
+    #   plain Symbols (which we should then be interpreted as variables,
+    #     which is different to how we handle Symbols in quote'd expressions)
+    return explore_interpolations!(ex.args[1], scopestate)::SymbolsState
+end
 
-        return SymbolsState(assignments = Set{Symbol}(packagenames))
+function explore_module!(ex::Expr, scopestate::ScopeState)
+    # Does create it's own scope, but can import from outer scope, that's what `explore_module_definition!` is for
+    symstate = explore_module_definition!(ex, scopestate)
+    return union(symstate, SymbolsState(assignments = Set{Symbol}([ex.args[2]])))::SymbolsState
+end
+
+function explore_fallback!(ex::Expr, scopestate::ScopeState)
+    # fallback, includes:
+    # begin, block, do, toplevel, const
+    # (and hopefully much more!)
+
+    # Does not create scope (probably)
+
+    return umapfoldl(a -> explore!(a, scopestate), ex.args)
+end
+
+# General recursive method. Is never a leaf.
+# Modifies the `scopestate`.
+function explore!(ex::Expr, scopestate::ScopeState)::SymbolsState
+    if ex.head == :(=)
+        return explore_assignment!(ex, scopestate)
+    elseif ex.head in modifiers
+        return explore_modifiers!(ex, scopestate)
+    elseif ex.head in modifiers_dotprefixed
+        return explore_dotprefixed_modifiers!(ex, scopestate)
+    elseif ex.head == :let || ex.head == :for || ex.head == :while
+        # Creates local scope
+        return explore_inner_scoped(ex, scopestate)
+    elseif ex.head == :filter
+        return explore_filter!(ex, scopestate)
+    elseif ex.head == :generator
+        return explore_generator!(ex, scopestate)
+    elseif ex.head == :macrocall
+        return explore_macrocall!(ex, scopestate)
+    elseif ex.head == :call
+        return explore_call!(ex, scopestate)
+    elseif Meta.isexpr(ex, :parameters)
+        return umapfoldl(a -> explore!(to_kw(a), scopestate), ex.args)
+    elseif ex.head == :kw
+        return explore!(ex.args[2], scopestate)
+    elseif ex.head == :struct
+        return explore_struct!(ex, scopestate)
+    elseif ex.head == :abstract
+        return explore_abstract!(ex, scopestate)
+    elseif ex.head == :function || ex.head == :macro
+        return explore_function_macro!(ex, scopestate)
+    elseif ex.head == :try
+        return explore_try!(ex, scopestate)
+    elseif ex.head == :(->)
+        return explore_anonymous_function!(ex, scopestate)
+    elseif ex.head == :global
+        return explore_global!(ex, scopestate)
+    elseif ex.head == :local
+        return explore_local!(ex, scopestate)
+    elseif ex.head == :tuple
+        return explore_tuple!(ex, scopestate)
+    elseif Meta.isexpr(ex, :(.), 2) && ex.args[2] isa Expr && ex.args[2].head == :tuple
+        return explore_broadcast!(ex, scopestate)
+    elseif ex.head == :using || ex.head == :import
+        return explore_load!(ex, scopestate)
     elseif ex.head == :quote
-        # Look through the quote and only returns explore! deeper into :$'s
-        # I thought we need to handle strings in the same way,
-        #   but strings do just fine with the catch all at the end
-        #   and actually strings don't always have a :$ expression, sometimes just
-        #   plain Symbols (which we should then be interpreted as variables,
-        #     which is different to how we handle Symbols in quote'd expressions)
-        return explore_interpolations!(ex.args[1], scopestate)
+        return explore_quote!(ex, scopestate)
     elseif ex.head == :module
-        # Does create it's own scope, but can import from outer scope, that's what `explore_module_definition!` is for
-        symstate = explore_module_definition!(ex, scopestate)
-
-        return union(symstate, SymbolsState(assignments = Set{Symbol}([ex.args[2]])))
+        return explore_module!(ex, scopestate)
     elseif Meta.isexpr(ex, Symbol("'"), 1)
         # a' corresponds to adjoint(a)
         return explore!(Expr(:call, :adjoint, ex.args[1]), scopestate)
     elseif ex.head == :meta
         return SymbolsState()
     else
-        # fallback, includes:
-        # begin, block, do, toplevel, const
-        # (and hopefully much more!)
-
-        # Does not create scope (probably)
-
-        return mapfoldl(a -> explore!(a, scopestate), union!, ex.args, init = SymbolsState())
+        return explore_fallback!(ex, scopestate)
     end
 end
 
@@ -797,7 +893,7 @@ function explore_module_definition!(ex::Expr, scopestate; module_depth::Number =
         return SymbolsState()
     else
         # Go deeper
-        return mapfoldl(a -> explore_module_definition!(a, scopestate, module_depth = module_depth), union!, ex.args, init = SymbolsState())
+        return umapfoldl(a -> explore_module_definition!(a, scopestate, module_depth = module_depth), ex.args)
     end
 end
 explore_module_definition!(expr, scopestate; module_depth::Number = 1) = SymbolsState()
@@ -806,10 +902,10 @@ explore_module_definition!(expr, scopestate; module_depth::Number = 1) = Symbols
 "Go through a quoted expression and use explore! for :\$ expressions"
 function explore_interpolations!(ex::Expr, scopestate)
     if ex.head == :$
-        explore!(ex.args[1], scopestate)
+        return explore!(ex.args[1], scopestate)::SymbolsState
     else
         # We are still in a quote, so we do go deeper, but we keep ignoring everything except :$'s
-        return mapfoldl(a -> explore_interpolations!(a, scopestate), union!, ex.args, init = SymbolsState())
+        return umapfoldl(a -> explore_interpolations!(a, scopestate), ex.args)
     end
 end
 explore_interpolations!(anything_else, scopestate) = SymbolsState()
@@ -823,9 +919,11 @@ function to_kw(ex::Expr)
 end
 to_kw(x) = x
 
-"Return the function name and the SymbolsState from argument defaults. Add arguments as hidden globals to the `scopestate`.
+"""
+Return the function name and the SymbolsState from argument defaults. Add arguments as hidden globals to the `scopestate`.
 
-Is also used for `struct` and `abstract`."
+Is also used for `struct` and `abstract`.
+"""
 function explore_funcdef!(ex::Expr, scopestate::ScopeState)::Tuple{FunctionName,SymbolsState}
     if ex.head == :call
         params_to_explore = ex.args[2:end]
@@ -857,7 +955,7 @@ function explore_funcdef!(ex::Expr, scopestate::ScopeState)::Tuple{FunctionName,
         # get the function name
         name, symstate = explore_funcdef!(funcroot, scopestate)
         # and explore the function arguments
-        return mapfoldl(a -> explore_funcdef!(a, scopestate), union!, params_to_explore, init = (name, symstate))
+        return umapfoldl(a -> explore_funcdef!(a, scopestate), params_to_explore; init=(name, symstate))
     elseif ex.head == :(::) || ex.head == :kw || ex.head == :(=)
         # account for unnamed params, like in f(::Example) = 1
         if ex.head == :(::) && length(ex.args) == 1
@@ -914,13 +1012,12 @@ function explore_funcdef!(ex::Expr, scopestate::ScopeState)::Tuple{FunctionName,
         return Symbol[name], symstate
 
     elseif Meta.isexpr(ex, :parameters)
-        return mapfoldl(
-            a -> explore_funcdef!(to_kw(a), scopestate),
-            union!, ex.args, init = (Symbol[], SymbolsState())
-        )
+        init = (Symbol[], SymbolsState())
+        return umapfoldl(a -> explore_funcdef!(to_kw(a), scopestate), ex.args; init)
 
     elseif ex.head == :tuple
-        return mapfoldl(a -> explore_funcdef!(a, scopestate), union!, ex.args, init = (Symbol[], SymbolsState()))
+        init = (Symbol[], SymbolsState())
+        return umapfoldl(a -> explore_funcdef!(a, scopestate), ex.args; init)
 
     elseif ex.head == :(.)
         return split_funcname(ex), SymbolsState()
@@ -1116,6 +1213,20 @@ hide_argument_name(x::Any) = x
 # UTILITY FUNCTIONS
 ###
 
+function handle_recursive_functions!(symstate::SymbolsState)
+    # We do something special to account for recursive functions:
+    # If a function `f` calls a function `g`, and both are defined inside this cell, the reference to `g` inside the symstate of `f` will be deleted.
+    # The motivitation is that normally, an assignment (or function definition) will add that symbol to a list of 'hidden globals' - any future references to that symbol will be ignored. i.e. the _local definition hides a global_.
+    # In the case of functions, you can reference functions and variables that do not yet exist, and so they won't be in the list of hidden symbols when the function definition is analysed. 
+    # Of course, our method will fail if a referenced function is defined both inside the cell **and** in another cell. However, this will lead to a MultipleDefinitionError before anything bad happens.
+    K = keys(symstate.funcdefs)
+    for (func, inner_symstate) in symstate.funcdefs
+        inner_symstate.references = setdiff(inner_symstate.references, K)
+        inner_symstate.funccalls = setdiff(inner_symstate.funccalls, K)
+    end
+    return nothing
+end
+
 """
     compute_symbolreferences(ex::Any)::SymbolsState
 
@@ -1124,17 +1235,8 @@ Inside Pluto, `ex` is always an `Expr`. However, we still accept `Any` to allow
 """
 function compute_symbolreferences(ex::Any)::SymbolsState
     symstate = explore!(ex, ScopeState())
-
-    # We do something special to account for recursive functions:
-    # If a function `f` calls a function `g`, and both are defined inside this cell, the reference to `g` inside the symstate of `f` will be deleted.
-    # The motivitation is that normally, an assignment (or function definition) will add that symbol to a list of 'hidden globals' - any future references to that symbol will be ignored. i.e. the _local definition hides a global_.
-    # In the case of functions, you can reference functions and variables that do not yet exist, and so they won't be in the list of hidden symbols when the function definition is analysed. 
-    # Of course, our method will fail if a referenced function is defined both inside the cell **and** in another cell. However, this will lead to a MultipleDefinitionError before anything bad happens.
-    for (func, inner_symstate) in symstate.funcdefs
-        inner_symstate.references = setdiff(inner_symstate.references, keys(symstate.funcdefs))
-        inner_symstate.funccalls = setdiff(inner_symstate.funccalls, keys(symstate.funcdefs))
-    end
-    symstate
+    handle_recursive_functions!(symstate)
+    return symstate
 end
 
 function try_compute_symbolreferences(ex::Any)::SymbolsState
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 43e12ff1fb..0d346412a8 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -54,7 +54,7 @@ end
 Run given cells and all the cells that depend on them, based on the topology information before and after the changes.
 
 !!! warning
-    You should probably should not call this directly and use `run_reactive!` instead.
+    You should probably not call this directly and use `run_reactive!` instead.
 """
 function run_reactive_core!(
     session::ServerSession,
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index ecb61dddf0..f174112953 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -1,6 +1,6 @@
 using Test
 
-#= 
+#=
 `@test_broken` means that the test doesn't pass right now, but we want it to pass. Feel free to try to fix it and open a PR!
 Some of these @test_broken lines are commented out to prevent printing to the terminal, but we still want them fixed.
 
@@ -17,8 +17,39 @@ Some of these @test_broken lines are commented out to prevent printing to the te
 -fons =#
 
 @testset "Explore Expressions" begin
-    @inferred Pluto.ExpressionExplorer.split_funcname(:(Base.Submodule.f))
-    @inferred Pluto.ExpressionExplorer.maybe_macroexpand(:(@time 1))
+    let
+        EE = Pluto.ExpressionExplorer
+        scopestate = EE.ScopeState()
+
+        @inferred EE.explore_assignment!(:(f(x) = x), scopestate)
+        @inferred EE.explore_modifiers!(:(1 + 1), scopestate)
+        @inferred EE.explore_dotprefixed_modifiers!(:([1] .+ [1]), scopestate)
+        @inferred EE.explore_inner_scoped(:(let x = 1 end), scopestate)
+        @inferred EE.explore_filter!(:(filter(true, a)), scopestate)
+        @inferred EE.explore_generator!(:((x for x in a)), scopestate)
+        @inferred EE.explore_macrocall!(:(@time 1), scopestate)
+        @inferred EE.explore_call!(:(f(x)), scopestate)
+        @inferred EE.explore_struct!(:(struct A end), scopestate)
+        @inferred EE.explore_abstract!(:(abstract type A end), scopestate)
+        @inferred EE.explore_function_macro!(:(function f(x); x; end), scopestate)
+        @inferred EE.explore_try!(:(try nothing catch end), scopestate)
+        @inferred EE.explore_anonymous_function!(:(x -> x), scopestate)
+        @inferred EE.explore_global!(:(global x = 1), scopestate)
+        @inferred EE.explore_local!(:(local x = 1), scopestate)
+        @inferred EE.explore_tuple!(:((a, b)), scopestate)
+        @inferred EE.explore_broadcast!(:(func.(a)), scopestate)
+        @inferred EE.explore_load!(:(using Foo), scopestate)
+        let
+            @inferred EE.explore_interpolations!(:(quote 1 end), scopestate)
+            @inferred EE.explore_quote!(:(quote 1 end), scopestate)
+        end
+        @inferred EE.explore_module!(:(module A end), scopestate)
+        @inferred EE.explore_fallback!(:(1 + 1), scopestate)
+        @inferred EE.explore!(:(1 + 1), scopestate)
+
+        @inferred EE.split_funcname(:(Base.Submodule.f))
+        @inferred EE.maybe_macroexpand(:(@time 1))
+    end
 
     @testset "Basics" begin
         # Note that Meta.parse(x) is not always an Expr.

From 4e926d8d9df477b80dea814c26f9489324815fb4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 9 Jun 2022 01:29:37 +0200
Subject: [PATCH 368/821] add_bonds_listener: null type fix

---
 frontend/common/PlutoContext.js   | 1 +
 frontend/components/CellOutput.js | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/common/PlutoContext.js b/frontend/common/PlutoContext.js
index 08de61d19b..79344a17b2 100644
--- a/frontend/common/PlutoContext.js
+++ b/frontend/common/PlutoContext.js
@@ -1,6 +1,7 @@
 import { createContext } from "../imports/Preact.js"
 
 export let PlutoActionsContext = createContext()
+// export let PlutoActionsContext = createContext(/** @type {Record<string,Function?>?} */ (null))
 export let PlutoBondsContext = createContext(/** @type {import("../components/Editor.js").BondValuesDict?} */ (null))
 export let PlutoJSInitializingContext = createContext(/** @type {SetWithEmptyCallback<HTMLElement>?} */ (null))
 
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 5808ee4f32..6f10ccf613 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -490,9 +490,11 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
                 })
 
                 if (pluto_actions != null) {
+                    const on_bond_value = (name, value) => pluto_actions?.set_bond?.(name, value) ?? Promise.resolve()
+
                     const bond_nodes = container.querySelectorAll("bond")
                     set_bound_elements_to_their_value(bond_nodes, pluto_bonds ?? {})
-                    add_bonds_listener(bond_nodes, pluto_actions.set_bond, pluto_bonds ?? {}, invalidation)
+                    add_bonds_listener(bond_nodes, on_bond_value, pluto_bonds ?? {}, invalidation)
                     add_bonds_disabled_message_handler(bond_nodes, invalidation)
                 }
 

From 5614714116c3f4a1da3c243983d355e4131294bf Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 9 Jun 2022 01:31:05 +0200
Subject: [PATCH 369/821] Include secret search param in WS connect (#2164)

---
 frontend/common/Binder.js          |  2 +-
 frontend/common/PlutoConnection.js |  7 ++++++-
 frontend/common/URLTools.js        | 10 +++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/frontend/common/Binder.js b/frontend/common/Binder.js
index 29f9a91c1b..8ac593a9f9 100644
--- a/frontend/common/Binder.js
+++ b/frontend/common/Binder.js
@@ -161,7 +161,7 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
 
         console.log("Connecting WebSocket")
 
-        const connect_promise = connect(with_token(ws_address_from_base(binder_session_url) + "channels"))
+        const connect_promise = connect(with_token(new URL("channels", ws_address_from_base(binder_session_url))))
         await timeout_promise(connect_promise, 20_000).catch((e) => {
             console.error("Failed to establish connection within 20 seconds. Navigating to the edit URL directly.", e)
             const edit_url = with_query_params(new URL("edit", binder_session_url), { id: new_notebook_id })
diff --git a/frontend/common/PlutoConnection.js b/frontend/common/PlutoConnection.js
index 67d0202f4f..71693e5d21 100644
--- a/frontend/common/PlutoConnection.js
+++ b/frontend/common/PlutoConnection.js
@@ -1,6 +1,7 @@
 import { Promises } from "../common/SetupCellEnvironment.js"
 import { pack, unpack } from "./MsgPack.js"
 import "./Polyfill.js"
+import { with_query_params } from "./URLTools.js"
 
 // https://github.com/denysdovhan/wtfjs/issues/61
 const different_Infinity_because_js_is_yuck = 2147483646
@@ -230,7 +231,11 @@ const batched_updates = (send) => {
 export const ws_address_from_base = (base_url) => {
     const ws_url = new URL("./", base_url)
     ws_url.protocol = ws_url.protocol.replace("http", "ws")
-    return String(ws_url)
+
+    // if the original URL had a secret in the URL, we can also add it here:
+    const ws_url_with_secret = with_query_params(ws_url, { secret: new URL(base_url).searchParams.get("secret") })
+
+    return ws_url_with_secret
 }
 
 const default_ws_address = () => ws_address_from_base(window.location.href)
diff --git a/frontend/common/URLTools.js b/frontend/common/URLTools.js
index aa91b5bb22..6f71eb7332 100644
--- a/frontend/common/URLTools.js
+++ b/frontend/common/URLTools.js
@@ -1,15 +1,15 @@
-export const with_query_params = (/** @type {String | URL} */ url_str, /** @type {Record<String,any>} */ params) => {
+export const with_query_params = (/** @type {String | URL} */ url_str, /** @type {Record<string,string?>} */ params) => {
     const fake_base = "http://delete-me.com/"
     const url = new URL(url_str, fake_base)
-    Object.entries(params)
-        .filter(([_, v]) => v != null)
-        .forEach(([key, val]) => url.searchParams.append(key, val))
+    Object.entries(params).forEach(([key, val]) => {
+        if (val != null) url.searchParams.append(key, val)
+    })
     return url.toString().replace(fake_base, "")
 }
 
 console.assert(with_query_params("https://example.com/", { a: "b c" }) === "https://example.com/?a=b+c")
 console.assert(with_query_params(new URL("https://example.com/"), { a: "b c" }) === "https://example.com/?a=b+c")
-console.assert(with_query_params(new URL("https://example.com/"), { a: "b c", asdf: null, xx: 123 }) === "https://example.com/?a=b+c&xx=123")
+console.assert(with_query_params(new URL("https://example.com/"), { a: "b c", asdf: null, xx: "123" }) === "https://example.com/?a=b+c&xx=123")
 console.assert(with_query_params("index.html", { a: "b c" }) === "index.html?a=b+c")
 console.assert(with_query_params("index.html?x=123", { a: "b c" }) === "index.html?x=123&a=b+c")
 console.assert(with_query_params("index.html?x=123#asdf", { a: "b c" }) === "index.html?x=123&a=b+c#asdf")

From da998cc946b43fa93a5939c6e13a00c827eb2b92 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 9 Jun 2022 19:00:33 +0200
Subject: [PATCH 370/821] tweak css hitboxes for add and fold buttons

---
 frontend/editor.css | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 3e7ae556a2..170b26ff80 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1258,12 +1258,12 @@ pluto-shoulder > button {
     flex: 0 0 auto;
     position: sticky;
     top: 0;
-    padding: 5px;
+    padding: 4px 5px 4px 10px;
 }
 
 pluto-cell:focus-within > pluto-shoulder > button {
     /* we use padding instead of 4px extra margin to move the eye to the left so that the hitbox becomes grows - you want to be able to double click the button */
-    padding-right: 4px;
+    padding-right: 9px;
 }
 
 /* pluto-cell.code_folded.inline-output > pluto-shoulder > button {
@@ -1509,6 +1509,11 @@ pluto-shoulder > button > span::after {
 
 pluto-cell > button.add_cell {
     left: -12px;
+    --hit-box-extend: 20px;
+    margin-left: calc(-1 * var(--hit-box-extend));
+    margin-right: calc(-1 * var(--hit-box-extend));
+    padding-left: var(--hit-box-extend);
+    padding-right: var(--hit-box-extend);
 }
 
 pluto-cell > button.add_cell.before {

From be3e6eb39df6631f00a4271fddd5bfab1b6ac650 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 9 Jun 2022 20:29:12 +0200
Subject: [PATCH 371/821] css: tweak header size inside docs

---
 frontend/editor.css | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/frontend/editor.css b/frontend/editor.css
index 170b26ff80..c942cc8959 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2143,6 +2143,20 @@ pluto-helpbox > section hr {
     color: var(--black);
 }
 
+.pluto-docs-binding h1 {
+    font-size: 1.4em;
+}
+
+.pluto-docs-binding h2 {
+    font-size: 1.3em;
+}
+.pluto-docs-binding h3,
+.pluto-docs-binding h4,
+.pluto-docs-binding h5,
+.pluto-docs-binding h6 {
+    font-size: 1.1em;
+}
+
 /* FOOTER */
 
 footer {

From 58c9f5b4e3dbe922838cd2a61ede1962e12b8456 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 9 Jun 2022 22:29:27 +0200
Subject: [PATCH 372/821] css tweaktweak

---
 frontend/editor.css | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index c942cc8959..06a2722d04 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2131,14 +2131,13 @@ pluto-helpbox > section hr {
 
 .pluto-docs-binding > span {
     display: inline-block;
-    transform: translate(-19px, -16px);
+    transform: translate(-1.2em, -73%);
     font-family: var(--julia-mono-font-stack);
     font-size: 0.9rem;
     font-weight: 700;
     margin-top: -1em;
-    padding: 4px;
-    border-radius: 7px;
-
+    padding: 0.235rem;
+    border-radius: 0.4rem;
     background: var(--pluto-output-bg-color);
     color: var(--black);
 }

From 0746de8205b8f54c8e735ecd8da646febaeb3d80 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Sun, 12 Jun 2022 11:14:53 +0200
Subject: [PATCH 373/821] TopologyUpdate: don't preserve identity when cells
 are removed  (#2168)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* TopologyUpdate: don't preserve identity when cells are removed

This lead to a subtle bug where the identity branch in
`Base.merge(::ImmutableDefaultDict, ::ImmutableDefaultDict)` where
the `delete_unsafe!` would be applied to both new and old topologies 😟.

* 🧹 don't rely on literal so much

* Fix cell insertion bug

* meh

* yay
---
 src/analysis/TopologyUpdate.jl     | 35 +++++++++++++++-----------
 src/evaluation/Run.jl              | 17 +++++++------
 src/notebook/Cell.jl               | 11 +++++---
 src/notebook/saving and loading.jl |  2 +-
 test/React.jl                      | 40 ++++++++++++++++++++++++++++++
 test/helpers.jl                    | 10 ++++++++
 6 files changed, 87 insertions(+), 28 deletions(-)

diff --git a/src/analysis/TopologyUpdate.jl b/src/analysis/TopologyUpdate.jl
index 0f9e1f4017..47251d4dd7 100644
--- a/src/analysis/TopologyUpdate.jl
+++ b/src/analysis/TopologyUpdate.jl
@@ -30,24 +30,29 @@ function updated_topology(old_topology::NotebookTopology, notebook::Notebook, ce
 			pop!(unresolved_cells, cell, nothing)
 		end
 	end
-	new_codes = merge(old_topology.codes, updated_codes)
-	new_nodes = merge(old_topology.nodes, updated_nodes)
 
-	for removed_cell in setdiff(keys(old_topology.nodes), notebook.cells)
-		delete_unsafe!(new_nodes, removed_cell)
-		delete_unsafe!(new_codes, removed_cell)
-		delete!(unresolved_cells, removed_cell)
+	old_cells = all_cells(old_topology)
+	removed_cells = setdiff(old_cells, notebook.cells)
+	if isempty(removed_cells)
+		# We can keep identity
+		new_codes = merge(old_topology.codes, updated_codes)
+		new_nodes = merge(old_topology.nodes, updated_nodes)
+	else
+		setdiff!(unresolved_cells, removed_cells)
+		new_codes = merge(setdiffkeys(old_topology.codes, removed_cells), updated_codes)
+		new_nodes = merge(setdiffkeys(old_topology.nodes, removed_cells), updated_nodes)
 	end
-	
-	# TODO: this could be cached in a better way if it matters
-	cell_order = notebook.cells == old_topology.cell_order ?
-		old_topology.cell_order : # if the order is the same, we can reuse the old one
-		ImmutableVector(notebook.cells) # (this will do a shallow copy)
-	
+
+	cell_order = if old_cells == notebook.cells
+		old_topology.cell_order
+	else
+		ImmutableVector(notebook.cells)
+	end
+
 	NotebookTopology(;
-		nodes=new_nodes, 
-		codes=new_codes, 
+		nodes=new_nodes,
+		codes=new_codes,
 		unresolved_cells=ImmutableSet(unresolved_cells; skip_copy=true), 
-		cell_order
+		cell_order,
 	)
 end
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 0d346412a8..556665fcba 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -34,7 +34,7 @@ function run_reactive!(
     roots::Vector{Cell};
     deletion_hook::Function = WorkspaceManager.move_vars,
     user_requested_run::Bool = true,
-	bond_value_pairs=_empty_bond_value_pairs,
+    bond_value_pairs=_empty_bond_value_pairs,
 )::TopologicalOrder
     withtoken(notebook.executetoken) do
         run_reactive_core!(
@@ -45,7 +45,7 @@ function run_reactive!(
             roots;
             deletion_hook,
             user_requested_run,
-			bond_value_pairs
+            bond_value_pairs
         )
     end
 end
@@ -65,7 +65,7 @@ function run_reactive_core!(
     deletion_hook::Function = WorkspaceManager.move_vars,
     user_requested_run::Bool = true,
     already_run::Vector{Cell} = Cell[],
-	bond_value_pairs = _empty_bond_value_pairs,
+    bond_value_pairs = _empty_bond_value_pairs,
 )::TopologicalOrder
     @assert !isready(notebook.executetoken) "run_reactive_core!() was called with a free notebook.executetoken."
     @assert will_run_code(notebook)
@@ -80,8 +80,8 @@ function run_reactive_core!(
         update_dependency_cache!(notebook)
     end
 
-    removed_cells = setdiff(keys(old_topology.nodes), keys(new_topology.nodes))
-    roots = Cell[roots..., removed_cells...]
+    removed_cells = setdiff(all_cells(old_topology), all_cells(new_topology))
+    roots = vcat(roots, removed_cells)
 
     # by setting the reactive node and expression caches of deleted cells to "empty", we are essentially pretending that those cells still exist, but now have empty code. this makes our algorithm simpler.
     new_topology = NotebookTopology(
@@ -97,7 +97,8 @@ function run_reactive_core!(
         cell_order = new_topology.cell_order,
     )
 
-    # save the old topological order - we'll delete variables assigned from it and re-evalutate its cells unless the cells have already run previously in the reactive run
+    # save the old topological order - we'll delete variables assigned from its
+    # and re-evalutate its cells unless the cells have already run previously in the reactive run
     old_order = topological_order(old_topology, roots)
 
     old_runnable = setdiff(old_order.runnable, already_run)
@@ -110,8 +111,8 @@ function run_reactive_core!(
     to_run_raw = setdiff(union(new_runnable, old_runnable), keys(new_order.errable))::Vector{Cell} # TODO: think if old error cell order matters
 
     # find (indirectly) deactivated cells and update their status
-	deactivated = filter(c -> c.metadata["disabled"], notebook.cells)
-    indirectly_deactivated = collect(topological_order(new_topology, deactivated))
+    disabled_cells = filter(is_disabled, notebook.cells)
+    indirectly_deactivated = collect(topological_order(new_topology, disabled_cells))
     for cell in indirectly_deactivated
         cell.running = false
         cell.queued = false
diff --git a/src/notebook/Cell.jl b/src/notebook/Cell.jl
index a76411ae27..a01902699b 100644
--- a/src/notebook/Cell.jl
+++ b/src/notebook/Cell.jl
@@ -1,10 +1,13 @@
 import UUIDs: UUID, uuid1
 import .ExpressionExplorer: SymbolsState, UsingsImports
 
+const METADATA_DISABLED_KEY = "disabled"
+const METADATA_SHOW_LOGS_KEY = "show_logs"
+
 # Make sure to keep this in sync with DEFAULT_CELL_METADATA in ../frontend/components/Editor.js
 const DEFAULT_CELL_METADATA = Dict{String, Any}(
-    "disabled" => false,
-    "show_logs" => true,
+    METADATA_DISABLED_KEY => false,
+    METADATA_SHOW_LOGS_KEY => true,
 )
 
 Base.@kwdef struct CellOutput
@@ -74,5 +77,5 @@ end
 
 
 "Returns whether or not the cell is **explicitely** disabled."
-is_disabled(c::Cell) = get(c.metadata, "disabled", false)
-can_show_logs(c::Cell) = get(c.metadata, "show_logs", true)
+is_disabled(c::Cell) = get(c.metadata, METADATA_DISABLED_KEY, DEFAULT_CELL_METADATA[METADATA_DISABLED_KEY])
+can_show_logs(c::Cell) = get(c.metadata, METADATA_SHOW_LOGS_KEY, DEFAULT_CELL_METADATA[METADATA_SHOW_LOGS_KEY])
diff --git a/src/notebook/saving and loading.jl b/src/notebook/saving and loading.jl
index 19de180031..00a915743d 100644
--- a/src/notebook/saving and loading.jl	
+++ b/src/notebook/saving and loading.jl	
@@ -68,7 +68,7 @@ function save_notebook(io::IO, notebook::Notebook)
             end
         end
         
-        cell_running_disabled = get(c.metadata, "disabled", false)::Bool
+        cell_running_disabled = is_disabled(c)::Bool
         if cell_running_disabled || c.depends_on_disabled_cells
             print(io, _disabled_prefix)
             print(io, replace(c.code, _cell_id_delimiter => "# "))
diff --git a/test/React.jl b/test/React.jl
index 3034b5feeb..bc1599f295 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -159,6 +159,46 @@ import Distributed
         end
     end
 
+    @testset "Simple insert cell" begin
+        notebook = Notebook(Cell[])
+        update_run!(🍭, notebook, notebook.cells)
+
+        insert_cell!(notebook, Cell("a = 1"))
+        update_run!(🍭, notebook, notebook.cells[begin])
+
+        insert_cell!(notebook, Cell("b = 2"))
+        update_run!(🍭, notebook, notebook.cells[begin+1])
+
+        insert_cell!(notebook, Cell("c = 3"))
+        update_run!(🍭, notebook, notebook.cells[begin+2])
+
+        insert_cell!(notebook, Cell("a + b + c"))
+        update_run!(🍭, notebook, notebook.cells[begin+3])
+
+        @test notebook.cells[begin+3].output.body == "6"
+
+        setcode!(notebook.cells[begin+1], "b = 10")
+        update_run!(🍭, notebook, notebook.cells[begin+1])
+
+        @test notebook.cells[begin+3].output.body == "14"
+    end
+
+    @testset "Simple delete cell" begin
+        notebook = Notebook(Cell.([
+            "x = 42",
+            "x",
+        ]))
+        update_run!(🍭, notebook, notebook.cells)
+
+        @test all(noerror, notebook.cells)
+
+        delete_cell!(notebook, notebook.cells[begin])
+        @test length(notebook.cells) == 1
+
+        update_run!(🍭, notebook, Cell[])
+        @test occursinerror("UndefVarError: x", notebook.cells[begin])
+    end
+
     @testset ".. as an identifier" begin
         notebook = Notebook(Cell.([
            ".. = 1",
diff --git a/test/helpers.jl b/test/helpers.jl
index 62bde6cc6f..ee5c51b3e5 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -127,6 +127,16 @@ function easy_symstate(expected_references, expected_definitions, expected_funcc
     SymbolsState(Set(expected_references), Set(expected_definitions), new_expected_funccalls, new_expected_funcdefs, new_expected_macrocalls)
 end
 
+function insert_cell!(notebook, cell)
+    notebook.cells_dict[cell.cell_id] = cell
+    push!(notebook.cell_order, cell.cell_id)
+end
+
+function delete_cell!(notebook, cell)
+    deleteat!(notebook.cell_order, findfirst(==(cell.cell_id), notebook.cell_order))
+    delete!(notebook.cells_dict, cell.cell_id)
+end
+
 function setcode!(cell, newcode)
     cell.code = newcode
 end

From 727b18d277a4c6f4547eaaa4bd90564641fbfc9e Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Tue, 14 Jun 2022 18:54:00 +0200
Subject: [PATCH 374/821] Simplify tuple handling in ExpressionExplorer (#2172)

* Simplify tuple handling in ExpressionExplorer

The Julia syntax `:(a, b = 1, 2)` is not a multiple assignment to a and b
but the constructor for a named tuple (which can be confusing) with fields a, b and 2 (which is
invalid). The conditional handling for multiple assignments and named
tuple can then be removed because multiple assignments will always be
top-level `:(=)`, instead of `:tuple` as though previously.

* Add comment

* comment 2
---
 src/analysis/ExpressionExplorer.jl | 69 ++++++++------------------
 test/ExpressionExplorer.jl         | 78 ++++++++++++++++++++++++------
 2 files changed, 84 insertions(+), 63 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 6512209936..29948a4704 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -702,55 +702,28 @@ end
 function explore_tuple!(ex::Expr, scopestate::ScopeState)::SymbolsState
     # Does not create scope
 
-    # There are three (legal) cases:
+    # There are two (legal) cases:
     # 1. Creating a tuple:
-    #   (a, b, c)
-
-    # 2. Creating a named tuple:
-    #   (a=1, b=2, c=3)
-
-    # 3. Multiple assignments
-    # a,b,c = 1,2,3
-    # This parses to:
-    # head = :tuple
-    # args = [:a, :b, :(c=1), :2, :3]
-    # 
-    # 🤔
-    # we turn it into two expressions:
-    # 
-    # (a, b) = (2, 3)
-    # (c = 1)
-    # 
-    # and explore those :)
-
-    indexoffirstassignment = findfirst(a -> isa(a, Expr) && a.head == :(=), ex.args)
-    if indexoffirstassignment !== nothing
-        # we have one of two cases, see next `if`
-        indexofsecondassignment = findnext(a -> isa(a, Expr) && a.head == :(=), ex.args, indexoffirstassignment + 1)
-
-        if length(ex.args) == 1 || indexofsecondassignment !== nothing
-            # 2.
-            # we have a named tuple, e.g. (a=1, b=2)
-            new_args = map(ex.args) do a
-                (a isa Expr && a.head == :(=)) ? a.args[2] : a
-            end
-            return explore!(Expr(:block, new_args...), scopestate)
-        else
-            # 3. 
-            # we have a tuple assignment, e.g. `a, (b, c) = [1, [2, 3]]`
-            before = ex.args[1:indexoffirstassignment-1]
-            after = ex.args[indexoffirstassignment+1:end]
-
-            symstate_middle = explore!(ex.args[indexoffirstassignment], scopestate)
-            symstate_outer = explore!(Expr(:(=), Expr(:tuple, before...), Expr(:block, after...)), scopestate)
-
-            return union!(symstate_middle, symstate_outer)
-        end
-    else
-        # 1.
-        # good ol' tuple
-        return explore!(Expr(:block, ex.args...), scopestate)
-    end
+    #   (a, b, c, 1, f()...)
+    # 2. Creating a named tuple (contains at least one Expr(:(=))):
+    #   (a=1, b=2, c=3, d, f()...)
+
+    # !!! Note that :(a, b = 1, 2) is the definition of a named tuple
+    # with fields :a, :b and :2 and not a multiple assignments to a and b which
+    # would always be a :(=) with tuples for the lhs and/or rhs.
+    # Using Meta.parse() (like Pluto does) or using a quote block
+    # returns the assignment version.
+    #
+    # julia> eval(:(a, b = 1, 2)) # Named tuple
+    # ERROR: syntax: invalid named tuple element "2"
+    #
+    # julia> eval(Meta.parse("a, b = 1, 2")) # Assignment to a and b
+    # (1, 2)
+    #
+    # julia> Meta.parse("a, b = 1, 2").head, :(a, b = 1, 2).head
+    # (:(=), :tuple)
+
+    return umapfoldl(a -> explore!(to_kw(a), scopestate), ex.args)
 end
 
 function explore_broadcast!(ex::Expr, scopestate::ScopeState)
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index f174112953..df2ce81d03 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -92,12 +92,18 @@ Some of these @test_broken lines are commented out to prevent printing to the te
     @testset "Types" begin
         @test testee(:(x::Foo = 3), [:Foo], [:x], [], [])
         @test testee(:(x::Foo), [:x, :Foo], [], [], [])
-        @test testee(:(a::Foo, b::String = 1, "2"), [:Foo, :String], [:a, :b], [], [])
+        @test testee(quote
+            a::Foo, b::String = 1, "2"
+        end, [:Foo, :String], [:a, :b], [], [])
         @test testee(:(Foo[]), [:Foo], [], [], [])
         @test testee(:(x isa Foo), [:x, :Foo], [], [:isa], [])
 
-        @test testee(:((x[])::Int = 1), [:Int, :x], [], [], [])
-        @test testee(:((x[])::Int, y = 1, 2), [:Int, :x], [:y], [], [])
+        @test testee(quote
+            (x[])::Int = 1
+        end, [:Int, :x], [], [], [])
+        @test testee(quote
+            (x[])::Int, y = 1, 2
+        end, [:Int, :x], [:y], [], [])
 
         @test testee(:(A{B} = B), [], [:A], [], [])
         @test testee(:(A{T} = Union{T,Int}), [:Int, :Union], [:A], [], [])
@@ -142,22 +148,64 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(:(_ = a + 1), [:a], [], [:+], [])
         @test testee(:(a = _ + 1), [], [:a], [:+], [])
     end
+    @testset "Multiple assignments" begin
+        # Note that using the shorthand syntax :(a = 1, b = 2) to create an expression
+        # will automatically return a :tuple Expr and not a multiple assignment
+        # we use quotes instead of this syntax to be sure of what is tested since quotes
+        # would behave the same way as Meta.parse() which Pluto uses to evaluate cell code.
+        ex = quote
+            a, b = 1, 2
+        end
+        @test Meta.isexpr(ex.args[2], :(=))
+
+        @test testee(quote
+            a, b = 1, 2
+        end, [], [:a, :b], [], [])
+        @test testee(quote
+            a, _, c, __ = 1, 2, 3, _d
+        end, [:_d], [:a, :c], [], [])
+        @test testee(quote
+            (a, b) = 1, 2
+        end, [], [:a, :b], [], [])
+        @test testee(quote
+            a = (b, c)
+        end, [:b, :c], [:a], [], [])
+        @test testee(quote
+            a, (b, c) = [e,[f,g]]
+        end, [:e, :f, :g], [:a, :b, :c], [], [])
+        @test testee(quote
+            a, (b, c) = [e,[f,g]]
+        end, [:e, :f, :g], [:a, :b, :c], [], [])
+        @test testee(quote
+            (x, y), a, (b, c) = z, e, (f, g)
+        end, [:z, :e, :f, :g], [:x, :y, :a, :b, :c], [], [])
+        @test testee(quote
+            (x[i], y.r), a, (b, c) = z, e, (f, g)
+        end, [:x, :i, :y, :z, :e, :f, :g], [:a, :b, :c], [], [])
+        @test testee(quote
+            (a[i], b.r) = (c.d, 2)
+        end, [:a, :b, :i, :c], [], [], [])
+        @test testee(quote (; a, b) = x end, [:x], [:a, :b], [], [])
+        @test testee(quote a = (b, c) end, [:b, :c], [:a], [], [])
+
+        @test testee(:(const a, b = 1, 2), [], [:a, :b], [], [])
+    end
     @testset "Tuples" begin
+        ex = :(1, 2, a, b, c)
+        @test Meta.isexpr(ex, :tuple)
+
         @test testee(:((a, b,)), [:a,:b], [], [], [])
+        @test testee(:((a, b, c, 1, 2, 3, :d, f()..., let y = 3 end)), [:a, :b, :c], [], [:f], [])
+
         @test testee(:((a = b, c = 2, d = 123,)), [:b], [], [], [])
+        @test testee(:((a = b, c, d, f()..., let x = (;a = e) end...)), [:b, :c, :d, :e], [], [:f], [])
         @test testee(:((a = b,)), [:b], [], [], [])
-        @test testee(:(a, b = 1, 2), [], [:a, :b], [], [])
-        @test testee(:(a, _, c, __ = 1, 2, 3, _d), [:_d], [:a, :c], [], [])
-        @test testee(:(const a, b = 1, 2), [], [:a, :b], [], [])
-        @test testee(:((a, b) = 1, 2), [], [:a, :b], [], [])
-        @test testee(:(a = b, c), [:b, :c], [:a], [], [])
-        @test testee(:(a, b = c), [:c], [:a, :b], [], [])
-        @test testee(:(a = (b, c)), [:b, :c], [:a], [], [])
-        @test testee(:(a, (b, c) = [e,[f,g]]), [:e, :f, :g], [:a, :b, :c], [], [])
-        @test testee(:((x, y), a, (b, c) = z, e, (f, g)), [:z, :e, :f, :g], [:x, :y, :a, :b, :c], [], [])
-        @test testee(:((x[i], y.r), a, (b, c) = z, e, (f, g)), [:x, :i, :y, :z, :e, :f, :g], [:a, :b, :c], [], [])
-        @test testee(:((a[i], b.r) = (c.d, 2)), [:a, :b, :i, :c], [], [], [])
-        @test testee(:((; a, b) = x), [:x], [:a, :b], [], [])
+        @test testee(:(a = b, c), [:b, :c], [], [], [])
+        @test testee(:(a, b = c), [:a, :c], [], [], [])
+
+        # Invalid named tuples but still parses just fine
+        @test testee(:((a, b = 1, 2)), [:a], [], [], [])
+        @test testee(:((a, b) = 1, 2), [], [], [], [])
     end
     @testset "Broadcasting" begin
         @test testee(:(a .= b), [:b, :a], [], [], []) # modifies elements, doesn't set `a`

From f09af795a906f5e5660d86bef0686e247c2d9606 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Wed, 15 Jun 2022 19:42:29 +0200
Subject: [PATCH 375/821] Update MathJax to 3.2.2 (#2165)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/editor.html |   4 +-
 sample/test1.jl      | 104 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 104 insertions(+), 4 deletions(-)

diff --git a/frontend/editor.html b/frontend/editor.html
index 5db5e29fd4..7d3b795313 100644
--- a/frontend/editor.html
+++ b/frontend/editor.html
@@ -45,7 +45,7 @@
     <script src="./warn_old_browsers.js"></script>
 
     <!-- This script will be enabled by JS after the notebook has initialized to prevent taking up bandwidth during the initial load. -->
-    <script type="text/javascript" id="MathJax-script" integrity="sha384-VNy4JkI16R9GCNiJUCI27sGNe0Sw8gv1ichFHkTMKChXK32eYSMtzAkhFunKJ/fb" crossorigin="anonymous" not-the-src-yet="https://cdn.jsdelivr.net/npm/mathjax@3.1.2/es5/tex-svg-full.js" async></script>
+    <script type="text/javascript" id="MathJax-script" integrity="sha384-4kE/rQ11E8xT9QgrCBTyvenkuPfQo8rXYQvJZuMgxyPOoUfpatjQPlgdv6V5yhUK" crossorigin="anonymous" not-the-src-yet="https://cdn.jsdelivr.net/npm/mathjax@3.2.2/es5/tex-svg-full.js" async></script>
 </head>
 
 <body class="loading no-MαθJax">
@@ -53,4 +53,4 @@
         <pluto-editor class="fullscreen"></pluto-editor>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/sample/test1.jl b/sample/test1.jl
index 7005463cd6..2972e4334f 100644
--- a/sample/test1.jl
+++ b/sample/test1.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.17.5
+# v0.19.8
 
 using Markdown
 using InteractiveUtils
@@ -45,6 +45,7 @@ md"## Stopping cells"
 md"# CodeMirror"
 
 # ╔═╡ bc5bf64e-8b47-45ac-baf2-3cbb8e35d916
+# (this code should error)
 """
 Some sample code from https://juliamono.netlify.app/
 """
@@ -451,6 +452,94 @@ Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem
 # ╔═╡ 4e320206-d682-11ea-3dfe-b77f6e96f33a
 Text(s)
 
+# ╔═╡ f16e48a7-f1db-4f15-a013-3d509b2f93ea
+md"""
+# LaTeX math
+"""
+
+# ╔═╡ c3ae2fd1-628b-4876-9253-053805c47295
+md"""
+This should be centered:
+
+$$T^{n+1}_i = \kappa (T^n_{i-1} - 2 T^n_i + T^n_{i+1}).$$
+
+and should look exactly the same as:
+
+```math
+T^{n+1}_i = \kappa (T^n_{i-1} - 2 T^n_i + T^n_{i+1}).
+```
+
+this should be on the left:
+
+ $T^{n+1}_i = \kappa (T^n_{i-1} - 2 T^n_i + T^n_{i+1}).$
+"""
+
+# ╔═╡ ae4ab84b-ed29-4e09-b9c3-049d287e8c60
+md"""
+This z``\alpha``z and z$\alpha$z should look the same.
+"""
+
+# ╔═╡ 4b44cf5b-cac3-4283-b156-7adfce878228
+md"""
+> Calling `T` the current vector, i.e. $\mathbf{T}^n := (T^n_i)_{i=1, \ldots, N_x}$, and `T′` the new vector at the next time step, we have the following basic expression, for the ``i``th element.
+"""
+
+# ╔═╡ a10b9a7c-33d6-447e-99c0-c96a43fb3c6f
+md"""
+$$\begin{aligned}
+\dot{x} &= a + x^2 y - bx - x \\
+\dot{y} &= b x - x^2 y
+\end{aligned}$$
+"""
+
+# ╔═╡ ec741d6c-b148-4929-8805-2cd93ce6fca7
+md"""
+## Extensions
+"""
+
+# ╔═╡ 1d10093f-3256-46a8-b0d4-5186092825e2
+md"""
+### `mchem`
+Here is a chemical reaction: ``\ce{CO2 + C -> 2 CO}``. And another one:
+
+```math
+\ce{Hg^2+ ->[I-]  $\underset{\mathrm{red}}{\ce{HgI2}}$  ->[I-]  $\underset{\mathrm{red}}{\ce{[Hg^{II}I4]^2-}}$}
+```
+"""
+
+# ╔═╡ 7376d9e9-5740-4b67-9e8e-a2447e2c17cf
+html"""
+<p>This should look like a centered, black version of</p>
+<img width="309" alt="image" src="https://user-images.githubusercontent.com/6933510/173889771-d2bd046a-4d18-4c76-9577-36f6dcab9d1c.png">
+
+"""
+
+# ╔═╡ d61ed468-4922-4d7b-b7f1-475e17bcd1e4
+md"""
+### `cases`
+```math
+\begin{numcases} {|x|=}
+x, & for $x \geq 0$\\
+-x, & for $x < 0$
+\end{numcases}
+```
+"""
+
+# ╔═╡ 9d4c1242-cea0-4e76-8554-de0e05938de3
+md"""
+### `physics`
+```math
+\require{physics}
+\principalvalue hysics
+```
+"""
+
+# ╔═╡ fe97e64f-9de6-46aa-bdb4-a1d6e2f61297
+md"""
+### `color`
+``\color{red}{i\ am\ red}``
+"""
+
 # ╔═╡ 1bb05fc0-b15d-11ea-3dae-7734f66a0c56
 md"# Testing machinery"
 
@@ -703,7 +792,7 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 # ╔═╡ Cell order:
 # ╟─ce7f9d90-b163-11ea-0ff7-cf7378644741
 # ╠═878a4750-b15e-11ea-2584-8feba490699f
-# ╟─fd0763a0-b163-11ea-23b4-a7bae7052e19
+# ╠═fd0763a0-b163-11ea-23b4-a7bae7052e19
 # ╟─11f3ae90-b164-11ea-1027-0d2e6e7048dd
 # ╟─26d2b310-b164-11ea-0029-f7b04ee5ba73
 # ╟─1c6229f0-b165-11ea-0f1d-674022c43971
@@ -815,6 +904,17 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 # ╟─46fc284a-d682-11ea-34b6-69874efcaf65
 # ╟─4d452956-d682-11ea-3aeb-cd7d1b2f67dc
 # ╠═4e320206-d682-11ea-3dfe-b77f6e96f33a
+# ╟─f16e48a7-f1db-4f15-a013-3d509b2f93ea
+# ╟─c3ae2fd1-628b-4876-9253-053805c47295
+# ╟─ae4ab84b-ed29-4e09-b9c3-049d287e8c60
+# ╟─4b44cf5b-cac3-4283-b156-7adfce878228
+# ╟─a10b9a7c-33d6-447e-99c0-c96a43fb3c6f
+# ╟─ec741d6c-b148-4929-8805-2cd93ce6fca7
+# ╟─1d10093f-3256-46a8-b0d4-5186092825e2
+# ╟─7376d9e9-5740-4b67-9e8e-a2447e2c17cf
+# ╟─d61ed468-4922-4d7b-b7f1-475e17bcd1e4
+# ╟─9d4c1242-cea0-4e76-8554-de0e05938de3
+# ╟─fe97e64f-9de6-46aa-bdb4-a1d6e2f61297
 # ╟─1bb05fc0-b15d-11ea-3dae-7734f66a0c56
 # ╠═9ac925d0-b15d-11ea-2abd-7db360900be0
 # ╠═7e2cc6c0-b15d-11ea-32b0-15394cdebd35

From 4d3410763000e7241c093b90198297401f81805e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 15 Jun 2022 23:27:34 +0200
Subject: [PATCH 376/821] Request autocompletions for latex on launch, this
 time really

cc @rikhuijzer
---
 frontend/components/Editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index bf002bd4d5..8c64c0643a 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -779,7 +779,7 @@ patch: ${JSON.stringify(
 
             // TODO Do this from julia itself
             this.client.send("complete", { query: "sq" }, { notebook_id: this.state.notebook.notebook_id })
-            this.client.send("complete", { query: "\sq" }, { notebook_id: this.state.notebook.notebook_id })
+            this.client.send("complete", { query: "\\sq" }, { notebook_id: this.state.notebook.notebook_id })
 
             setTimeout(init_feedback, 2 * 1000) // 2 seconds - load feedback a little later for snappier UI
         }

From 128d51c361f3d38027e673ac4c6825cc2f7e32e6 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 15 Jun 2022 23:37:18 +0200
Subject: [PATCH 377/821] context menu: copy output hover help

---
 frontend/components/CellInput.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 346c1b418f..b52baf7a59 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -884,7 +884,11 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, running_disabled, any_
                                 : html`<span class="show_logs ctx_icon" /><span>Show logs</span>`}
                         </li>`
                       : null}
-                  ${is_copy_output_supported() ? html`<li title="" onClick=${copy_output}><span class="copy_output ctx_icon" />Copy output</li>` : null}
+                  ${is_copy_output_supported()
+                      ? html`<li title="Copy the output of this cell to the clipboard." onClick=${copy_output}>
+                            <span class="copy_output ctx_icon" />Copy output
+                        </li>`
+                      : null}
                   <li class="coming_soon" title=""><span class="bandage ctx_icon" /><em>Coming soon…</em></li>
               </ul>`
             : html``}

From dc30133bb1558773cf22cb5e6d456c4c9044a988 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Jun 2022 00:15:02 +0200
Subject: [PATCH 378/821] Improve configuration docs

---
 frontend/common/PlutoConnection.js |  2 +-
 src/Configuration.jl               | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/frontend/common/PlutoConnection.js b/frontend/common/PlutoConnection.js
index 71693e5d21..4d5156d8f3 100644
--- a/frontend/common/PlutoConnection.js
+++ b/frontend/common/PlutoConnection.js
@@ -243,7 +243,7 @@ const default_ws_address = () => ws_address_from_base(window.location.href)
 /**
  * @typedef PlutoConnection
  * @type {{
- *  session_options: Object,
+ *  session_options: Record<string,any>,
  *  send: import("./PlutoConnectionSendFn").SendFn,
  *  kill: () => void,
  *  version_info: {
diff --git a/src/Configuration.jl b/src/Configuration.jl
index a7cdd26cdb..e211de4ef9 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -33,6 +33,7 @@ const PORT_DEFAULT = nothing
 const LAUNCH_BROWSER_DEFAULT = true
 const DISMISS_UPDATE_NOTIFICATION_DEFAULT = false
 const SHOW_FILE_SYSTEM_DEFAULT = true
+const ENABLE_PACKAGE_AUTHOR_FEATURES_DEFAULT = true
 const DISABLE_WRITING_NOTEBOOK_FILES_DEFAULT = false
 const AUTO_RELOAD_FROM_FILE_DEFAULT = false
 const AUTO_RELOAD_FROM_FILE_COOLDOWN_DEFAULT = 0.4
@@ -49,13 +50,12 @@ const ON_EVENT_DEFAULT = function(a) #= @info "$(typeof(a))" =# end
 
 The HTTP server options. See [`SecurityOptions`](@ref) for additional settings.
 
-# Arguments
+# Keyword arguments
 
-- `root_url::Union{Nothing,String} = $ROOT_URL_DEFAULT`
-- `host::String = "$HOST_DEFAULT"`
-- `port::Union{Nothing,Integer} = $PORT_DEFAULT`
+- `host::String = "$HOST_DEFAULT"` Set to `"127.0.0.1"` (default) to run on *localhost*, which makes the server available to your computer and the local network (LAN). Set to `"0.0.0.0"` to make the server available to the entire network (internet).
+- `port::Union{Nothing,Integer} = $PORT_DEFAULT` When specified, this port will be used for the server.
 - `launch_browser::Bool = $LAUNCH_BROWSER_DEFAULT`
-- `dismiss_update_notification::Bool = $DISMISS_UPDATE_NOTIFICATION_DEFAULT`
+- `dismiss_update_notification::Bool = $DISMISS_UPDATE_NOTIFICATION_DEFAULT` If `false`, the Pluto frontend will check the Pluto.jl github releases for any new recommended updates, and show a notification if there are any. If `true`, this is disabled.
 - `show_file_system::Bool = $SHOW_FILE_SYSTEM_DEFAULT`
 - `notebook_path_suggestion::String = notebook_path_suggestion()`
 - `disable_writing_notebook_files::Bool = $DISABLE_WRITING_NOTEBOOK_FILES_DEFAULT`
@@ -68,6 +68,7 @@ The HTTP server options. See [`SecurityOptions`](@ref) for additional settings.
 - `simulated_pkg_lag::Real=$SIMULATED_PKG_LAG_DEFAULT` (internal) Extra lag to add to operations done by Pluto's package manager. Will be multiplied by `0.5 + rand()`.
 - `injected_javascript_data_url::String = "$INJECTED_JAVASCRIPT_DATA_URL_DEFAULT"` (internal) Optional javascript injectables to the front-end. Can be used to customize the editor, but this API is not meant for general use yet.
 - `on_event::Function = $ON_EVENT_DEFAULT`
+- `root_url::Union{Nothing,String} = $ROOT_URL_DEFAULT` This setting is used to specify the root URL of the Pluto server, but this setting is *only* used to customize the launch message (*"Go to http://localhost:1234/ in your browser"*). You can probably ignore this.
 """
 @option mutable struct ServerOptions
     root_url::Union{Nothing,String} = ROOT_URL_DEFAULT
@@ -90,7 +91,7 @@ The HTTP server options. See [`SecurityOptions`](@ref) for additional settings.
 end
 
 const REQUIRE_SECRET_FOR_OPEN_LINKS_DEFAULT = true
-const REQUIRE_SECRET_FOR_ACESS_DEFAULT = true
+const REQUIRE_SECRET_FOR_ACCESS_DEFAULT = true
 
 """
     SecurityOptions([; kwargs...])
@@ -105,7 +106,7 @@ Security settings for the HTTP server.
 
     Use `true` for almost every setup. Only use `false` if Pluto is running in a safe container (like mybinder.org), where arbitrary code execution is not a problem.
 
-- `require_secret_for_access::Bool = $REQUIRE_SECRET_FOR_ACESS_DEFAULT`
+- `require_secret_for_access::Bool = $REQUIRE_SECRET_FOR_ACCESS_DEFAULT`
 
     If false, you do not need to use a `secret` in the URL to access Pluto: you will be authenticated by visiting `http://localhost:1234/` in your browser. An authentication cookie is still used for access (to prevent XSS and deceptive links or an img src to `http://localhost:1234/open?url=badpeople.org/script.jl`), and is set automatically, but this request to `/` is protected by cross-origin policy.
 
@@ -117,7 +118,7 @@ Note that Pluto is quickly evolving software, maintained by designers, educators
 """
 @option mutable struct SecurityOptions
     require_secret_for_open_links::Bool = REQUIRE_SECRET_FOR_OPEN_LINKS_DEFAULT
-    require_secret_for_access::Bool = REQUIRE_SECRET_FOR_ACESS_DEFAULT
+    require_secret_for_access::Bool = REQUIRE_SECRET_FOR_ACCESS_DEFAULT
 end
 
 const RUN_NOTEBOOK_ON_LOAD_DEFAULT = true
@@ -231,7 +232,7 @@ function from_flat_kwargs(;
         injected_javascript_data_url::String = INJECTED_JAVASCRIPT_DATA_URL_DEFAULT,
         on_event::Function = ON_EVENT_DEFAULT,
         require_secret_for_open_links::Bool = REQUIRE_SECRET_FOR_OPEN_LINKS_DEFAULT,
-        require_secret_for_access::Bool = REQUIRE_SECRET_FOR_ACESS_DEFAULT,
+        require_secret_for_access::Bool = REQUIRE_SECRET_FOR_ACCESS_DEFAULT,
         run_notebook_on_load::Bool = RUN_NOTEBOOK_ON_LOAD_DEFAULT,
         workspace_use_distributed::Bool = WORKSPACE_USE_DISTRIBUTED_DEFAULT,
         lazy_workspace_creation::Bool = LAZY_WORKSPACE_CREATION_DEFAULT,

From c21290a7e23aace544d3c5fefca2ac6a4e4e34c5 Mon Sep 17 00:00:00 2001
From: Alberto Mengali <disberd@gmail.com>
Date: Thu, 16 Jun 2022 00:40:58 +0200
Subject: [PATCH 379/821] Implement @skip_as_script functionality inside cell
 metadata (#2018)

Co-authored-by: Paul Berg <naydex.mc+github@gmail.com>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/Cell.js        | 32 +++++++++++++-----
 frontend/components/CellInput.js   | 23 +++++++++++--
 frontend/components/Editor.js      | 14 +++++---
 frontend/components/Notebook.js    |  4 +--
 frontend/dark_color.css            |  1 +
 frontend/editor.css                | 24 ++++++++++++--
 frontend/light_color.css           |  1 +
 src/notebook/Cell.jl               |  3 ++
 src/notebook/saving and loading.jl |  3 +-
 test/Notebook.jl                   | 53 ++++++++++++++++++++++++++++++
 10 files changed, 137 insertions(+), 21 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 644dd143f8..d42fb3c572 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -7,6 +7,7 @@ import { Logs } from "./Logs.js"
 import { RunArea, useDebouncedTruth } from "./RunArea.js"
 import { cl } from "../common/ClassTable.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
+import { open_pluto_popup } from "./Popup.js"
 
 const useCellApi = (node_ref, published_object_keys, pluto_actions) => {
     const [cell_api_ready, set_cell_api_ready] = useState(false)
@@ -55,7 +56,7 @@ export const Cell = ({
     nbpkg,
     global_definition_locations,
 }) => {
-    const { show_logs, disabled: running_disabled } = metadata
+    const { show_logs, disabled: running_disabled, skip_as_script } = metadata
     let pluto_actions = useContext(PlutoActionsContext)
     const on_update_doc_query = pluto_actions.set_doc_query
     const on_focus_neighbor = pluto_actions.focus_on_neighbor
@@ -159,15 +160,16 @@ export const Cell = ({
             ref=${node_ref}
             class=${cl({
                 queued: queued || (waiting_to_run && is_process_ready),
-                running: running,
-                activate_animation: activate_animation,
-                errored: errored,
-                selected: selected,
+                running,
+                activate_animation,
+                errored,
+                selected,
                 code_differs: class_code_differs,
                 code_folded: class_code_folded,
-                running_disabled: running_disabled,
-                depends_on_disabled_cells: depends_on_disabled_cells,
-                show_input: show_input,
+                skip_as_script,
+                running_disabled,
+                depends_on_disabled_cells,
+                show_input,
                 shrunk: Object.values(logs).length > 0,
                 hooked_up: output?.has_pluto_hook_features ?? false,
             })}
@@ -240,6 +242,20 @@ export const Cell = ({
             >
                 <span></span>
             </button>
+            ${skip_as_script
+                ? html`<div
+                      class="skip_as_script_marker"
+                      title=${`This cell is currently stored in the notebook file as a Julia comment, instead of code. This way, it will not run when the notebook runs as a script outside of Pluto.`}
+                      onClick=${(e) => {
+                          open_pluto_popup({
+                              type: "info",
+                              source_element: e.target,
+                              body: html`This cell is currently stored in the notebook file as a Julia <em>comment</em>, instead of <em>code</em>.<br />
+                                  This way, it will not run when the notebook runs as a script outside of Pluto.`,
+                          })
+                      }}
+                  ></div>`
+                : null}
         </pluto-cell>
     `
 }
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index b52baf7a59..4fcac96f82 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -375,7 +375,7 @@ export const CellInput = ({
     global_definition_locations,
 }) => {
     let pluto_actions = useContext(PlutoActionsContext)
-    const { disabled: running_disabled } = metadata
+    const { disabled: running_disabled, skip_as_script } = metadata
 
     const newcm_ref = useRef(/** @type {EditorView?} */ (null))
     const dom_node_ref = useRef(/** @type {HTMLElement?} */ (null))
@@ -814,6 +814,7 @@ export const CellInput = ({
                 on_delete=${on_delete}
                 cell_id=${cell_id}
                 run_cell=${on_submit}
+                skip_as_script=${skip_as_script}
                 running_disabled=${running_disabled}
                 any_logs=${any_logs}
                 show_logs=${show_logs}
@@ -823,13 +824,21 @@ export const CellInput = ({
     `
 }
 
-const InputContextMenu = ({ on_delete, cell_id, run_cell, running_disabled, any_logs, show_logs, set_show_logs }) => {
+const InputContextMenu = ({ on_delete, cell_id, run_cell, skip_as_script, running_disabled, any_logs, show_logs, set_show_logs }) => {
     const timeout = useRef(null)
     let pluto_actions = useContext(PlutoActionsContext)
     const [open, setOpen] = useState(false)
     const mouseenter = () => {
         if (timeout.current) clearTimeout(timeout.current)
     }
+    const toggle_skip_as_script = async (e) => {
+        const new_val = !skip_as_script
+        e.preventDefault()
+        // e.stopPropagation()
+        await pluto_actions.update_notebook((notebook) => {
+            notebook.cell_inputs[cell_id].metadata["skip_as_script"] = new_val
+        })
+    }
     const toggle_running_disabled = async (e) => {
         const new_val = !running_disabled
         e.preventDefault()
@@ -889,7 +898,15 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, running_disabled, any_
                             <span class="copy_output ctx_icon" />Copy output
                         </li>`
                       : null}
-                  <li class="coming_soon" title=""><span class="bandage ctx_icon" /><em>Coming soon…</em></li>
+                  <li
+                      onClick=${toggle_skip_as_script}
+                      title=${skip_as_script
+                          ? "This cell is currently stored in the notebook file as a Julia comment. Click here to disable."
+                          : "Store this code in the notebook file as a Julia comment. This way, it will not run when the notebook runs as a script outside of Pluto."}
+                  >
+                      ${skip_as_script ? html`<span class="skip_as_script ctx_icon" />` : html`<span class="run_as_script ctx_icon" />`}
+                      ${skip_as_script ? html`<b>Enable in file</b>` : html`Disable in file`}
+                  </li>
               </ul>`
             : html``}
     </button>`
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 8c64c0643a..c265fed812 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -41,9 +41,11 @@ export const default_path = "..."
 const DEBUG_DIFFING = false
 
 // Be sure to keep this in sync with DEFAULT_CELL_METADATA in Cell.jl
+/** @type {CellMetaData} */
 const DEFAULT_CELL_METADATA = {
     disabled: false,
     show_logs: true,
+    skip_as_script: false,
 }
 
 // from our friends at https://stackoverflow.com/a/2117523
@@ -104,15 +106,19 @@ const first_true_key = (obj) => {
 }
 
 /**
+ * @typedef CellMetaData
+ * @type {{
+ *    disabled: boolean,
+ *    show_logs: boolean,
+ *    skip_as_script: boolean
+ *  }}
+ *
  * @typedef CellInputData
  * @type {{
  *  cell_id: string,
  *  code: string,
  *  code_folded: boolean,
- *  metadata: {
- *    disabled: boolean,
- *    show_logs: boolean,
- *  },
+ *  metadata: CellMetaData,
  * }}
  */
 
diff --git a/frontend/components/Notebook.js b/frontend/components/Notebook.js
index d208b225a7..c97af65383 100644
--- a/frontend/components/Notebook.js
+++ b/frontend/components/Notebook.js
@@ -63,8 +63,8 @@ let CellMemo = ({
     }, [
         // Object references may invalidate this faster than the optimal. To avoid this, spread out objects to primitives!
         cell_id,
-        metadata.disabled,
-        metadata.show_logs,
+        ...Object.keys(metadata),
+        ...Object.values(metadata),
         depends_on_disabled_cells,
         queued,
         running,
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index 51cbe22b99..85d722c801 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -59,6 +59,7 @@
         --selected-cell-bg-color: rgb(42 115 205 / 78%);
         --hover-scrollbar-color-1: rgba(0, 0, 0, 0.15);
         --hover-scrollbar-color-2: rgba(0, 0, 0, 0.05);
+        --skip-as-script-border-color: #888;
 
         /* Pluto shoulders */
         --shoulder-hover-bg-color: rgba(255, 255, 255, 0.05);
diff --git a/frontend/editor.css b/frontend/editor.css
index 06a2722d04..93978ededc 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1109,6 +1109,19 @@ pluto-cell.running_disabled > pluto-output {
     background-color: var(--disabled-cell-bg-color);
 }
 
+/* SKIP AS SCRIPT CELLS */
+pluto-cell.skip_as_script .skip_as_script_marker {
+    display: block;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    cursor: help;
+    right: -4.85px;
+    border-radius: 5px;
+    border-right: 5px solid var(--skip-as-script-border-color);
+}
+
 /* SELECTION */
 
 pluto-cell.selected {
@@ -1531,13 +1544,13 @@ pluto-cell > button.add_cell > span::after {
     filter: var(--image-filters);
 }
 pluto-input > button.input_context_menu ul {
-    --width: 156px;
     left: 100%;
     top: -8px;
     margin: 0;
     padding: 0px;
     border-radius: 6px;
-    display: block;
+    display: grid;
+    grid-template-columns: max-content;
     position: absolute;
     border: 1px solid var(--input-context-menu-border-color);
     background-color: var(--input-context-menu-bg-color);
@@ -1564,7 +1577,6 @@ pluto-input > button.input_context_menu ul {
     position: relative;
     list-style: none;
     padding: 8px;
-    width: var(--width);
     height: 32px;
     display: flex;
     align-items: center;
@@ -1632,6 +1644,12 @@ pluto-input > button.input_context_menu ul {
 .ctx_icon.delete {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-circle-outline.svg");
 }
+.ctx_icon.run_as_script {
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-lock-outline.svg");
+}
+.ctx_icon.skip_as_script {
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg");
+}
 
 .ctx_icon.copy_output {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/copy-outline.svg");
diff --git a/frontend/light_color.css b/frontend/light_color.css
index fa33f154a7..de08581241 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -62,6 +62,7 @@
         --selected-cell-bg-color: rgba(40, 78, 189, 0.24);
         --hover-scrollbar-color-1: rgba(0, 0, 0, 0.15);
         --hover-scrollbar-color-2: rgba(0, 0, 0, 0.05);
+        --skip-as-script-border-color: #ccc;
 
         /* Pluto shoulders */
         --shoulder-hover-bg-color: rgba(0, 0, 0, 0.05);
diff --git a/src/notebook/Cell.jl b/src/notebook/Cell.jl
index a01902699b..d3bfbed267 100644
--- a/src/notebook/Cell.jl
+++ b/src/notebook/Cell.jl
@@ -3,11 +3,13 @@ import .ExpressionExplorer: SymbolsState, UsingsImports
 
 const METADATA_DISABLED_KEY = "disabled"
 const METADATA_SHOW_LOGS_KEY = "show_logs"
+const METADATA_SKIP_AS_SCRIPT_KEY = "skip_as_script"
 
 # Make sure to keep this in sync with DEFAULT_CELL_METADATA in ../frontend/components/Editor.js
 const DEFAULT_CELL_METADATA = Dict{String, Any}(
     METADATA_DISABLED_KEY => false,
     METADATA_SHOW_LOGS_KEY => true,
+    METADATA_SKIP_AS_SCRIPT_KEY => false,
 )
 
 Base.@kwdef struct CellOutput
@@ -79,3 +81,4 @@ end
 "Returns whether or not the cell is **explicitely** disabled."
 is_disabled(c::Cell) = get(c.metadata, METADATA_DISABLED_KEY, DEFAULT_CELL_METADATA[METADATA_DISABLED_KEY])
 can_show_logs(c::Cell) = get(c.metadata, METADATA_SHOW_LOGS_KEY, DEFAULT_CELL_METADATA[METADATA_SHOW_LOGS_KEY])
+is_skipped_as_script(c::Cell) = get(c.metadata, METADATA_SKIP_AS_SCRIPT_KEY, DEFAULT_CELL_METADATA[METADATA_SKIP_AS_SCRIPT_KEY])
diff --git a/src/notebook/saving and loading.jl b/src/notebook/saving and loading.jl
index 00a915743d..5fd47c0da5 100644
--- a/src/notebook/saving and loading.jl	
+++ b/src/notebook/saving and loading.jl	
@@ -69,7 +69,8 @@ function save_notebook(io::IO, notebook::Notebook)
         end
         
         cell_running_disabled = is_disabled(c)::Bool
-        if cell_running_disabled || c.depends_on_disabled_cells
+        cell_skip_as_script = is_skipped_as_script(c)::Bool
+        if cell_skip_as_script || cell_running_disabled || c.depends_on_disabled_cells
             print(io, _disabled_prefix)
             print(io, replace(c.code, _cell_id_delimiter => "# "))
             print(io, _disabled_suffix)
diff --git a/test/Notebook.jl b/test/Notebook.jl
index f3d2ef4016..dfc93fefee 100644
--- a/test/Notebook.jl
+++ b/test/Notebook.jl
@@ -46,6 +46,34 @@ function cell_metadata_notebook()
     ]) |> init_packages!
 end
 
+function ingredients(path::String)
+	# this is from the Julia source code (evalfile in base/loading.jl)
+	# but with the modification that it returns the module instead of the last object
+	name = Symbol(basename(path))
+	m = Module(name)
+	Core.eval(m,
+        Expr(:toplevel,
+             :(eval(x) = $(Expr(:core, :eval))($name, x)),
+             :(include(x) = $(Expr(:top, :include))($name, x)),
+             :(include(mapexpr::Function, x) = $(Expr(:top, :include))(mapexpr, $name, x)),
+             :(include($path))))
+	m
+end
+
+function skip_as_script_notebook()
+    Notebook([
+        Cell(
+            code="skipped_var = 10",
+            metadata=Dict(
+                "skip_as_script" => true,
+            ) |> create_cell_metadata,
+        ),
+        Cell(
+            code="non_skipped_var = 15",
+        ),
+    ]) |> init_packages!
+end
+
 function notebook_metadata_notebook()
     nb = Notebook([
         Cell(code="n * (n + 1) / 2"),
@@ -238,6 +266,31 @@ end
         
         WorkspaceManager.unmake_workspace((🍭, nb); verbose=false)
     end
+
+    @testset "Skip as script" begin
+        🍭 = ServerSession()
+        🍭.options.evaluation.workspace_use_distributed = false
+        fakeclient = ClientSession(:fake, nothing)
+        🍭.connected_clients[fakeclient.id] = fakeclient
+
+        nb = skip_as_script_notebook()
+        update_run!(🍭, nb, nb.cells)
+
+        save_notebook(nb)
+
+        m = ingredients(nb.path)
+        @test !isdefined(m, :skipped_var)
+        @test m.non_skipped_var == 15
+        
+        nb.cells[1].metadata["skip_as_script"] = false
+        save_notebook(nb)
+
+        m = ingredients(nb.path)
+        @test m.skipped_var == 10
+        @test m.non_skipped_var == 15        
+        
+        WorkspaceManager.unmake_workspace((🍭, nb); verbose=false)
+    end
     
     @testset "More Metadata" begin
         test_file_contents = """

From 20cac72b1e3bd120b364343ee6afafd42b0b3477 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Jun 2022 01:25:42 +0200
Subject: [PATCH 380/821] Allow customizing the :1234 "port hint" (#2173)

---
 src/Configuration.jl       | 5 +++++
 src/webserver/WebServer.jl | 7 ++++---
 test/webserver.jl          | 6 +++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index e211de4ef9..5ae65b5143 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -30,6 +30,7 @@ end
 const ROOT_URL_DEFAULT = nothing
 const HOST_DEFAULT = "127.0.0.1"
 const PORT_DEFAULT = nothing
+const PORT_HINT_DEFAULT = 1234
 const LAUNCH_BROWSER_DEFAULT = true
 const DISMISS_UPDATE_NOTIFICATION_DEFAULT = false
 const SHOW_FILE_SYSTEM_DEFAULT = true
@@ -54,6 +55,7 @@ The HTTP server options. See [`SecurityOptions`](@ref) for additional settings.
 
 - `host::String = "$HOST_DEFAULT"` Set to `"127.0.0.1"` (default) to run on *localhost*, which makes the server available to your computer and the local network (LAN). Set to `"0.0.0.0"` to make the server available to the entire network (internet).
 - `port::Union{Nothing,Integer} = $PORT_DEFAULT` When specified, this port will be used for the server.
+- `port_hint::Integer = $PORT_HINT_DEFAULT` If the other setting `port` is not specified, then this setting (`port_hint`) will be used as the starting point in finding an available port to run the server on. 
 - `launch_browser::Bool = $LAUNCH_BROWSER_DEFAULT`
 - `dismiss_update_notification::Bool = $DISMISS_UPDATE_NOTIFICATION_DEFAULT` If `false`, the Pluto frontend will check the Pluto.jl github releases for any new recommended updates, and show a notification if there are any. If `true`, this is disabled.
 - `show_file_system::Bool = $SHOW_FILE_SYSTEM_DEFAULT`
@@ -74,6 +76,7 @@ The HTTP server options. See [`SecurityOptions`](@ref) for additional settings.
     root_url::Union{Nothing,String} = ROOT_URL_DEFAULT
     host::String = HOST_DEFAULT
     port::Union{Nothing,Integer} = PORT_DEFAULT
+    port_hint::Integer = PORT_HINT_DEFAULT
     launch_browser::Bool = LAUNCH_BROWSER_DEFAULT
     dismiss_update_notification::Bool = DISMISS_UPDATE_NOTIFICATION_DEFAULT
     show_file_system::Bool = SHOW_FILE_SYSTEM_DEFAULT
@@ -217,6 +220,7 @@ function from_flat_kwargs(;
         root_url::Union{Nothing,String} = ROOT_URL_DEFAULT,
         host::String = HOST_DEFAULT,
         port::Union{Nothing,Integer} = PORT_DEFAULT,
+        port_hint::Integer = PORT_HINT_DEFAULT,
         launch_browser::Bool = LAUNCH_BROWSER_DEFAULT,
         dismiss_update_notification::Bool = DISMISS_UPDATE_NOTIFICATION_DEFAULT,
         show_file_system::Bool = SHOW_FILE_SYSTEM_DEFAULT,
@@ -250,6 +254,7 @@ function from_flat_kwargs(;
         root_url,
         host,
         port,
+        port_hint,
         launch_browser,
         dismiss_update_notification,
         show_file_system,
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index fdf1942204..5f967ba4bc 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -112,10 +112,10 @@ end
 const is_first_run = Ref(true)
 
 "Return a port and serversocket to use while taking into account the `favourite_port`."
-function port_serversocket(hostIP::Sockets.IPAddr, favourite_port)
+function port_serversocket(hostIP::Sockets.IPAddr, favourite_port, port_hint)
     local port, serversocket
     if favourite_port === nothing
-        port, serversocket = Sockets.listenany(hostIP, UInt16(1234))
+        port, serversocket = Sockets.listenany(hostIP, UInt16(port_hint))
     else
         port = UInt16(favourite_port)
         try
@@ -143,8 +143,9 @@ function run(session::ServerSession, pluto_router)
     host = session.options.server.host
     hostIP = parse(Sockets.IPAddr, host)
     favourite_port = session.options.server.port
+    port_hint = session.options.server.port_hint
 
-    local port, serversocket = port_serversocket(hostIP, favourite_port)
+    local port, serversocket = port_serversocket(hostIP, favourite_port, port_hint)
 
     shutdown_server = Ref{Function}(() -> ())
 
diff --git a/test/webserver.jl b/test/webserver.jl
index 7ff4777212..bbf68fd9ef 100644
--- a/test/webserver.jl
+++ b/test/webserver.jl
@@ -10,7 +10,11 @@ using Pluto.WorkspaceManager: WorkspaceManager, poll
 
 
 @testset "Exports" begin
-    @inferred Pluto.port_serversocket(Sockets.ip"0.0.0.0", nothing)
+    port, socket = 
+        @inferred Pluto.port_serversocket(Sockets.ip"0.0.0.0", nothing, 5543) 
+    
+    close(socket)
+    @test 5543 <= port < 5600
 
     port = 13432
     host = "localhost"

From 4e7a48d7087036f40d03e88f51bb830fa90a1516 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Jun 2022 11:49:29 +0200
Subject: [PATCH 381/821] Only enable the skip_as_script feature behind a flag

---
 frontend/components/CellInput.js | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 4fcac96f82..598a5576dc 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -66,6 +66,7 @@ import { debug_syntax_plugin } from "./CellInput/debug_syntax_plugin.js"
 import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
 
 export const ENABLE_CM_MIXED_PARSER = window.localStorage.getItem("ENABLE_CM_MIXED_PARSER") === "true"
+export const ENABLE_SKIP_AS_SCRIPT = window.localStorage.getItem("ENABLE_SKIP_AS_SCRIPT") === "true"
 
 if (ENABLE_CM_MIXED_PARSER) {
     console.log(`YOU ENABLED THE CODEMIRROR MIXED LANGUAGE PARSER
@@ -81,6 +82,11 @@ window.PLUTO_TOGGLE_CM_MIXED_PARSER = () => {
     window.localStorage.setItem("ENABLE_CM_MIXED_PARSER", String(!ENABLE_CM_MIXED_PARSER))
     window.location.reload()
 }
+// @ts-ignore
+window.PLUTO_TOGGLE_SKIP_AS_SCRIPT = () => {
+    window.localStorage.setItem("ENABLE_SKIP_AS_SCRIPT", String(!ENABLE_SKIP_AS_SCRIPT))
+    window.location.reload()
+}
 
 export const pluto_syntax_colors = HighlightStyle.define(
     [
@@ -898,15 +904,17 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, skip_as_script, runnin
                             <span class="copy_output ctx_icon" />Copy output
                         </li>`
                       : null}
-                  <li
-                      onClick=${toggle_skip_as_script}
-                      title=${skip_as_script
-                          ? "This cell is currently stored in the notebook file as a Julia comment. Click here to disable."
-                          : "Store this code in the notebook file as a Julia comment. This way, it will not run when the notebook runs as a script outside of Pluto."}
-                  >
-                      ${skip_as_script ? html`<span class="skip_as_script ctx_icon" />` : html`<span class="run_as_script ctx_icon" />`}
-                      ${skip_as_script ? html`<b>Enable in file</b>` : html`Disable in file`}
-                  </li>
+                  ${ENABLE_SKIP_AS_SCRIPT || skip_as_script
+                      ? html`<li
+                            onClick=${toggle_skip_as_script}
+                            title=${skip_as_script
+                                ? "This cell is currently stored in the notebook file as a Julia comment. Click here to disable."
+                                : "Store this code in the notebook file as a Julia comment. This way, it will not run when the notebook runs as a script outside of Pluto."}
+                        >
+                            ${skip_as_script ? html`<span class="skip_as_script ctx_icon" />` : html`<span class="run_as_script ctx_icon" />`}
+                            ${skip_as_script ? html`<b>Enable in file</b>` : html`Disable in file`}
+                        </li>`
+                      : null}
               </ul>`
             : html``}
     </button>`

From 853b452e92950871a6c4b8c0f1c1b472e63a38d4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Jun 2022 11:49:53 +0200
Subject: [PATCH 382/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index f0011d8b9c..f6c6abd129 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.8"
+version = "0.19.9"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 6c4732a1888c40a1e9aec580b9e685258d1fd9ed Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Jun 2022 12:44:57 +0200
Subject: [PATCH 383/821] update versions in sample notebooks

---
 sample/Basic mathematics.jl | 185 ++++++++++++++++++------------------
 sample/Getting started.jl   |   5 +-
 sample/JavaScript.jl        |  10 +-
 sample/Plots.jl.jl          |  36 +++----
 sample/PlutoUI.jl.jl        |  10 +-
 5 files changed, 124 insertions(+), 122 deletions(-)

diff --git a/sample/Basic mathematics.jl b/sample/Basic mathematics.jl
index c60f2d467c..e4739fa32a 100644
--- a/sample/Basic mathematics.jl	
+++ b/sample/Basic mathematics.jl	
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.11.4
+# v0.19.9
 
 using Markdown
 using InteractiveUtils
@@ -7,102 +7,13 @@ using InteractiveUtils
 # This Pluto notebook uses @bind for interactivity. When running this notebook outside of Pluto, the following 'mock version' of @bind gives bound variables a default value (instead of an error).
 macro bind(def, element)
     quote
+        local iv = try Base.loaded_modules[Base.PkgId(Base.UUID("6e696c72-6542-2067-7265-42206c756150"), "AbstractPlutoDingetjes")].Bonds.initial_value catch; b -> missing; end
         local el = $(esc(element))
-        global $(esc(def)) = Core.applicable(Base.get, el) ? Base.get(el) : missing
+        global $(esc(def)) = Core.applicable(Base.get, el) ? Base.get(el) : iv(el)
         el
     end
 end
 
-# ╔═╡ e5e0a0da-d45c-11ea-1042-e9b5d0654d4f
-md"Fix the value of `c` below to make it `c = a * b`"
-
-# ╔═╡ 4dff4b5e-d461-11ea-29c8-d548fdb5f08b
-md"Edit the equation below to calculate the number of pizzas to order using the variables above for **people**, **avg**, and **slices**:"
-
-# ╔═╡ f907e46a-d471-11ea-07e5-f30e2aab3d08
-md"""The diameter of a pizza is often stated on a menu so let's define a **formula** to calculate the area of a pizza given the diameter **d**.
-
-We do this by writing a formula like this: `area(d) = pi * (d/2)^2`
-
-Let's write that below:
-"""
-
-# ╔═╡ d9575e9c-d472-11ea-1eda-2d335d039f28
-md"""Now we have a function called **area** that we can pass any diameter and it will return the area of a pizza (or circle), let's try that with the pizza from before with `area(2*r)` to get the area of the pizza:
-"""
-
-# ╔═╡ edb95b14-d473-11ea-3a5a-77382d31f941
-md"""## Finding the best pizza deal
-
-Let's see if a larger pizza is a better value by calculating the price per area.  There are 4 sizes: small, medium, large, extra large with the following prices:
-
-Size     | Diameter (inches) | Price ($)
-:------- | :---------------: | --------:
-small    | 9  | 13.10
-medium   | 13 | 20.95
-large    | 15 | 24.90 
-XL       | 17 | 30.95
-
-### 1. How many small pizzas is the same as one XL pizza?
-
-Edit the expression below:
-"""
-
-# ╔═╡ 5b07b8fe-d475-11ea-01aa-6b88d6ed8a05
-md"""### 2. Calculate the cost per area of each pizza:
-"""
-
-# ╔═╡ a42e4eb0-d474-11ea-316a-3d864451bc01
-md"Which size of pizza is the best deal?  Write your answer below and assign it to the variable **best_value**."
-
-# ╔═╡ cb419286-d4ff-11ea-1d7f-af5c8574b775
-md"""### 3. Is this a good deal?
-
-San Marinos has a special **\"Buy two medium pizzas and save \$5\"**.  Is this a better deal than buying a extra-large pizza?
-
-Calculate the total cost of two medium pizzas deal (saving \$5):"""
-
-# ╔═╡ 0d76d97c-d500-11ea-2433-e96c6fc43b05
-md"Calculate the total area of two medium pizzas:"
-
-# ╔═╡ 20a1e9cc-d500-11ea-3d9b-279c71bc20f1
-md"Now calculate cost per area by taking the total cost of two medium pizzas and divide by the total area:"
-
-# ╔═╡ 57f024ae-d500-11ea-1cc4-ed28348fdf93
-md"""Is it a better deal to get two medium pizzas for \$5 off or to just buy an extra-large?"""
-
-# ╔═╡ 180c8fdc-d503-11ea-04ca-bf2c07fd1c17
-md"""### 4. Advanced Problem
-
-A new worker at a pizza shop was getting paid for cutting pizza into pieces.  The pieces of pizza could be any size.  Calculate the maximum number of pieces the worker could make with two cuts of the pizza."""
-
-# ╔═╡ 92b4a012-d503-11ea-15a2-1f3a446d3284
-md"Now what about 3 cuts across the pizza?  What is the maximum number of pieces that can be made with **3 cuts**?"
-
-# ╔═╡ 2eb9a560-d507-11ea-3b8b-9d06678fe131
-md"Now, how many pieces can be made with **4 cuts**?"
-
-# ╔═╡ d1e3dec0-d507-11ea-1213-d37a9325ee2f
-md"Are you starting to see a pattern?  Can you figure out a formula for how many pieces of pizza can be made with \"n\" cuts?  Make a table and fill in the number of pieces for a number of cuts and see if you can find the pattern:
-
-Cuts | Pieces
-:--- | ------:
-0    |   1
-1    |   2
-2    |   4
-3    |   
-4    |   
-"
-
-# ╔═╡ 97bfd13c-dcc2-11ea-0067-ad8c2c6517fc
-md"To get an extra hint, figure out how many slices we can get from **5 cuts**:"
-
-# ╔═╡ e0cb2822-dcc2-11ea-2c85-5748bfe526dc
-md"Have you found the pattern? Write down the formula below:"
-
-# ╔═╡ 03249876-d508-11ea-16bb-fd5afed37a1f
-md"""##### Let's test your formula!"""
-
 # ╔═╡ 14158eb0-d45c-11ea-088f-330e45412320
 a = 2
 
@@ -119,6 +30,9 @@ First let's do some simple math with setting **a = $a**, **b = $b** and **c = a
 
 Type in the cells (with the coloured background) below and press **`Shift-Enter`** or the click the right-arrow button (▶️) to the right to execute the cell after changing the values."
 
+# ╔═╡ e5e0a0da-d45c-11ea-1042-e9b5d0654d4f
+md"Fix the value of `c` below to make it `c = a * b`"
+
 # ╔═╡ 30f0f882-d45c-11ea-2adc-7d84ecf8a7a6
 c = 10
 
@@ -156,6 +70,9 @@ Number of slices on a piece of pizza | slices
 
 """
 
+# ╔═╡ 4dff4b5e-d461-11ea-29c8-d548fdb5f08b
+md"Edit the equation below to calculate the number of pizzas to order using the variables above for **people**, **avg**, and **slices**:"
+
 # ╔═╡ 444e2fa4-d460-11ea-12aa-57e0576c2d66
 pizzas = 1
 
@@ -171,15 +88,48 @@ The area of a pizza is ``A = \pi r^2``.  Lets try calculating the area of a pizz
 # ╔═╡ 50f0f6d6-d471-11ea-304e-8f72e7ef9d7e
 A =  r^2
 
+# ╔═╡ f907e46a-d471-11ea-07e5-f30e2aab3d08
+md"""The diameter of a pizza is often stated on a menu so let's define a **formula** to calculate the area of a pizza given the diameter **d**.
+
+We do this by writing a formula like this: `area(d) = pi * (d/2)^2`
+
+Let's write that below:
+"""
+
 # ╔═╡ cb36a9ee-d472-11ea-1835-bf7963137e18
 area(d) = pi * (d / 2)^2
 
+# ╔═╡ d9575e9c-d472-11ea-1eda-2d335d039f28
+md"""Now we have a function called **area** that we can pass any diameter and it will return the area of a pizza (or circle), let's try that with the pizza from before with `area(2*r)` to get the area of the pizza:
+"""
+
 # ╔═╡ 04b010c0-d473-11ea-1767-136c7e26e122
 A2 = area(r)
 
+# ╔═╡ edb95b14-d473-11ea-3a5a-77382d31f941
+md"""## Finding the best pizza deal
+
+Let's see if a larger pizza is a better value by calculating the price per area.  There are 4 sizes: small, medium, large, extra large with the following prices:
+
+Size     | Diameter (inches) | Price ($)
+:------- | :---------------: | --------:
+small    | 9  | 13.10
+medium   | 13 | 20.95
+large    | 15 | 24.90 
+XL       | 17 | 30.95
+
+### 1. How many small pizzas is the same as one XL pizza?
+
+Edit the expression below:
+"""
+
 # ╔═╡ 637c26fa-d475-11ea-2c5b-2b0f4775b119
 smalls_in_xl = 1
 
+# ╔═╡ 5b07b8fe-d475-11ea-01aa-6b88d6ed8a05
+md"""### 2. Calculate the cost per area of each pizza:
+"""
+
 # ╔═╡ 3823d09e-d474-11ea-194e-59b5805f303b
 small = 13.10 / area(9)
 
@@ -192,35 +142,86 @@ large = 24.90 / area(15)
 # ╔═╡ 962e6b86-d474-11ea-11a6-a1d11e33ae42
 xl = 30.95 / area(17)
 
+# ╔═╡ a42e4eb0-d474-11ea-316a-3d864451bc01
+md"Which size of pizza is the best deal?  Write your answer below and assign it to the variable **best_value**."
+
 # ╔═╡ 16ec3f32-d4ff-11ea-20e2-5bc6dd5db083
 best_value = small
 
+# ╔═╡ cb419286-d4ff-11ea-1d7f-af5c8574b775
+md"""### 3. Is this a good deal?
+
+San Marinos has a special **\"Buy two medium pizzas and save \$5\"**.  Is this a better deal than buying a extra-large pizza?
+
+Calculate the total cost of two medium pizzas deal (saving \$5):"""
+
 # ╔═╡ f147b6cc-d4ff-11ea-05ad-6f5b441e5d1b
 two_medium_cost = 20.95 * 1 - 0
 
+# ╔═╡ 0d76d97c-d500-11ea-2433-e96c6fc43b05
+md"Calculate the total area of two medium pizzas:"
+
 # ╔═╡ 19eb2a82-d500-11ea-3782-596adc689382
 two_medium_area = 1 * area(13)
 
+# ╔═╡ 20a1e9cc-d500-11ea-3d9b-279c71bc20f1
+md"Now calculate cost per area by taking the total cost of two medium pizzas and divide by the total area:"
+
 # ╔═╡ 70e85498-d500-11ea-35af-474574f5c011
 two_medium_deal = 1
 
+# ╔═╡ 57f024ae-d500-11ea-1cc4-ed28348fdf93
+md"""Is it a better deal to get two medium pizzas for \$5 off or to just buy an extra-large?"""
+
+# ╔═╡ 180c8fdc-d503-11ea-04ca-bf2c07fd1c17
+md"""### 4. Advanced Problem
+
+A new worker at a pizza shop was getting paid for cutting pizza into pieces.  The pieces of pizza could be any size.  Calculate the maximum number of pieces the worker could make with two cuts of the pizza."""
+
 # ╔═╡ 6494e270-d503-11ea-38a7-df96e7f0a241
 cuts2 = 1
 
+# ╔═╡ 92b4a012-d503-11ea-15a2-1f3a446d3284
+md"Now what about 3 cuts across the pizza?  What is the maximum number of pieces that can be made with **3 cuts**?"
+
 # ╔═╡ a05aae8e-d506-11ea-190f-57e9ce53b8b9
 cuts3 = 1
 
+# ╔═╡ 2eb9a560-d507-11ea-3b8b-9d06678fe131
+md"Now, how many pieces can be made with **4 cuts**?"
+
 # ╔═╡ 5a8ede88-d507-11ea-30d9-c99a67243781
 cuts4 = 1
 
+# ╔═╡ d1e3dec0-d507-11ea-1213-d37a9325ee2f
+md"Are you starting to see a pattern?  Can you figure out a formula for how many pieces of pizza can be made with \"n\" cuts?  Make a table and fill in the number of pieces for a number of cuts and see if you can find the pattern:
+
+Cuts | Pieces
+:--- | ------:
+0    |   1
+1    |   2
+2    |   4
+3    |   
+4    |   
+"
+
+# ╔═╡ 97bfd13c-dcc2-11ea-0067-ad8c2c6517fc
+md"To get an extra hint, figure out how many slices we can get from **5 cuts**:"
+
 # ╔═╡ bae0cb62-dcc2-11ea-0667-512e1c407d40
 cuts5 = 1
 
+# ╔═╡ e0cb2822-dcc2-11ea-2c85-5748bfe526dc
+md"Have you found the pattern? Write down the formula below:"
+
 # ╔═╡ f5f89724-d507-11ea-0a93-6d904f36bbe4
 function pieces(n)
 	return n
 end
 
+# ╔═╡ 03249876-d508-11ea-16bb-fd5afed37a1f
+md"""##### Let's test your formula!"""
+
 # ╔═╡ bd9f3d24-d509-11ea-165d-3d465a0b4542
 md"""Move the slider to change the number of cuts: 
 
diff --git a/sample/Getting started.jl b/sample/Getting started.jl
index 3fba0f7f7b..cf3c51ccea 100644
--- a/sample/Getting started.jl	
+++ b/sample/Getting started.jl	
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.11.14
+# v0.19.9
 
 using Markdown
 using InteractiveUtils
@@ -7,8 +7,9 @@ using InteractiveUtils
 # This Pluto notebook uses @bind for interactivity. When running this notebook outside of Pluto, the following 'mock version' of @bind gives bound variables a default value (instead of an error).
 macro bind(def, element)
     quote
+        local iv = try Base.loaded_modules[Base.PkgId(Base.UUID("6e696c72-6542-2067-7265-42206c756150"), "AbstractPlutoDingetjes")].Bonds.initial_value catch; b -> missing; end
         local el = $(esc(element))
-        global $(esc(def)) = Core.applicable(Base.get, el) ? Base.get(el) : missing
+        global $(esc(def)) = Core.applicable(Base.get, el) ? Base.get(el) : iv(el)
         el
     end
 end
diff --git a/sample/JavaScript.jl b/sample/JavaScript.jl
index 507078e35d..d26481309b 100644
--- a/sample/JavaScript.jl
+++ b/sample/JavaScript.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.19.5
+# v0.19.9
 
 using Markdown
 using InteractiveUtils
@@ -1116,9 +1116,9 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
 [[ColorTypes]]
 deps = ["FixedPointNumbers", "Random"]
-git-tree-sha1 = "0f4e115f6f34bbe43c19751c90a38b2f380637b9"
+git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4"
 uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
-version = "0.11.3"
+version = "0.11.4"
 
 [[Dates]]
 deps = ["Printf"]
@@ -1207,9 +1207,9 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
 [[Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "1285416549ccfcdf0c50d4997a94331e88d68413"
+git-tree-sha1 = "0044b23da09b5608b4ecacb4e5e6c6332f833a7e"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.3.1"
+version = "2.3.2"
 
 [[Pkg]]
 deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
diff --git a/sample/Plots.jl.jl b/sample/Plots.jl.jl
index 2da3ddba77..bc41af069b 100644
--- a/sample/Plots.jl.jl
+++ b/sample/Plots.jl.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.19.5
+# v0.19.9
 
 using Markdown
 using InteractiveUtils
@@ -215,7 +215,7 @@ PLUTO_PROJECT_TOML_CONTENTS = """
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 
 [compat]
-Plots = "~1.29.0"
+Plots = "~1.30.0"
 """
 
 # ╔═╡ 00000000-0000-0000-0000-000000000002
@@ -269,9 +269,9 @@ version = "3.18.0"
 
 [[ColorTypes]]
 deps = ["FixedPointNumbers", "Random"]
-git-tree-sha1 = "0f4e115f6f34bbe43c19751c90a38b2f380637b9"
+git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4"
 uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
-version = "0.11.3"
+version = "0.11.4"
 
 [[ColorVectorSpace]]
 deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "TensorCore"]
@@ -397,15 +397,15 @@ version = "3.3.6+0"
 
 [[GR]]
 deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Printf", "Random", "RelocatableFolders", "Serialization", "Sockets", "Test", "UUIDs"]
-git-tree-sha1 = "b316fd18f5bc025fedcb708332aecb3e13b9b453"
+git-tree-sha1 = "c98aea696662d09e215ef7cda5296024a9646c75"
 uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
-version = "0.64.3"
+version = "0.64.4"
 
 [[GR_jll]]
 deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Pkg", "Qt5Base_jll", "Zlib_jll", "libpng_jll"]
-git-tree-sha1 = "1e5490a51b4e9d07e8b04836f6008f46b48aaa87"
+git-tree-sha1 = "3a233eeeb2ca45842fe100e0413936834215abf5"
 uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
-version = "0.64.3+0"
+version = "0.64.4+0"
 
 [[GeometryBasics]]
 deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"]
@@ -459,9 +459,9 @@ uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 
 [[InverseFunctions]]
 deps = ["Test"]
-git-tree-sha1 = "336cc738f03e069ef2cac55a104eb823455dca75"
+git-tree-sha1 = "b3364212fb5d870f724876ffcd34dd8ec6d98918"
 uuid = "3587e190-3f89-42d0-90ee-14403ec27112"
-version = "0.1.4"
+version = "0.1.7"
 
 [[IrrationalConstants]]
 git-tree-sha1 = "7fd44fd4ff43fc60815f8e764c0f352b83c49151"
@@ -691,9 +691,9 @@ version = "8.44.0+0"
 
 [[Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "1285416549ccfcdf0c50d4997a94331e88d68413"
+git-tree-sha1 = "0044b23da09b5608b4ecacb4e5e6c6332f833a7e"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.3.1"
+version = "2.3.2"
 
 [[Pixman_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -719,9 +719,9 @@ version = "1.2.0"
 
 [[Plots]]
 deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "Unzip"]
-git-tree-sha1 = "d457f881ea56bbfa18222642de51e0abf67b9027"
+git-tree-sha1 = "0b727ac13565a2b665cc78db579e0093b869034e"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
-version = "1.29.0"
+version = "1.30.0"
 
 [[Preferences]]
 deps = ["TOML"]
@@ -814,9 +814,9 @@ version = "2.1.6"
 
 [[StaticArrays]]
 deps = ["LinearAlgebra", "Random", "Statistics"]
-git-tree-sha1 = "cd56bf18ed715e8b09f06ef8c6b781e6cdc49911"
+git-tree-sha1 = "2bbd9f2e40afd197a1379aef05e0d85dba649951"
 uuid = "90137ffa-7385-5640-81b9-e52037218182"
-version = "1.4.4"
+version = "1.4.7"
 
 [[Statistics]]
 deps = ["LinearAlgebra", "SparseArrays"]
@@ -824,9 +824,9 @@ uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [[StatsAPI]]
 deps = ["LinearAlgebra"]
-git-tree-sha1 = "c82aaa13b44ea00134f8c9c89819477bd3986ecd"
+git-tree-sha1 = "2c11d7290036fe7aac9038ff312d3b3a2a5bf89e"
 uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0"
-version = "1.3.0"
+version = "1.4.0"
 
 [[StatsBase]]
 deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
diff --git a/sample/PlutoUI.jl.jl b/sample/PlutoUI.jl.jl
index 5eb8139421..1c38006113 100644
--- a/sample/PlutoUI.jl.jl
+++ b/sample/PlutoUI.jl.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.19.5
+# v0.19.9
 
 using Markdown
 using InteractiveUtils
@@ -644,9 +644,9 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
 [[ColorTypes]]
 deps = ["FixedPointNumbers", "Random"]
-git-tree-sha1 = "0f4e115f6f34bbe43c19751c90a38b2f380637b9"
+git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4"
 uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
-version = "0.11.3"
+version = "0.11.4"
 
 [[Dates]]
 deps = ["Printf"]
@@ -735,9 +735,9 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
 [[Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "1285416549ccfcdf0c50d4997a94331e88d68413"
+git-tree-sha1 = "0044b23da09b5608b4ecacb4e5e6c6332f833a7e"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.3.1"
+version = "2.3.2"
 
 [[Pkg]]
 deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]

From a3b54afd667f20b302020a678d4d78e323f7af01 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Jun 2022 13:08:15 +0200
Subject: [PATCH 384/821] frontmatter GUI: bump rebel-tag-input

---
 frontend/components/FrontmatterInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index f49d2f237b..5b1f65d0ea 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -1,7 +1,7 @@
 import { html, Component, useRef, useLayoutEffect, useState, useEffect } from "../imports/Preact.js"
 import { has_ctrl_or_cmd_pressed } from "../common/KeyboardShortcuts.js"
 
-import "https://cdn.jsdelivr.net/gh/fonsp/rebel-tag-input@1.0.4/lib/rebel-tag-input.mjs"
+import "https://cdn.jsdelivr.net/gh/fonsp/rebel-tag-input@1.0.5/lib/rebel-tag-input.mjs"
 
 //@ts-ignore
 import dialogPolyfill from "https://cdn.jsdelivr.net/npm/dialog-polyfill@0.5.6/dist/dialog-polyfill.esm.min.js"

From 3df8390a2eda312bad42d7ee274e5837c313815f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Jun 2022 13:29:56 +0200
Subject: [PATCH 385/821] fix bundle

---
 frontend/components/FrontmatterInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index 5b1f65d0ea..5af47b3499 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -1,7 +1,7 @@
 import { html, Component, useRef, useLayoutEffect, useState, useEffect } from "../imports/Preact.js"
 import { has_ctrl_or_cmd_pressed } from "../common/KeyboardShortcuts.js"
 
-import "https://cdn.jsdelivr.net/gh/fonsp/rebel-tag-input@1.0.5/lib/rebel-tag-input.mjs"
+import "https://cdn.jsdelivr.net/gh/fonsp/rebel-tag-input@1.0.6/lib/rebel-tag-input.mjs"
 
 //@ts-ignore
 import dialogPolyfill from "https://cdn.jsdelivr.net/npm/dialog-polyfill@0.5.6/dist/dialog-polyfill.esm.min.js"

From f56f9c4dcd8d096918a1cc520e4fe652d06dff4c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Jun 2022 15:30:17 +0200
Subject: [PATCH 386/821] =?UTF-8?q?=F0=9F=A5=95=20`Pluto.set=5Ffrontmatter?=
 =?UTF-8?q?!`=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/notebook/frontmatter.jl | 22 ++++++++++++++++++++++
 test/Notebook.jl            |  8 ++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/notebook/frontmatter.jl b/src/notebook/frontmatter.jl
index c5842848e4..e93f03e257 100644
--- a/src/notebook/frontmatter.jl
+++ b/src/notebook/frontmatter.jl
@@ -28,3 +28,25 @@ function frontmatter(abs_path::String; raise::Bool=false)
 		end
 	end
 end
+
+"""
+```julia
+set_frontmatter!(nb::Notebook, new_value::Dict)
+```
+
+Set the new frontmatter of the [`Notebook`](@ref). Use [`frontmatter(nb)`](@ref) to get the old dictionary.
+
+If you want to save the file, call [`save_notebook(nb)`](@ref) afterwards.
+
+`set_frontmatter!(nb, nothing)` will delete the frontmatter.
+
+"""
+function set_frontmatter!(nb::Notebook, ::Nothing)
+	delete!(nb.metadata, "frontmatter")
+end
+
+function set_frontmatter!(nb::Notebook, new_value::Dict)
+	nb.metadata["frontmatter"] = convert(FrontMatter, new_value)
+end
+
+
diff --git a/test/Notebook.jl b/test/Notebook.jl
index dfc93fefee..e22ebe7bf1 100644
--- a/test/Notebook.jl
+++ b/test/Notebook.jl
@@ -343,6 +343,14 @@ end
         @test Pluto.frontmatter(nb) == Dict(
             "title" => "cool stuff",
         )
+        
+        Pluto.set_frontmatter!(nb, Dict("a" => "b"))
+        @test Pluto.frontmatter(nb) ==  Dict("a" => "b")
+        
+        Pluto.set_frontmatter!(nb, nothing)
+        @test Pluto.frontmatter(nb) ==  Dict()
+        Pluto.set_frontmatter!(nb, nothing)
+        @test Pluto.frontmatter(nb) ==  Dict()
     end
 
     @testset "I/O overloaded" begin

From 96eb096e83afc5488481c743e3eccea62e7aed71 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Jun 2022 15:32:29 +0200
Subject: [PATCH 387/821] /uploadnotebook endpoint: clear_frontmatter query
 option

---
 src/webserver/SessionActions.jl | 11 ++++++++++-
 src/webserver/Static.jl         |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index e8b2d31419..420d8408a6 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -41,7 +41,13 @@ function open_url(session::ServerSession, url::AbstractString; kwargs...)
 end
 
 "Open the notebook at `path` into `session::ServerSession` and run it. Returns the `Notebook`."
-function open(session::ServerSession, path::AbstractString; run_async=true, compiler_options=nothing, as_sample=false, notebook_id::UUID=uuid1())
+function open(session::ServerSession, path::AbstractString; 
+    run_async::Bool=true, 
+    compiler_options=nothing, 
+    as_sample::Bool=false, 
+    clear_frontmatter::Bool=false,
+    notebook_id::UUID=uuid1()
+)
     path = maybe_convert_path_to_wsl(path)
     if as_sample
         new_filename = "sample " * without_pluto_file_extension(basename(path))
@@ -64,6 +70,9 @@ function open(session::ServerSession, path::AbstractString; run_async=true, comp
     if compiler_options !== nothing
         nb.compiler_options = compiler_options
     end
+    if clear_frontmatter
+        set_frontmatter!(nb, nothing)
+    end
 
     session.notebooks[nb.notebook_id] = nb
     for c in nb.cells
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index 1c1b2513ca..0aa511d027 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -327,11 +327,13 @@ function http_router_for(session::ServerSession)
         query = HTTP.queryparams(uri)
         
         save_path = SessionActions.save_upload(request.body; filename_base=get(query, "name", nothing))
+        
         try_launch_notebook_response(
             SessionActions.open,
             save_path;
             as_redirect=false,
             as_sample=false,
+            clear_frontmatter=!isnothing(get(query, "clear_frontmatter", nothing)),
             title="Failed to load notebook",
             advice="The contents could not be read as a Pluto notebook file. When copying contents from somewhere else, make sure that you copy the entire notebook file.  You can also <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
         )

From 5b987fd59405576355615f3aff6601a3036431da Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Jun 2022 15:37:05 +0200
Subject: [PATCH 388/821] fixiefix

---
 src/webserver/SessionActions.jl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 420d8408a6..1904c63017 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -1,6 +1,6 @@
 module SessionActions
 
-import ..Pluto: ServerSession, Notebook, Cell, emptynotebook, tamepath, new_notebooks_directory, without_pluto_file_extension, numbered_until_new, cutename, readwrite, update_save_run!, update_from_file, wait_until_file_unchanged, putnotebookupdates!, putplutoupdates!, load_notebook, clientupdate_notebook_list, WorkspaceManager, try_event_call, NewNotebookEvent, OpenNotebookEvent, ShutdownNotebookEvent, @asynclog, ProcessStatus, maybe_convert_path_to_wsl
+import ..Pluto: Pluto, ServerSession, Notebook, Cell, emptynotebook, tamepath, new_notebooks_directory, without_pluto_file_extension, numbered_until_new, cutename, readwrite, update_save_run!, update_from_file, wait_until_file_unchanged, putnotebookupdates!, putplutoupdates!, load_notebook, clientupdate_notebook_list, WorkspaceManager, try_event_call, NewNotebookEvent, OpenNotebookEvent, ShutdownNotebookEvent, @asynclog, ProcessStatus, maybe_convert_path_to_wsl
 using FileWatching
 import ..Pluto.DownloadCool: download_cool
 import HTTP
@@ -71,7 +71,7 @@ function open(session::ServerSession, path::AbstractString;
         nb.compiler_options = compiler_options
     end
     if clear_frontmatter
-        set_frontmatter!(nb, nothing)
+        Pluto.set_frontmatter!(nb, nothing)
     end
 
     session.notebooks[nb.notebook_id] = nb

From 9787ebbb329f25a02b804ab060e1d859cb4cec9d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Jun 2022 17:39:13 +0200
Subject: [PATCH 389/821] =?UTF-8?q?=F0=9F=8C=9F=20Featured=20notebooks=20&?=
 =?UTF-8?q?=20new=20main=20menu=20(#2048)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: merlijnkersten <50485980+merlijnkersten@users.noreply.github.com>
---
 README.md                                     |   8 +-
 frontend-bundler/package.json                 |   4 +-
 frontend/common/Binder.js                     |  21 +-
 frontend/common/Bond.js                       |   3 +-
 frontend/common/RunLocal.js                   |  80 ++++++
 .../{BinderButton.js => EditOrRunButton.js}   |  19 ++
 frontend/components/Editor.js                 |  32 ++-
 frontend/components/Popup.js                  |  10 +-
 frontend/components/welcome/Featured.js       | 167 +++++++++++
 frontend/components/welcome/FeaturedCard.js   |  93 +++++++
 frontend/components/welcome/Open.js           |  33 +--
 frontend/components/welcome/Recent.js         |  11 +-
 frontend/components/welcome/Welcome.js        |  25 +-
 frontend/dark_color.css                       |   9 +-
 frontend/editor.css                           |  19 +-
 frontend/editor.js                            |  11 +-
 frontend/featured_sources.js                  |   8 +
 frontend/img/favicon_unsaturated_bg.svg       |  18 ++
 frontend/index.css                            | 233 ++++++++++++----
 frontend/index.html                           |  53 +++-
 frontend/index.js                             |   2 +-
 frontend/light_color.css                      |   7 +
 frontend/sample.html                          |  44 ---
 frontend/welcome.css                          | 262 ++++++++++++++++++
 24 files changed, 1012 insertions(+), 160 deletions(-)
 create mode 100644 frontend/common/RunLocal.js
 rename frontend/components/{BinderButton.js => EditOrRunButton.js} (93%)
 create mode 100644 frontend/components/welcome/Featured.js
 create mode 100644 frontend/components/welcome/FeaturedCard.js
 create mode 100644 frontend/featured_sources.js
 create mode 100755 frontend/img/favicon_unsaturated_bg.svg
 delete mode 100644 frontend/sample.html
 create mode 100644 frontend/welcome.css

diff --git a/README.md b/README.md
index 22d5c17def..824fb1b002 100644
--- a/README.md
+++ b/README.md
@@ -69,9 +69,9 @@ Lastly, here's _**one more feature**_: Pluto notebooks have a `@bind` macro to c
 
 <br >
 
-You don't need to know HTML to use it! The [PlutoUI package](https://github.com/fonsp/PlutoUI.jl) contains basic inputs like sliders and buttons. Pluto's interactivity is very easy to use, you will learn more from the sample notebooks inside Pluto!
+You don't need to know HTML to use it! The [PlutoUI package](https://github.com/fonsp/PlutoUI.jl) contains basic inputs like sliders and buttons. Pluto's interactivity is very easy to use, you will learn more from the featured notebooks inside Pluto!
 
-But for those who want to dive deeper - you can use HTML, JavaScript and CSS to write your own widgets! Custom update events can be fired by dispatching a `new CustomEvent("input")`, making it compatible with the [`viewof` operator of observablehq](https://observablehq.com/@observablehq/a-brief-introduction-to-viewof). Have a look at the JavaScript sample notebook inside Pluto!
+But for those who want to dive deeper - you can use HTML, JavaScript and CSS to write your own widgets! Custom update events can be fired by dispatching a `new CustomEvent("input")`, making it compatible with the [`viewof` operator of observablehq](https://observablehq.com/@observablehq/a-brief-introduction-to-viewof). Have a look at the JavaScript featured notebook inside Pluto!
 
 <br >
 
@@ -160,9 +160,9 @@ Pluto.jl is open source! Specifically, it is [MIT Licensed](https://github.com/f
 
 If you want to reference Pluto.jl in scientific writing, you can use our DOI: [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4792401.svg)](https://doi.org/10.5281/zenodo.4792401)
 
-### Sample notebooks
+### Featured notebooks
 
-The included sample notebooks have a more permissive license: the [Unlicense](https://github.com/fonsp/Pluto.jl/blob/main/sample/LICENSE). This means that you can use sample notebook code however you like - you do not need to credit us! 
+Unless otherwise specified, the included featured notebooks have a more permissive license: the [Unlicense](https://github.com/fonsp/Pluto.jl/blob/main/sample/LICENSE). This means that you can use them however you like - you do not need to credit us! 
 
 Your notebook files are _yours_, you also do not need to credit us. Have fun!
 
diff --git a/frontend-bundler/package.json b/frontend-bundler/package.json
index 0ee5bd1416..c05068d4c9 100644
--- a/frontend-bundler/package.json
+++ b/frontend-bundler/package.json
@@ -6,8 +6,8 @@
     "version": "1.0.0",
     "description": "",
     "scripts": {
-        "start": "cd ../frontend && parcel --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html sample.html",
-        "build": "cd ../frontend && parcel build --no-source-maps --public-url . --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html sample.html && node ../frontend-bundler/add_sri.js ../frontend-dist/editor.html",
+        "start": "cd ../frontend && parcel --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html",
+        "build": "cd ../frontend && parcel build --no-source-maps --public-url . --dist-dir ../frontend-dist --config ../frontend-bundler/.parcelrc editor.html index.html error.jl.html && node ../frontend-bundler/add_sri.js ../frontend-dist/editor.html",
         "test": "echo \"Error: no test specified\" && exit 1"
     },
     "author": "",
diff --git a/frontend/common/Binder.js b/frontend/common/Binder.js
index 8ac593a9f9..2ecbcd3e99 100644
--- a/frontend/common/Binder.js
+++ b/frontend/common/Binder.js
@@ -124,10 +124,17 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
         let open_response = new Response()
 
         if (launch_params.notebookfile.startsWith("data:")) {
-            open_response = await fetch(with_token(new URL("notebookupload", binder_session_url)), {
-                method: "POST",
-                body: await (await fetch(new Request(launch_params.notebookfile, { integrity: launch_params.notebookfile_integrity }))).arrayBuffer(),
-            })
+            open_response = await fetch(
+                with_token(
+                    with_query_params(new URL("notebookupload", binder_session_url), {
+                        name: new URLSearchParams(window.location.search).get("name"),
+                    })
+                ),
+                {
+                    method: "POST",
+                    body: await (await fetch(new Request(launch_params.notebookfile, { integrity: launch_params.notebookfile_integrity }))).arrayBuffer(),
+                }
+            )
         } else {
             for (const [p1, p2] of [
                 ["path", launch_params.notebookfile],
@@ -145,6 +152,12 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
             }
         }
 
+        if (!open_response.ok) {
+            let b = await open_response.blob()
+            window.location.href = URL.createObjectURL(b)
+            return
+        }
+
         // Opening a notebook gives us the notebook ID, which means that we have a running session! Time to connect.
 
         const new_notebook_id = await open_response.text()
diff --git a/frontend/common/Bond.js b/frontend/common/Bond.js
index a3a89af925..6efc6b2b4d 100644
--- a/frontend/common/Bond.js
+++ b/frontend/common/Bond.js
@@ -152,7 +152,7 @@ export const set_bound_elements_to_their_value = (bond_nodes, bond_values) => {
 export const add_bonds_disabled_message_handler = (bond_nodes, invalidation) => {
     bond_nodes.forEach((bond_node) => {
         const listener = (e) => {
-            if (e.target.closest(".bonds_disabled.offer_binder")) {
+            if (e.target.closest(".bonds_disabled:where(.offer_binder, .offer_local)")) {
                 open_pluto_popup({
                     type: "info",
                     source_element: e.target,
@@ -163,6 +163,7 @@ export const add_bonds_disabled_message_handler = (bond_nodes, invalidation) =>
                                 //@ts-ignore
                                 window.open_edit_or_run_popup()
                                 e.preventDefault()
+                                window.dispatchEvent(new CustomEvent("close pluto popup"))
                             }}
                             >Run this notebook</a
                         >
diff --git a/frontend/common/RunLocal.js b/frontend/common/RunLocal.js
new file mode 100644
index 0000000000..546c0f7d86
--- /dev/null
+++ b/frontend/common/RunLocal.js
@@ -0,0 +1,80 @@
+import immer from "../imports/immer.js"
+import { BackendLaunchPhase } from "./Binder.js"
+import { timeout_promise } from "./PlutoConnection.js"
+import { with_query_params } from "./URLTools.js"
+
+// This file is very similar to `start_binder` in Binder.js
+
+/**
+ *
+ * @param {{
+ *  launch_params: import("../components/Editor.js").LaunchParameters,
+ *  setStatePromise: any,
+ *  connect: () => Promise<void>,
+ * }} props
+ */
+export const start_local = async ({ setStatePromise, connect, launch_params }) => {
+    try {
+        if (launch_params.pluto_server_url == null || launch_params.notebookfile == null) throw Error("Invalid launch parameters for starting locally.")
+
+        await setStatePromise(
+            immer((state) => {
+                state.backend_launch_phase = BackendLaunchPhase.created
+                state.disable_ui = false
+            })
+        )
+
+        const with_token = (x) => String(x)
+        const binder_session_url = new URL(launch_params.pluto_server_url, window.location.href)
+
+        let open_response
+
+        // We download the notebook file contents, and then upload them to the Pluto server.
+        const notebook_contents = await (
+            await fetch(new Request(launch_params.notebookfile, { integrity: launch_params.notebookfile_integrity ?? undefined }))
+        ).arrayBuffer()
+
+        open_response = await fetch(
+            with_token(
+                with_query_params(new URL("notebookupload", binder_session_url), {
+                    name: new URLSearchParams(window.location.search).get("name"),
+                    clear_frontmatter: "yesplease",
+                })
+            ),
+            {
+                method: "POST",
+                body: notebook_contents,
+            }
+        )
+
+        if (!open_response.ok) {
+            let b = await open_response.blob()
+            window.location.href = URL.createObjectURL(b)
+            return
+        }
+
+        const new_notebook_id = await open_response.text()
+        const edit_url = with_query_params(new URL("edit", binder_session_url), { id: new_notebook_id })
+        console.info("notebook_id:", new_notebook_id)
+
+        window.history.replaceState({}, "", edit_url)
+
+        await setStatePromise(
+            immer((state) => {
+                state.notebook.notebook_id = new_notebook_id
+                state.backend_launch_phase = BackendLaunchPhase.notebook_running
+            })
+        )
+        console.log("Connecting WebSocket")
+
+        const connect_promise = connect()
+        await timeout_promise(connect_promise, 20_000).catch((e) => {
+            console.error("Failed to establish connection within 20 seconds. Navigating to the edit URL directly.", e)
+
+            window.parent.location.href = with_token(edit_url)
+        })
+    } catch (err) {
+        console.error("Failed to initialize binder!", err)
+        alert("Something went wrong! 😮\n\nWe failed to open this notebook. Please try again with a different browser, or come back later.")
+    }
+}
diff --git a/frontend/components/BinderButton.js b/frontend/components/EditOrRunButton.js
similarity index 93%
rename from frontend/components/BinderButton.js
rename to frontend/components/EditOrRunButton.js
index 725ec61122..181008b02e 100644
--- a/frontend/components/BinderButton.js
+++ b/frontend/components/EditOrRunButton.js
@@ -1,6 +1,25 @@
 import { BackendLaunchPhase } from "../common/Binder.js"
 import { html, useEffect, useState, useRef } from "../imports/Preact.js"
 
+export const RunLocalButton = ({ show, start_local }) => {
+    //@ts-ignore
+    window.open_edit_or_run_popup = () => {
+        start_local()
+    }
+
+    return html`<div class="edit_or_run">
+        <button
+            onClick=${(e) => {
+                e.stopPropagation()
+                e.preventDefault()
+                start_local()
+            }}
+        >
+            <b>Edit</b> or <b>run</b> this notebook
+        </button>
+    </div>`
+}
+
 export const BinderButton = ({ offer_binder, start_binder, notebookfile }) => {
     const [popupOpen, setPopupOpen] = useState(false)
     const [showCopyPopup, setShowCopyPopup] = useState(false)
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index c265fed812..77759440bb 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -25,19 +25,20 @@ import { has_ctrl_or_cmd_pressed, ctrl_or_cmd_name, is_mac_keyboard, in_textarea
 import { PlutoActionsContext, PlutoBondsContext, PlutoJSInitializingContext, SetWithEmptyCallback } from "../common/PlutoContext.js"
 import { start_binder, BackendLaunchPhase, count_stat } from "../common/Binder.js"
 import { setup_mathjax } from "../common/SetupMathJax.js"
-import { BinderButton } from "./BinderButton.js"
+import { BinderButton, RunLocalButton } from "./EditOrRunButton.js"
 import { slider_server_actions, nothing_actions } from "../common/SliderServerClient.js"
 import { ProgressBar } from "./ProgressBar.js"
 import { IsolatedCell } from "./Cell.js"
 import { RawHTMLContainer } from "./CellOutput.js"
 import { RecordingPlaybackUI, RecordingUI } from "./RecordingUI.js"
 import { HijackExternalLinksToOpenInNewTab } from "./HackySideStuff/HijackExternalLinksToOpenInNewTab.js"
+import { start_local } from "../common/RunLocal.js"
 import { FrontMatterInput } from "./FrontmatterInput.js"
 
 // This is imported asynchronously - uncomment for development
 // import environment from "../common/Environment.js"
 
-export const default_path = "..."
+export const default_path = ""
 const DEBUG_DIFFING = false
 
 // Be sure to keep this in sync with DEFAULT_CELL_METADATA in Cell.jl
@@ -88,6 +89,7 @@ const statusmap = (/** @type {EditorState} */ state, /** @type {LaunchParameters
     static_preview: state.static_preview,
     bonds_disabled: !(state.connected || state.initializing || launch_params.slider_server_url != null),
     offer_binder: state.backend_launch_phase === BackendLaunchPhase.wait_for_user && launch_params.binder_url != null,
+    offer_local: state.backend_launch_phase === BackendLaunchPhase.wait_for_user && launch_params.pluto_server_url != null,
     binder: launch_params.binder_url != null && state.backend_launch_phase != null,
     code_differs: state.notebook.cell_order.some(
         (cell_id) => state.cell_inputs_local[cell_id] != null && state.notebook.cell_inputs[cell_id].code !== state.cell_inputs_local[cell_id].code
@@ -191,6 +193,7 @@ const first_true_key = (obj) => {
  *  preamble_html: string?,
  *  isolated_cell_ids: string[]?,
  *  binder_url: string?,
+ *  pluto_server_url: string?,
  *  slider_server_url: string?,
  *  recording_url: string?,
  *  recording_url_integrity: string?,
@@ -288,7 +291,10 @@ export class Editor extends Component {
 
             disable_ui: launch_params.disable_ui,
             static_preview: launch_params.statefile != null,
-            backend_launch_phase: launch_params.notebookfile != null && launch_params.binder_url != null ? BackendLaunchPhase.wait_for_user : null,
+            backend_launch_phase:
+                launch_params.notebookfile != null && (launch_params.binder_url != null || launch_params.pluto_server_url != null)
+                    ? BackendLaunchPhase.wait_for_user
+                    : null,
             binder_session_url: null,
             binder_session_token: null,
             connected: false,
@@ -1212,7 +1218,11 @@ patch: ${JSON.stringify(
                 initializing: false,
             })
             // view stats on https://stats.plutojl.org/
-            count_stat(`article-view`)
+            if (this.state.pluto_server_url != null) {
+                count_stat(`article-view`)
+            } else {
+                count_stat(`article-view`)
+            }
         } else {
             this.connect()
         }
@@ -1315,6 +1325,9 @@ patch: ${JSON.stringify(
             <${PlutoActionsContext.Provider} value=${this.actions}>
                 <${PlutoBondsContext.Provider} value=${this.state.notebook.bonds}>
                     <${PlutoJSInitializingContext.Provider} value=${this.js_init_set}>
+                    <button title="Go back" onClick=${() => {
+                        history.back()
+                    }} class="floating_back_button"><span></span></button>
                     <${Scroller} active=${this.state.scroller} />
                     <${ProgressBar} notebook=${this.state.notebook} backend_launch_phase=${this.state.backend_launch_phase} status=${status}/>
                     <header id="pluto-nav" className=${export_menu_open ? "show_export" : ""}>
@@ -1408,7 +1421,16 @@ patch: ${JSON.stringify(
                     />
                     
                     ${
-                        status.offer_binder
+                        status.offer_local
+                            ? html`<${RunLocalButton}
+                                  start_local=${() =>
+                                      start_local({
+                                          setStatePromise: this.setStatePromise,
+                                          connect: this.connect,
+                                          launch_params: launch_params,
+                                      })}
+                              />`
+                            : status.offer_binder
                             ? html`<${BinderButton}
                                   offer_binder=${status.offer_binder}
                                   start_binder=${() =>
diff --git a/frontend/components/Popup.js b/frontend/components/Popup.js
index 7b142e08fe..e33e128ffb 100644
--- a/frontend/components/Popup.js
+++ b/frontend/components/Popup.js
@@ -55,6 +55,10 @@ export const Popup = ({ notebook }) => {
         set_recent_event(e.detail)
     }
 
+    const close = () => {
+        set_recent_event(null)
+    }
+
     useEffect(() => {
         const onpointerdown = (e) => {
             if (e.target == null) return
@@ -62,19 +66,21 @@ export const Popup = ({ notebook }) => {
             if (recent_source_element_ref.current == null) return
             if (recent_source_element_ref.current.contains(e.target)) return
 
-            set_recent_event(null)
+            close()
         }
         const onkeydown = (e) => {
             if (e.key === "Escape") {
-                set_recent_event(null)
+                close()
             }
         }
         window.addEventListener("open pluto popup", open)
+        window.addEventListener("close pluto popup", close)
         window.addEventListener("pointerdown", onpointerdown)
         document.addEventListener("keydown", onkeydown)
 
         return () => {
             window.removeEventListener("open pluto popup", open)
+            window.removeEventListener("close pluto popup", close)
             window.removeEventListener("pointerdown", onpointerdown)
             document.removeEventListener("keydown", onkeydown)
         }
diff --git a/frontend/components/welcome/Featured.js b/frontend/components/welcome/Featured.js
new file mode 100644
index 0000000000..5457e6904a
--- /dev/null
+++ b/frontend/components/welcome/Featured.js
@@ -0,0 +1,167 @@
+import featured_sources from "../../featured_sources.js"
+import _ from "../../imports/lodash.js"
+import { html, useEffect, useState } from "../../imports/Preact.js"
+import { FeaturedCard } from "./FeaturedCard.js"
+
+const run = (f) => f()
+
+/**
+ * @typedef SourceManifestNotebookEntry
+ * @type {{
+ *   id: String,
+ *   hash: String,
+ *   html_path: String,
+ *   statefile_path: String,
+ *   notebookfile_path: String,
+ *   frontmatter: Record<string,any>,
+ * }}
+ */
+
+/**
+ * @typedef SourceManifestCollectionEntry
+ * @type {{
+ *   title: String?,
+ *   description: String?,
+ *   tags: Array<String>?,
+ * }}
+ */
+
+/**
+ * @typedef SourceManifest
+ * @type {{
+ *   notebooks: Record<string,SourceManifestNotebookEntry>,
+ *   collections: Array<SourceManifestCollectionEntry>?,
+ *   pluto_version: String,
+ *   julia_version: String,
+ *   format_version: String,
+ *   source_url: String,
+ *   title: String?,
+ *   description: String?,
+ * }}
+ */
+
+const placeholder_data = [
+    {
+        title: "Featured Notebooks",
+        description: "These notebooks from the Julia community show off what you can do with Pluto. Give it a try, you might learn something new!",
+        collections: [
+            {
+                title: "Loading...",
+                tags: [],
+            },
+        ],
+        notebooks: [],
+    },
+]
+
+const offline_html = html`
+    <div class="featured-source">
+        <h1>${placeholder_data[0].title}</h1>
+        <p>Here are a couple of notebooks to get started with Pluto.jl:</p>
+        <ul>
+            <li>1. <a href="sample/Getting%20started.jl">Getting started</a></li>
+            <li>2. <a href="sample/Basic%20mathematics.jl">Basic mathematics</a></li>
+            <li>3. <a href="sample/Interactivity.jl">Interactivity</a></li>
+            <li>4. <a href="sample/PlutoUI.jl.jl">PlutoUI.jl</a></li>
+            <li>5. <a href="sample/Plots.jl.jl">Plots.jl</a></li>
+            <li>6. <a href="sample/Tower%20of%20Hanoi.jl">Tower of Hanoi</a></li>
+            <li>7. <a href="sample/JavaScript.jl">JavaScript</a></li>
+        </ul>
+        <br />
+        <br />
+        <br />
+        <br />
+        <br />
+        <br />
+        <p>Tip: <em>Visit this page again when you are connected to the internet to read our online collection of featured notebooks.</em></p>
+    </div>
+`
+
+export const Featured = () => {
+    // Option 1: Dynamically load source list from a json:
+    // const [sources, set_sources] = useState(/** @type{Array<{url: String, integrity: String?}>?} */ (null))
+    // useEffect(() => {
+    //     run(async () => {
+    //         const data = await (await fetch("featured_sources.json")).json()
+
+    //         set_sources(data.sources)
+    //     })
+    // }, [])
+
+    // Option 2: From a JS file. This means that the source list can be bundled together.
+    const sources = featured_sources.sources
+
+    const [source_data, set_source_data] = useState(/** @type{Array<SourceManifest>} */ ([]))
+
+    useEffect(() => {
+        if (sources != null) {
+            const promises = sources.map(async ({ url, integrity }) => {
+                const data = await (await fetch(new Request(url, { integrity: integrity ?? undefined }))).json()
+
+                if (data.format_version !== "1") {
+                    throw new Error(`Invalid format version: ${data.format_version}`)
+                }
+
+                set_source_data((old) => [
+                    ...old,
+                    {
+                        ...data,
+                        source_url: url,
+                    },
+                ])
+            })
+
+            Promise.any(promises).catch((e) => {
+                console.error("All featured sources failed to load: ", e)
+                set_waited_too_long(true)
+            })
+        }
+    }, [sources])
+
+    useEffect(() => {
+        if (source_data?.length > 0) {
+            console.log("Sources:", source_data)
+        }
+    }, [source_data])
+
+    const [waited_too_long, set_waited_too_long] = useState(false)
+    useEffect(() => {
+        setTimeout(() => {
+            set_waited_too_long(true)
+        }, 8 * 1000)
+    }, [])
+
+    const no_data = !(source_data?.length > 0)
+
+    return no_data && waited_too_long
+        ? offline_html
+        : html`
+              ${(no_data ? placeholder_data : source_data).map(
+                  (data) => html`
+                      <div class="featured-source">
+                          <h1>${data.title}</h1>
+                          <p>${data.description}</p>
+                          ${data.collections.map((coll) => {
+                              return html`
+                                  <div class="collection">
+                                      <h2>${coll.title}</h2>
+                                      <p>${coll.description}</p>
+                                      <div class="card-list">
+                                          ${collection(Object.values(data.notebooks), coll.tags).map(
+                                              (entry) => html`<${FeaturedCard} entry=${entry} source_url=${data.source_url} />`
+                                          )}
+                                      </div>
+                                  </div>
+                              `
+                          })}
+                      </div>
+                  `
+              )}
+          `
+}
+
+const collection = (/** @type {SourceManifestNotebookEntry[]} */ notebooks, /** @type {String[]} */ tags) => {
+    const nbs = notebooks.filter((notebook) => tags.some((t) => (notebook.frontmatter?.tags ?? []).includes(t)))
+
+    return /** @type {SourceManifestNotebookEntry[]} */ (_.sortBy(nbs, [(nb) => Number(nb?.frontmatter?.order), "id"]))
+}
diff --git a/frontend/components/welcome/FeaturedCard.js b/frontend/components/welcome/FeaturedCard.js
new file mode 100644
index 0000000000..b12f0529dc
--- /dev/null
+++ b/frontend/components/welcome/FeaturedCard.js
@@ -0,0 +1,93 @@
+import { base64url_to_base64 } from "../../common/PlutoHash.js"
+import { with_query_params } from "../../common/URLTools.js"
+import _ from "../../imports/lodash.js"
+import { html, useEffect, useState, useMemo } from "../../imports/Preact.js"
+
+const transparent_svg = "data:image/svg+xml;charset=utf8,%3Csvg%20xmlns='http://www.w3.org/2000/svg'%3E%3C/svg%3E"
+
+const str_to_degree = (s) => ([...s].reduce((a, b) => a + b.charCodeAt(0), 0) * 79) % 360
+
+/**
+ * @param {{
+ *  entry: import("./Featured.js").SourceManifestNotebookEntry,
+ *  source_url: String,
+ * }} props
+ */
+export const FeaturedCard = ({ entry, source_url }) => {
+    const title = entry.frontmatter?.title
+    const u = (x) => (x == null ? null : new URL(x, source_url).href)
+
+    const href = with_query_params(`editor.html`, {
+        statefile: u(entry.statefile_path),
+        notebookfile: u(entry.notebookfile_path),
+        notebookfile_integrity: `sha256-${base64url_to_base64(entry.hash)}`,
+        disable_ui: `true`,
+        pluto_server_url: `.`,
+        name: title == null ? null : `sample ${title}`,
+    })
+
+    const author = author_info(entry.frontmatter)
+
+    return html`
+        <featured-card style=${`--card-color-hue: ${str_to_degree(entry.id)}deg;`}>
+            <a class="banner" href=${href}><img src=${u(entry.frontmatter.image) ?? transparent_svg} /></a>
+            ${author?.name == null
+                ? null
+                : html`
+                      <div class="author">
+                          <a href=${author.url}> <img src=${author.image ?? transparent_svg} /><span>${author.name}</span></a>
+                      </div>
+                  `}
+            <h3><a href=${href} title=${entry.frontmatter.title}>${entry.frontmatter.title}</a></h3>
+            <p title=${entry.frontmatter.description}>${entry.frontmatter.description}</p>
+        </featured-card>
+    `
+}
+
+/**
+ * @typedef AuthorInfo
+ * @type {{
+ * name: string?,
+ * url: string?,
+ * image: string?,
+ * }}
+ */
+
+const author_info = (frontmatter) =>
+    author_info_item(frontmatter.author) ??
+    author_info_item({
+        name: frontmatter.author_name,
+        url: frontmatter.author_url,
+        image: frontmatter.author_image,
+    })
+
+/**
+ * @returns {AuthorInfo?}
+ */
+const author_info_item = (x) => {
+    if (x instanceof Array) {
+        return author_info_item(x[0])
+    } else if (x == null) {
+        return null
+    } else if (typeof x === "string") {
+        return {
+            name: x,
+            url: null,
+            image: null,
+        }
+    } else if (x instanceof Object) {
+        let { name, image, url } = x
+
+        if (image == null && url != null) {
+            image = url + ".png?size=48"
+        }
+
+        return {
+            name,
+            url,
+            image,
+        }
+    } else {
+        return null
+    }
+}
diff --git a/frontend/components/welcome/Open.js b/frontend/components/welcome/Open.js
index bb9abdd9e8..3c513fd90a 100644
--- a/frontend/components/welcome/Open.js
+++ b/frontend/components/welcome/Open.js
@@ -1,5 +1,5 @@
 import _ from "../../imports/lodash.js"
-import { html, Component, useEffect, useState, useMemo } from "../../imports/Preact.js"
+import { html } from "../../imports/Preact.js"
 
 import { FilePicker } from "../FilePicker.js"
 import { PasteHandler } from "../PasteHandler.js"
@@ -28,27 +28,22 @@ export const Open = ({ client, connected, CustomPicker, show_samples }) => {
     }
 
     const picker = CustomPicker ?? {
-        text: "Open from file",
+        text: "Open a notebook",
         placeholder: "Enter path or URL...",
     }
 
-    return html`<p>New session:</p>
-        <${PasteHandler} />
-        <ul id="new">
-            ${show_samples && html`<li>Open a <a href="sample">sample notebook</a></li>`}
-            <li>Create a <a href="new">new notebook</a></li>
-            <li>
-                ${picker.text}:
-                <${FilePicker}
-                    key=${picker.placeholder}
-                    client=${client}
-                    value=""
-                    on_submit=${on_open_path}
-                    button_label="Open"
-                    placeholder=${picker.placeholder}
-                />
-            </li>
-        </ul>`
+    return html`<${PasteHandler} />
+        <h2>${picker.text}</h2>
+        <div id="new">
+            <${FilePicker}
+                key=${picker.placeholder}
+                client=${client}
+                value=""
+                on_submit=${on_open_path}
+                button_label="Open"
+                placeholder=${picker.placeholder}
+            />
+        </div>`
 }
 
 // /open will execute a script from your hard drive, so we include a token in the URL to prevent a mean person from getting a bad file on your computer _using another hypothetical intrusion_, and executing it using Pluto
diff --git a/frontend/components/welcome/Recent.js b/frontend/components/welcome/Recent.js
index 7bcfdfca28..815987456e 100644
--- a/frontend/components/welcome/Recent.js
+++ b/frontend/components/welcome/Recent.js
@@ -181,7 +181,7 @@ export const Recent = ({ client, connected, remote_notebooks, CustomRecent }) =>
                       })}
                   >
                       <button onclick=${() => on_session_click(nb)} title=${running ? "Shut down notebook" : "Start notebook in background"}>
-                          <span></span>
+                          <span class="ionicon"></span>
                       </button>
                       <a
                           href=${running ? link_edit(nb.notebook_id) : link_open_path(nb.path)}
@@ -201,8 +201,13 @@ export const Recent = ({ client, connected, remote_notebooks, CustomRecent }) =>
 
     if (CustomRecent == null) {
         return html`
-            <p>Recent sessions:</p>
-            <ul id="recent">
+            <h2>My work</h2>
+            <ul id="recent" class="show-scrollbar">
+                <li class="new">
+                    <a href="new"
+                        ><button><span class="ionicon"></span></button>Create a <strong>new notebook</strong></a
+                    >
+                </li>
                 ${recents}
             </ul>
         `
diff --git a/frontend/components/welcome/Welcome.js b/frontend/components/welcome/Welcome.js
index 4c20bd170b..8733e92b46 100644
--- a/frontend/components/welcome/Welcome.js
+++ b/frontend/components/welcome/Welcome.js
@@ -6,6 +6,7 @@ import { create_pluto_connection } from "../../common/PlutoConnection.js"
 import { new_update_message } from "../../common/NewUpdateMessage.js"
 import { Open } from "./Open.js"
 import { Recent } from "./Recent.js"
+import { Featured } from "./Featured.js"
 
 // This is imported asynchronously - uncomment for development
 // import environment from "../../common/Environment.js"
@@ -72,8 +73,26 @@ export const Welcome = () => {
     const { show_samples, CustomRecent, CustomPicker } = extended_components
 
     return html`
-        <${Open} client=${client_ref.current} connected=${connected} CustomPicker=${CustomPicker} show_samples=${show_samples} />
-        <br />
-        <${Recent} client=${client_ref.current} connected=${connected} remote_notebooks=${remote_notebooks} CustomRecent=${CustomRecent} />
+        <section id="title">
+            <h1>welcome to <img src="img/logo.svg" /></h1>
+            <!-- <a id="github" href="https://github.com/fonsp/Pluto.jl"
+                ><img src="https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/logo-github.svg"
+            /></a> -->
+        </section>
+        <section id="mywork">
+            <div>
+                <${Recent} client=${client_ref.current} connected=${connected} remote_notebooks=${remote_notebooks} CustomRecent=${CustomRecent} />
+            </div>
+        </section>
+        <section id="open">
+            <div>
+                <${Open} client=${client_ref.current} connected=${connected} CustomPicker=${CustomPicker} show_samples=${show_samples} />
+            </div>
+        </section>
+        <section id="featured">
+            <div>
+                <${Featured} />
+            </div>
+        </section>
     `
 }
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index 85d722c801..6447a4923f 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -139,7 +139,7 @@
         --footer-atag-color: rgb(114, 161, 223);
         --footer-input-border-color: #6c6c6c;
         --footer-filepicker-button-color: black;
-        --footer-filepicker-focus-color: #9d9d9d;
+        --footer-filepicker-focus-color: #c1c1c1;
         --footnote-border-color: rgba(114, 225, 231, 0.15);
 
         /* undo delete cell*/
@@ -185,6 +185,13 @@
         /* Landing colors */
         --index-text-color: rgb(199, 199, 199);
         --index-clickable-text-color: rgb(235, 235, 235);
+        --index-card-bg: #313131;
+        --welcome-mywork-bg: var(--header-bg-color);
+        --welcome-newnotebook-bg: rgb(68 72 102);
+        --welcome-recentnotebook-bg: #3b3b3b;
+        --welcome-recentnotebook-border: #6e6e6e;
+        --welcome-open-bg: hsl(233deg 20% 33%);
+        --welcome-card-author-backdrop: #0000006b;
 
         /* docs binding */
         --docs-binding-bg: #323431;
diff --git a/frontend/editor.css b/frontend/editor.css
index 93978ededc..3ea685ec19 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1069,7 +1069,7 @@ pluto-output:not(.rich_output) > div > pre {
     display: flex;
 }
 
-.bonds_disabled.offer_binder bond {
+.bonds_disabled:where(.offer_binder, .offer_local) bond {
     opacity: 0.6;
     filter: grayscale(1);
 }
@@ -1209,6 +1209,7 @@ pluto-cell.code_differs > pluto-input > .cm-editor {
 
 /* UI */
 
+button.floating_back_button,
 .overlay-button button,
 pluto-cell > button,
 pluto-input > button,
@@ -2226,7 +2227,7 @@ footer a {
 footer input {
     margin: 0px;
     border: 2px solid var(--footer-input-border-color);
-    background: transparent;
+    background: var(--white);
     font-family: inherit;
     font-size: inherit;
     border-radius: 3px 0 0 3px;
@@ -2606,6 +2607,7 @@ nav#slide_controls > button {
     padding: 5px;
 }
 
+button.floating_back_button > span::after,
 nav#slide_controls > button > span::after {
     content: " " !important;
     display: block;
@@ -2613,6 +2615,7 @@ nav#slide_controls > button > span::after {
     width: 30px;
     background-size: 30px 30px;
 }
+button.floating_back_button > span::after,
 nav#slide_controls > button.prev > span::after {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-back-outline.svg");
     filter: var(--image-filters);
@@ -2622,6 +2625,18 @@ nav#slide_controls > button.next > span::after {
     filter: var(--image-filters);
 }
 
+button.floating_back_button {
+    display: none;
+}
+
+.static_preview.offer_local button.floating_back_button {
+    display: flex;
+    position: fixed;
+    z-index: 1000;
+    left: 1em;
+    top: 1em;
+}
+
 /* CODEMIRROR HINTS */
 
 .cm-editor .cm-tooltip {
diff --git a/frontend/editor.js b/frontend/editor.js
index 72ab6c4155..a923ca7825 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -48,6 +48,8 @@ const launch_params = {
     //@ts-ignore
     binder_url: url_params.get("binder_url") ?? window.pluto_binder_url,
     //@ts-ignore
+    pluto_server_url: url_params.get("pluto_server_url") ?? window.pluto_pluto_server_url,
+    //@ts-ignore
     slider_server_url: url_params.get("slider_server_url") ?? window.pluto_slider_server_url,
     //@ts-ignore
     recording_url: url_params.get("recording_url") ?? window.pluto_recording_url,
@@ -95,6 +97,13 @@ export const empty_notebook_state = ({ notebook_id }) => ({
     nbpkg: null,
 })
 
+/**
+ *
+ * @param {import("./components/Editor.js").NotebookData} state
+ * @returns {import("./components/Editor.js").NotebookData}
+ */
+const without_path_entries = (state) => ({ ...state, path: default_path, shortpath: "" })
+
 /**
  *
  * @param {{
@@ -114,7 +123,7 @@ const EditorLoader = ({ launch_params }) => {
             ;(async () => {
                 const r = await fetch(new Request(launch_params.statefile, { integrity: launch_params.statefile_integrity }))
                 const data = await read_Uint8Array_with_progress(r, set_statefile_download_progress)
-                const state = unpack(data)
+                const state = without_path_entries(unpack(data))
                 initial_notebook_state_ref.current = state
                 set_ready_for_editor(true)
             })()
diff --git a/frontend/featured_sources.js b/frontend/featured_sources.js
new file mode 100644
index 0000000000..250ea2b81c
--- /dev/null
+++ b/frontend/featured_sources.js
@@ -0,0 +1,8 @@
+export default {
+    sources: [
+        {
+            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@a0158dceac9ec602aaf4d8e0d53ddd10b8b56854/pluto_export.json",
+            integrity: "sha256-6LMXdEg2AvJcgkO1ne6tf75UFC8Vob6YqRAx6ytrfk8=",
+        },
+    ],
+}
diff --git a/frontend/img/favicon_unsaturated_bg.svg b/frontend/img/favicon_unsaturated_bg.svg
new file mode 100755
index 0000000000..1adc29e099
--- /dev/null
+++ b/frontend/img/favicon_unsaturated_bg.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="64px" height="64px" viewBox="0 0 171 171" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;">
+    <g id="Layer-1" serif:id="Layer 1" transform="matrix(1,0,0,1,-614.733,-339.436)">
+        <g transform="matrix(1.36912,0,0,1.14015,583.759,327.006)">
+            <path d="M146.848,38.142C146.848,23.107 136.683,10.901 124.163,10.901L45.308,10.901C32.788,10.901 22.623,23.107 22.623,38.142L22.623,132.833C22.623,147.867 32.788,160.073 45.308,160.073L124.163,160.073C136.683,160.073 146.848,147.867 146.848,132.833L146.848,38.142Z" style="fill:rgb(245,243,213);"/>
+        </g>
+        <g transform="matrix(0.483616,0,0,0.483616,448.339,267.753)">
+            <g id="Layer-11" serif:id="Layer 1">
+                <g id="g51">
+                    <circle id="circle18" cx="519.903" cy="381.451" r="46.772" style="fill:rgb(214,102,97);stroke:rgb(201,61,57);stroke-width:8.5px;"/>
+                    <circle id="circle22" cx="519.903" cy="324.064" r="46.772" style="fill:rgb(170,125,192);stroke:rgb(148,91,176);stroke-width:8.5px;"/>
+                    <circle id="circle20" cx="519.903" cy="266.676" r="46.772" style="fill:rgb(107,171,91);stroke:rgb(59,151,46);stroke-width:8.5px;"/>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/frontend/index.css b/frontend/index.css
index 007a7028a9..65bceeef8a 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -7,24 +7,16 @@
 @import url("light_color.css");
 @import url("dark_color.css");
 
+@import url("https://cdn.jsdelivr.net/npm/open-props@1.3.16/open-props.min.css");
+
 * {
     box-sizing: border-box;
 }
-
-#title {
-    /* position: absolute; */
-    /* left: 0; */
-    /* right: 0; */
-    margin-top: 34vh;
-    /* bottom: 0; */
-    /* margin: auto; */
-    display: block;
-    width: 100%;
-    text-align: center;
+html {
+    font-size: 17px;
 }
 
-#title h1,
-#title h2 {
+#title h1 {
     font-style: italic;
     font-size: 2em;
     letter-spacing: 0.08em;
@@ -32,15 +24,13 @@
     font-family: "Vollkorn", serif;
     color: var(--pluto-output-h-color);
     margin: 0px;
-    border-bottom: solid 2px var(--rule-color);
-}
-
-#title h2 {
-    font-size: 1.4em;
-}
+    padding: 4rem 1rem 3rem 1rem;
+    /* flex: 1 1 auto; */ /* max-width: 920px; */
+text-align: center;}
 
-#title img {
+#title h1 img {
     height: 1.2em;
+    width: 4.9em;
     margin-bottom: -0.27em;
     /* margin-right: -1.5em; */
     margin-left: 0.1em;
@@ -55,31 +45,24 @@ body {
     background: var(--main-bg-color);
 }
 
-main {
-    width: 15em;
-    margin: 0 auto;
-    margin-top: 20vh;
-    text-align: left;
-    font-family: "Roboto Mono", monospace;
-    color: var(--index-text-color);
-}
-
 p {
-    color: var(--index-clickable-text-color);
+    color: var(--index-text-color);
 }
 
 ul {
-    padding-left: 0.5em;
+    padding-left: 0;
     list-style: none;
 }
 
 li {
     white-space: nowrap;
-    margin-bottom: 0.9em;
+    padding: 0.4em;
+    border-bottom: 1px solid var(--welcome-recentnotebook-border);
 }
 
 a {
     color: inherit;
+
     color: var(--index-clickable-text-color);
 }
 
@@ -96,7 +79,8 @@ a {
 pluto-filepicker {
     display: flex;
     flex-direction: row;
-    margin-top: 0.3rem;
+    /* margin-top: 0.3rem; */
+    background: var(--white);
 }
 
 pluto-filepicker .cm-editor {
@@ -105,16 +89,19 @@ pluto-filepicker .cm-editor {
     width: 100%;
     font-style: normal;
     font-weight: 500;
-    font-family: "Roboto Mono", monospace;
+
+    font-family: var(--inter-ui-font-stack);
     font-size: 0.75rem;
     letter-spacing: 1px;
     background: none;
     color: var(--nav-filepicker-color);
-    border: 2px solid var(--nav-filepicker-border-color);
+    border: 2px solid var(--footer-filepicker-focus-color);
     border-radius: 3px;
     border-right: none;
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
+    flex: 1 1 100%;
+    width: 0px; /* min-width: 0px; */
 }
 
 pluto-filepicker .cm-scroller {
@@ -154,11 +141,14 @@ pluto-filepicker button:disabled {
 }
 
 .cm-tooltip-autocomplete {
-    max-height: calc(20 * 16px);
     box-sizing: content-box;
     z-index: 100;
 }
 
+.cm-editor .cm-tooltip.cm-tooltip-autocomplete > ul {
+    max-height: max(3em, min(50dvh, 20em));
+}
+
 .cm-tooltip.cm-completionInfo.cm-completionInfo-right:empty {
     /* https://github.com/codemirror/codemirror.next/issues/574 */
     display: none;
@@ -166,10 +156,10 @@ pluto-filepicker button:disabled {
 
 .cm-editor .cm-tooltip.cm-tooltip-autocomplete > ul > li {
     /* this is the line height rounded to an integer to prevent jiggle */
-    height: 16px;
+    height: 18px;
     overflow-y: hidden;
     /* font-size: 16px; */
-    line-height: 16px;
+    /* line-height: 16px; */
     border-radius: 3px;
     margin-bottom: unset;
 }
@@ -180,9 +170,7 @@ pluto-filepicker button:disabled {
 }
 
 .cm-editor .cm-completionIcon {
-    opacity: 1;
-    width: 1em;
-    transform: translateY(-1.5px);
+    display: none;
 }
 
 .cm-completionIcon::before {
@@ -215,9 +203,10 @@ pluto-filepicker button:disabled {
 }
 
 .cm-editor .cm-tooltip-autocomplete .cm-completionLabel {
-    font-family: JuliaMono, Menlo, "Roboto Mono", "Lucida Sans Typewriter", "Source Code Pro", monospace !important;
+    font-family: var(--inter-ui-font-stack);
+    font-weight: 400;
     font-variant-ligatures: none;
-    font-size: 0.75rem;
+    font-size: 0.8rem;
 }
 
 body.nosessions ul#new ~ * {
@@ -225,7 +214,12 @@ body.nosessions ul#new ~ * {
 }
 
 #recent {
-    margin-bottom: 8em;
+    scrollbar-gutter: stable;background: var(--welcome-recentnotebook-bg); /* margin-bottom: 8em; */
+    max-height: 16em;
+    overflow-y: auto;
+    overflow-x: hidden;border-radius: 0.4rem;
+    box-shadow: -2px 4px 9px 0px #00000012;
+    border: 0.2rem solid #d5d5d5;
 }
 
 #recent > li.recent {
@@ -244,28 +238,30 @@ body.nosessions ul#new ~ * {
     color: var(--ui-button-color);
 }
 
-#recent button > span::after {
-    display: block;
+span.ionicon::after {
+    display: inline-block;
     content: " ";
-    background-size: 17px 17px;
-    height: 17px;
-    width: 17px;
-    margin-bottom: -3px;
+    background-size: 1rem 1rem;
+    height: 1rem;
+    width: 1rem;
+    margin-bottom: -0.17rem;
+    filter: var(--image-filters);
 }
 
 #recent li.running button > span::after {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-circle.svg");
-    filter: var(--image-filters);
 }
 
 #recent li.recent button > span::after {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg");
-    filter: var(--image-filters);
 }
 
 #recent li.transitioning button > span::after {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/ellipsis-horizontal-outline.svg");
-    filter: var(--image-filters);
+}
+
+#recent li.new span::after {
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/add-outline.svg");
 }
 
 loading-bar {
@@ -294,3 +290,134 @@ body.loading loading-bar {
         right: 0vw;
     }
 }
+
+:root {
+    --card-width: 15rem;
+}
+
+featured-card {
+    --card-color: hsl(var(--card-color-hue), 77%, 82%);
+    --card-border-radius: 10px;
+    --card-border-width: 3px;
+
+    display: block;
+    /* width: var(--card-width); */
+    border: var(--card-border-width) solid var(--card-color);
+    border-radius: var(--card-border-radius);
+    margin: 10px;
+    padding-bottom: 0.3rem;
+    box-shadow: 0px 2px 6px 0px #00000014;
+    font-family: var(--inter-ui-font-stack);
+    position: relative;
+    word-break: break-word;
+    hyphens: auto;
+    background: var(--index-card-bg);
+    max-width: var(--card-width);
+}
+
+.card-list {
+    display: grid;
+    /* grid-auto-columns: 50px; */
+    place-items: center;
+    align-items: stretch;
+    grid-template-columns: repeat(auto-fit, minmax(var(--card-width), 1fr));
+    gap: 0rem;
+    justify-items: stretch;
+}
+
+featured-card .banner img {
+    --zz: calc(var(--card-border-radius) - var(--card-border-width));
+    width: 100%;
+    /* height: 8rem; */
+    aspect-ratio: 3/2;
+    object-fit: cover;
+    /* background-color: hsl(16deg 100% 66%); */
+    background: var(--card-color);
+    border-radius: var(--zz) var(--zz) 0 0;
+    flex: 1 1 200px;
+    min-width: 0;
+}
+
+featured-card .author img {
+    --size: 1.6em;
+    /* margin: 0.4em 0.4em; */
+    /* margin-bottom: -0.4em; */
+    width: var(--size);
+    height: var(--size);
+    object-fit: cover;
+    border-radius: 100%;
+    background: #b6b6b6;
+    display: inline-block;
+    overflow: hidden;
+}
+
+featured-card a {
+    text-decoration: none;
+    /* font-weight: 800; */
+}
+
+featured-card a.banner {
+    display: flex;
+}
+
+featured-card .author {
+    font-weight: 600;
+}
+
+featured-card h3 a {
+    padding: 0.6em;
+    padding-bottom: 0;
+    -webkit-line-clamp: 2;
+    display: inline-block;
+    display: -webkit-inline-box;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    background: var(--index-card-bg);
+    border-radius: 0.6em;
+    /* border-top-left-radius: 0; */
+}
+
+featured-card p {
+    margin: 0.3rem 0.8rem;
+    /* padding-top: 0; */
+    /* margin-block: 0; */
+    color: #838383;
+    -webkit-line-clamp: 4;
+    display: inline-block;
+    display: -webkit-inline-box;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+}
+
+featured-card h3 {
+    margin: -1.1rem 0rem 0rem 0rem;
+}
+
+featured-card.big {
+    grid-column-end: span 2;
+    grid-row-end: span 2;
+    /* width: 2000px; */
+}
+
+featured-card.big .banner img {
+    height: 16rem;
+}
+
+featured-card.special::before {
+    content: "New!";
+    font-size: 1.4rem;
+    font-weight: 700;
+    text-transform: uppercase;
+    font-style: italic;
+    display: block;
+    background: #fcf492;
+    color: #833bc6;
+    text-shadow: 0 0 1px #ff6767;
+    position: absolute;
+    transform: translateY(calc(-100% - -15px)) rotate(-5deg);
+    padding: 2px 19px;
+    left: -9px;
+    /* right: 51px; */
+    /* border: 2px solid #ffca62; */
+    pointer-events: none;
+}
diff --git a/frontend/index.html b/frontend/index.html
index a032146059..e7fda8c032 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -3,7 +3,7 @@
 
 <head>
     <meta name="viewport" content="width=device-width" />
-    <title>⚡ Pluto.jl ⚡</title>
+    <title>Pluto.jl</title>
     <meta charset="utf-8" />
     <script>
         console.log("Pluto.jl, by Fons van der Plas (https://github.com/fonsp) and Mikołaj Bochenski (https://github.com/malyvsen) 🌈");
@@ -20,6 +20,7 @@
     <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.20/lodash.min.js" defer></script>
     <script src="https://cdn.jsdelivr.net/npm/@observablehq/stdlib@3.3.1/dist/stdlib.js" defer></script>
 
+    <link rel="stylesheet" href="welcome.css">
     <link rel="stylesheet" href="index.css">
 
     <script src="index.js" type="module" defer></script>
@@ -29,21 +30,43 @@
     <link rel="prerender" href="editor.html">
 </head>
 
-<body class="loading nosessions">
+<!-- <body class="loading nosessions"> -->
+
+<body class="nosessions">
     <loading-bar></loading-bar>
-    <div id="title">
-        <h1>welcome to <img src="img/logo.svg"></h1>
-        <main>
-            <p>New session:</p>
-            <ul id="new">
-                <li>Open a <a href="sample">sample notebook</a></li>
-                <li>Create a <a href="new">new notebook</a></li>
-                <li>
-                    Open from file:
-                    <p><em>Loading...</em></p>
-                </li>
-            </ul>
-        </main>
+    <!-- <header>
+        <div>
+            <span class="pluto-logo"><img src="img/favicon_unsaturated_bg.svg"> Pluto.jl</span>
+        </div>
+    </header> -->
+    <div id="app">
+        <section id="title"><h1>welcome to <img src="img/logo.svg"></h1></section>
+        <section id="mywork">
+            <div>
+                <h2>My work</h2>
+                <ul id="recent">
+                    <li class="new"><a href="new"><button><span class="ionicon"></span></button>Create a <strong>new notebook</strong></a></li>
+                    <li><em>Loading...</em></li>
+                </ul>
+            </div>
+        </section>
+        <section id="open">
+            <div>
+                <h2>Open a notebook</h2>
+                <p><em>Loading...</em></p>
+            </div>
+        </section>
+        <section id="featured">
+            <div>
+                <div class="featured-source">
+                    <h1>Featured Notebooks</h1>
+                    <p>These notebooks from the Julia community show off what you can do with Pluto. Give it a try, you might learn something new!</p>
+                    <div class="collection">
+                        <h2>Loading...</h2>
+                    </div>
+                </div>
+            </div>
+        </section>
     </div>
 </body>
 
diff --git a/frontend/index.js b/frontend/index.js
index 15efdd148a..4ba142026d 100644
--- a/frontend/index.js
+++ b/frontend/index.js
@@ -3,4 +3,4 @@ import "./common/NodejsCompatibilityPolyfill.js"
 
 import { Welcome } from "./components/welcome/Welcome.js"
 
-render(html`<${Welcome} />`, document.querySelector("main"))
+render(html`<${Welcome} />`, document.querySelector("#app"))
diff --git a/frontend/light_color.css b/frontend/light_color.css
index de08581241..bcfa8a11ea 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -189,6 +189,13 @@
         --index-text-color: hsl(0, 0, 60);
         --index-clickable-text-color: hsl(0, 0, 30);
         --docs-binding-bg: #8383830a;
+        --index-card-bg: white;
+        --welcome-mywork-bg: hsl(35deg 66% 93%);
+        --welcome-newnotebook-bg: whitesmoke;
+        --welcome-recentnotebook-bg: white;
+        --welcome-recentnotebook-border: #dfdfdf;
+        --welcome-open-bg: #fbfbfb;
+        --welcome-card-author-backdrop: #ffffffb0;
 
         /* HTML in codemirror! */
         --cm-html-color: #48b685;
diff --git a/frontend/sample.html b/frontend/sample.html
deleted file mode 100644
index e7fb445210..0000000000
--- a/frontend/sample.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <title>⚡ Pluto.jl ⚡</title>
-    <meta charset="utf-8" />
-    <script>
-        console.log("Pluto.jl, by Fons van der Plas (https://github.com/fonsp) and Mikołaj Bochenski (https://github.com/malyvsen) 🌈");
-    </script>
-    <meta name="author" content="Fons van der Plas; Mikołaj Bochenski" />
-    <meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
-    <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#2a2928">
-    <meta name="color-scheme" content="light dark">
-    <link rel="icon" type="image/png" sizes="16x16" href="./img/favicon-16x16.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="./img/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="./img/favicon-96x96.png">
-    <meta name="description" content="Pluto.jl notebooks" />
-
-    <link rel="stylesheet" href="./index.css">
-
-</head>
-
-<body>
-    <div id="title">
-        <h1>welcome to <img src="./img/logo.svg"></h1>
-        <main>
-            <p class="new">Samples:</p>
-            <ul class="new">
-                <li>1. <a href="sample/Getting%20started.jl">Getting started</a></li>
-                <li>2. <a href="sample/Basic%20mathematics.jl">Basic mathematics</a></li>
-                <li>3. <a href="sample/Interactivity.jl">Interactivity</a></li>
-                <li>4. <a href="sample/PlutoUI.jl.jl">PlutoUI.jl</a></li>
-                <li>5. <a href="sample/Plots.jl.jl">Plots.jl</a></li>
-                <li>6. <a href="sample/Tower%20of%20Hanoi.jl">Tower of Hanoi</a></li>
-                <li>7. <a href="sample/JavaScript.jl">JavaScript</a></li>
-                <li>&#160&#160&#160<i>More to come...</i></li>
-            </ul>
-            <br>
-        </main>
-    </div>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/frontend/welcome.css b/frontend/welcome.css
new file mode 100644
index 0000000000..94eaaa6fc7
--- /dev/null
+++ b/frontend/welcome.css
@@ -0,0 +1,262 @@
+@import url("https://cdn.jsdelivr.net/npm/inter-ui@3.19.3/inter-latin.css");
+
+:root {
+    --pluto-cell-spacing: 17px;
+    /* use the value "contextual" to enable contextual ligatures `document.documentElement.style.setProperty('--pluto-operator-ligatures', 'contextual');`
+        for julia mono see here: https://cormullion.github.io/pages/2020-07-26-JuliaMono/#contextual_and_stylistic_alternates_and_ligatures */
+    --pluto-operator-ligatures: none;
+    --julia-mono-font-stack: JuliaMono, Menlo, "Roboto Mono", "Lucida Sans Typewriter", "Source Code Pro", monospace;
+    --sans-serif-font-stack: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
+    --lato-ui-font-stack: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, Helvetica, Arial, "Apple Color Emoji",
+        "Segoe UI Emoji", "Segoe UI Symbol", system-ui, sans-serif;
+    --inter-ui-font-stack: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, Helvetica, Arial, "Apple Color Emoji",
+        "Segoe UI Emoji", "Segoe UI Symbol", system-ui, sans-serif;
+
+    color-scheme: light dark;
+}
+
+html {
+    font-family: var(--inter-ui-font-stack);
+    font-size: 17px;
+}
+
+main {
+    display: block;
+    max-width: 1200px;
+    padding: 1rem;
+    margin: 0 auto;
+}
+/* font-size: 1.7em; */
+
+header {
+    background-color: #f5efd2; /* background-image: linear-gradient(to top, white, #fff0), var(--noise-4); */
+    /* filter: var(--noise-filter-1); */
+    display: flex;
+    background-size: cover;
+    justify-content: center;
+    padding: 1.3rem;
+}
+header h1 {
+    font-weight: 500;
+
+    /* font-style: italic; */
+    text-align: center;
+    /* color: white; */
+}
+
+section#mywork,
+section#open {
+    /* --c1: rgb(255 255 255 / 20%); */
+    /* --c2: rgb(255 255 255 / 7%); */
+    /* background-color: #92add9; */
+    /* --grad-stops: transparent 9%, var(--c1) 10%, var(--c1) 12%, transparent 13%, transparent 29%, var(--c2) 30%, var(--c2) 31%, transparent 32%, transparent 49%,
+        var(--c2) 50%, var(--c2) 51%, transparent 52%, transparent 69%, var(--c2) 70%, var(--c2) 71%, transparent 72%, transparent 89%, var(--c2) 90%,
+        var(--c2) 91%, transparent 92%, transparent; */
+    /* background-size: 40px 40px; */
+    /* background-position: 20px 20px; */
+    /* background-image: linear-gradient(360deg, var(--grad-stops)), linear-gradient(90deg, var(--grad-stops)); */
+    /* background: #f5f5f6; */
+    /* position: relative; */
+    /* background: url("https://computationalthinking.mit.edu/Spring21/homepage/bg.svg"); */ /* background-size: cover; */ /* background-position: 0% 70%; */
+    background: var(--welcome-mywork-bg);
+    /* background: var(--header-bg-color); */
+    position: relative;
+}
+
+.pluto-logo {
+    font-style: normal;
+    font-weight: 800;
+    color: inherit;
+    /* padding: 0.3em; */
+    display: flex;
+    flex-direction: row;
+    padding: 0.5em;
+    align-items: center;
+    gap: 0.5ch;
+    font-family: var(--inter-ui-font-stack);
+    transform: translateY(0.23em);
+}
+
+.pluto-logo img {
+    height: 1.2em;
+    width: 1.2em;
+}
+
+#new {
+    background: var(--welcome-open-bg);
+    box-shadow: -2px 4px 9px 0px #00000012;
+    padding: 1.3rem;
+    border-radius: 0.6rem;
+    margin: 1rem;
+    /* border: 0.3rem solid #d6e0d8; */
+    display: flex;
+    flex-direction: column;
+    align-content: stretch;
+}
+
+section {
+    display: flex; /* overflow: hidden; */ /* place-items: center; */ /* margin: 0rem 0rem; */
+
+    flex-direction: row;
+    justify-content: center;
+}
+
+section > div {
+    margin: 1rem 1rem;
+    max-width: 614px; /* margin: auto; */
+    flex: 1 1 auto;
+}
+
+.pluto-logo {
+    background: white;
+    border-radius: 0.4em;
+    display: flex;
+    flex: 0 1 auto;
+    transform: none;
+    font-size: 1.6rem;
+}
+
+section#open {
+    /* background: #f5f5f6; */
+    /* box-shadow: inset 1px 1px 20px red; */
+    position: relative;
+}
+
+section#featured > div {
+    max-width: 900px;
+}
+
+header > div {
+    max-width: 62rem; /* margin: 0 auto; */
+    flex: 1 1 auto;
+    display: flex;
+    z-index: 1;
+}
+
+section#mywork::before,
+section#open::after {
+    --c: hsl(196deg 20% 26% / 6%);
+    content: "";
+    height: 50px;
+    top: 0px;
+    left: 0;
+    right: 0;
+    position: absolute;
+    display: block;
+    background: linear-gradient(0deg, transparent, var(--c));
+    pointer-events: none;
+    z-index: 0;
+}
+
+:where(#mywork, #open) h2 {
+    /* color: black; */
+    --off: 4px;
+    --offm: -4px;
+    --oc: #ffffff;
+    /* text-shadow: var(--off) 0 var(--oc), var(--off) var(--off) var(--oc), 0 var(--off) var(--oc), var(--offm) var(--off) var(--oc), var(--offm) 0 var(--oc),
+        var(--offm) var(--offm) var(--oc), 0 var(--offm) var(--oc), var(--off) var(--offm) var(--oc); */
+    display: inline-block; /* background: #fffffffc; */ /* padding: 0.4em; */
+    border-radius: 0.4em;
+    /* color: white; */ /* text-transform: uppercase; */
+    margin: 2rem 0rem 0rem 0;
+}
+
+section#open::after {
+    top: unset;
+    bottom: 0;
+    background: linear-gradient(0deg, var(--c), transparent);
+}
+
+div#app {
+    /* background: url(https://computationalthinking.mit.edu/Spring21/homepage/bg.svg); */
+    background-size: cover;
+    background-position: 0% 77%;
+}
+
+section#featured {
+    /* background: white; */
+}
+
+.new a {
+    text-decoration: none; /* font-weight: 700; */
+    font-weight: 500;
+    font-style: italic;
+}
+
+li.new {
+    position: sticky;
+    background: var(--welcome-newnotebook-bg);
+    top: 0;
+    z-index: 2;
+}
+
+h1 {
+    font-size: 2.8rem;
+    margin-block-end: 0em;
+}
+
+.collection {
+    margin: 6em 0;
+}
+
+.collection h2 {
+    font-size: 2.5rem;
+    font-weight: 600;
+    margin: 0;
+}
+
+#featured p {
+    max-width: 54ch;
+    color: #757575;
+}
+
+.author {
+    position: absolute;
+    top: 0.3em;
+    right: 0.3em;
+    background: var(--welcome-card-author-backdrop);
+    /* background: hsl(var(--card-color-hue) 34% 46% / 59%); */
+    backdrop-filter: blur(15px);
+    color: black;
+    border-radius: 117px;
+    /* height: 2.5em; */
+    padding: 0.3em;
+    padding-right: 0.8em;
+    display: flex;
+}
+
+.author a {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 0.4ch;
+}
+
+#github img {
+    aspect-ratio: 1;
+    filter: var(--image-filters);
+    width: 2rem;
+}
+
+a#github {
+    display: block;
+    position: absolute;
+    top: 0.5rem;
+    right: 0.5rem;
+}
+
+.show-scrollbar::-webkit-scrollbar {
+    width: 10px;
+    opacity: 0.1;
+}
+.show-scrollbar::-webkit-scrollbar-track {
+}
+.show-scrollbar::-webkit-scrollbar-thumb {
+    /* height: 11px; */
+    background-color: var(--black);
+    opacity: 0.6;
+    border-radius: 1000px;
+}
+.show-scrollbar::-webkit-scrollbar-thumb:hover {
+    opacity: 1;
+}

From 4758c4e73e472808b1dad1b765fc12bfb3cd4071 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Jun 2022 17:56:13 +0200
Subject: [PATCH 390/821] fix bundle

---
 frontend/featured_sources.js |  1 +
 frontend/index.css           | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/featured_sources.js b/frontend/featured_sources.js
index 250ea2b81c..e9573ba776 100644
--- a/frontend/featured_sources.js
+++ b/frontend/featured_sources.js
@@ -1,4 +1,5 @@
 export default {
+    // check out https://github.com/JuliaPluto/pluto-developer-instructions/blob/main/How%20to%20update%20the%20featured%20notebooks.md to learn more
     sources: [
         {
             url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@a0158dceac9ec602aaf4d8e0d53ddd10b8b56854/pluto_export.json",
diff --git a/frontend/index.css b/frontend/index.css
index 65bceeef8a..da21f1be91 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -7,8 +7,6 @@
 @import url("light_color.css");
 @import url("dark_color.css");
 
-@import url("https://cdn.jsdelivr.net/npm/open-props@1.3.16/open-props.min.css");
-
 * {
     box-sizing: border-box;
 }
@@ -26,7 +24,8 @@ html {
     margin: 0px;
     padding: 4rem 1rem 3rem 1rem;
     /* flex: 1 1 auto; */ /* max-width: 920px; */
-text-align: center;}
+    text-align: center;
+}
 
 #title h1 img {
     height: 1.2em;
@@ -214,10 +213,12 @@ body.nosessions ul#new ~ * {
 }
 
 #recent {
-    scrollbar-gutter: stable;background: var(--welcome-recentnotebook-bg); /* margin-bottom: 8em; */
+    scrollbar-gutter: stable;
+    background: var(--welcome-recentnotebook-bg); /* margin-bottom: 8em; */
     max-height: 16em;
     overflow-y: auto;
-    overflow-x: hidden;border-radius: 0.4rem;
+    overflow-x: hidden;
+    border-radius: 0.4rem;
     box-shadow: -2px 4px 9px 0px #00000012;
     border: 0.2rem solid #d5d5d5;
 }

From bc257883b63dc45859a74b21050e56e60b424432 Mon Sep 17 00:00:00 2001
From: Alberto Mengali <disberd@gmail.com>
Date: Sat, 25 Jun 2022 15:00:24 +0200
Subject: [PATCH 391/821] fix cell paste at specific cell (#2189)

---
 frontend/common/Serialization.js                    | 6 ++----
 frontend/components/CellInput.js                    | 1 -
 frontend/components/CellInput/pluto_paste_plugin.js | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/frontend/common/Serialization.js b/frontend/common/Serialization.js
index 912ea43ddc..c45c1cc67d 100644
--- a/frontend/common/Serialization.js
+++ b/frontend/common/Serialization.js
@@ -1,5 +1,3 @@
-import { in_textarea_or_input } from "./KeyboardShortcuts.js"
-
 /**
  * Serialize an array of cells into a string form (similar to the .jl file).
  *
@@ -53,9 +51,9 @@ export function deserialize_repl(repl_session) {
         .filter((s) => s !== "")
 }
 
-export const detect_deserializer = (topaste, check_in_textarea_or_input = true) =>
+export const detect_deserializer = (topaste) =>
     topaste.trim().startsWith(JULIA_REPL_PROMPT)
         ? deserialize_repl
-        : check_in_textarea_or_input && !in_textarea_or_input() && topaste.match(/# ╔═╡ ........-....-....-....-............/g)?.length
+        : topaste.match(/# ╔═╡ ........-....-....-....-............/g)?.length
         ? deserialize_cells
         : null
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 598a5576dc..e328bb0e50 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -6,7 +6,6 @@ import { utf8index_to_ut16index } from "../common/UnicodeTools.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
 import { get_selected_doc_from_state } from "./CellInput/LiveDocsFromCursor.js"
 import { go_to_definition_plugin, GlobalDefinitionsFacet } from "./CellInput/go_to_definition_plugin.js"
-import { detect_deserializer } from "../common/Serialization.js"
 
 import {
     EditorState,
diff --git a/frontend/components/CellInput/pluto_paste_plugin.js b/frontend/components/CellInput/pluto_paste_plugin.js
index 6dd8a11948..c38a9de720 100644
--- a/frontend/components/CellInput/pluto_paste_plugin.js
+++ b/frontend/components/CellInput/pluto_paste_plugin.js
@@ -14,7 +14,7 @@ export let pluto_paste_plugin = ({ pluto_actions, cell_id }) => {
             event.stopPropagation()
 
             const topaste = event.clipboardData.getData("text/plain")
-            const deserializer = detect_deserializer(topaste, false)
+            const deserializer = detect_deserializer(topaste)
             if (deserializer == null) {
                 return false
             }

From dc4bd39e98bc5c6bacad243cf86261949e28d54b Mon Sep 17 00:00:00 2001
From: Alberto Mengali <disberd@gmail.com>
Date: Sun, 26 Jun 2022 17:39:39 +0200
Subject: [PATCH 392/821] Track dependency of `skipped_as_script` cells (#2178)

* first julia-side implementation

* First JS implementation

* Update dependency even without reactive_run

* differentiate popup text

* whitespaces

* fix typescript test error

* Fix/add test

* fix typo

* Set the tooltip only on the left border.

* move flag to cell_results

* differentiate directly and indirectly skipped cells visually

* move jump functions from RunArea.js to Cell.js

* Add jump to upstream skipped cell, change text

* clean on_jump

* use plain color for dependents on skip as script

this is to prevent confusion with running cells which have the same
gradient background.

* update light theme too!

* remove skip_as_script experimental flag

* prevent infinite recursion and use lazy search

Co-authored-by: Paul <paul@plutojl.org>
---
 frontend/components/Cell.js        | 92 +++++++++++++++++++++++++++++-
 frontend/components/CellInput.js   | 26 +++------
 frontend/components/Editor.js      |  1 +
 frontend/components/Notebook.js    |  3 +-
 frontend/components/RunArea.js     | 26 +--------
 frontend/dark_color.css            |  3 +-
 frontend/editor.css                | 21 +++++--
 frontend/light_color.css           |  3 +-
 src/evaluation/Run.jl              | 14 +++++
 src/notebook/Cell.jl               |  2 +
 src/notebook/saving and loading.jl |  4 +-
 src/webserver/Dynamic.jl           | 16 ++++++
 test/Notebook.jl                   |  8 ++-
 13 files changed, 162 insertions(+), 57 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index d42fb3c572..17a5aa806b 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -29,6 +29,63 @@ const useCellApi = (node_ref, published_object_keys, pluto_actions) => {
     return cell_api_ready
 }
 
+/**
+ * @param {String} a_cell_id
+ * @param {import("./Editor.js").NotebookData} notebook
+ * @returns {Array<String>}
+ */
+const upstream_of = (a_cell_id, notebook) => Object.values(notebook?.cell_dependencies?.[a_cell_id]?.upstream_cells_map || {}).flatMap((x) => x)
+
+/**
+ * @param {String} a_cell_id
+ * @param {import("./Editor.js").NotebookData} notebook
+ * @param {Function} predicate
+ * @param {Set<String>} explored
+ * @returns {String | null}
+ */
+const find_upstream_of = (a_cell_id, notebook, predicate, explored = new Set([])) => {
+    if (explored.has(a_cell_id)) return null
+    explored.add(a_cell_id)
+
+    if (predicate(a_cell_id)) {
+        return a_cell_id
+    }
+
+    for (let upstream of upstream_of(a_cell_id, notebook)) {
+        const upstream_val = find_upstream_of(upstream, notebook, predicate, explored)
+        if (upstream_val !== null) {
+            return upstream_val
+        }
+    }
+
+    return null
+}
+
+/**
+ * @param {String} flag_name
+ * @returns {Function}
+ */
+const hasTargetBarrier = (flag_name) => {
+    return (a_cell_id, notebook) => {
+        return notebook?.cell_inputs?.[a_cell_id].metadata[flag_name]
+    }
+}
+
+const on_jump = (hasBarrier, pluto_actions, cell_id) => () => {
+    const notebook = pluto_actions.get_notebook() || {}
+    const barrier_cell_id = find_upstream_of(cell_id, notebook, (c) => hasBarrier(c, notebook))
+    if (barrier_cell_id !== null) {
+        window.dispatchEvent(
+            new CustomEvent("cell_focus", {
+                detail: {
+                    cell_id: barrier_cell_id,
+                    line: 0, // 1-based to 0-based index
+                },
+            })
+        )
+    }
+}
+
 /**
  * @param {{
  *  cell_result: import("./Editor.js").CellResultData,
@@ -44,7 +101,7 @@ const useCellApi = (node_ref, published_object_keys, pluto_actions) => {
  * */
 export const Cell = ({
     cell_input: { cell_id, code, code_folded, metadata },
-    cell_result: { queued, running, runtime, errored, output, logs, published_object_keys, depends_on_disabled_cells },
+    cell_result: { queued, running, runtime, errored, output, logs, published_object_keys, depends_on_disabled_cells, depends_on_skipped_cells },
     cell_dependencies,
     cell_input_local,
     notebook_id,
@@ -155,6 +212,16 @@ export const Cell = ({
         pluto_actions.set_and_run_multiple(pluto_actions.get_selected_cells(cell_id, selected))
         set_waiting_to_run_smart(true)
     }, [pluto_actions, cell_id, selected, set_waiting_to_run_smart])
+
+    const skip_as_script_jump = useCallback(
+        on_jump(hasTargetBarrier("skip_as_script"), pluto_actions, cell_id),
+        [pluto_actions, cell_id],
+    )
+    const disabled_jump = useCallback(
+        on_jump(hasTargetBarrier("disabled"), pluto_actions, cell_id),
+        [pluto_actions, cell_id],
+    )
+
     return html`
         <pluto-cell
             ref=${node_ref}
@@ -169,6 +236,7 @@ export const Cell = ({
                 skip_as_script,
                 running_disabled,
                 depends_on_disabled_cells,
+                depends_on_skipped_cells,
                 show_input,
                 shrunk: Object.values(logs).length > 0,
                 hooked_up: output?.has_pluto_hook_features ?? false,
@@ -232,6 +300,7 @@ export const Cell = ({
                 running=${running}
                 code_differs=${class_code_differs}
                 queued=${queued}
+                on_jump=${disabled_jump}
             />
             <button
                 onClick=${() => {
@@ -245,13 +314,30 @@ export const Cell = ({
             ${skip_as_script
                 ? html`<div
                       class="skip_as_script_marker"
-                      title=${`This cell is currently stored in the notebook file as a Julia comment, instead of code. This way, it will not run when the notebook runs as a script outside of Pluto.`}
+                      title=${`This cell is directly flagged as disabled in file. Click to know more!`}
+                      onClick=${(e) => {
+                          open_pluto_popup({
+                              type: "info",
+                              source_element: e.target,
+                              body: html`This cell is currently stored in the notebook file as a Julia <em>comment</em>, instead of <em>code</em>.<br />
+                                  This way, it will not run when the notebook runs as a script outside of Pluto.<br />
+                                  Use the context menu to change enable it again`,
+                          })
+                      }}
+                  ></div>`
+                : depends_on_skipped_cells
+                ? html`<div
+                      class="depends_on_skipped_marker"
+                      title=${`This cell is indirectly flagged as disabled in file. Click to know more!`}
                       onClick=${(e) => {
                           open_pluto_popup({
                               type: "info",
                               source_element: e.target,
                               body: html`This cell is currently stored in the notebook file as a Julia <em>comment</em>, instead of <em>code</em>.<br />
-                                  This way, it will not run when the notebook runs as a script outside of Pluto.`,
+                                  This way, it will not run when the notebook runs as a script outside of Pluto.<br />
+                                  An upstream cell is <b> indirectly</b> <em>disabling in file</em> this one; enable
+                                  <span onClick=${skip_as_script_jump} style="cursor: pointer; text-decoration: underline"> the upstream one</span> to
+                                  affect this cell.`,
                           })
                       }}
                   ></div>`
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index e328bb0e50..cea6a51964 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -65,7 +65,6 @@ import { debug_syntax_plugin } from "./CellInput/debug_syntax_plugin.js"
 import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
 
 export const ENABLE_CM_MIXED_PARSER = window.localStorage.getItem("ENABLE_CM_MIXED_PARSER") === "true"
-export const ENABLE_SKIP_AS_SCRIPT = window.localStorage.getItem("ENABLE_SKIP_AS_SCRIPT") === "true"
 
 if (ENABLE_CM_MIXED_PARSER) {
     console.log(`YOU ENABLED THE CODEMIRROR MIXED LANGUAGE PARSER
@@ -81,11 +80,6 @@ window.PLUTO_TOGGLE_CM_MIXED_PARSER = () => {
     window.localStorage.setItem("ENABLE_CM_MIXED_PARSER", String(!ENABLE_CM_MIXED_PARSER))
     window.location.reload()
 }
-// @ts-ignore
-window.PLUTO_TOGGLE_SKIP_AS_SCRIPT = () => {
-    window.localStorage.setItem("ENABLE_SKIP_AS_SCRIPT", String(!ENABLE_SKIP_AS_SCRIPT))
-    window.location.reload()
-}
 
 export const pluto_syntax_colors = HighlightStyle.define(
     [
@@ -903,17 +897,15 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, skip_as_script, runnin
                             <span class="copy_output ctx_icon" />Copy output
                         </li>`
                       : null}
-                  ${ENABLE_SKIP_AS_SCRIPT || skip_as_script
-                      ? html`<li
-                            onClick=${toggle_skip_as_script}
-                            title=${skip_as_script
-                                ? "This cell is currently stored in the notebook file as a Julia comment. Click here to disable."
-                                : "Store this code in the notebook file as a Julia comment. This way, it will not run when the notebook runs as a script outside of Pluto."}
-                        >
-                            ${skip_as_script ? html`<span class="skip_as_script ctx_icon" />` : html`<span class="run_as_script ctx_icon" />`}
-                            ${skip_as_script ? html`<b>Enable in file</b>` : html`Disable in file`}
-                        </li>`
-                      : null}
+                  <li
+                      onClick=${toggle_skip_as_script}
+                      title=${skip_as_script
+                          ? "This cell is currently stored in the notebook file as a Julia comment. Click here to disable."
+                          : "Store this code in the notebook file as a Julia comment. This way, it will not run when the notebook runs as a script outside of Pluto."}
+                  >
+                      ${skip_as_script ? html`<span class="skip_as_script ctx_icon" />` : html`<span class="run_as_script ctx_icon" />`}
+                      ${skip_as_script ? html`<b>Enable in file</b>` : html`Disable in file`}
+                  </li>
               </ul>`
             : html``}
     </button>`
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 77759440bb..3cd6ed7780 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -147,6 +147,7 @@ const first_true_key = (obj) => {
  *  upstream_cells_map: { string: [string]},
  *  precedence_heuristic: ?number,
  *  depends_on_disabled_cells: boolean,
+ *  depends_on_skipped_cells: boolean,
  *  output: {
  *      body: string,
  *      persist_js_state: boolean,
diff --git a/frontend/components/Notebook.js b/frontend/components/Notebook.js
index c97af65383..1448297a1d 100644
--- a/frontend/components/Notebook.js
+++ b/frontend/components/Notebook.js
@@ -41,7 +41,7 @@ let CellMemo = ({
     global_definition_locations,
 }) => {
     const { body, last_run_timestamp, mime, persist_js_state, rootassignee } = cell_result?.output || {}
-    const { queued, running, runtime, errored, depends_on_disabled_cells, logs } = cell_result || {}
+    const { queued, running, runtime, errored, depends_on_disabled_cells, logs, depends_on_skipped_cells } = cell_result || {}
     const { cell_id, code, code_folded, metadata } = cell_input || {}
     return useMemo(() => {
         return html`
@@ -66,6 +66,7 @@ let CellMemo = ({
         ...Object.keys(metadata),
         ...Object.values(metadata),
         depends_on_disabled_cells,
+        depends_on_skipped_cells,
         queued,
         running,
         runtime,
diff --git a/frontend/components/RunArea.js b/frontend/components/RunArea.js
index 8552b9bc37..e17303a8c4 100644
--- a/frontend/components/RunArea.js
+++ b/frontend/components/RunArea.js
@@ -4,37 +4,13 @@ import { html, useContext, useEffect, useMemo, useState } from "../imports/Preac
 import { in_textarea_or_input } from "../common/KeyboardShortcuts.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
 
-const upstream_of = (a_cell_id, notebook) => Object.values(notebook?.cell_dependencies?.[a_cell_id]?.upstream_cells_map || {}).flatMap((x) => x)
-
-const all_upstreams_of = (a_cell_id, notebook) => {
-    const upstreams = upstream_of(a_cell_id, notebook)
-    if (upstreams.length === 0) return []
-    return [...upstreams, ...upstreams.flatMap((v) => all_upstreams_of(v, notebook))]
-}
-const hasBarrier = (a_cell_id, notebook) => {
-    return notebook?.cell_inputs?.[a_cell_id].metadata.disabled
-}
-
-export const RunArea = ({ runtime, running, queued, code_differs, on_run, on_interrupt, depends_on_disabled_cells, running_disabled, cell_id }) => {
+export const RunArea = ({ runtime, running, queued, code_differs, on_run, on_interrupt, depends_on_disabled_cells, running_disabled, on_jump }) => {
     const on_save = on_run /* because disabled cells save without running */
 
     const local_time_running_ms = useMillisSinceTruthy(running)
     const local_time_running_ns = local_time_running_ms == null ? null : 1e6 * local_time_running_ms
     const pluto_actions = useContext(PlutoActionsContext)
 
-    const on_jump = () => {
-        const notebook = pluto_actions.get_notebook() || {}
-        const barrier_cell_id = all_upstreams_of(cell_id, notebook).find((c) => hasBarrier(c, notebook))
-        barrier_cell_id &&
-            window.dispatchEvent(
-                new CustomEvent("cell_focus", {
-                    detail: {
-                        cell_id: barrier_cell_id,
-                        line: 0, // 1-based to 0-based index
-                    },
-                })
-            )
-    }
     const action = running || queued ? "interrupt" : running_disabled ? "save" : depends_on_disabled_cells && !code_differs ? "jump" : "run"
 
     const fmap = {
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index 6447a4923f..c29eb738b0 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -59,7 +59,8 @@
         --selected-cell-bg-color: rgb(42 115 205 / 78%);
         --hover-scrollbar-color-1: rgba(0, 0, 0, 0.15);
         --hover-scrollbar-color-2: rgba(0, 0, 0, 0.05);
-        --skip-as-script-border-color: #888;
+        --skip-as-script-background-color: #888;
+        --depends-on-skip-as-script-background-color: #666;
 
         /* Pluto shoulders */
         --shoulder-hover-bg-color: rgba(255, 255, 255, 0.05);
diff --git a/frontend/editor.css b/frontend/editor.css
index 3ea685ec19..95fbf24223 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1110,16 +1110,27 @@ pluto-cell.running_disabled > pluto-output {
 }
 
 /* SKIP AS SCRIPT CELLS */
-pluto-cell.skip_as_script .skip_as_script_marker {
+pluto-cell.skip_as_script .skip_as_script_marker,
+pluto-cell.depends_on_skipped_cells .depends_on_skipped_marker {
     display: block;
     position: absolute;
     top: 0;
     bottom: 0;
-    left: 0;
     cursor: help;
-    right: -4.85px;
-    border-radius: 5px;
-    border-right: 5px solid var(--skip-as-script-border-color);
+    z-index: 20;
+    right: -3px;
+    width: 4px;
+    border-radius: 0px 4px 4px 0px;
+    background-color: var(--skip-as-script-background-color);
+}
+
+pluto-cell.depends_on_skipped_cells .depends_on_skipped_marker {
+    background-color: var(--depends-on-skip-as-script-background-color);
+}
+
+pluto-cell.skip_as_script pluto-input .cm-editor,
+pluto-cell.depends_on_skipped_cells pluto-input .cm-editor {
+    border-bottom-right-radius: 0px;
 }
 
 /* SELECTION */
diff --git a/frontend/light_color.css b/frontend/light_color.css
index bcfa8a11ea..a8b832b94a 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -62,7 +62,8 @@
         --selected-cell-bg-color: rgba(40, 78, 189, 0.24);
         --hover-scrollbar-color-1: rgba(0, 0, 0, 0.15);
         --hover-scrollbar-color-2: rgba(0, 0, 0, 0.05);
-        --skip-as-script-border-color: #ccc;
+        --skip-as-script-background-color: #ccc;
+        --depends-on-skip-as-script-background-color: #eee;
 
         /* Pluto shoulders */
         --shoulder-hover-bg-color: rgba(0, 0, 0, 0.05);
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 556665fcba..6349ebf813 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -119,6 +119,9 @@ function run_reactive_core!(
         cell.depends_on_disabled_cells = true
     end
 
+    # find (indirectly) skipped cells and update their status
+    update_skipped_cells_dependency!(notebook, new_topology)
+
     to_run = setdiff(to_run_raw, indirectly_deactivated)
 
     # change the bar on the sides of cells to "queued"
@@ -698,3 +701,14 @@ function update_from_file(session::ServerSession, notebook::Notebook; kwargs...)
 	
 	return true
 end
+
+function update_skipped_cells_dependency!(notebook::Notebook, topology::NotebookTopology=notebook.topology)
+    skipped_cells = filter(is_skipped_as_script, notebook.cells)
+    indirectly_skipped = collect(topological_order(topology, skipped_cells))
+    for cell in indirectly_skipped
+        cell.depends_on_skipped_cells = true
+    end
+    for cell in setdiff(notebook.cells, indirectly_skipped)
+        cell.depends_on_skipped_cells = false
+    end
+end
\ No newline at end of file
diff --git a/src/notebook/Cell.jl b/src/notebook/Cell.jl
index d3bfbed267..e90b4194d3 100644
--- a/src/notebook/Cell.jl
+++ b/src/notebook/Cell.jl
@@ -56,6 +56,7 @@ Base.@kwdef mutable struct Cell
     cell_dependencies::CellDependencies{Cell}=CellDependencies{Cell}(Dict{Symbol,Vector{Cell}}(), Dict{Symbol,Vector{Cell}}(), 99)
 
     depends_on_disabled_cells::Bool=false
+    depends_on_skipped_cells::Bool=false
 
     metadata::Dict{String,Any}=copy(DEFAULT_CELL_METADATA)
 end
@@ -82,3 +83,4 @@ end
 is_disabled(c::Cell) = get(c.metadata, METADATA_DISABLED_KEY, DEFAULT_CELL_METADATA[METADATA_DISABLED_KEY])
 can_show_logs(c::Cell) = get(c.metadata, METADATA_SHOW_LOGS_KEY, DEFAULT_CELL_METADATA[METADATA_SHOW_LOGS_KEY])
 is_skipped_as_script(c::Cell) = get(c.metadata, METADATA_SKIP_AS_SCRIPT_KEY, DEFAULT_CELL_METADATA[METADATA_SKIP_AS_SCRIPT_KEY])
+must_be_commented_in_file(c::Cell) = is_disabled(c) || is_skipped_as_script(c) || c.depends_on_disabled_cells || c.depends_on_skipped_cells
\ No newline at end of file
diff --git a/src/notebook/saving and loading.jl b/src/notebook/saving and loading.jl
index 5fd47c0da5..abc9209577 100644
--- a/src/notebook/saving and loading.jl	
+++ b/src/notebook/saving and loading.jl	
@@ -68,9 +68,7 @@ function save_notebook(io::IO, notebook::Notebook)
             end
         end
         
-        cell_running_disabled = is_disabled(c)::Bool
-        cell_skip_as_script = is_skipped_as_script(c)::Bool
-        if cell_skip_as_script || cell_running_disabled || c.depends_on_disabled_cells
+        if must_be_commented_in_file(c)
             print(io, _disabled_prefix)
             print(io, replace(c.code, _cell_id_delimiter => "# "))
             print(io, _disabled_suffix)
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index cbf38a0f67..e8bf3dbfcd 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -138,6 +138,7 @@ function notebook_to_js(notebook::Notebook)
                 "errored" => cell.errored,
                 "runtime" => cell.runtime,
                 "logs" => FirebaseyUtils.AppendonlyMarker(cell.logs),
+                "depends_on_skipped_cells" => cell.depends_on_skipped_cells,
             )
         for (id, cell) in notebook.cells_dict),
         "cell_order" => notebook.cell_order,
@@ -312,10 +313,25 @@ responses[:update_notebook] = function response_update_notebook(🙋::ClientRequ
             push!(changes, current_changes...)
         end
 
+        # We put a flag to check whether any patch changes the skip_as_script metadata. This is to eventually trigger a notebook updated if no reactive_run is part of this update
+        skip_as_script_changed = any(patches) do patch
+            path = patch.path
+            metadata_idx = findfirst(isequal("metadata"), path)
+            if metadata_idx === nothing
+                false
+            else
+                isequal(path[metadata_idx+1], "skip_as_script")
+            end
+        end
+
         # If CodeChanged ∈ changes, then the client will also send a request like run_multiple_cells, which will trigger a file save _before_ running the cells.
         # In the future, we should get rid of that request, and save the file here. For now, we don't save the file here, to prevent unnecessary file IO.
         # (You can put a log in save_notebook to track how often the file is saved)
         if FileChanged() ∈ changes && CodeChanged() ∉ changes
+            if skip_as_script_changed
+                # If skip_as_script has changed but no cell run is happening we want to update the notebook dependency here before saving the file
+                update_skipped_cells_dependency!(notebook)
+            end  
              save_notebook(🙋.session, notebook)
         end
 
diff --git a/test/Notebook.jl b/test/Notebook.jl
index e22ebe7bf1..24ee129a0c 100644
--- a/test/Notebook.jl
+++ b/test/Notebook.jl
@@ -1,5 +1,5 @@
 using Test
-import Pluto: Notebook, ServerSession, ClientSession, Cell, load_notebook, load_notebook_nobackup, save_notebook, WorkspaceManager, cutename, numbered_until_new, readwrite, without_pluto_file_extension, update_run!, get_metadata_no_default, is_disabled, create_cell_metadata
+import Pluto: Notebook, ServerSession, ClientSession, Cell, load_notebook, load_notebook_nobackup, save_notebook, WorkspaceManager, cutename, numbered_until_new, readwrite, without_pluto_file_extension, update_run!, get_metadata_no_default, is_disabled, create_cell_metadata, update_skipped_cells_dependency!
 import Pluto.WorkspaceManager: poll, WorkspaceManager
 import Random
 import Pkg
@@ -71,6 +71,9 @@ function skip_as_script_notebook()
         Cell(
             code="non_skipped_var = 15",
         ),
+        Cell(
+            code="dependent_var = skipped_var + 1",
+        ),
     ]) |> init_packages!
 end
 
@@ -280,14 +283,17 @@ end
 
         m = ingredients(nb.path)
         @test !isdefined(m, :skipped_var)
+        @test !isdefined(m, :dependent_var)
         @test m.non_skipped_var == 15
         
         nb.cells[1].metadata["skip_as_script"] = false
+        update_skipped_cells_dependency!(nb)
         save_notebook(nb)
 
         m = ingredients(nb.path)
         @test m.skipped_var == 10
         @test m.non_skipped_var == 15        
+        @test m.dependent_var == 11
         
         WorkspaceManager.unmake_workspace((🍭, nb); verbose=false)
     end

From 78d8e8c1c6294f89ca7fc1df8bd72b56f93f72c3 Mon Sep 17 00:00:00 2001
From: Paul <paul@plutojl.org>
Date: Sun, 26 Jun 2022 17:58:30 +0200
Subject: [PATCH 393/821] add data_url

---
 src/webserver/data_url.jl | 110 +++++++++++++++++++++++---------------
 1 file changed, 66 insertions(+), 44 deletions(-)

diff --git a/src/webserver/data_url.jl b/src/webserver/data_url.jl
index fca7186191..04be62a041 100644
--- a/src/webserver/data_url.jl
+++ b/src/webserver/data_url.jl
@@ -1,18 +1,44 @@
 ### A Pluto.jl notebook ###
-# v0.17.1
+# v0.19.9
 
 using Markdown
 using InteractiveUtils
 
+# ╔═╡ b987a8a2-6ab0-4e88-af3c-d7f2778af657
+# ╠═╡ show_logs = false
+# ╠═╡ skip_as_script = true
+#=╠═╡
+begin
+	import Pkg
+
+	# create a local environment for this notebook
+	# used to install and load PlutoTest
+	local_env = mktempdir()
+	Pkg.activate(local_env)
+	Pkg.add(name="PlutoTest", version="0.2")
+	pushfirst!(LOAD_PATH, local_env)
+
+	# activate Pluto's environment, used to load HTTP.jl
+	Pkg.activate(Base.current_project(@__FILE__))
+	using PlutoTest
+end
+  ╠═╡ =#
+
 # ╔═╡ cc180e7e-46c3-11ec-3fff-05e1b5c77986
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"""
 # Download Data URLs
 
 
 """
+  ╠═╡ =#
 
 # ╔═╡ 2385dd3b-15f8-4790-907f-e0576a56c4c0
+# ╠═╡ skip_as_script = true
+#=╠═╡
 random_data = rand(UInt8, 30)
+  ╠═╡ =#
 
 # ╔═╡ d8ed6d44-33cd-4c9d-828b-d237d43769f5
 # try
@@ -21,38 +47,8 @@ random_data = rand(UInt8, 30)
 # 	e
 # end |> typeof
 
-# ╔═╡ e1610184-5d16-499b-883e-7ef92f402ebb
-function is_inside_pluto(m::Module)
-	if isdefined(m, :PlutoForceDisplay)
-		return m.PlutoForceDisplay
-	else
-		isdefined(m, :PlutoRunner) && parentmodule(m) == Main
-	end
-end
-
-# ╔═╡ b987a8a2-6ab0-4e88-af3c-d7f2778af657
+# ╔═╡ b3f685a3-b52d-4190-9196-6977a7e76aa1
 begin
-	if is_inside_pluto(@__MODULE__)
-		import Pkg
-
-		# create a local environment for this notebook
-		# used to install and load PlutoTest
-		local_env = mktempdir()
-		Pkg.activate(local_env)
-		Pkg.add(name="PlutoTest", version="0.2")
-		pushfirst!(LOAD_PATH, local_env)
-
-		# activate Pluto's environment, used to load HTTP.jl
-		Pkg.activate(Base.current_project(@__FILE__))
-		using PlutoTest
-	else
-		if !isdefined(@__MODULE__, Symbol("@test"))
-			macro test(e...) nothing; end
-			macro test_throws(e...) nothing; end
-			macro test_broken(e...) nothing; end
-			macro testset(e...) nothing; end
-		end
-	end
 	import HTTP.URIs
 	import Base64
 end
@@ -97,49 +93,75 @@ end
 # ╔═╡ 6e1dd79c-a7bf-44d6-bfa6-ced75b45170a
 download_cool_string(args...) = read(download_cool(args...), String)
 
-# ╔═╡ 3630b4bc-ff63-426d-b95d-ae4e4f9ccd88
-download_cool_data(args...) = read(download_cool(args...))
-
 # ╔═╡ 6339496d-11be-40d0-b4e5-9247e5199367
+#=╠═╡
 @test download_cool_string("data:,Hello%2C%20World%21") == "Hello, World!"
+  ╠═╡ =#
 
 # ╔═╡ bf7b4241-9cb0-4d90-9ded-b527bf220803
+#=╠═╡
 @test download_cool_string("data:text/plain,Hello%2C%20World%21") == "Hello, World!"
+  ╠═╡ =#
 
 # ╔═╡ d6e01532-a8e4-4173-a270-eae37c8002c7
+#=╠═╡
 @test download_cool_string("data:text/plain;base64,SGVsbG8sIFdvcmxkIQ==") == "Hello, World!"
+  ╠═╡ =#
 
 # ╔═╡ b0ba1add-f452-4a44-ab23-becbc610e2b9
+#=╠═╡
 @test download_cool_string("data:;base64,SGVsbG8sIFdvcmxkIQ==") == "Hello, World!"
+  ╠═╡ =#
 
 # ╔═╡ e630e261-1c2d-4117-9c44-dd49199fa3de
+#=╠═╡
 @test download_cool_string("data:,hello") == "hello"
+  ╠═╡ =#
 
 # ╔═╡ 4bb75573-09bd-4ce7-b76f-34c0249d7b88
+#=╠═╡
 @test download_cool_string("data:text/html,%3Ch1%3EHello%2C%20World%21%3C%2Fh1%3E") == "<h1>Hello, World!</h1>"
+  ╠═╡ =#
 
 # ╔═╡ 301eee81-7715-4d39-89aa-37bffde3557f
+#=╠═╡
 @test download_cool_string("data:text/html,<script>alert('hi');</script>") == "<script>alert('hi');</script>"
-
-# ╔═╡ ae296e09-08dd-4ee8-87ac-eb2bf24b28b9
-random_data_url = "data:asf;base64,$(
-	Base64.base64encode(random_data)
-)"
-
-# ╔═╡ 2eabfa58-2d8f-4479-9c00-a58b934638d9
-@test download_cool_data(random_data_url) == random_data
+  ╠═╡ =#
 
 # ╔═╡ 525b2cb6-b7b9-436e-898e-a951e6a1f2f1
+#=╠═╡
 @test occursin("reactive", download_cool_string("https://raw.githubusercontent.com/fonsp/Pluto.jl/v0.17.1/README.md"))
+  ╠═╡ =#
+
+# ╔═╡ 3630b4bc-ff63-426d-b95d-ae4e4f9ccd88
+download_cool_data(args...) = read(download_cool(args...))
 
 # ╔═╡ 40b48818-e191-4509-85ad-b9ff745cd0cb
+#=╠═╡
 @test_throws Exception download_cool("data:xoxo;base10,asdfasdfasdf")
+  ╠═╡ =#
 
 # ╔═╡ 1f175fcd-8b94-4f13-a912-02a21c95f8ca
+#=╠═╡
 @test_throws Exception download_cool("data:text/plain;base10,asdfasdfasdf")
+  ╠═╡ =#
 
 # ╔═╡ a4f671e6-0e23-4753-9301-048b2ef505e3
+#=╠═╡
 @test_throws Exception download_cool("data:asdfasdfasdf")
+  ╠═╡ =#
+
+# ╔═╡ ae296e09-08dd-4ee8-87ac-eb2bf24b28b9
+#=╠═╡
+random_data_url = "data:asf;base64,$(
+	Base64.base64encode(random_data)
+)"
+  ╠═╡ =#
+
+# ╔═╡ 2eabfa58-2d8f-4479-9c00-a58b934638d9
+#=╠═╡
+@test download_cool_data(random_data_url) == random_data
+  ╠═╡ =#
 
 # ╔═╡ Cell order:
 # ╟─cc180e7e-46c3-11ec-3fff-05e1b5c77986
@@ -161,5 +183,5 @@ random_data_url = "data:asf;base64,$(
 # ╠═1f175fcd-8b94-4f13-a912-02a21c95f8ca
 # ╠═a4f671e6-0e23-4753-9301-048b2ef505e3
 # ╠═d8ed6d44-33cd-4c9d-828b-d237d43769f5
-# ╟─e1610184-5d16-499b-883e-7ef92f402ebb
+# ╠═b3f685a3-b52d-4190-9196-6977a7e76aa1
 # ╠═b987a8a2-6ab0-4e88-af3c-d7f2778af657

From f4365c8a151fa4a57439ba57af6c946597f3562b Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Sun, 26 Jun 2022 22:57:47 +0200
Subject: [PATCH 394/821] Skip pluto cells in src notebooks (#2191)

---
 src/webserver/Firebasey.jl      | 654 ++++++++++++++++++++------------
 src/webserver/FirebaseyUtils.jl | 369 +++++++++++++-----
 2 files changed, 685 insertions(+), 338 deletions(-)

diff --git a/src/webserver/Firebasey.jl b/src/webserver/Firebasey.jl
index ee36b912bd..863ef08118 100644
--- a/src/webserver/Firebasey.jl
+++ b/src/webserver/Firebasey.jl
@@ -1,35 +1,95 @@
 ### A Pluto.jl notebook ###
-# v0.17.5
+# v0.19.9
 
 using Markdown
 using InteractiveUtils
 
+# ╔═╡ e748600a-2de1-11eb-24be-d5f0ecab8fa4
+# ╠═╡ show_logs = false
+# ╠═╡ skip_as_script = true
+#=╠═╡
+# Only define this in Pluto - assume we are `using Test` otherwise
+begin
+	import Pkg
+	Pkg.activate(mktempdir())
+	Pkg.add(Pkg.PackageSpec(name="PlutoTest"))
+	using PlutoTest
+end
+  ╠═╡ =#
+
+# ╔═╡ 3e07f976-6cd0-4841-9762-d40337bb0645
+# ╠═╡ skip_as_script = true
+#=╠═╡
+using Markdown: @md_str
+  ╠═╡ =#
+
 # ╔═╡ d948dc6e-2de1-11eb-19e7-cb3bb66353b6
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"# Diffing"
+  ╠═╡ =#
 
 # ╔═╡ 1a6e1853-6db1-4074-bce0-5f274351cece
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"""
 We define a _diffing system_ for Julia `Dict`s, which is analogous to the diffing system of immer.js.
 
 This notebook is part of Pluto's source code (included in `src/webserver/Dynamic.jl`).
 """
+  ╠═╡ =#
 
 # ╔═╡ 49fc1f97-3b8f-4297-94e5-2e24c001d35c
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"""
 ## Example
 
 Computing a diff:
 """
+  ╠═╡ =#
+
+# ╔═╡ d8e73b90-24c5-4e50-830b-b1dbe6224c8e
+# ╠═╡ skip_as_script = true
+#=╠═╡
+dict_1 = Dict{String,Any}(
+	"a" => 1,
+	"b" => Dict(
+		"c" => [3,4],
+		"d" => 99,
+	),
+	"e" => "hello!"
+);
+  ╠═╡ =#
+
+# ╔═╡ 19646596-b35b-44fa-bfcf-891f9ffb748c
+# ╠═╡ skip_as_script = true
+#=╠═╡
+dict_2 = Dict{String,Any}(
+	"a" => 1,
+	"b" => Dict(
+		"c" => [3,4,5],
+		"d" => 99,
+		"🏝" => "👍",
+	),
+);
+  ╠═╡ =#
 
 # ╔═╡ 9d2c07d9-16a9-4b9f-a375-2adb6e5b907a
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"""
 Applying a set of patches:
 """
+  ╠═╡ =#
 
 # ╔═╡ 336bfd4f-8a8e-4a2d-be08-ee48d6a9f747
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"""
 ## JSONPatch objects
 """
+  ╠═╡ =#
 
 # ╔═╡ db116c0a-2de1-11eb-2a56-872af797c547
 abstract type JSONPatch end
@@ -73,7 +133,10 @@ const Patches = Vector{JSONPatch}
 const NoChanges = Patches()
 
 # ╔═╡ aad7ab32-eecf-4aad-883d-1c802cad6c0c
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"### =="
+  ╠═╡ =#
 
 # ╔═╡ 732fd744-acdb-4507-b1de-6866ec5563dd
 Base.hash(a::AddPatch) = hash([AddPatch, a.value, a.path])
@@ -115,8 +178,44 @@ function Base.:(==)(a::MovePatch, b::MovePatch)
 	a.path == b.path && a.from == b.from
 end
 
+# ╔═╡ 5ddfd616-db20-451b-bc1e-2ad52e0e2777
+#=╠═╡
+@test Base.hash(ReplacePatch(["asd"], Dict("a" => 2))) == 
+		Base.hash(ReplacePatch(["asd"], Dict("a" => 2)))
+  ╠═╡ =#
+
+# ╔═╡ 24e93923-eab9-4a7b-9bc7-8d8a1209a78f
+#=╠═╡
+@test ReplacePatch(["asd"], Dict("a" => 2)) == 
+		ReplacePatch(["asd"], Dict("a" => 2))
+  ╠═╡ =#
+
+# ╔═╡ 09ddf4d9-5ccb-4530-bfab-d11b864e872a
+#=╠═╡
+@test Base.hash(RemovePatch(["asd"])) == Base.hash(RemovePatch(["asd"]))
+  ╠═╡ =#
+
+# ╔═╡ d9e764db-94fc-44f7-8c2e-3d63f4809617
+#=╠═╡
+@test RemovePatch(["asd"]) == RemovePatch(["asd"])
+  ╠═╡ =#
+
+# ╔═╡ 99df99ad-aad5-4275-97d4-d1ceeb2f8d15
+#=╠═╡
+@test Base.hash(RemovePatch(["aasd"])) != Base.hash(RemovePatch(["asd"]))
+  ╠═╡ =#
+
+# ╔═╡ 2d665639-7274-495a-ae9d-f358a8219bb7
+#=╠═╡
+@test Base.hash(ReplacePatch(["asd"], Dict("a" => 2))) != 
+		Base.hash(AddPatch(["asd"], Dict("a" => 2)))
+  ╠═╡ =#
+
 # ╔═╡ f658a72d-871d-49b3-9b73-7efedafbd7a6
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"### convert(::Type{Dict}, ::JSONPatch)"
+  ╠═╡ =#
 
 # ╔═╡ 230bafe2-aaa7-48f0-9fd1-b53956281684
 function Base.convert(::Type{Dict}, patch::AddPatch)
@@ -148,25 +247,46 @@ function Base.convert(::Type{JSONPatch}, patch_dict::Dict)
 end
 
 # ╔═╡ 07eeb122-6706-4544-a007-1c8d6581eec8
+# ╠═╡ skip_as_script = true
+#=╠═╡
 Base.convert(Dict, AddPatch([:x, :y], 10))
+  ╠═╡ =#
 
 # ╔═╡ c59b30b9-f702-41f1-bb2e-1736c8cd5ede
+# ╠═╡ skip_as_script = true
+#=╠═╡
 Base.convert(Dict, RemovePatch([:x, :y]))
+  ╠═╡ =#
 
 # ╔═╡ 7feeee3a-3aec-47ce-b8d7-74a0d9b0b381
+# ╠═╡ skip_as_script = true
+#=╠═╡
 Base.convert(Dict, ReplacePatch([:x, :y], 10))
+  ╠═╡ =#
 
 # ╔═╡ 6d67f8a5-0e0c-4b6e-a267-96b34d580946
+# ╠═╡ skip_as_script = true
+#=╠═╡
 add_patch = AddPatch(["counter"], 10)
+  ╠═╡ =#
 
 # ╔═╡ 56b28842-4a67-44d7-95e7-55d457a44fb1
+# ╠═╡ skip_as_script = true
+#=╠═╡
 remove_patch = RemovePatch(["counter"])
+  ╠═╡ =#
 
 # ╔═╡ f10e31c0-1d2c-4727-aba5-dd676a10041b
+# ╠═╡ skip_as_script = true
+#=╠═╡
 replace_patch = ReplacePatch(["counter"], 10)
+  ╠═╡ =#
 
 # ╔═╡ 3a99e22d-42d6-4b2d-9381-022b41b0e852
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"### wrappath"
+  ╠═╡ =#
 
 # ╔═╡ 831d84a6-1c71-4e68-8c7c-27d9093a82c4
 function wrappath(path::PatchPath, patches::Vector{JSONPatch})
@@ -201,7 +321,10 @@ function wrappath(path, patch::MovePatch)
 end
 
 # ╔═╡ daf9ec12-2de1-11eb-3a8d-59d9c2753134
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"## Diff"
+  ╠═╡ =#
 
 # ╔═╡ 0b50f6b2-8e85-4565-9f04-f99c913b4592
 const use_triple_equals_for_arrays = Ref(false)
@@ -297,40 +420,213 @@ function diff(o1::Nothing, o2::Nothing)
 	NoChanges
 end
 
+# ╔═╡ 7ca087b8-73ac-49ea-9c5a-2971f0da491f
+#=╠═╡
+example_patches = diff(dict_1, dict_2)
+  ╠═╡ =#
+
 # ╔═╡ 59b46bfe-da74-43af-9c11-cb0bdb2c13a2
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"""
 ### Dict example
 """
+  ╠═╡ =#
+
+# ╔═╡ 200516da-8cfb-42fe-a6b9-cb4730168923
+# ╠═╡ skip_as_script = true
+#=╠═╡
+celldict1 = Dict(:x => 1, :y => 2, :z => 3)
+  ╠═╡ =#
+
+# ╔═╡ 76326e6c-b95a-4b2d-a78c-e283e5fadbe2
+# ╠═╡ skip_as_script = true
+#=╠═╡
+celldict2 = Dict(:x => 1, :y => 2, :z => 4)
+  ╠═╡ =#
+
+# ╔═╡ 664cd334-91c7-40dd-a2bf-0da720307cfc
+# ╠═╡ skip_as_script = true
+#=╠═╡
+notebook1 = Dict(
+	:x => 1,
+	:y => 2,
+)
+  ╠═╡ =#
+
+# ╔═╡ b7fa5625-6178-4da8-a889-cd4f014f43ba
+# ╠═╡ skip_as_script = true
+#=╠═╡
+notebook2 = Dict(
+	:y => 4,
+	:z => 5
+)
+  ╠═╡ =#
+
+# ╔═╡ dbdd1df0-2de1-11eb-152f-8d1af1ad02fe
+#=╠═╡
+notebook1_to_notebook2 = diff(notebook1, notebook2)
+  ╠═╡ =#
 
 # ╔═╡ 3924953f-787a-4912-b6ee-9c9d3030f0f0
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"""
 ### Large Dict example 1
 """
+  ╠═╡ =#
+
+# ╔═╡ 80689881-1b7e-49b2-af97-9e3ab639d006
+# ╠═╡ skip_as_script = true
+#=╠═╡
+big_array = rand(UInt8, 1_000_000)
+  ╠═╡ =#
+
+# ╔═╡ fd22b6af-5fd2-428a-8291-53e223ea692c
+# ╠═╡ skip_as_script = true
+#=╠═╡
+big_string = repeat('a', 1_000_000);
+  ╠═╡ =#
+
+# ╔═╡ bcd5059b-b0d2-49d8-a756-92349aa56aca
+#=╠═╡
+large_dict_1 = Dict{String,Any}(
+	"cell_$(i)" => Dict{String,Any}(
+		"x" => 1,
+		"y" => big_array,
+		"z" => big_string,
+	)
+	for i in 1:10
+);
+  ╠═╡ =#
+
+# ╔═╡ e7fd6bab-c114-4f3e-b9ad-1af2d1147770
+#=╠═╡
+begin
+	large_dict_2 = Dict{String,Any}(
+		"cell_$(i)" => Dict{String,Any}(
+			"x" => 1,
+			"y" => big_array,
+			"z" => big_string,
+		)
+		for i in 1:10
+	)
+	large_dict_2["cell_5"]["y"] = [2,20]
+	delete!(large_dict_2, "cell_2")
+	large_dict_2["hello"] = Dict("a" => 1, "b" => 2)
+	large_dict_2
+end;
+  ╠═╡ =#
+
+# ╔═╡ 43c36ab7-e9ac-450a-8abe-435412f2be1d
+#=╠═╡
+diff(large_dict_1, large_dict_2)
+  ╠═╡ =#
 
 # ╔═╡ 1cf22fe6-4b58-4220-87a1-d7a18410b4e8
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"""
 With `===` comparison for arrays:
 """
+  ╠═╡ =#
 
 # ╔═╡ ffb01ab4-e2e3-4fa4-8c0b-093d2899a536
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"""
 ### Large Dict example 2
 """
+  ╠═╡ =#
+
+# ╔═╡ 8188de75-ae6e-48aa-9495-111fd27ffd26
+# ╠═╡ skip_as_script = true
+#=╠═╡
+many_items_1 = Dict{String,Any}(
+	"cell_$(i)" => Dict{String,Any}(
+		"x" => 1,
+		"y" => [2,3],
+		"z" => "four",
+	)
+	for i in 1:100
+)
+  ╠═╡ =#
+
+# ╔═╡ fdc427f0-dfe8-4114-beca-48fc15434534
+#=╠═╡
+@test isempty(diff(many_items_1, many_items_1))
+  ╠═╡ =#
+
+# ╔═╡ d807195e-ba27-4015-92a7-c9294d458d47
+#=╠═╡
+begin
+	many_items_2 = deepcopy(many_items_1)
+	many_items_2["cell_5"]["y"][2] = 20
+	delete!(many_items_2, "cell_2")
+	many_items_2["hello"] = Dict("a" => 1, "b" => 2)
+	many_items_2
+end
+  ╠═╡ =#
+
+# ╔═╡ 2e91a1a2-469c-4123-a0d7-3dcc49715738
+#=╠═╡
+diff(many_items_1, many_items_2)
+  ╠═╡ =#
+
+# ╔═╡ b8061c1b-dd03-4cd1-b275-90359ae2bb39
+fairly_equal(a,b) = Set(a) == Set(b)
+
+# ╔═╡ 2983f6d4-c1ca-4b66-a2d3-f858b0df2b4c
+#=╠═╡
+@test fairly_equal(diff(large_dict_1, large_dict_2), [
+	ReplacePatch(["cell_5","y"], [2,20]),
+	RemovePatch(["cell_2"]),
+	AddPatch(["hello"], Dict("b" => 2, "a" => 1)),
+])
+  ╠═╡ =#
+
+# ╔═╡ 61b81430-d26e-493c-96da-b6818e58c882
+#=╠═╡
+@test fairly_equal(diff(many_items_1, many_items_2), [
+	ReplacePatch(["cell_5","y"], [2,20]),
+	RemovePatch(["cell_2"]),
+	AddPatch(["hello"], Dict("b" => 2, "a" => 1)),
+])
+  ╠═╡ =#
+
+# ╔═╡ aeab3363-08ba-47c2-bd33-04a004ed72c4
+#=╠═╡
+diff(many_items_1, many_items_1)
+  ╠═╡ =#
+
+# ╔═╡ 62de3e79-4b4e-41df-8020-769c3c255c3e
+#=╠═╡
+@test isempty(diff(many_items_1, many_items_1))
+  ╠═╡ =#
 
 # ╔═╡ c7de406d-ccfe-41cf-8388-6bd2d7c42d64
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"### Struct example"
+  ╠═╡ =#
 
 # ╔═╡ b9cc11ae-394b-44b9-bfbe-541d7720ead0
+# ╠═╡ skip_as_script = true
+#=╠═╡
 struct Cell
 	id
 	code
 	folded
 end
+  ╠═╡ =#
 
 # ╔═╡ c3c675be-9178-4176-afe0-30501786b72c
+#=╠═╡
 deep_diff(old::Cell, new::Cell) = diff(Deep(old), Deep(new))
+  ╠═╡ =#
 
 # ╔═╡ 02585c72-1d92-4526-98c2-1ca07aad87a3
+#=╠═╡
 function direct_diff(old::Cell, new::Cell)
 	changes = []
 	if old.id ≠ new.id
@@ -344,15 +640,25 @@ function direct_diff(old::Cell, new::Cell)
 	end
 	changes
 end
+  ╠═╡ =#
 
 # ╔═╡ 2d084dd1-240d-4443-a8a2-82ae6e0b8900
+# ╠═╡ skip_as_script = true
+#=╠═╡
 cell1 = Cell(1, 2, 3)
+  ╠═╡ =#
 
 # ╔═╡ 3e05200f-071a-4ebe-b685-ff980f07cde7
+# ╠═╡ skip_as_script = true
+#=╠═╡
 cell2 = Cell(1, 2, 4)
+  ╠═╡ =#
 
 # ╔═╡ dd312598-2de1-11eb-144c-f92ed6484f5d
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"## Update"
+  ╠═╡ =#
 
 # ╔═╡ d2af2a4b-8982-4e43-9fd7-0ecfdfb70511
 const strict_applypatch = Ref(false)
@@ -392,7 +698,10 @@ function applypatch!(value, patches::Array{JSONPatch})
 end
 
 # ╔═╡ 3e285076-1d97-4728-87cf-f71b22569e57
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"### applypatch! AddPatch"
+  ╠═╡ =#
 
 # ╔═╡ dd87ca7e-2de1-11eb-2ec3-d5721c32f192
 function applypatch!(value, patch::AddPatch)
@@ -420,10 +729,16 @@ function applypatch!(value, patch::AddPatch)
 end
 
 # ╔═╡ a11e4082-4ff4-4c1b-9c74-c8fa7dcceaa6
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"*Should throw in strict mode:*"
+  ╠═╡ =#
 
 # ╔═╡ be6b6fc4-e12a-4cef-81d8-d5115fda50b7
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"### applypatch! ReplacePatch"
+  ╠═╡ =#
 
 # ╔═╡ 6509d62e-77b6-499c-8dab-4a608e44720a
 function applypatch!(value, patch::ReplacePatch)
@@ -451,10 +766,16 @@ function applypatch!(value, patch::ReplacePatch)
 end
 
 # ╔═╡ f1dde1bd-3fa4-48b7-91ed-b2f98680fcc1
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"*Should throw in strict mode:*"
+  ╠═╡ =#
 
 # ╔═╡ f3ef354b-b480-4b48-8358-46dbf37e1d95
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"### applypatch! RemovePatch"
+  ╠═╡ =#
 
 # ╔═╡ ddaf5b66-2de1-11eb-3348-b905b94a984b
 function applypatch!(value, patch::RemovePatch)
@@ -481,250 +802,83 @@ function applypatch!(value, patch::RemovePatch)
 	return value
 end
 
-# ╔═╡ df41caa7-f0fc-4b0d-ab3d-ebdab4804040
-md"*Should throw in strict mode:*"
-
-# ╔═╡ e55d1cea-2de1-11eb-0d0e-c95009eedc34
-md"## Testing"
-
-# ╔═╡ b05fcb88-3781-45d0-9f24-e88c339a72e5
-macro test2(expr)
-	quote nothing end
-end
-
-# ╔═╡ e8d0c98a-2de1-11eb-37b9-e1df3f5cfa25
-md"## `@skip_as_script`"
-
-# ╔═╡ e907d862-2de1-11eb-11a9-4b3ac37cb0f3
-function is_inside_pluto(m::Module)
-	if isdefined(m, :PlutoForceDisplay)
-		return m.PlutoForceDisplay
-	else
-		isdefined(m, :PlutoRunner) && parentmodule(m) == Main
-	end
-end
-
-# ╔═╡ e924a0be-2de1-11eb-2170-71d56e117af2
-"""
-	@skip_as_script expression
-
-Marks a expression as Pluto-only, which means that it won't be executed when running outside Pluto. Do not use this for your own projects.
-"""
-macro skip_as_script(ex)
-	if is_inside_pluto(__module__)
-		esc(ex)
-	else
-		nothing
-	end
-end
-
-# ╔═╡ d8e73b90-24c5-4e50-830b-b1dbe6224c8e
-@skip_as_script dict_1 = Dict{String,Any}(
-	"a" => 1,
-	"b" => Dict(
-		"c" => [3,4],
-		"d" => 99,
-	),
-	"e" => "hello!"
-);
-
-# ╔═╡ 19646596-b35b-44fa-bfcf-891f9ffb748c
-@skip_as_script dict_2 = Dict{String,Any}(
-	"a" => 1,
-	"b" => Dict(
-		"c" => [3,4,5],
-		"d" => 99,
-		"🏝" => "👍",
-	),
-);
-
-# ╔═╡ 7ca087b8-73ac-49ea-9c5a-2971f0da491f
-@skip_as_script example_patches = diff(dict_1, dict_2)
-
 # ╔═╡ e65d483a-4c13-49ba-bff1-1d54de78f534
-@skip_as_script let
+#=╠═╡
+let
 	dict_1_copy = deepcopy(dict_1)
 	applypatch!(dict_1_copy, example_patches)
 end
-
-# ╔═╡ 200516da-8cfb-42fe-a6b9-cb4730168923
-@skip_as_script celldict1 = Dict(:x => 1, :y => 2, :z => 3)
-
-# ╔═╡ 76326e6c-b95a-4b2d-a78c-e283e5fadbe2
-@skip_as_script celldict2 = Dict(:x => 1, :y => 2, :z => 4)
-
-# ╔═╡ 664cd334-91c7-40dd-a2bf-0da720307cfc
-@skip_as_script notebook1 = Dict(
-	:x => 1,
-	:y => 2,
-)
-
-# ╔═╡ b7fa5625-6178-4da8-a889-cd4f014f43ba
-@skip_as_script notebook2 = Dict(
-	:y => 4,
-	:z => 5
-)
-
-# ╔═╡ dbdd1df0-2de1-11eb-152f-8d1af1ad02fe
-@skip_as_script notebook1_to_notebook2 = diff(notebook1, notebook2)
-
-# ╔═╡ 80689881-1b7e-49b2-af97-9e3ab639d006
-@skip_as_script big_array = rand(UInt8, 1_000_000)
-
-# ╔═╡ fd22b6af-5fd2-428a-8291-53e223ea692c
-@skip_as_script big_string = repeat('a', 1_000_000);
-
-# ╔═╡ bcd5059b-b0d2-49d8-a756-92349aa56aca
-@skip_as_script large_dict_1 = Dict{String,Any}(
-	"cell_$(i)" => Dict{String,Any}(
-		"x" => 1,
-		"y" => big_array,
-		"z" => big_string,
-	)
-	for i in 1:10
-);
-
-# ╔═╡ e7fd6bab-c114-4f3e-b9ad-1af2d1147770
-@skip_as_script begin
-	large_dict_2 = Dict{String,Any}(
-		"cell_$(i)" => Dict{String,Any}(
-			"x" => 1,
-			"y" => big_array,
-			"z" => big_string,
-		)
-		for i in 1:10
-	)
-	large_dict_2["cell_5"]["y"] = [2,20]
-	delete!(large_dict_2, "cell_2")
-	large_dict_2["hello"] = Dict("a" => 1, "b" => 2)
-	large_dict_2
-end;
-
-# ╔═╡ 43c36ab7-e9ac-450a-8abe-435412f2be1d
-@skip_as_script diff(large_dict_1, large_dict_2)
-
-# ╔═╡ 8188de75-ae6e-48aa-9495-111fd27ffd26
-@skip_as_script many_items_1 = Dict{String,Any}(
-	"cell_$(i)" => Dict{String,Any}(
-		"x" => 1,
-		"y" => [2,3],
-		"z" => "four",
-	)
-	for i in 1:100
-)
-
-# ╔═╡ d807195e-ba27-4015-92a7-c9294d458d47
-@skip_as_script begin
-	many_items_2 = deepcopy(many_items_1)
-	many_items_2["cell_5"]["y"][2] = 20
-	delete!(many_items_2, "cell_2")
-	many_items_2["hello"] = Dict("a" => 1, "b" => 2)
-	many_items_2
-end
-
-# ╔═╡ 2e91a1a2-469c-4123-a0d7-3dcc49715738
-@skip_as_script diff(many_items_1, many_items_2)
-
-# ╔═╡ b8061c1b-dd03-4cd1-b275-90359ae2bb39
-@skip_as_script fairly_equal(a,b) = Set(a) == Set(b)
-
-# ╔═╡ aeab3363-08ba-47c2-bd33-04a004ed72c4
-@skip_as_script diff(many_items_1, many_items_1)
-
-# ╔═╡ c2c2b057-a88f-4cc6-ada4-fc55ac29931e
-"The opposite of `@skip_as_script`"
-macro only_as_script(ex) is_inside_pluto(__module__) ? nothing : esc(ex) end
-
-# ╔═╡ e748600a-2de1-11eb-24be-d5f0ecab8fa4
-# Only define this in Pluto - assume we are `using Test` otherwise
-begin
-	@skip_as_script begin
-		import Pkg
-		Pkg.activate(mktempdir())
-		Pkg.add(Pkg.PackageSpec(name="PlutoTest"))
-		using PlutoTest
-	end
-	# Do nothing inside pluto (so we don't need to have Test as dependency)
-	# test/Firebasey is `using Test` before including this file
-	@only_as_script begin
-		if !isdefined(@__MODULE__, Symbol("@test"))
-			macro test(e...) nothing; end
-			macro test_throws(e...) nothing; end
-			macro test_broken(e...) nothing; end
-			macro testset(e...) nothing; end
-		end
-	end
-end
-
-# ╔═╡ 5ddfd616-db20-451b-bc1e-2ad52e0e2777
-@test Base.hash(ReplacePatch(["asd"], Dict("a" => 2))) == 
-		Base.hash(ReplacePatch(["asd"], Dict("a" => 2)))
-
-# ╔═╡ 24e93923-eab9-4a7b-9bc7-8d8a1209a78f
-@test ReplacePatch(["asd"], Dict("a" => 2)) == 
-		ReplacePatch(["asd"], Dict("a" => 2))
-
-# ╔═╡ 09ddf4d9-5ccb-4530-bfab-d11b864e872a
-@test Base.hash(RemovePatch(["asd"])) == Base.hash(RemovePatch(["asd"]))
-
-# ╔═╡ d9e764db-94fc-44f7-8c2e-3d63f4809617
-@test RemovePatch(["asd"]) == RemovePatch(["asd"])
-
-# ╔═╡ 99df99ad-aad5-4275-97d4-d1ceeb2f8d15
-@test Base.hash(RemovePatch(["aasd"])) != Base.hash(RemovePatch(["asd"]))
-
-# ╔═╡ 2d665639-7274-495a-ae9d-f358a8219bb7
-@test Base.hash(ReplacePatch(["asd"], Dict("a" => 2))) != 
-		Base.hash(AddPatch(["asd"], Dict("a" => 2)))
+  ╠═╡ =#
 
 # ╔═╡ 595fdfd4-3960-4fbd-956c-509c4cf03473
-@skip_as_script @test applypatch!(deepcopy(notebook1), notebook1_to_notebook2) == notebook2
-
-# ╔═╡ 2983f6d4-c1ca-4b66-a2d3-f858b0df2b4c
-@skip_as_script @test fairly_equal(diff(large_dict_1, large_dict_2), [
-	ReplacePatch(["cell_5","y"], [2,20]),
-	RemovePatch(["cell_2"]),
-	AddPatch(["hello"], Dict("b" => 2, "a" => 1)),
-])
-
-# ╔═╡ fdc427f0-dfe8-4114-beca-48fc15434534
-@skip_as_script @test isempty(diff(many_items_1, many_items_1))
-
-# ╔═╡ 61b81430-d26e-493c-96da-b6818e58c882
-@skip_as_script @test fairly_equal(diff(many_items_1, many_items_2), [
-	ReplacePatch(["cell_5","y"], [2,20]),
-	RemovePatch(["cell_2"]),
-	AddPatch(["hello"], Dict("b" => 2, "a" => 1)),
-])
-
-# ╔═╡ 62de3e79-4b4e-41df-8020-769c3c255c3e
-@skip_as_script @test isempty(diff(many_items_1, many_items_1))
+#=╠═╡
+@test applypatch!(deepcopy(notebook1), notebook1_to_notebook2) == notebook2
+  ╠═╡ =#
 
 # ╔═╡ c3e4738f-4568-4910-a211-6a46a9d447ee
-@skip_as_script @test applypatch!(Dict(:y => "x"), AddPatch([:x], "-")) == Dict(:y => "x", :x => "-")
+#=╠═╡
+@test applypatch!(Dict(:y => "x"), AddPatch([:x], "-")) == Dict(:y => "x", :x => "-")
+  ╠═╡ =#
 
 # ╔═╡ 0f094932-10e5-40f9-a3fc-db27a85b4999
-@skip_as_script @test applypatch!(Dict(:x => "x"), AddPatch([:x], "-")) == Dict(:x => "-")
+#=╠═╡
+@test applypatch!(Dict(:x => "x"), AddPatch([:x], "-")) == Dict(:x => "-")
+  ╠═╡ =#
 
 # ╔═╡ a560fdca-ee12-469c-bda5-62d7203235b8
+#=╠═╡
 @test applypatch!(Dict(:x => "x"), ReplacePatch([:x], "-")) == Dict(:x => "-")
+  ╠═╡ =#
 
 # ╔═╡ 01e3417e-334e-4a8d-b086-4bddc42737b3
+#=╠═╡
 @test applypatch!(Dict(:y => "x"), ReplacePatch([:x], "-")) == Dict(:x => "-", :y => "x")
+  ╠═╡ =#
 
 # ╔═╡ 96a80a23-7c56-4c41-b489-15bc1c4e3700
-@skip_as_script @test applypatch!(Dict(:x => "x"), RemovePatch([:x])) == Dict()
+#=╠═╡
+@test applypatch!(Dict(:x => "x"), RemovePatch([:x])) == Dict()
+  ╠═╡ =#
+
+# ╔═╡ df41caa7-f0fc-4b0d-ab3d-ebdab4804040
+# ╠═╡ skip_as_script = true
+#=╠═╡
+md"*Should throw in strict mode:*"
+  ╠═╡ =#
 
 # ╔═╡ fac65755-2a2a-4a3c-b5a8-fc4f6d256754
-@skip_as_script @test applypatch!(Dict(:y => "x"), RemovePatch([:x])) == Dict(:y => "x")
+#=╠═╡
+@test applypatch!(Dict(:y => "x"), RemovePatch([:x])) == Dict(:y => "x")
+  ╠═╡ =#
+
+# ╔═╡ e55d1cea-2de1-11eb-0d0e-c95009eedc34
+# ╠═╡ skip_as_script = true
+#=╠═╡
+md"## Testing"
+  ╠═╡ =#
+
+# ╔═╡ b05fcb88-3781-45d0-9f24-e88c339a72e5
+# ╠═╡ skip_as_script = true
+#=╠═╡
+macro test2(expr)
+	quote nothing end
+end
+  ╠═╡ =#
 
 # ╔═╡ e7e8d076-2de1-11eb-0214-8160bb81370a
-@skip_as_script @test notebook1 == deepcopy(notebook1)
+#=╠═╡
+@test notebook1 == deepcopy(notebook1)
+  ╠═╡ =#
 
 # ╔═╡ ee70e282-36d5-4772-8585-f50b9a67ca54
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"## Track"
+  ╠═╡ =#
 
 # ╔═╡ a3e8fe70-cbf5-4758-a0f2-d329d138728c
+# ╠═╡ skip_as_script = true
+#=╠═╡
 function prettytime(time_ns::Number)
     suffices = ["ns", "μs", "ms", "s"]
 	
@@ -747,8 +901,11 @@ function prettytime(time_ns::Number)
 	end
     return "$(roundedtime) $(suffix)"
 end
+  ╠═╡ =#
 
 # ╔═╡ 0e1c6442-9040-49d9-b754-173583db7ba2
+# ╠═╡ skip_as_script = true
+#=╠═╡
 begin
     Base.@kwdef struct Tracked
 		expr
@@ -829,8 +986,11 @@ begin
     end
 	Tracked
 end
+  ╠═╡ =#
 
 # ╔═╡ 7618aef7-1884-4e32-992d-0fd988e1ab20
+# ╠═╡ skip_as_script = true
+#=╠═╡
 macro track(expr)
 	times_ran_expr = :(1)
 	expr_to_show = expr
@@ -864,27 +1024,41 @@ macro track(expr)
 		)
 	end
 end
+  ╠═╡ =#
 
 # ╔═╡ 7b8ab89b-bf56-4ddf-b220-b4881f4a2050
-@skip_as_script @track Base.convert(JSONPatch, convert(Dict, add_patch)) == add_patch
+#=╠═╡
+@track Base.convert(JSONPatch, convert(Dict, add_patch)) == add_patch
+  ╠═╡ =#
 
 # ╔═╡ 48ccd28a-060d-4214-9a39-f4c4e506d1aa
-@skip_as_script @track Base.convert(JSONPatch, convert(Dict, remove_patch)) == remove_patch
+#=╠═╡
+@track Base.convert(JSONPatch, convert(Dict, remove_patch)) == remove_patch
+  ╠═╡ =#
 
 # ╔═╡ 34d86e02-dd34-4691-bb78-3023568a5d16
-@skip_as_script @track Base.convert(JSONPatch, convert(Dict, replace_patch)) == replace_patch
+#=╠═╡
+@track Base.convert(JSONPatch, convert(Dict, replace_patch)) == replace_patch
+  ╠═╡ =#
 
 # ╔═╡ 95ff676d-73c8-44cb-ac35-af94418737e9
-@skip_as_script @track for _ in 1:100 diff(celldict1, celldict2) end
+#=╠═╡
+@track for _ in 1:100 diff(celldict1, celldict2) end
+  ╠═╡ =#
 
 # ╔═╡ 8c069015-d922-4c60-9340-8d65c80b1a06
-@skip_as_script @track for _ in 1:1000 diff(large_dict_1, large_dict_1) end
+#=╠═╡
+@track for _ in 1:1000 diff(large_dict_1, large_dict_1) end
+  ╠═╡ =#
 
 # ╔═╡ bc9a0822-1088-4ee7-8c79-98e06fd50f11
-@skip_as_script @track for _ in 1:1000 diff(large_dict_1, large_dict_2) end
+#=╠═╡
+@track for _ in 1:1000 diff(large_dict_1, large_dict_2) end
+  ╠═╡ =#
 
 # ╔═╡ ddf1090c-5239-41df-ae4d-70aeb3a75f2b
-@skip_as_script let
+#=╠═╡
+let
 	old = use_triple_equals_for_arrays[]
 	use_triple_equals_for_arrays[] = true
 	
@@ -893,9 +1067,11 @@ end
 	use_triple_equals_for_arrays[] = old
 	result
 end
+  ╠═╡ =#
 
 # ╔═╡ 88009db3-f40e-4fd0-942a-c7f4a7eecb5a
-@skip_as_script let
+#=╠═╡
+let
 	old = use_triple_equals_for_arrays[]
 	use_triple_equals_for_arrays[] = true
 	
@@ -904,21 +1080,32 @@ end
 	use_triple_equals_for_arrays[] = old
 	result
 end
+  ╠═╡ =#
 
 # ╔═╡ c287009f-e864-45d2-a4d0-a525c988a6e0
-@skip_as_script @track for _ in 1:1000 diff(many_items_1, many_items_1) end
+#=╠═╡
+@track for _ in 1:1000 diff(many_items_1, many_items_1) end
+  ╠═╡ =#
 
 # ╔═╡ 67a1ae27-f7df-4f84-8809-1cc6a9bcd1ce
-@skip_as_script @track for _ in 1:1000 diff(many_items_1, many_items_2) end
+#=╠═╡
+@track for _ in 1:1000 diff(many_items_1, many_items_2) end
+  ╠═╡ =#
 
 # ╔═╡ fa959806-3264-4dd5-9f94-ba369697689b
-@skip_as_script @track for _ in 1:1000 direct_diff(cell2, cell1) end
+#=╠═╡
+@track for _ in 1:1000 direct_diff(cell2, cell1) end
+  ╠═╡ =#
 
 # ╔═╡ a9088341-647c-4fe1-ab85-d7da049513ae
-@skip_as_script @track for _ in 1:1000 diff(Deep(cell1), Deep(cell2)) end
+#=╠═╡
+@track for _ in 1:1000 diff(Deep(cell1), Deep(cell2)) end
+  ╠═╡ =#
 
 # ╔═╡ 1a26eed8-670c-43bf-9726-2db84b1afdab
-@skip_as_script @track sleep(0.1)
+#=╠═╡
+@track sleep(0.1)
+  ╠═╡ =#
 
 # ╔═╡ Cell order:
 # ╟─d948dc6e-2de1-11eb-19e7-cb3bb66353b6
@@ -1049,13 +1236,10 @@ end
 # ╟─df41caa7-f0fc-4b0d-ab3d-ebdab4804040
 # ╟─fac65755-2a2a-4a3c-b5a8-fc4f6d256754
 # ╟─e55d1cea-2de1-11eb-0d0e-c95009eedc34
+# ╠═3e07f976-6cd0-4841-9762-d40337bb0645
 # ╠═e748600a-2de1-11eb-24be-d5f0ecab8fa4
 # ╠═b05fcb88-3781-45d0-9f24-e88c339a72e5
 # ╠═e7e8d076-2de1-11eb-0214-8160bb81370a
-# ╟─e8d0c98a-2de1-11eb-37b9-e1df3f5cfa25
-# ╟─e907d862-2de1-11eb-11a9-4b3ac37cb0f3
-# ╟─e924a0be-2de1-11eb-2170-71d56e117af2
-# ╠═c2c2b057-a88f-4cc6-ada4-fc55ac29931e
 # ╟─ee70e282-36d5-4772-8585-f50b9a67ca54
 # ╟─1a26eed8-670c-43bf-9726-2db84b1afdab
 # ╟─0e1c6442-9040-49d9-b754-173583db7ba2
diff --git a/src/webserver/FirebaseyUtils.jl b/src/webserver/FirebaseyUtils.jl
index 1033870053..fe9448060a 100644
--- a/src/webserver/FirebaseyUtils.jl
+++ b/src/webserver/FirebaseyUtils.jl
@@ -1,9 +1,22 @@
 ### A Pluto.jl notebook ###
-# v0.19.3
+# v0.19.9
 
 using Markdown
 using InteractiveUtils
 
+# ╔═╡ 092c4b11-8b75-446f-b3ad-01fa858daebb
+# ╠═╡ show_logs = false
+# ╠═╡ skip_as_script = true
+#=╠═╡
+# Only define this in Pluto using skip_as_script = true
+begin
+	import Pkg
+	Pkg.activate(mktempdir())
+	Pkg.add(Pkg.PackageSpec(name="PlutoTest"))
+	using PlutoTest
+end
+  ╠═╡ =#
+
 # ╔═╡ 058a3333-0567-43b7-ac5f-1f6688325a08
 begin
 	"""
@@ -32,9 +45,34 @@ begin
 			(String(name) => getfield(a, name), i + 1)
 		end
 	end
-	
+
 end
 
+# ╔═╡ 55975e53-f70f-4b70-96d2-b144f74e7cde
+# ╠═╡ skip_as_script = true
+#=╠═╡
+struct A
+	x
+	y
+	z
+end
+  ╠═╡ =#
+
+# ╔═╡ d7e0de85-5cb2-4036-a2e3-ca416ea83737
+#=╠═╡
+id1 = ImmutableMarker(A(1,"asdf",3))
+  ╠═╡ =#
+
+# ╔═╡ 08350326-526e-4c34-ab27-df9fbf69243e
+#=╠═╡
+id2 = ImmutableMarker(A(1,"asdf",4))
+  ╠═╡ =#
+
+# ╔═╡ aa6192e8-410f-4924-8250-4775e21b1590
+#=╠═╡
+id1d, id2d = Dict(id1), Dict(id2)
+  ╠═╡ =#
+
 # ╔═╡ 273c7c85-8178-44a7-99f0-581754aeb8c8
 begin
 	"""
@@ -58,11 +96,16 @@ begin
 end
 
 # ╔═╡ ef7032d1-a666-48a6-a56e-df175f5ed832
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"""
 ## ImmutableMarker
 """
+  ╠═╡ =#
 
 # ╔═╡ 183cef1f-bfe9-42cd-8239-49e9ed00a7b6
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"""
 ## AppendonlyMarker(s)
 
@@ -71,54 +114,12 @@ We make a new type with a specific diff function.
 It might be very specific per problem, but that's fine for performance problems (I think).
 It also keeps the performance solutions as separate modules/packages to whatever it is you're actually modeling.
 """
-
-# ╔═╡ 2284ae12-5b8c-4542-81fa-c4d34f2483e7
-# @skip_as_script @test length([AppendonlyMarker([1,2,3], 1)...]) == 1
-
-# ╔═╡ 971709de-074e-49cf-8bd4-9c675b037dfd
-md"## `@skip_as_script`"
-
-# ╔═╡ 9fce9aa9-d3c6-4134-9692-8a8756fa3cff
-function is_inside_pluto(m::Module)
-	if isdefined(m, :PlutoForceDisplay)
-		return m.PlutoForceDisplay
-	else
-		isdefined(m, :PlutoRunner) && parentmodule(m) == Main
-	end
-end
-
-# ╔═╡ db9167c4-7ba7-42e1-949b-0ad18e2d7b25
-"""
-	@skip_as_script expression
-
-Marks a expression as Pluto-only, which means that it won't be executed when running outside Pluto. Do not use this for your own projects.
-"""
-macro skip_as_script(ex)
-	if is_inside_pluto(__module__)
-		esc(ex)
-	else
-		nothing
-	end
-end
-
-# ╔═╡ 55975e53-f70f-4b70-96d2-b144f74e7cde
-@skip_as_script struct A
-	x
-	y
-	z
-end
-
-# ╔═╡ d7e0de85-5cb2-4036-a2e3-ca416ea83737
-@skip_as_script id1 = ImmutableMarker(A(1,"asdf",3))
-
-# ╔═╡ 08350326-526e-4c34-ab27-df9fbf69243e
-@skip_as_script id2 = ImmutableMarker(A(1,"asdf",4))
-
-# ╔═╡ aa6192e8-410f-4924-8250-4775e21b1590
-@skip_as_script id1d, id2d = Dict(id1), Dict(id2)
+  ╠═╡ =#
 
 # ╔═╡ 35d3bcd7-af51-466a-b4c4-cc055e74d01d
-@skip_as_script appendonly_1, appendonly_2 = let
+# ╠═╡ skip_as_script = true
+#=╠═╡
+appendonly_1, appendonly_2 = let
 	array_1 = [1,2,3,4]
 	appendonly_1 = AppendonlyMarker(array_1)
 	push!(array_1, 5)
@@ -126,9 +127,12 @@ end
 
 	appendonly_1, appendonly_2
 end;
+  ╠═╡ =#
 
 # ╔═╡ 1017f6cc-58ac-4c7b-a6d0-a03f5e387f1b
-@skip_as_script appendonly_1_large, appendonly_2_large = let
+# ╠═╡ skip_as_script = true
+#=╠═╡
+appendonly_1_large, appendonly_2_large = let
 	large_array_1 = [
 		Dict{String,Any}(
 			"x" => 1,
@@ -143,47 +147,33 @@ end;
 
 	appendonly_1, appendonly_2
 end;
-
-# ╔═╡ 33facb62-af28-4e94-946d-545637f320e9
-"The opposite of `@skip_as_script`"
-macro only_as_script(ex) is_inside_pluto(__module__) ? nothing : esc(ex) end
-
-# ╔═╡ 092c4b11-8b75-446f-b3ad-01fa858daebb
-# Only define this in Pluto - assume we are `using Test` otherwise
-begin
-	@skip_as_script begin
-		import Pkg
-		Pkg.activate(mktempdir())
-		Pkg.add(Pkg.PackageSpec(name="PlutoTest"))
-		using PlutoTest
-	end
-	# Do nothing inside pluto (so we don't need to have Test as dependency)
-	# test/Firebasey is `using Test` before including this file
-	@only_as_script begin
-		if !isdefined(@__MODULE__, Symbol("@test"))
-			macro test(e...) nothing; end
-			macro test_throws(e...) nothing; end
-			macro test_broken(e...) nothing; end
-			macro testset(e...) nothing; end
-		end
-	end
-end
+  ╠═╡ =#
 
 # ╔═╡ 06492e8d-4500-4efe-80ee-55bf1ee2348c
-@skip_as_script @test length([AppendonlyMarker([1,2,3])...]) == 3
+#=╠═╡
+@test length([AppendonlyMarker([1,2,3])...]) == 3
+  ╠═╡ =#
+
+# ╔═╡ 2284ae12-5b8c-4542-81fa-c4d34f2483e7
+# @test length([AppendonlyMarker([1,2,3], 1)...]) == 1
 
 # ╔═╡ dc5cd268-9cfb-49bf-87fb-5b7db4fa6e3c
+# ╠═╡ skip_as_script = true
+#=╠═╡
 md"## Import Firebasey when running inside notebook"
+  ╠═╡ =#
 
 # ╔═╡ 0c2f23d8-8e98-47b7-9c4f-5daa70a6c7fb
 # OH how I wish I would put in the time to refactor with fromFile or SOEMTGHINLAS LDKJ JULIA WHY ARE YOU LIKE THIS GROW UP
-@skip_as_script Firebasey = let
-	wrapper_module = Module()
-	Core.eval(wrapper_module, :(module Firebasey
-			include("Firebasey.jl")
-		end
-	))
-	wrapper_module.Firebasey
+if !@isdefined(Firebasey)
+	Firebasey = let
+		wrapper_module = Module()
+		Core.eval(wrapper_module, :(module Firebasey
+				include("Firebasey.jl")
+			end
+		))
+		wrapper_module.Firebasey
+	end
 end
 
 # ╔═╡ 2903d17e-c6fd-4cea-8585-4db26a00b0e7
@@ -212,28 +202,201 @@ function Firebasey.diff(a::ImmutableMarker, b::ImmutableMarker)
 end
 
 # ╔═╡ 138d2cc2-59ba-4f76-bf66-ecdb98cf4fd5
-@skip_as_script Firebasey.diff(id1, id2)
+#=╠═╡
+Firebasey.diff(id1, id2)
+  ╠═╡ =#
 
 # ╔═╡ 8537488d-2ff9-42b7-8bfc-72d43fca713f
-@skip_as_script @test Firebasey.diff(appendonly_1, appendonly_2) == [Firebasey.AddPatch([5], 5)]
+#=╠═╡
+@test Firebasey.diff(appendonly_1, appendonly_2) == [Firebasey.AddPatch([5], 5)]
+  ╠═╡ =#
 
-# ╔═╡ 70179239-357a-424d-bac3-3a1431aff536
-var"@track" = Firebasey.var"@track"
+# ╔═╡ 721e3c90-15ae-43f2-9234-57b38e3e6b69
+# ╠═╡ skip_as_script = true
+#=╠═╡
+md"""
+## Track
+"""
+  ╠═╡ =#
+
+# ╔═╡ e830792c-c809-4fde-ae55-8ae01b4c04b9
+# ╠═╡ skip_as_script = true
+#=╠═╡
+function prettytime(time_ns::Number)
+    suffices = ["ns", "μs", "ms", "s"]
+	
+	current_amount = time_ns
+	suffix = ""
+	for current_suffix in suffices
+    	if current_amount >= 1000.0
+        	current_amount = current_amount / 1000.0
+		else
+			suffix = current_suffix
+			break
+		end
+	end
+    
+    # const roundedtime = time_ns.toFixed(time_ns >= 100.0 ? 0 : 1)
+	roundedtime = if current_amount >= 100.0
+		round(current_amount; digits=0)
+	else
+		round(current_amount; digits=1)
+	end
+    return "$(roundedtime) $(suffix)"
+end
+  ╠═╡ =#
+
+# ╔═╡ 16b03608-0f5f-421a-bab4-89365528b0b4
+# ╠═╡ skip_as_script = true
+#=╠═╡
+begin
+    Base.@kwdef struct Tracked
+		expr
+		value
+		time
+		bytes
+		times_ran = 1
+		which = nothing
+		code_info = nothing
+    end
+    function Base.show(io::IO, mime::MIME"text/html", value::Tracked)
+	times_ran = if value.times_ran === 1
+		""
+	else
+		"""<span style="opacity: 0.5"> ($(value.times_ran)×)</span>"""
+	end
+	# method = sprint(show, MIME("text/plain"), value.which)
+	code_info = if value.code_info ≠ nothing
+		codelength = length(value.code_info.first.code)
+		"$(codelength) frames in @code_typed"
+	else
+		""
+	end
+	color = if value.time > 1
+		"red"
+	elseif value.time > 0.001
+		"orange"
+	elseif value.time > 0.0001
+		"blue"
+	else
+		"green"
+	end
+		
+	
+	show(io, mime, HTML("""
+		<div
+			style="
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+			"
+		>
+			<div
+				style="
+					width: 12px;
+					height: 12px;
+					border-radius: 50%;
+					background-color: $(color);
+				"
+			></div>
+			<div style="width: 12px"></div>
+			<div>
+				<code
+					class="language-julia"
+					style="
+						background-color: transparent;
+						filter: grayscale(1) brightness(0.8);
+					"
+				>$(value.expr)</code>
+				<div style="
+					font-family: monospace;
+					font-size: 12px;
+					color: $(color);
+				">
+					$(prettytime(value.time * 1e9 / value.times_ran))
+					$(times_ran)
+				</div>
+				<div style="
+					font-family: monospace;
+					font-size: 12px;
+					color: gray;
+				">$(code_info)</div>
+
+			</div>
+			
+		</div>
+	"""))
+    end
+	Tracked
+end
+  ╠═╡ =#
+
+# ╔═╡ 875fd249-37cc-49da-8a7d-381fe0e21063
+#=╠═╡
+macro track(expr)
+	times_ran_expr = :(1)
+	expr_to_show = expr
+	if expr.head == :for
+		@assert expr.args[1].head == :(=)
+		times_ran_expr = expr.args[1].args[2]
+		expr_to_show = expr.args[2].args[2]
+	end
+
+	Tracked # reference so that baby Pluto understands
+				
+	quote
+		local times_ran = length($(esc(times_ran_expr)))
+		local value, time, bytes = @timed $(esc(expr))
+		
+		local method = nothing
+		local code_info = nothing
+		try
+			# Uhhh
+			method = @which $(expr_to_show)
+			code_info = @code_typed $(expr_to_show)
+		catch nothing end
+		Tracked(
+			expr=$(QuoteNode(expr_to_show)),
+			value=value,
+			time=time,
+			bytes=bytes,
+			times_ran=times_ran,
+			which=method,
+			code_info=code_info
+		)
+	end
+end
+  ╠═╡ =#
 
 # ╔═╡ a5f43f47-6189-413f-95a0-d98f927bb7ce
-@skip_as_script @track for _ in 1:1000 Firebasey.diff(id1, id1) end
+#=╠═╡
+@track for _ in 1:1000 Firebasey.diff(id1, id1) end
+  ╠═╡ =#
 
 # ╔═╡ ab5089cc-fec8-43b9-9aa4-d6fa96e231e0
-@skip_as_script @track for _ in 1:1000 Firebasey.diff(id1d, id1d) end
+#=╠═╡
+@track for _ in 1:1000 Firebasey.diff(id1d, id1d) end
+  ╠═╡ =#
 
 # ╔═╡ a84dcdc3-e9ed-4bf5-9bec-c9cbfc267c17
-@skip_as_script @track for _ in 1:1000 Firebasey.diff(id1, id2) end
+#=╠═╡
+@track for _ in 1:1000 Firebasey.diff(id1, id2) end
+  ╠═╡ =#
 
 # ╔═╡ f696bb85-0bbd-43c9-99ea-533816bc8e0d
-@skip_as_script @track for _ in 1:1000 Firebasey.diff(id1d, id2d) end
+#=╠═╡
+@track for _ in 1:1000 Firebasey.diff(id1d, id2d) end
+  ╠═╡ =#
 
 # ╔═╡ 37fe8c10-09f0-4f72-8cfd-9ce044c78c13
-@skip_as_script @track for _ in 1:1000 Firebasey.diff(appendonly_1_large, appendonly_2_large) end
+#=╠═╡
+@track for _ in 1:1000 Firebasey.diff(appendonly_1_large, appendonly_2_large) end
+  ╠═╡ =#
+
+# ╔═╡ 9862ee48-48a0-4178-8ec4-306792827e17
+#=╠═╡
+@track sleep(0.1)
+  ╠═╡ =#
 
 # ╔═╡ Cell order:
 # ╟─ef7032d1-a666-48a6-a56e-df175f5ed832
@@ -244,24 +407,24 @@ var"@track" = Firebasey.var"@track"
 # ╠═08350326-526e-4c34-ab27-df9fbf69243e
 # ╠═138d2cc2-59ba-4f76-bf66-ecdb98cf4fd5
 # ╠═aa6192e8-410f-4924-8250-4775e21b1590
-# ╠═a5f43f47-6189-413f-95a0-d98f927bb7ce
-# ╠═ab5089cc-fec8-43b9-9aa4-d6fa96e231e0
-# ╠═a84dcdc3-e9ed-4bf5-9bec-c9cbfc267c17
-# ╠═f696bb85-0bbd-43c9-99ea-533816bc8e0d
+# ╟─a5f43f47-6189-413f-95a0-d98f927bb7ce
+# ╟─ab5089cc-fec8-43b9-9aa4-d6fa96e231e0
+# ╟─a84dcdc3-e9ed-4bf5-9bec-c9cbfc267c17
+# ╟─f696bb85-0bbd-43c9-99ea-533816bc8e0d
 # ╟─183cef1f-bfe9-42cd-8239-49e9ed00a7b6
 # ╠═273c7c85-8178-44a7-99f0-581754aeb8c8
 # ╠═2903d17e-c6fd-4cea-8585-4db26a00b0e7
 # ╠═35d3bcd7-af51-466a-b4c4-cc055e74d01d
 # ╠═1017f6cc-58ac-4c7b-a6d0-a03f5e387f1b
-# ╠═06492e8d-4500-4efe-80ee-55bf1ee2348c
+# ╟─06492e8d-4500-4efe-80ee-55bf1ee2348c
 # ╠═2284ae12-5b8c-4542-81fa-c4d34f2483e7
-# ╠═8537488d-2ff9-42b7-8bfc-72d43fca713f
-# ╠═37fe8c10-09f0-4f72-8cfd-9ce044c78c13
-# ╟─971709de-074e-49cf-8bd4-9c675b037dfd
-# ╟─9fce9aa9-d3c6-4134-9692-8a8756fa3cff
-# ╟─db9167c4-7ba7-42e1-949b-0ad18e2d7b25
-# ╟─33facb62-af28-4e94-946d-545637f320e9
+# ╟─8537488d-2ff9-42b7-8bfc-72d43fca713f
+# ╟─37fe8c10-09f0-4f72-8cfd-9ce044c78c13
 # ╟─dc5cd268-9cfb-49bf-87fb-5b7db4fa6e3c
 # ╠═0c2f23d8-8e98-47b7-9c4f-5daa70a6c7fb
-# ╠═70179239-357a-424d-bac3-3a1431aff536
 # ╠═092c4b11-8b75-446f-b3ad-01fa858daebb
+# ╟─721e3c90-15ae-43f2-9234-57b38e3e6b69
+# ╟─9862ee48-48a0-4178-8ec4-306792827e17
+# ╟─16b03608-0f5f-421a-bab4-89365528b0b4
+# ╟─875fd249-37cc-49da-8a7d-381fe0e21063
+# ╟─e830792c-c809-4fde-ae55-8ae01b4c04b9

From 4b577270a1c0777d053150c723573f2a02707f73 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Thu, 30 Jun 2022 22:33:56 +0200
Subject: [PATCH 395/821] Fix slide controls (#2194)

* Fix slide controls

* Update new_notebook_test.js
---
 frontend/components/SlideControls.js      |  2 +-
 test/frontend/__tests__/slide_controls.js | 63 +++++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 test/frontend/__tests__/slide_controls.js

diff --git a/frontend/components/SlideControls.js b/frontend/components/SlideControls.js
index 9d7e4f3542..60a6380eb0 100644
--- a/frontend/components/SlideControls.js
+++ b/frontend/components/SlideControls.js
@@ -2,7 +2,7 @@ import { html } from "../imports/Preact.js"
 
 export const SlideControls = () => {
     const calculate_slide_positions = (/** @type {Event} */ e) => {
-        const notebook_node = /** @type {HTMLElement?} */ (e.target)?.closest("pluto-notebook")
+        const notebook_node = /** @type {HTMLElement?} */ (e.target)?.closest("pluto-editor")?.querySelector("pluto-notebook")
         if (!notebook_node) return []
 
         const height = window.innerHeight
diff --git a/test/frontend/__tests__/slide_controls.js b/test/frontend/__tests__/slide_controls.js
new file mode 100644
index 0000000000..0d7d7530bb
--- /dev/null
+++ b/test/frontend/__tests__/slide_controls.js
@@ -0,0 +1,63 @@
+import puppeteer from "puppeteer"
+import { setupPage, waitForContent } from "../helpers/common"
+import { createNewNotebook, getPlutoUrl, manuallyEnterCells, prewarmPluto, waitForNoUpdateOngoing } from "../helpers/pluto"
+
+describe("slideControls", () => {
+    let browser = null
+    let page = null
+
+    beforeAll(async () => {
+        browser = await puppeteer.launch({
+            headless: process.env.HEADLESS !== "false",
+            args: ["--no-sandbox", "--disable-setuid-sandbox"],
+            devtools: false,
+        })
+
+        let page = await browser.newPage()
+        setupPage(page)
+        await prewarmPluto(browser, page)
+        await page.close()
+    })
+    beforeEach(async () => {
+        page = await browser.newPage()
+        setupPage(page)
+        await page.goto(getPlutoUrl(), { waitUntil: "networkidle0" })
+        await createNewNotebook(page)
+        await page.waitForSelector("pluto-input", { visible: true })
+    })
+    afterAll(async () => {
+        await page.close()
+        await browser.close()
+    })
+
+    it("should create titles", async () => {
+        const cells = ['md"# Slide 1"', 'md"# Slide 2"']
+        const plutoCellIds = await manuallyEnterCells(page, cells)
+        await page.waitForSelector(".runallchanged", { visible: true, polling: 200, timeout: 0 })
+        await page.click(".runallchanged")
+        await waitForNoUpdateOngoing(page, { polling: 100 })
+        const content = await waitForContent(page, `pluto-cell[id="${plutoCellIds[1]}"] pluto-output`)
+        expect(content).toBe("Slide 2")
+
+        const slide_1_title = await page.$(`pluto-cell[id="${plutoCellIds[0]}"] pluto-output h1`)
+        const slide_2_title = await page.$(`pluto-cell[id="${plutoCellIds[1]}"] pluto-output h1`)
+
+        expect(await slide_2_title.isIntersectingViewport()).toBe(true)
+        expect(await slide_1_title.isIntersectingViewport()).toBe(true)
+
+        /* @ts-ignore */
+        await page.evaluate(() => window.present())
+
+        await page.click(".changeslide.next")
+        expect(await slide_1_title.isIntersectingViewport()).toBe(true)
+        expect(await slide_2_title.isIntersectingViewport()).toBe(false)
+
+        await page.click(".changeslide.next")
+        expect(await slide_1_title.isIntersectingViewport()).toBe(false)
+        expect(await slide_2_title.isIntersectingViewport()).toBe(true)
+
+        await page.click(".changeslide.prev")
+        expect(await slide_1_title.isIntersectingViewport()).toBe(true)
+        expect(await slide_2_title.isIntersectingViewport()).toBe(false)
+    })
+})

From 87184bb92dcd1b877f93511cc69d21d396beb392 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Tue, 12 Jul 2022 22:23:41 +0200
Subject: [PATCH 396/821] Update to HTTP.jl 1.0 (#2185)

* Update to HTTP.jl 1.0

[HTTP.jl](https://github.com/JuliaWeb/HTTP.jl) is nearing its 1.0
release! This PR is a first draft at updating Pluto to use it.

* Use Accept-Encoding: identity in test/compiletimes.jl

* use https://github.com/JuliaWeb/HTTP.jl/pull/857 for testing

* Allow using IO instead of stream for tests

* soften HTTP.jl constraint for now

* update HTTP.jl to 1.0.2

* remove test install

* close serversocket
---
 Project.toml                  |   2 +-
 src/webserver/PutUpdates.jl   |  29 ++++--
 src/webserver/Static.jl       |  32 +++---
 src/webserver/WebServer.jl    | 180 ++++++++++++++++------------------
 src/webserver/WebSocketFix.jl |  80 ---------------
 test/compiletimes.jl          |   2 +-
 6 files changed, 125 insertions(+), 200 deletions(-)
 delete mode 100644 src/webserver/WebSocketFix.jl

diff --git a/Project.toml b/Project.toml
index f6c6abd129..efcdff0eb7 100644
--- a/Project.toml
+++ b/Project.toml
@@ -31,7 +31,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 [compat]
 Configurations = "0.15, 0.16, 0.17"
 FuzzyCompletions = "0.3, 0.4, 0.5"
-HTTP = "^0.9.1"
+HTTP = "^1.0.2"
 HypertextLiteral = "0.7, 0.8, 0.9"
 MIMEs = "0.1"
 MsgPack = "1.1"
diff --git a/src/webserver/PutUpdates.jl b/src/webserver/PutUpdates.jl
index ea541777d0..2fd44f074b 100644
--- a/src/webserver/PutUpdates.jl
+++ b/src/webserver/PutUpdates.jl
@@ -16,7 +16,9 @@ function serialize_message_to_stream(io::IO, message::UpdateMessage)
 end
 
 function serialize_message(message::UpdateMessage)
-    sprint(serialize_message_to_stream, message)
+    io = IOBuffer()
+    serialize_message_to_stream(io, message)
+    take!(io)
 end
 
 "Send `messages` to all clients connected to the `notebook`."
@@ -65,18 +67,29 @@ end
 # https://github.com/JuliaWeb/HTTP.jl/issues/382
 const flushtoken = Token()
 
+function send_message(stream::HTTP.WebSocket, msg)
+    HTTP.send(stream, serialize_message(msg))
+end
+function send_message(stream::IO, msg)
+    write(stream, serialize_message(msg))
+end
+
+function is_stream_open(stream::HTTP.WebSocket)
+    !HTTP.WebSockets.isclosed(stream)
+end
+function is_stream_open(io::IO)
+    isopen(io)
+end
+
 function flushclient(client::ClientSession)
     take!(flushtoken)
     while isready(client.pendingupdates)
         next_to_send = take!(client.pendingupdates)
-        
+
         try
             if client.stream !== nothing
-                if isopen(client.stream)
-                    if client.stream isa HTTP.WebSockets.WebSocket
-                        client.stream.frame_type = HTTP.WebSockets.WS_BINARY
-                    end
-                    write(client.stream, serialize_message(next_to_send))
+                if is_stream_open(client.stream)
+                    send_message(client.stream, next_to_send)
                 else
                     put!(flushtoken)
                     return false
@@ -112,4 +125,4 @@ end
 
 function flushallclients(session::ServerSession)
     flushallclients(session, values(session.connected_clients))
-end
\ No newline at end of file
+end
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index 0aa511d027..e4aecb908e 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -158,11 +158,11 @@ function http_router_for(session::ServerSession)
     #    require_secret_for_access == false
     # Access to all 'risky' endpoints is still restricted to requests that have the secret cookie, but visiting `/` is allowed, and it will set the cookie. From then on the security situation is identical to 
     #    secret_for_access == true
-    HTTP.@register(router, "GET", "/", with_authentication(
+    HTTP.register!(router, "GET", "/", with_authentication(
         create_serve_onefile(project_relative_path(frontend_directory(), "index.html"));
         required=security.require_secret_for_access
         ))
-    HTTP.@register(router, "GET", "/edit", with_authentication(
+    HTTP.register!(router, "GET", "/edit", with_authentication(
         create_serve_onefile(project_relative_path(frontend_directory(), "editor.html"));
         required=security.require_secret_for_access || 
         security.require_secret_for_open_links,
@@ -170,8 +170,8 @@ function http_router_for(session::ServerSession)
     # the /edit page also uses with_authentication, but this is not how access to notebooks is secured: this is done by requiring the WS connection to be authenticated.
     # we still use it for /edit to do the cookie stuff, and show a more helpful error, instead of the WS never connecting.
     
-    HTTP.@register(router, "GET", "/ping", r -> HTTP.Response(200, "OK!"))
-    HTTP.@register(router, "GET", "/possible_binder_token_please", r -> session.binder_token === nothing ? HTTP.Response(200,"") : HTTP.Response(200, session.binder_token))
+    HTTP.register!(router, "GET", "/ping", r -> HTTP.Response(200, "OK!"))
+    HTTP.register!(router, "GET", "/possible_binder_token_please", r -> session.binder_token === nothing ? HTTP.Response(200,"") : HTTP.Response(200, session.binder_token))
     
     function try_launch_notebook_response(action::Function, path_or_url::AbstractString; title="", advice="", home_url="./", as_redirect=true, action_kwargs...)
         try
@@ -192,8 +192,8 @@ function http_router_for(session::ServerSession)
     ) do request::HTTP.Request
         notebook_response(SessionActions.new(session); as_redirect=(request.method == "GET"))
     end
-    HTTP.@register(router, "GET", "/new", serve_newfile)
-    HTTP.@register(router, "POST", "/new", serve_newfile)
+    HTTP.register!(router, "GET", "/new", serve_newfile)
+    HTTP.register!(router, "POST", "/new", serve_newfile)
 
     # This is not in Dynamic.jl because of bookmarks, how HTML works,
     # real loading bars and the rest; Same for CustomLaunchEvent
@@ -242,8 +242,8 @@ function http_router_for(session::ServerSession)
         end
     end
 
-    HTTP.@register(router, "GET", "/open", serve_openfile)
-    HTTP.@register(router, "POST", "/open", serve_openfile)
+    HTTP.register!(router, "GET", "/open", serve_openfile)
+    HTTP.register!(router, "POST", "/open", serve_openfile)
     
     serve_sample = with_authentication(;
         required=security.require_secret_for_access || 
@@ -262,8 +262,8 @@ function http_router_for(session::ServerSession)
             advice="Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
         )
     end
-    HTTP.@register(router, "GET", "/sample/*", serve_sample)
-    HTTP.@register(router, "POST", "/sample/*", serve_sample)
+    HTTP.register!(router, "GET", "/sample/*", serve_sample)
+    HTTP.register!(router, "POST", "/sample/*", serve_sample)
 
     notebook_from_uri(request) = let
         uri = HTTP.URI(request.target)        
@@ -285,7 +285,7 @@ function http_router_for(session::ServerSession)
             return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
         end
     end
-    HTTP.@register(router, "GET", "/notebookfile", serve_notebookfile)
+    HTTP.register!(router, "GET", "/notebookfile", serve_notebookfile)
 
     serve_statefile = with_authentication(; 
         required=security.require_secret_for_access || 
@@ -301,7 +301,7 @@ function http_router_for(session::ServerSession)
             return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
         end
     end
-    HTTP.@register(router, "GET", "/statefile", serve_statefile)
+    HTTP.register!(router, "GET", "/statefile", serve_statefile)
 
     serve_notebookexport = with_authentication(; 
         required=security.require_secret_for_access || 
@@ -317,7 +317,7 @@ function http_router_for(session::ServerSession)
             return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
         end
     end
-    HTTP.@register(router, "GET", "/notebookexport", serve_notebookexport)
+    HTTP.register!(router, "GET", "/notebookexport", serve_notebookexport)
     
     serve_notebookupload = with_authentication(; 
         required=security.require_secret_for_access || 
@@ -338,15 +338,15 @@ function http_router_for(session::ServerSession)
             advice="The contents could not be read as a Pluto notebook file. When copying contents from somewhere else, make sure that you copy the entire notebook file.  You can also <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
         )
     end
-    HTTP.@register(router, "POST", "/notebookupload", serve_notebookupload)
+    HTTP.register!(router, "POST", "/notebookupload", serve_notebookupload)
     
     function serve_asset(request::HTTP.Request)
         uri = HTTP.URI(request.target)
         filepath = project_relative_path(frontend_directory(), relpath(HTTP.unescapeuri(uri.path), "/"))
         asset_response(filepath; cacheable=should_cache(filepath))
     end
-    HTTP.@register(router, "GET", "/*", serve_asset)
-    HTTP.@register(router, "GET", "/favicon.ico", create_serve_onefile(project_relative_path(frontend_directory(allow_bundled=false), "img", "favicon.ico")))
+    HTTP.register!(router, "GET", "/**", serve_asset)
+    HTTP.register!(router, "GET", "/favicon.ico", create_serve_onefile(project_relative_path(frontend_directory(allow_bundled=false), "img", "favicon.ico")))
 
     return router
 end
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 5f967ba4bc..4fef488f25 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -4,8 +4,6 @@ import HTTP
 import Sockets
 import .PkgCompat
 
-include("./WebSocketFix.jl")
-
 function open_in_default_browser(url::AbstractString)::Bool
     try
         if Sys.isapple()
@@ -27,11 +25,13 @@ end
 
 isurl(s::String) = startswith(s, "http://") || startswith(s, "https://")
 
-swallow_exception(f, exception_type::Type{T}) where T =
-    try f()
+function swallow_exception(f, exception_type::Type{T}) where {T}
+    try
+        f()
     catch e
         isa(e, T) || rethrow(e)
     end
+end
 
 """
     Pluto.run()
@@ -67,19 +67,19 @@ end
 
 # Deprecation errors
 
-function run(host::String, port::Union{Nothing,Integer}=nothing; kwargs...)
+function run(host::String, port::Union{Nothing,Integer} = nothing; kwargs...)
     @error """run(host, port) is deprecated in favor of:
-    
+
         run(;host="$host", port=$port)  
-    
+
     """
 end
 
 function run(port::Integer; kwargs...)
     @error "Oopsie! This is the old command to launch Pluto. The new command is:
-    
+
         Pluto.run()
-    
+
     without the port as argument - it will choose one automatically. If you need to specify the port, use:
 
         Pluto.run(port=$port)
@@ -88,27 +88,17 @@ end
 
 # open notebook(s) on startup
 
-open_notebook!(session:: ServerSession, notebook:: Nothing) = Nothing
+open_notebook!(session::ServerSession, notebook::Nothing) = Nothing
 
-open_notebook!(session:: ServerSession, notebook:: AbstractString) = SessionActions.open(session, notebook)
+open_notebook!(session::ServerSession, notebook::AbstractString) = SessionActions.open(session, notebook)
 
-function open_notebook!(session:: ServerSession, notebook:: AbstractVector{<: AbstractString})
+function open_notebook!(session::ServerSession, notebook::AbstractVector{<:AbstractString})
     for nb in notebook
         SessionActions.open(session, nb)
     end
 end
 
 
-"""
-    run(session::ServerSession)
-
-Specifiy the [`Pluto.ServerSession`](@ref) to run the web server on, which includes the configuration. Passing a session as argument allows you to start the web server with some notebooks already running. See [`SessionActions`](@ref) to learn more about manipulating a `ServerSession`.
-"""
-function run(session::ServerSession)
-    pluto_router = http_router_for(session)
-    Base.invokelatest(run, session, pluto_router)
-end
-
 const is_first_run = Ref(true)
 
 "Return a port and serversocket to use while taking into account the `favourite_port`."
@@ -127,16 +117,23 @@ function port_serversocket(hostIP::Sockets.IPAddr, favourite_port, port_hint)
     return port, serversocket
 end
 
-function run(session::ServerSession, pluto_router)
+"""
+    run(session::ServerSession)
+
+Specifiy the [`Pluto.ServerSession`](@ref) to run the web server on, which includes the configuration. Passing a session as argument allows you to start the web server with some notebooks already running. See [`SessionActions`](@ref) to learn more about manipulating a `ServerSession`.
+"""
+function run(session::ServerSession)
     if is_first_run[]
         is_first_run[] = false
         @info "Loading..."
     end
-    
+
     if VERSION < v"1.6.2"
         @warn("\nPluto is running on an old version of Julia ($(VERSION)) that is no longer supported. Visit https://julialang.org/downloads/ for more information about upgrading Julia.")
     end
 
+    pluto_router = http_router_for(session)
+
     notebook_at_startup = session.options.server.notebook
     open_notebook!(session, notebook_at_startup)
 
@@ -147,11 +144,23 @@ function run(session::ServerSession, pluto_router)
 
     local port, serversocket = port_serversocket(hostIP, favourite_port, port_hint)
 
-    shutdown_server = Ref{Function}(() -> ())
+    on_shutdown() = @sync begin
+        # Triggered by HTTP.jl
+        @info("\n\nClosing Pluto... Restart Julia for a fresh session. \n\nHave a nice day! 🎈\n\n")
+        # TODO: put do_work tokens back 
+        @async swallow_exception(() -> close(serversocket), Base.IOError)
+        for client in values(session.connected_clients)
+            @async swallow_exception(() -> close(client.stream), Base.IOError)
+        end
+        empty!(session.connected_clients)
+        for nb in values(session.notebooks)
+            @asynclog SessionActions.shutdown(session, nb; keep_in_session = false, async = false, verbose = false)
+        end
+    end
 
-    servertask = @async HTTP.serve(hostIP, port; stream=true, server=serversocket) do http::HTTP.Stream
+    server = HTTP.listen!(hostIP, port; stream = true, server = serversocket, on_shutdown) do http::HTTP.Stream
         # messy messy code so that we can use the websocket on the same port as the HTTP server
-        if HTTP.WebSockets.is_upgrade(http.message)
+        if HTTP.WebSockets.isupgrade(http.message)
             secret_required = let
                 s = session.options.security
                 s.require_secret_for_access || s.require_secret_for_open_links
@@ -160,39 +169,34 @@ function run(session::ServerSession, pluto_router)
                 try
 
                     HTTP.WebSockets.upgrade(http) do clientstream
-                        if !isopen(clientstream)
+                        if HTTP.WebSockets.isclosed(clientstream)
                             return
                         end
                         try
-                        while !eof(clientstream)
-                            # This stream contains data received over the WebSocket.
-                            # It is formatted and MsgPack-encoded by send(...) in PlutoConnection.js
-                            local parentbody = nothing
-                            try
-                                message = collect(WebsocketFix.readmessage(clientstream))
-                                parentbody = unpack(message)
-                                
-                                let
-                                    lag = session.options.server.simulated_lag
-                                    (lag > 0) && sleep(lag * (0.5 + rand())) # sleep(0) would yield to the process manager which we dont want
-                                end
-
-                                process_ws_message(session, parentbody, clientstream)
-                            catch ex
-                                if ex isa InterruptException
-                                    shutdown_server[]()
-                                elseif ex isa HTTP.WebSockets.WebSocketError || ex isa EOFError
-                                    # that's fine!
-                                else
-                                    bt = stacktrace(catch_backtrace())
-                                    @warn "Reading WebSocket client stream failed for unknown reason:" parentbody exception = (ex, bt)
+                            for message in clientstream
+                                # This stream contains data received over the WebSocket.
+                                # It is formatted and MsgPack-encoded by send(...) in PlutoConnection.js
+                                local parentbody = nothing
+                                try
+                                    parentbody = unpack(message)
+
+                                    let
+                                        lag = session.options.server.simulated_lag
+                                        (lag > 0) && sleep(lag * (0.5 + rand())) # sleep(0) would yield to the process manager which we dont want
+                                    end
+
+                                    process_ws_message(session, parentbody, clientstream)
+                                catch ex
+                                    if ex isa InterruptException || ex isa HTTP.WebSockets.WebSocketError || ex isa EOFError
+                                        # that's fine!
+                                    else
+                                        bt = stacktrace(catch_backtrace())
+                                        @warn "Reading WebSocket client stream failed for unknown reason:" parentbody exception = (ex, bt)
+                                    end
                                 end
                             end
-                        end
                         catch ex
-                            if ex isa InterruptException
-                                shutdown_server[]()
-                            elseif ex isa HTTP.WebSockets.WebSocketError || ex isa EOFError || (ex isa Base.IOError && occursin("connection reset", ex.msg))
+                            if ex isa InterruptException || ex isa HTTP.WebSockets.WebSocketError || ex isa EOFError || (ex isa Base.IOError && occursin("connection reset", ex.msg))
                                 # that's fine!
                             else
                                 bt = stacktrace(catch_backtrace())
@@ -202,7 +206,7 @@ function run(session::ServerSession, pluto_router)
                     end
                 catch ex
                     if ex isa InterruptException
-                        shutdown_server[]()
+                        # that's fine!
                     elseif ex isa Base.IOError
                         # that's fine!
                     elseif ex isa ArgumentError && occursin("stream is closed", ex.msg)
@@ -225,10 +229,10 @@ function run(session::ServerSession, pluto_router)
             end
         else
             # then it's a regular HTTP request, not a WS upgrade
-            
+
             request::HTTP.Request = http.message
             request.body = read(http)
-            HTTP.closeread(http)
+            # HTTP.closeread(http)
 
             # If a "token" url parameter is passed in from binder, then we store it to add to every URL (so that you can share the URL to collaborate).
             params = HTTP.queryparams(HTTP.URI(request.target))
@@ -236,9 +240,8 @@ function run(session::ServerSession, pluto_router)
                 session.binder_token = params["token"]
             end
 
-            request_body = IOBuffer(HTTP.payload(request))
-            response_body = HTTP.handle(pluto_router, request)
-    
+            response_body = pluto_router(request)
+
             request.response::HTTP.Response = response_body
             request.response.request = request
             try
@@ -249,7 +252,6 @@ function run(session::ServerSession, pluto_router)
                 HTTP.setheader(http, "Server" => "Pluto.jl/$(PLUTO_VERSION_STR[2:end]) Julia/$(JULIA_VERSION_STR[2:end])")
                 HTTP.startwrite(http)
                 write(http, request.response.body)
-                HTTP.closewrite(http)
             catch e
                 if isa(e, Base.IOError) || isa(e, ArgumentError)
                     # @warn "Attempted to write to a closed stream at $(request.target)"
@@ -259,15 +261,16 @@ function run(session::ServerSession, pluto_router)
             end
         end
     end
-    
-    server_running() = try
-        HTTP.get("http://$(hostIP):$(port)/ping"; status_exception=false, retry=false, connect_timeout=10, readtimeout=10).status == 200
-    catch
-        false
-    end
+
+    server_running() =
+        try
+            HTTP.get("http://$(hostIP):$(port)/ping"; status_exception = false, retry = false, connect_timeout = 10, readtimeout = 10).status == 200
+        catch
+            false
+        end
     # Wait for the server to start up before opening the browser. We have a 5 second grace period for allowing the connection, and then 10 seconds for the server to write data.
     WorkspaceManager.poll(server_running, 5.0, 1.0)
-    
+
     address = pretty_address(session, hostIP, port)
     if session.options.server.launch_browser && open_in_default_browser(address)
         @info("\nOpening $address in your default browser... ~ have fun!")
@@ -275,7 +278,7 @@ function run(session::ServerSession, pluto_router)
         @info("\nGo to $address in your browser to start writing ~ have fun!")
     end
     @info("\nPress Ctrl+C in this terminal to stop Pluto\n\n")
-    
+
     # Trigger ServerStartEvent with server details
     try_event_call(session, ServerStartEvent(address, port))
 
@@ -286,31 +289,18 @@ function run(session::ServerSession, pluto_router)
     # Start this in the background, so that the first notebook launch (which will trigger registry update) will be faster
     @asynclog withtoken(pkg_token) do
         will_update = !PkgCompat.check_registry_age()
-        PkgCompat.update_registries(; force=false)
+        PkgCompat.update_registries(; force = false)
         will_update && println("    Updating registry done ✓")
     end
 
-    shutdown_server[] = () -> @sync begin
-        @info("\n\nClosing Pluto... Restart Julia for a fresh session. \n\nHave a nice day! 🎈\n\n")
-        @async swallow_exception(() -> close(serversocket), Base.IOError)
-        # TODO: HTTP has a kill signal?
-        # TODO: put do_work tokens back 
-        for client in values(session.connected_clients)
-            @async swallow_exception(() -> close(client.stream), Base.IOError)
-        end
-        empty!(session.connected_clients)
-        for nb in values(session.notebooks)
-            @asynclog SessionActions.shutdown(session, nb; keep_in_session=false, async=false, verbose=false)
-        end
-    end
-
     try
         # create blocking call and switch the scheduler back to the server task, so that interrupts land there
-        wait(servertask)
+        wait(server)
     catch e
         if e isa InterruptException
-            shutdown_server[]()
+            close(server)
         elseif e isa TaskFailedException
+            @debug "Error is " exception = e stacktrace = catch_backtrace()
             # nice!
         else
             rethrow(e)
@@ -319,9 +309,9 @@ function run(session::ServerSession, pluto_router)
 end
 precompile(run, (ServerSession, HTTP.Handlers.Router{Symbol("##001")}))
 
-get_favorite_notebook(notebook:: Nothing) = nothing
-get_favorite_notebook(notebook:: String) = notebook
-get_favorite_notebook(notebook:: AbstractVector) = first(notebook)
+get_favorite_notebook(notebook::Nothing) = nothing
+get_favorite_notebook(notebook::String) = notebook
+get_favorite_notebook(notebook::AbstractVector) = first(notebook)
 
 function pretty_address(session::ServerSession, hostIP, port)
     root = if session.options.server.root_url !== nothing
@@ -359,15 +349,17 @@ function pretty_address(session::ServerSession, hostIP, port)
     else
         root
     end
-    string(HTTP.URI(HTTP.URI(new_root); query=url_params))
+    string(HTTP.URI(HTTP.URI(new_root); query = url_params))
 end
 
 "All messages sent over the WebSocket get decoded+deserialized and end up here."
-function process_ws_message(session::ServerSession, parentbody::Dict, clientstream::IO)
+function process_ws_message(session::ServerSession, parentbody::Dict, clientstream)
     client_id = Symbol(parentbody["client_id"])
-    client = get!(session.connected_clients, client_id, ClientSession(client_id, clientstream))
+    client = get!(session.connected_clients, client_id ) do 
+        ClientSession(client_id, clientstream)
+    end
     client.stream = clientstream # it might change when the same client reconnects
-    
+
     messagetype = Symbol(parentbody["type"])
     request_id = Symbol(parentbody["request_id"])
 
@@ -384,7 +376,7 @@ function process_ws_message(session::ServerSession, parentbody::Dict, clientstre
                 client.connected_notebook = notebook
             end
         end
-        
+
         notebook
     else
         nothing
diff --git a/src/webserver/WebSocketFix.jl b/src/webserver/WebSocketFix.jl
deleted file mode 100644
index a7ad726938..0000000000
--- a/src/webserver/WebSocketFix.jl
+++ /dev/null
@@ -1,80 +0,0 @@
-"Things that will hopefully go into HTTP.jl someday."
-module WebsocketFix
-
-import HTTP.WebSockets
-
-function readframe(ws::WebSockets.WebSocket)
-    header = WebSockets.readheader(ws.io)
-    # @debug 1 "WebSocket ➡️  $header"
-
-    if header.length > 0
-        if length(ws.rxpayload) < header.length
-            resize!(ws.rxpayload, header.length)
-        end
-        unsafe_read(ws.io, pointer(ws.rxpayload), header.length)
-        # @debug 2 "          ➡️  \"$(String(ws.rxpayload[1:header.length]))\""
-    end
-    l = Int(header.length)
-    if header.hasmask
-        WebSockets.mask!(ws.rxpayload, ws.rxpayload, l, reinterpret(UInt8, [header.mask]))
-    end
-
-    return header, view(ws.rxpayload, 1:l)
-end
-
-"""
-    readmessage(ws::WebSocket)
-
-HTTP.jl's default `readframe` (or `readavailable`) doesn't look at the FINAL field of frames.
-This means that it will return a frame no matter what, even though most people expect to get a full message.
-This method fixes that and gives you what you expect.
-"""
-function readmessage(ws::WebSockets.WebSocket)
-    # this code is based on HTTP.jl source code: https://github.com/JuliaWeb/HTTP.jl/blob/master/src/WebSockets.jl
-
-    header, data = readframe(ws)
-    l = Int(header.length)
-
-    if header.opcode == WebSockets.WS_CLOSE
-        ws.rxclosed = true
-        if l >= 2
-            status = UInt16(ws.rxpayload[1]) << 8 | ws.rxpayload[2]
-            if status != 1000
-                message = String(ws.rxpayload[3:l])
-                status_descr = get(WebSockets.STATUS_CODE_DESCRIPTION, Int(status), "")
-                msg = "Status: $(status_descr), Internal Code: $(message)"
-                throw(WebSockets.WebSocketError(status, msg))
-            end
-        end
-        return UInt8[]
-    elseif header.opcode == WebSockets.WS_PING
-        WebSockets.wswrite(ws, WebSockets.WS_FINAL | WebSockets.WS_PONG, ws.rxpayload[1:l])
-        header2, data2 = readframe(ws)
-        return readmessage(ws)
-    elseif header.opcode == WebSockets.WS_CONTINUATION
-        error("WS continuation gone wrong")
-    else
-        if header.final == true
-            return view(ws.rxpayload, 1:l)
-        else
-            multi_message_data = UInt8[]
-            append!(multi_message_data, data)  
-            while true
-                header2, data2 = readframe(ws)
-                if header2.opcode != WebSockets.WS_CONTINUATION
-                    println("header2.opcode:", header2.opcode)
-                    println("header2:", header2)
-                    throw("Should be a continuation")
-                end
-                append!(multi_message_data, data2)
-                if header2.final
-                    break
-                end
-            end
-
-            multi_message_data
-        end
-    end
-end
-
-end
\ No newline at end of file
diff --git a/test/compiletimes.jl b/test/compiletimes.jl
index 123f01ca3c..c1eef7d165 100644
--- a/test/compiletimes.jl
+++ b/test/compiletimes.jl
@@ -40,7 +40,7 @@ wait_for_ready(nb)
 
 Pluto.SessionActions.shutdown(🍭, nb; async=false)
 
-# Compile HTTP get.
+# Compile HTTP get. Use no encoding since there seem to be an issue with Accept-Encoding: gzip
 HTTP.get("http://github.com")
 
 @timeit TOUT "Pluto.run" server_task = @eval let

From 67a1e9fdfa1ee2cd612eca6fc438c501386e59ae Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Wed, 13 Jul 2022 08:20:18 +0200
Subject: [PATCH 397/821] fix broadcast bug with Vector + AbstractMatrix
 (#2212)

---
 src/runner/PlutoRunner.jl |  5 ++++-
 test/React.jl             | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 4ac9d070ab..c5558d64e1 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -399,7 +399,10 @@ struct OutputNotDefined end
 function compute(m::Module, computer::Computer)
     # 1. get the referenced global variables
     # this might error if the global does not exist, which is exactly what we want
-    input_global_values = getfield.([m], computer.input_globals)
+    input_global_values = Vector{Any}(undef, length(computer.input_globals))
+    for (i, s) in enumerate(computer.input_globals)
+        input_global_values[i] = getfield(m, s)
+    end
 
     # 2. run the function
     out = Base.invokelatest(computer.f, input_global_values...)
diff --git a/test/React.jl b/test/React.jl
index bc1599f295..a4b112a02c 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -1706,4 +1706,20 @@ import Distributed
 
         WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
+
+    @testset "Broadcast bug - Issue #2211" begin
+        notebook = Notebook(Cell.([
+            "abstract type AbstractFoo{T} <: AbstractMatrix{T} end",
+            "struct X{T} <: AbstractFoo{T} end",
+            "convert(::Type{AbstractArray{T}}, S::AbstractFoo) where {T<:Number} = convert(AbstractFoo{T}, S)",
+            "Base.convert(::Type{AbstractArray{T}}, ::AbstractFoo) where {T} = nothing",
+            "Base.size(::AbstractFoo) = (2,2)",
+            "Base.getindex(::AbstractFoo{T}, args...) where {T} = one(T)",
+            "x = X{Float64}()",
+            "y = zeros(2,)",
+            "x, y",
+        ]))
+        update_run!(🍭, notebook, notebook.cells)
+        @test all(noerror, notebook.cells)
+    end
 end

From 9674bf8da85410a415038f0f1af1eb83c5f25c3c Mon Sep 17 00:00:00 2001
From: Pablo Zubieta <8410335+pabloferz@users.noreply.github.com>
Date: Wed, 20 Jul 2022 14:22:10 -0500
Subject: [PATCH 398/821] Fix WSL paths (#2219)

---
 src/notebook/path helpers.jl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/notebook/path helpers.jl b/src/notebook/path helpers.jl
index 4ada9473c4..8f486a57ea 100644
--- a/src/notebook/path helpers.jl	
+++ b/src/notebook/path helpers.jl	
@@ -28,7 +28,8 @@ function maybe_convert_path_to_wsl(path)
     try
         if detectwsl()
             # wslpath utility prints path to stderr if it fails to convert
-            # (it fails for WSL-valid paths)
+            # (it used to fail for WSL-valid paths)
+             !isnothing(match(r"^/mnt/\w+/", path)) && return path
             return readchomp(pipeline(`wslpath -u $(path)`; stderr=devnull))
         end
     catch e

From 9b4ca83da24b49d15e8192a70a4d8a985c554e37 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Sat, 23 Jul 2022 10:08:21 +0200
Subject: [PATCH 399/821] fix progress logging perf (#2222)

---
 src/runner/PlutoRunner.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index c5558d64e1..d2d7bfc2c6 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -2135,7 +2135,7 @@ function Logging.handle_message(pl::PlutoLogger, level, msg, _module, group, id,
         
         put!(pl.log_channel, Dict{String,Any}(
             "level" => string(level),
-            "msg" => format_output_default(msg isa String ? Text(msg) : msg),
+            "msg" => format_output_default(msg isa AbstractString ? Text(msg) : msg),
             "group" => string(group),
             "id" => string(id),
             "file" => string(file),

From f568105117e1c53229062ac7767152f4b39c9b5c Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Sun, 24 Jul 2022 17:03:55 +0200
Subject: [PATCH 400/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index efcdff0eb7..a950282e57 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.9"
+version = "0.19.10"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 80a9b07c818efbd0e171499a1fb64d70a84d5151 Mon Sep 17 00:00:00 2001
From: Paul <paul@plutojl.org>
Date: Sun, 24 Jul 2022 17:15:08 +0200
Subject: [PATCH 401/821] Update sample notebooks & reimport from
 JuliaPluto/featured

---
 frontend/featured_sources.js |   4 +-
 sample/JavaScript.jl         |  29 +++++-
 sample/Plots.jl.jl           | 168 +++++++++++++++++++++++------------
 sample/PlutoUI.jl.jl         |  30 ++++++-
 4 files changed, 166 insertions(+), 65 deletions(-)

diff --git a/frontend/featured_sources.js b/frontend/featured_sources.js
index e9573ba776..4af889fd10 100644
--- a/frontend/featured_sources.js
+++ b/frontend/featured_sources.js
@@ -2,8 +2,8 @@ export default {
     // check out https://github.com/JuliaPluto/pluto-developer-instructions/blob/main/How%20to%20update%20the%20featured%20notebooks.md to learn more
     sources: [
         {
-            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@a0158dceac9ec602aaf4d8e0d53ddd10b8b56854/pluto_export.json",
-            integrity: "sha256-6LMXdEg2AvJcgkO1ne6tf75UFC8Vob6YqRAx6ytrfk8=",
+            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@b31a1701ebe14b3cc9cc8a06849153161e6f6972/pluto_export.json",
+            integrity: "sha256-JHf0MqoVjk8ISe2GJ9qBC3gj/3I86SiZbgp07eJYZD4=",
         },
     ],
 }
diff --git a/sample/JavaScript.jl b/sample/JavaScript.jl
index d26481309b..cc59d97a7e 100644
--- a/sample/JavaScript.jl
+++ b/sample/JavaScript.jl
@@ -1,6 +1,14 @@
 ### A Pluto.jl notebook ###
 # v0.19.9
 
+#> [frontmatter]
+#> author_url = "https://github.com/JuliaPluto"
+#> image = "https://upload.wikimedia.org/wikipedia/commons/9/99/Unofficial_JavaScript_logo_2.svg"
+#> tags = ["javascript", "web", "classic"]
+#> author_name = "Pluto.jl"
+#> description = "Use HTML, CSS and JavaScript to make your own interactive visualizations!"
+#> license = "Unlicense"
+
 using Markdown
 using InteractiveUtils
 
@@ -1120,14 +1128,21 @@ git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4"
 uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
 version = "0.11.4"
 
+[[CompilerSupportLibraries_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
+
 [[Dates]]
 deps = ["Printf"]
 uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
 
 [[Downloads]]
-deps = ["ArgTools", "LibCURL", "NetworkOptions"]
+deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
 uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 
+[[FileWatching]]
+uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
+
 [[FixedPointNumbers]]
 deps = ["Statistics"]
 git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc"
@@ -1182,7 +1197,7 @@ uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
 uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 
 [[LinearAlgebra]]
-deps = ["Libdl"]
+deps = ["Libdl", "libblastrampoline_jll"]
 uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [[Logging]]
@@ -1205,6 +1220,10 @@ uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
 [[NetworkOptions]]
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
+[[OpenBLAS_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
+uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
+
 [[Parsers]]
 deps = ["Dates"]
 git-tree-sha1 = "0044b23da09b5608b4ecacb4e5e6c6332f833a7e"
@@ -1230,7 +1249,7 @@ deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
 uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 
 [[Random]]
-deps = ["Serialization"]
+deps = ["SHA", "Serialization"]
 uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [[Reexport]]
@@ -1283,6 +1302,10 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 deps = ["Libdl"]
 uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
 
+[[libblastrampoline_jll]]
+deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
+uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
+
 [[nghttp2_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
diff --git a/sample/Plots.jl.jl b/sample/Plots.jl.jl
index bc41af069b..833cbfdd95 100644
--- a/sample/Plots.jl.jl
+++ b/sample/Plots.jl.jl
@@ -1,6 +1,14 @@
 ### A Pluto.jl notebook ###
 # v0.19.9
 
+#> [frontmatter]
+#> author_url = "https://github.com/JuliaPluto"
+#> image = "https://user-images.githubusercontent.com/6933510/174067386-c0a1296f-dba8-4dbf-b936-1c7f81933f94.png"
+#> tags = ["basic", "classic", "plotting"]
+#> author_name = "Pluto.jl"
+#> description = "An introduction to Plots.jl"
+#> license = "Unlicense"
+
 using Markdown
 using InteractiveUtils
 
@@ -22,6 +30,7 @@ Let's start by importing the `Plots` package. _(Pluto's package manager automati
 md"We need to choose a _backend_ for Plots.jl. We choose `plotly` because it works with no additional dependencies. You can [read more about backends](http://docs.juliaplots.org/latest/backends/#backends) in Plots.jl - it's one of its coolest features!"
 
 # ╔═╡ 9414a092-f105-11ea-10cd-23f84e47d876
+# ╠═╡ show_logs = false
 plotly()
 
 # ╔═╡ 5ae65950-9ad9-11ea-2e14-35119d369acd
@@ -215,7 +224,7 @@ PLUTO_PROJECT_TOML_CONTENTS = """
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 
 [compat]
-Plots = "~1.30.0"
+Plots = "~1.31.4"
 """
 
 # ╔═╡ 00000000-0000-0000-0000-000000000002
@@ -251,21 +260,27 @@ version = "1.16.1+1"
 
 [[ChainRulesCore]]
 deps = ["Compat", "LinearAlgebra", "SparseArrays"]
-git-tree-sha1 = "9489214b993cd42d17f44c36e359bf6a7c919abf"
+git-tree-sha1 = "80ca332f6dcb2508adba68f22f551adb2d00a624"
 uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
-version = "1.15.0"
+version = "1.15.3"
 
 [[ChangesOfVariables]]
 deps = ["ChainRulesCore", "LinearAlgebra", "Test"]
-git-tree-sha1 = "1e315e3f4b0b7ce40feded39c73049692126cf53"
+git-tree-sha1 = "38f7a08f19d8810338d4f5085211c7dfa5d5bdd8"
 uuid = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0"
-version = "0.1.3"
+version = "0.1.4"
+
+[[CodecZlib]]
+deps = ["TranscodingStreams", "Zlib_jll"]
+git-tree-sha1 = "ded953804d019afa9a3f98981d99b33e3db7b6da"
+uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
+version = "0.7.0"
 
 [[ColorSchemes]]
 deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Random"]
-git-tree-sha1 = "7297381ccb5df764549818d9a7d57e45f1057d30"
+git-tree-sha1 = "1fd869cc3875b57347f7027521f561cf46d1fcd8"
 uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
-version = "3.18.0"
+version = "3.19.0"
 
 [[ColorTypes]]
 deps = ["FixedPointNumbers", "Random"]
@@ -296,10 +311,9 @@ deps = ["Artifacts", "Libdl"]
 uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
 
 [[Contour]]
-deps = ["StaticArrays"]
-git-tree-sha1 = "9f02045d934dc030edad45944ea80dbd1f0ebea7"
+git-tree-sha1 = "d05d9e7b7aedff4e5b51a029dced05cfb6125781"
 uuid = "d38c429a-6771-53c6-b99e-75d170b6e991"
-version = "0.5.7"
+version = "0.6.2"
 
 [[DataAPI]]
 git-tree-sha1 = "fb5f5316dd3fd4c5e7c30a24d50643b73e37cd40"
@@ -327,12 +341,12 @@ uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
 
 [[DocStringExtensions]]
 deps = ["LibGit2"]
-git-tree-sha1 = "b19534d1895d702889b219c382a6e18010797f0b"
+git-tree-sha1 = "c5544d8abb854e306b7b2f799ab31cdba527ccae"
 uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
-version = "0.8.6"
+version = "0.9.0"
 
 [[Downloads]]
-deps = ["ArgTools", "LibCURL", "NetworkOptions"]
+deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
 uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 
 [[EarCut_jll]]
@@ -354,10 +368,13 @@ uuid = "c87230d0-a227-11e9-1b43-d7ebe4e7570a"
 version = "0.4.1"
 
 [[FFMPEG_jll]]
-deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "LAME_jll", "Libdl", "Ogg_jll", "OpenSSL_jll", "Opus_jll", "Pkg", "Zlib_jll", "libass_jll", "libfdk_aac_jll", "libvorbis_jll", "x264_jll", "x265_jll"]
-git-tree-sha1 = "d8a578692e3077ac998b50c0217dfd67f21d1e5f"
+deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "LAME_jll", "Libdl", "Ogg_jll", "OpenSSL_jll", "Opus_jll", "Pkg", "Zlib_jll", "libaom_jll", "libass_jll", "libfdk_aac_jll", "libvorbis_jll", "x264_jll", "x265_jll"]
+git-tree-sha1 = "ccd479984c7838684b3ac204b716c89955c76623"
 uuid = "b22a6f82-2f65-5046-a5b2-351ab43fb4e5"
-version = "4.4.0+0"
+version = "4.4.2+0"
+
+[[FileWatching]]
+uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
 
 [[FixedPointNumbers]]
 deps = ["Statistics"]
@@ -397,15 +414,15 @@ version = "3.3.6+0"
 
 [[GR]]
 deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Printf", "Random", "RelocatableFolders", "Serialization", "Sockets", "Test", "UUIDs"]
-git-tree-sha1 = "c98aea696662d09e215ef7cda5296024a9646c75"
+git-tree-sha1 = "037a1ca47e8a5989cc07d19729567bb71bfabd0c"
 uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
-version = "0.64.4"
+version = "0.66.0"
 
 [[GR_jll]]
 deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Pkg", "Qt5Base_jll", "Zlib_jll", "libpng_jll"]
-git-tree-sha1 = "3a233eeeb2ca45842fe100e0413936834215abf5"
+git-tree-sha1 = "c8ab731c9127cd931c93221f65d6a1008dad7256"
 uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
-version = "0.64.4+0"
+version = "0.66.0+0"
 
 [[GeometryBasics]]
 deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"]
@@ -437,10 +454,10 @@ uuid = "42e2da0e-8278-4e71-bc24-59509adca0fe"
 version = "1.0.2"
 
 [[HTTP]]
-deps = ["Base64", "Dates", "IniFile", "Logging", "MbedTLS", "NetworkOptions", "Sockets", "URIs"]
-git-tree-sha1 = "0fa77022fe4b511826b39c894c90daf5fce3334a"
+deps = ["Base64", "CodecZlib", "Dates", "IniFile", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"]
+git-tree-sha1 = "ed47af35905b7cc8f1a522ca684b35a212269bd8"
 uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
-version = "0.9.17"
+version = "1.2.0"
 
 [[HarfBuzz_jll]]
 deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"]
@@ -521,9 +538,9 @@ version = "1.3.0"
 
 [[Latexify]]
 deps = ["Formatting", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "Printf", "Requires"]
-git-tree-sha1 = "46a39b9c58749eefb5f2dc1178cb8fab5332b1ab"
+git-tree-sha1 = "1a43be956d433b5d0321197150c2f94e16c0aaa0"
 uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
-version = "0.15.15"
+version = "0.15.16"
 
 [[LibCURL]]
 deps = ["LibCURL_jll", "MozillaCACerts_jll"]
@@ -593,18 +610,24 @@ uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700"
 version = "2.36.0+0"
 
 [[LinearAlgebra]]
-deps = ["Libdl"]
+deps = ["Libdl", "libblastrampoline_jll"]
 uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [[LogExpFunctions]]
 deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"]
-git-tree-sha1 = "09e4b894ce6a976c354a69041a04748180d43637"
+git-tree-sha1 = "7c88f63f9f0eb5929f15695af9a4d7d3ed278a91"
 uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
-version = "0.3.15"
+version = "0.3.16"
 
 [[Logging]]
 uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
 
+[[LoggingExtras]]
+deps = ["Dates", "Logging"]
+git-tree-sha1 = "5d4d2d9904227b8bd66386c1138cf4d5ffa826bf"
+uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36"
+version = "0.4.9"
+
 [[MacroTools]]
 deps = ["Markdown", "Random"]
 git-tree-sha1 = "3d3e902b31198a27340d0bf00d6ac452866021cf"
@@ -616,10 +639,10 @@ deps = ["Base64"]
 uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
 
 [[MbedTLS]]
-deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"]
-git-tree-sha1 = "1c38e51c3d08ef2278062ebceade0e46cefc96fe"
+deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "Random", "Sockets"]
+git-tree-sha1 = "9f4f5a42de3300439cb8300236925670f844a555"
 uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
-version = "1.0.3"
+version = "1.1.1"
 
 [[MbedTLS_jll]]
 deps = ["Artifacts", "Libdl"]
@@ -643,9 +666,10 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
 
 [[NaNMath]]
-git-tree-sha1 = "737a5957f387b17e74d4ad2f440eb330b39a62c5"
+deps = ["OpenLibm_jll"]
+git-tree-sha1 = "a7c3d1da1189a1c2fe843a3bfa04d18d20eb3211"
 uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
-version = "1.0.0"
+version = "1.0.1"
 
 [[NetworkOptions]]
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
@@ -656,15 +680,19 @@ git-tree-sha1 = "887579a3eb005446d514ab7aeac5d1d027658b8f"
 uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051"
 version = "1.3.5+1"
 
+[[OpenBLAS_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
+uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
+
 [[OpenLibm_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "05823500-19ac-5b8b-9628-191a04bc5112"
 
 [[OpenSSL_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "ab05aa4cc89736e95915b01e7279e61b1bfe33b8"
+git-tree-sha1 = "e60321e3f2616584ff98f0a4f18d98ae6f89bbb3"
 uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
-version = "1.1.14+0"
+version = "1.1.17+0"
 
 [[OpenSpecFun_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"]
@@ -713,15 +741,15 @@ version = "3.0.0"
 
 [[PlotUtils]]
 deps = ["ColorSchemes", "Colors", "Dates", "Printf", "Random", "Reexport", "Statistics"]
-git-tree-sha1 = "bb16469fd5224100e422f0b027d26c5a25de1200"
+git-tree-sha1 = "9888e59493658e476d3073f1ce24348bdc086660"
 uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043"
-version = "1.2.0"
+version = "1.3.0"
 
 [[Plots]]
 deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "Unzip"]
-git-tree-sha1 = "0b727ac13565a2b665cc78db579e0093b869034e"
+git-tree-sha1 = "0a0da27969e8b6b2ee67c112dcf7001a659049a0"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
-version = "1.30.0"
+version = "1.31.4"
 
 [[Preferences]]
 deps = ["TOML"]
@@ -744,7 +772,7 @@ deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
 uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 
 [[Random]]
-deps = ["Serialization"]
+deps = ["SHA", "Serialization"]
 uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [[RecipesBase]]
@@ -754,9 +782,9 @@ version = "1.2.1"
 
 [[RecipesPipeline]]
 deps = ["Dates", "NaNMath", "PlotUtils", "RecipesBase"]
-git-tree-sha1 = "dc1e451e15d90347a7decc4221842a022b011714"
+git-tree-sha1 = "2690681814016887462cf5ac37102b51cd9ec781"
 uuid = "01d81517-befc-4cb6-b9ec-a95719d0359c"
-version = "0.5.2"
+version = "0.6.2"
 
 [[Reexport]]
 git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b"
@@ -765,9 +793,9 @@ version = "1.2.2"
 
 [[RelocatableFolders]]
 deps = ["SHA", "Scratch"]
-git-tree-sha1 = "cdbd3b1338c72ce29d9584fdbe9e9b70eeb5adca"
+git-tree-sha1 = "22c5201127d7b243b9ee1de3b43c408879dff60f"
 uuid = "05181044-ff0b-4ac5-8273-598c1e38db00"
-version = "0.1.3"
+version = "0.3.0"
 
 [[Requires]]
 deps = ["UUIDs"]
@@ -780,9 +808,9 @@ uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
 
 [[Scratch]]
 deps = ["Dates"]
-git-tree-sha1 = "0b4b7f1393cff97c33891da2a0bf69c6ed241fda"
+git-tree-sha1 = "f94f779c94e58bf9ea243e77a37e16d9de9126bd"
 uuid = "6c6a2e73-6563-6170-7368-637461726353"
-version = "1.1.0"
+version = "1.1.1"
 
 [[Serialization]]
 uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
@@ -793,6 +821,11 @@ git-tree-sha1 = "91eddf657aca81df9ae6ceb20b959ae5653ad1de"
 uuid = "992d4aef-0814-514b-bc4d-f2e9a6c4116f"
 version = "1.0.3"
 
+[[SimpleBufferStream]]
+git-tree-sha1 = "874e8867b33a00e784c8a7e4b60afe9e037b74e1"
+uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7"
+version = "1.1.0"
+
 [[Sockets]]
 uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
 
@@ -808,15 +841,20 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [[SpecialFunctions]]
 deps = ["ChainRulesCore", "IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"]
-git-tree-sha1 = "a9e798cae4867e3a41cae2dd9eb60c047f1212db"
+git-tree-sha1 = "d75bda01f8c31ebb72df80a46c88b25d1c79c56d"
 uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
-version = "2.1.6"
+version = "2.1.7"
 
 [[StaticArrays]]
-deps = ["LinearAlgebra", "Random", "Statistics"]
-git-tree-sha1 = "2bbd9f2e40afd197a1379aef05e0d85dba649951"
+deps = ["LinearAlgebra", "Random", "StaticArraysCore", "Statistics"]
+git-tree-sha1 = "23368a3313d12a2326ad0035f0db0c0966f438ef"
 uuid = "90137ffa-7385-5640-81b9-e52037218182"
-version = "1.4.7"
+version = "1.5.2"
+
+[[StaticArraysCore]]
+git-tree-sha1 = "66fe9eb253f910fe8cf161953880cfdaef01cdf0"
+uuid = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
+version = "1.0.1"
 
 [[Statistics]]
 deps = ["LinearAlgebra", "SparseArrays"]
@@ -830,15 +868,15 @@ version = "1.4.0"
 
 [[StatsBase]]
 deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
-git-tree-sha1 = "8977b17906b0a1cc74ab2e3a05faa16cf08a8291"
+git-tree-sha1 = "472d044a1c8df2b062b23f222573ad6837a615ba"
 uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
-version = "0.33.16"
+version = "0.33.19"
 
 [[StructArrays]]
 deps = ["Adapt", "DataAPI", "StaticArrays", "Tables"]
-git-tree-sha1 = "9abba8f8fb8458e9adf07c8a2377a070674a24f1"
+git-tree-sha1 = "ec47fb6069c57f1cee2f67541bf8f23415146de7"
 uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
-version = "0.6.8"
+version = "0.6.11"
 
 [[TOML]]
 deps = ["Dates"]
@@ -870,10 +908,16 @@ version = "0.1.1"
 deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
 uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
+[[TranscodingStreams]]
+deps = ["Random", "Test"]
+git-tree-sha1 = "216b95ea110b5972db65aa90f88d8d89dcb8851c"
+uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
+version = "0.9.6"
+
 [[URIs]]
-git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355"
+git-tree-sha1 = "e59ecc5a41b000fa94423a578d29290c7266fc10"
 uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
-version = "1.3.0"
+version = "1.4.0"
 
 [[UUIDs]]
 deps = ["Random", "SHA"]
@@ -1053,12 +1097,22 @@ git-tree-sha1 = "e45044cd873ded54b6a5bac0eb5c971392cf1927"
 uuid = "3161d3a3-bdf6-5164-811a-617609db77b4"
 version = "1.5.2+0"
 
+[[libaom_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "3a2ea60308f0996d26f1e5354e10c24e9ef905d4"
+uuid = "a4ae2306-e953-59d6-aa16-d00cac43593b"
+version = "3.4.0+0"
+
 [[libass_jll]]
 deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "HarfBuzz_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]
 git-tree-sha1 = "5982a94fcba20f02f42ace44b9894ee2b140fe47"
 uuid = "0ac62f75-1d6f-5e53-bd7c-93b484bb37c0"
 version = "0.15.1+0"
 
+[[libblastrampoline_jll]]
+deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
+uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
+
 [[libfdk_aac_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
 git-tree-sha1 = "daacc84a041563f965be61859a36e17c4e4fcd55"
diff --git a/sample/PlutoUI.jl.jl b/sample/PlutoUI.jl.jl
index 1c38006113..c3365c47f3 100644
--- a/sample/PlutoUI.jl.jl
+++ b/sample/PlutoUI.jl.jl
@@ -1,6 +1,15 @@
 ### A Pluto.jl notebook ###
 # v0.19.9
 
+#> [frontmatter]
+#> author_url = "https://github.com/JuliaPluto"
+#> image = "https://user-images.githubusercontent.com/6933510/174067690-50c8128d-748b-4f50-8a76-2ce18166642b.png"
+#> order = "3"
+#> tags = ["basic", "interactivity", "classic"]
+#> author_name = "Pluto.jl"
+#> description = "Slider, buttons, dropdowns and more from PlutoUI.jl!"
+#> license = "Unlicense"
+
 using Markdown
 using InteractiveUtils
 
@@ -648,14 +657,21 @@ git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4"
 uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
 version = "0.11.4"
 
+[[CompilerSupportLibraries_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
+
 [[Dates]]
 deps = ["Printf"]
 uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
 
 [[Downloads]]
-deps = ["ArgTools", "LibCURL", "NetworkOptions"]
+deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
 uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 
+[[FileWatching]]
+uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
+
 [[FixedPointNumbers]]
 deps = ["Statistics"]
 git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc"
@@ -710,7 +726,7 @@ uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
 uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 
 [[LinearAlgebra]]
-deps = ["Libdl"]
+deps = ["Libdl", "libblastrampoline_jll"]
 uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [[Logging]]
@@ -733,6 +749,10 @@ uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
 [[NetworkOptions]]
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
+[[OpenBLAS_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
+uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
+
 [[Parsers]]
 deps = ["Dates"]
 git-tree-sha1 = "0044b23da09b5608b4ecacb4e5e6c6332f833a7e"
@@ -758,7 +778,7 @@ deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
 uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 
 [[Random]]
-deps = ["Serialization"]
+deps = ["SHA", "Serialization"]
 uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [[Reexport]]
@@ -811,6 +831,10 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 deps = ["Libdl"]
 uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
 
+[[libblastrampoline_jll]]
+deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
+uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
+
 [[nghttp2_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"

From 61e5548b1962d5b9508ea0fd23e608ce21152cbe Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Wed, 27 Jul 2022 08:13:43 +0200
Subject: [PATCH 402/821] Add base_url option (#2227)

* Add base_url option

* add tests & improve docs

* Fix polling

* update test
---
 src/Configuration.jl       |  7 ++++-
 src/webserver/Static.jl    | 38 ++++++++++++++++++++++++---
 src/webserver/WebServer.jl |  5 ++--
 test/webserver.jl          | 54 +++++++++++++++++++++++++++++++++++---
 4 files changed, 94 insertions(+), 10 deletions(-)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index 5ae65b5143..8177c012a1 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -28,6 +28,7 @@ function __init__()
 end
 
 const ROOT_URL_DEFAULT = nothing
+const BASE_URL_DEFAULT = "/"
 const HOST_DEFAULT = "127.0.0.1"
 const PORT_DEFAULT = nothing
 const PORT_HINT_DEFAULT = 1234
@@ -70,10 +71,12 @@ The HTTP server options. See [`SecurityOptions`](@ref) for additional settings.
 - `simulated_pkg_lag::Real=$SIMULATED_PKG_LAG_DEFAULT` (internal) Extra lag to add to operations done by Pluto's package manager. Will be multiplied by `0.5 + rand()`.
 - `injected_javascript_data_url::String = "$INJECTED_JAVASCRIPT_DATA_URL_DEFAULT"` (internal) Optional javascript injectables to the front-end. Can be used to customize the editor, but this API is not meant for general use yet.
 - `on_event::Function = $ON_EVENT_DEFAULT`
-- `root_url::Union{Nothing,String} = $ROOT_URL_DEFAULT` This setting is used to specify the root URL of the Pluto server, but this setting is *only* used to customize the launch message (*"Go to http://localhost:1234/ in your browser"*). You can probably ignore this.
+- `root_url::Union{Nothing,String} = $ROOT_URL_DEFAULT` This setting is used to specify the root URL of the Pluto server, but this setting is *only* used to customize the launch message (*"Go to http://localhost:1234/ in your browser"*). You can probably ignore this and use `base_url` instead.
+- `base_url::String = "$BASE_URL_DEFAULT"` This setting is used to specify the base URL at which the Pluto server will receive requests, it should start be a valid path starting and ending with a '/'.
 """
 @option mutable struct ServerOptions
     root_url::Union{Nothing,String} = ROOT_URL_DEFAULT
+    base_url::String = BASE_URL_DEFAULT
     host::String = HOST_DEFAULT
     port::Union{Nothing,Integer} = PORT_DEFAULT
     port_hint::Integer = PORT_HINT_DEFAULT
@@ -218,6 +221,7 @@ end
 
 function from_flat_kwargs(;
         root_url::Union{Nothing,String} = ROOT_URL_DEFAULT,
+        base_url::String = BASE_URL_DEFAULT,
         host::String = HOST_DEFAULT,
         port::Union{Nothing,Integer} = PORT_DEFAULT,
         port_hint::Integer = PORT_HINT_DEFAULT,
@@ -252,6 +256,7 @@ function from_flat_kwargs(;
     )
     server = ServerOptions(;
         root_url,
+        base_url,
         host,
         port,
         port_hint,
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index e4aecb908e..7fa00c51c2 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -42,6 +42,10 @@ const day = let
     day = 24hour
 end
 
+function default_404(req = nothing)
+    HTTP.Response(404, "Not found!")
+end
+
 function asset_response(path; cacheable::Bool=false)
     if !isfile(path) && !endswith(path, ".html")
         return asset_response(path * ".html"; cacheable)
@@ -55,7 +59,7 @@ function asset_response(path; cacheable::Bool=false)
         cacheable && push!(response.headers, "Cache-Control" => "public, max-age=$(30day), immutable")
         response
     else
-        HTTP.Response(404, "Not found!")
+        default_404()
     end
 end
 
@@ -115,8 +119,31 @@ function is_authenticated(session::ServerSession, request::HTTP.Request)
     # that ) || ( kind of looks like Krabs from spongebob
 end
 
+"""
+    scoped_router(base_url::String, base_router::HTTP.Router)::HTTP.Router
+
+Returns a new `HTTP.Router` which delegates all requests to `base_router` but with requests trimmed
+so that they seem like they arrived at `/**` instead of `/\$base_url/**`.
+"""
+function scoped_router(base_url, base_router)
+    @assert startswith(base_url, '/') "base_url \"$base_url\" should start with a '/'"
+    @assert endswith(base_url, '/')  "base_url \"$base_url\" should end with a '/'"
+    @assert !occursin('*', base_url) "'*' not allowed in base_url \"$base_url\" "
+
+    function handler(request)
+        request.target = request.target[length(base_url):end]
+        return base_router(request)
+    end
+
+    router = HTTP.Router(base_router._404, base_router._405)
+    HTTP.register!(router, base_url * "**", handler)
+    HTTP.register!(router, base_url, handler)
+
+    return router
+end
+
 function http_router_for(session::ServerSession)
-    router = HTTP.Router()
+    router = HTTP.Router(default_404)
     security = session.options.security
 
     function add_set_secret_cookie!(response::HTTP.Response)
@@ -263,7 +290,7 @@ function http_router_for(session::ServerSession)
         )
     end
     HTTP.register!(router, "GET", "/sample/*", serve_sample)
-    HTTP.register!(router, "POST", "/sample/*", serve_sample)
+    HTTP.register!(router, "POST","/sample/*", serve_sample)
 
     notebook_from_uri(request) = let
         uri = HTTP.URI(request.target)        
@@ -348,5 +375,10 @@ function http_router_for(session::ServerSession)
     HTTP.register!(router, "GET", "/**", serve_asset)
     HTTP.register!(router, "GET", "/favicon.ico", create_serve_onefile(project_relative_path(frontend_directory(allow_bundled=false), "img", "favicon.ico")))
 
+    base_url = session.options.server.base_url
+    if base_url != "/"
+        return scoped_router(base_url, router)
+    end
+
     return router
 end
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 4fef488f25..3a4540a860 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -264,7 +264,7 @@ function run(session::ServerSession)
 
     server_running() =
         try
-            HTTP.get("http://$(hostIP):$(port)/ping"; status_exception = false, retry = false, connect_timeout = 10, readtimeout = 10).status == 200
+            HTTP.get("http://$(hostIP):$(port)$(session.options.server.base_url)ping"; status_exception = false, retry = false, connect_timeout = 10, readtimeout = 10).status == 200
         catch
             false
         end
@@ -333,7 +333,8 @@ function pretty_address(session::ServerSession, hostIP, port)
             host_str
         end
         port_pretty = Int(port)
-        "http://$(host_pretty):$(port_pretty)/"
+        base_url = session.options.server.base_url
+        "http://$(host_pretty):$(port_pretty)$(base_url)"
     end
 
     url_params = Dict{String,String}()
diff --git a/test/webserver.jl b/test/webserver.jl
index bbf68fd9ef..9afbd3bdf1 100644
--- a/test/webserver.jl
+++ b/test/webserver.jl
@@ -8,11 +8,55 @@ using Pluto.WorkspaceManager: WorkspaceManager, poll
 
 @testset "Web server" begin
 
+@testset "base_url" begin
+    port = 13433
+    host = "localhost"
+
+    n_components = rand(2:6)
+    base_url = "/"
+    for _ in 1:n_components
+        base_url *= String(rand(collect('a':'z') ∪ collect('0':'9'), rand(5:10))) * "/"
+    end
+    local_url(suffix) = "http://$host:$port$base_url$suffix"
+
+    @show local_url("favicon.ico")
+    server_running() = HTTP.get(local_url("favicon.ico")).status == 200 && HTTP.get(local_url("edit")).status == 200
+
+    # without notebook at startup
+    options = Pluto.Configuration.from_flat_kwargs(;
+        port,
+        launch_browser=false,
+        workspace_use_distributed=true,
+        require_secret_for_access=false,
+        require_secret_for_open_links=false,
+        base_url,
+    )
+    🍭 = Pluto.ServerSession(; options)
+    server_task = @async Pluto.run(🍭)
+
+    # FYI, you should normally use a PlutoEvent for things we do in this test instead of polling! Don't use this as an example.
+    @test poll(10) do
+        server_running()
+    end
+
+    sleep(20)
+    @test HTTP.get("http://$host:$port/edit"; status_exception=false).status == 404
+
+    for notebook in values(🍭.notebooks)
+        SessionActions.shutdown(🍭, notebook; keep_in_session=false)
+    end
+
+    schedule(server_task, InterruptException(); error=true)
+
+    # wait for the server task to finish
+    # normally this `wait` would rethrow the above InterruptException, but Pluto.run should catch for InterruptExceptions and not bubble them up.
+    wait(server_task)
+end
 
 @testset "Exports" begin
     port, socket = 
         @inferred Pluto.port_serversocket(Sockets.ip"0.0.0.0", nothing, 5543) 
-    
+
     close(socket)
     @test 5543 <= port < 5600
 
@@ -20,9 +64,9 @@ using Pluto.WorkspaceManager: WorkspaceManager, poll
     host = "localhost"
     local_url(suffix) = "http://$host:$port/$suffix"
 
-    
+
     server_running() = HTTP.get(local_url("favicon.ico")).status == 200 && HTTP.get(local_url("edit")).status == 200
-    
+
 
     # without notebook at startup
     options = Pluto.Configuration.from_flat_kwargs(; port, launch_browser=false, workspace_use_distributed=true, require_secret_for_access=false, require_secret_for_open_links=false)
@@ -64,7 +108,9 @@ using Pluto.WorkspaceManager: WorkspaceManager, poll
     @test occursin(string(Pluto.PLUTO_VERSION), export_contents)
     @test occursin("</html>", export_contents)
     
-    SessionActions.shutdown(🍭, notebook; keep_in_session=false)
+    for notebook in values(🍭.notebooks)
+        SessionActions.shutdown(🍭, notebook; keep_in_session=false)
+    end
     
     schedule(server_task, InterruptException(); error=true)
     # wait for the server task to finish

From ad07c522cd0fecefe38eaad03aa876e56476fc84 Mon Sep 17 00:00:00 2001
From: Paul <paul@plutojl.org>
Date: Wed, 27 Jul 2022 23:17:14 +0200
Subject: [PATCH 403/821] fix 404 on welcome menu

---
 frontend/components/welcome/Welcome.js | 5 ++++-
 frontend/index.html                    | 4 +++-
 src/webserver/Static.jl                | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/frontend/components/welcome/Welcome.js b/frontend/components/welcome/Welcome.js
index 8733e92b46..2b58bc3177 100644
--- a/frontend/components/welcome/Welcome.js
+++ b/frontend/components/welcome/Welcome.js
@@ -21,6 +21,9 @@ import { Featured } from "./Featured.js"
  * }}
  */
 
+// We use a link from the head instead of directing linking "img/logo.svg" because parcel does not bundle preact files
+const url_logo_big = document.head.querySelector("link[rel='pluto-logo-big']")?.getAttribute("href") ?? ""
+
 export const Welcome = () => {
     const [remote_notebooks, set_remote_notebooks] = useState(/** @type {Array<NotebookListEntry>} */ ([]))
 
@@ -74,7 +77,7 @@ export const Welcome = () => {
 
     return html`
         <section id="title">
-            <h1>welcome to <img src="img/logo.svg" /></h1>
+            <h1>welcome to <img src=${url_logo_big} /></h1>
             <!-- <a id="github" href="https://github.com/fonsp/Pluto.jl"
                 ><img src="https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/logo-github.svg"
             /></a> -->
diff --git a/frontend/index.html b/frontend/index.html
index e7fda8c032..9ada585d32 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -20,6 +20,8 @@
     <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.20/lodash.min.js" defer></script>
     <script src="https://cdn.jsdelivr.net/npm/@observablehq/stdlib@3.3.1/dist/stdlib.js" defer></script>
 
+    <link rel="pluto-logo-big" href="./img/logo.svg" />
+
     <link rel="stylesheet" href="welcome.css">
     <link rel="stylesheet" href="index.css">
 
@@ -70,4 +72,4 @@ <h2>Loading...</h2>
     </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index 7fa00c51c2..acb767e494 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -369,7 +369,7 @@ function http_router_for(session::ServerSession)
     
     function serve_asset(request::HTTP.Request)
         uri = HTTP.URI(request.target)
-        filepath = project_relative_path(frontend_directory(), relpath(HTTP.unescapeuri(uri.path), "/"))
+        filepath = project_relative_path(frontend_directory(), relpath(uri.path, "/"))
         asset_response(filepath; cacheable=should_cache(filepath))
     end
     HTTP.register!(router, "GET", "/**", serve_asset)

From 2158cab91132ae337e68fb0b708dd6cc46305b88 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Wed, 27 Jul 2022 23:18:26 +0200
Subject: [PATCH 404/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index a950282e57..1a1e46b45f 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.10"
+version = "0.19.11"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 72555eda2ba121a023243344ffa1dd75d3a17d35 Mon Sep 17 00:00:00 2001
From: Alberto Mengali <disberd@gmail.com>
Date: Wed, 17 Aug 2022 18:00:01 +0200
Subject: [PATCH 405/821] Add macrocall cell_id to LineNumberNodes inside
 expanded expr (#2241)

* Add function to update disabled_cells_dependency

* update disabled/skipped dependency inside load_notebook

* add a test

* append macrocall cell_id inside macro expr

* Revert "Add function to update disabled_cells_dependency"

This reverts commit f659cf912773ce11d12a6185f75af9c16a827334.

* Revert "update disabled/skipped dependency inside load_notebook"

This reverts commit 897604e112594412c1ed50189ae4067ec6e3dea8.

* Revert "add a test"

This reverts commit 5b590621125eb1b58a3464f566dc3a3093b1e111.

* Correctly handle jump to link in stacktraces

* move LineNumberNode processing to replace_pluto_properties_in_expr

* add tests for methods deletion from macros
---
 Project.toml                        |  3 +-
 frontend/components/ErrorMessage.js |  2 +-
 src/runner/PlutoRunner.jl           | 12 +++++++-
 test/MacroAnalysis.jl               | 48 +++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/Project.toml b/Project.toml
index 1a1e46b45f..47ea4bcaf7 100644
--- a/Project.toml
+++ b/Project.toml
@@ -48,6 +48,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
+Memoize = "c03570c3-d221-55d1-a50c-7939bbd78826"
 
 [targets]
-test = ["DataFrames", "OffsetArrays", "Random", "Sockets", "Test", "TimerOutputs"]
+test = ["DataFrames", "OffsetArrays", "Random", "Sockets", "Test", "TimerOutputs", "Memoize"]
diff --git a/frontend/components/ErrorMessage.js b/frontend/components/ErrorMessage.js
index 0ef5344eed..173243ee9b 100644
--- a/frontend/components/ErrorMessage.js
+++ b/frontend/components/ErrorMessage.js
@@ -4,7 +4,7 @@ import { html, useContext, useState } from "../imports/Preact.js"
 const StackFrameFilename = ({ frame, cell_id }) => {
     const sep_index = frame.file.indexOf("#==#")
     if (sep_index != -1) {
-        const frame_cell_id = frame.file.substr(sep_index + 4)
+        const frame_cell_id = frame.file.substr(sep_index + 4, 36)
         const a = html`<a
             href="#"
             onclick=${(e) => {
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index d2d7bfc2c6..dc8883fef3 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -181,6 +181,17 @@ else
     m
 end
 replace_pluto_properties_in_expr(other; kwargs...) = other
+function replace_pluto_properties_in_expr(ln::LineNumberNode; cell_id, kwargs...) # See https://github.com/fonsp/Pluto.jl/pull/2241
+    file = string(ln.file)
+    out = if endswith(file, string(cell_id))
+        # We already have the correct cell_id in this LineNumberNode
+        ln
+    else
+        # We append to the LineNumberNode file #@#==# + cell_id
+        LineNumberNode(ln.line, Symbol(file * "#@#==#$(cell_id)"))
+    end
+    return out
+end
 
 "Similar to [`replace_pluto_properties_in_expr`](@ref), but just checks for existance and doesn't check for [`GiveMeCellID`](@ref)"
 has_hook_style_pluto_properties_in_expr(::GiveMeRerunCellFunction) = true
@@ -253,7 +264,6 @@ module CantReturnInPluto
     replace_returns_with_error_in_interpolation(ex) = ex
 end
 
-
 function try_macroexpand(mod, cell_uuid, expr)
     # Remove the precvious cached expansion, so when we error somewhere before we update,
     # the old one won't linger around and get run accidentally.
diff --git a/test/MacroAnalysis.jl b/test/MacroAnalysis.jl
index 96c925dc69..396c732b22 100644
--- a/test/MacroAnalysis.jl
+++ b/test/MacroAnalysis.jl
@@ -1,6 +1,7 @@
 using Test
 import UUIDs
 import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, ClientSession, update_run!
+import Memoize: @memoize
 
 @testset "Macro analysis" begin
     🍭 = ServerSession()
@@ -872,4 +873,51 @@ import Pluto: PlutoRunner, Notebook, WorkspaceManager, Cell, ServerSession, Clie
         @test !occursin("An empty conjugate", bool.output.body)
         @test occursin("complex conjugate", bool.output.body)
     end
+
+    @testset "Delete methods from macros" begin
+        🍭 = ServerSession()
+        🍭.options.evaluation.workspace_use_distributed = false
+
+        fakeclient = ClientSession(:fake, nothing)
+        🍭.connected_clients[fakeclient.id] = fakeclient
+
+        notebook = Notebook([
+            Cell("using Memoize"),
+            Cell("""
+                macro user_defined()
+                    quote
+                        struct ASD end
+                        custom_func(::ASD) = "ASD"
+                    end |> esc
+                end
+            """),
+            Cell("@user_defined"),
+            Cell("methods(custom_func)"),
+            Cell("""
+                @memoize function memoized_func(a)
+                    println("Running")
+                    2a
+                end
+            """),
+            Cell("methods(memoized_func)"),
+        ])
+        cell(idx) = notebook.cells[idx]
+
+        update_run!(🍭, notebook, notebook.cells)
+        
+        @test :custom_func ∈ notebook.topology.nodes[cell(3)].funcdefs_without_signatures
+        @test cell(4) |> noerror
+        @test :memoized_func ∈ notebook.topology.nodes[cell(5)].funcdefs_without_signatures
+        @test cell(6) |> noerror
+
+        cell(3).code = "#=$(cell(3).code)=#"
+        cell(5).code = "#=$(cell(5).code)=#"
+        
+        update_run!(🍭, notebook, notebook.cells)
+        
+        @test :custom_func ∉ notebook.topology.nodes[cell(3)].funcdefs_without_signatures
+        @test occursinerror("UndefVarError: custom_func", cell(4))
+        @test :memoized_func ∉ notebook.topology.nodes[cell(5)].funcdefs_without_signatures
+        @test occursinerror("UndefVarError: memoized_func", cell(6))
+    end
 end

From 70a80786fe9f5c3fe1c6c1368eb937a7e0288305 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Sun, 4 Sep 2022 22:29:00 +0200
Subject: [PATCH 406/821] :broom: Code cleanup (#2260)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Cleanup Run.jl and move macro analysis to its own file

* 🧹 Cleanup code
---
 src/Pluto.jl                    |   1 +
 src/evaluation/MacroAnalysis.jl | 203 +++++++++++++++++++++++++
 src/evaluation/Run.jl           | 256 ++++----------------------------
 src/webserver/Dynamic.jl        |  20 +--
 src/webserver/Firebasey.jl      |  11 +-
 5 files changed, 240 insertions(+), 251 deletions(-)
 create mode 100644 src/evaluation/MacroAnalysis.jl

diff --git a/src/Pluto.jl b/src/Pluto.jl
index 835fea5eb8..88e0cafce5 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -71,6 +71,7 @@ include("./analysis/DependencyCache.jl")
 include("./analysis/MoreAnalysis.jl")
 
 include("./evaluation/WorkspaceManager.jl")
+include("./evaluation/MacroAnalysis.jl")
 include("./packages/Packages.jl")
 include("./packages/PkgUtils.jl")
 include("./evaluation/Run.jl")
diff --git a/src/evaluation/MacroAnalysis.jl b/src/evaluation/MacroAnalysis.jl
new file mode 100644
index 0000000000..4ef8760978
--- /dev/null
+++ b/src/evaluation/MacroAnalysis.jl
@@ -0,0 +1,203 @@
+# Macro Analysis & Topology Resolution (see https://github.com/fonsp/Pluto.jl/pull/1032)
+
+import .WorkspaceManager: macroexpand_in_workspace
+
+const lazymap = Base.Generator
+
+function defined_variables(topology::NotebookTopology, cells)
+	lazymap(cells) do cell
+		topology.nodes[cell].definitions
+	end
+end
+
+function defined_functions(topology::NotebookTopology, cells)
+	lazymap(cells) do cell
+		((cell.cell_id, namesig.name) for namesig in topology.nodes[cell].funcdefs_with_signatures)
+	end
+end
+
+is_macro_identifier(symbol::Symbol) = startswith(string(symbol), "@")
+
+function with_new_soft_definitions(topology::NotebookTopology, cell::Cell, soft_definitions)
+    old_node = topology.nodes[cell]
+    new_node = union!(ReactiveNode(), old_node, ReactiveNode(soft_definitions=soft_definitions))
+    NotebookTopology(
+		codes=topology.codes, 
+		nodes=merge(topology.nodes, Dict(cell => new_node)), 
+		unresolved_cells=topology.unresolved_cells,
+		cell_order=topology.cell_order,
+	)
+end
+
+collect_implicit_usings(topology::NotebookTopology, cell::Cell) = ExpressionExplorer.collect_implicit_usings(topology.codes[cell].module_usings_imports)
+
+function cells_with_deleted_macros(old_topology::NotebookTopology, new_topology::NotebookTopology)
+    old_macros = mapreduce(c -> defined_macros(old_topology, c), union!, all_cells(old_topology); init=Set{Symbol}())
+    new_macros = mapreduce(c -> defined_macros(new_topology, c), union!, all_cells(new_topology); init=Set{Symbol}())
+    removed_macros = setdiff(old_macros, new_macros)
+
+    where_referenced(old_topology, removed_macros)
+end
+
+"Returns the set of macros names defined by this cell"
+defined_macros(topology::NotebookTopology, cell::Cell) = defined_macros(topology.nodes[cell])
+defined_macros(node::ReactiveNode) = union!(filter(is_macro_identifier, node.funcdefs_without_signatures), filter(is_macro_identifier, node.definitions)) # macro definitions can come from imports
+
+"Tells whether or not a cell can 'unlock' the resolution of other cells"
+function can_help_resolve_cells(topology::NotebookTopology, cell::Cell)
+    cell_code = topology.codes[cell]
+    cell_node = topology.nodes[cell]
+    macros = defined_macros(cell_node)
+
+	!isempty(cell_code.module_usings_imports.usings) ||
+		(!isempty(macros) && any(calls -> !disjoint(calls, macros), topology.nodes[c].macrocalls for c in topology.unresolved_cells))
+end
+
+# Sorry couldn't help myself - DRAL
+abstract type Result end
+struct Success <: Result
+	result
+end
+struct Failure <: Result
+	error
+end
+struct Skipped <: Result end
+
+"""We still have 'unresolved' macrocalls, use the current and maybe previous workspace to do macro-expansions.
+
+You can optionally specify the roots for the current reactive run. If a cell macro contains only macros that will
+be re-defined during this reactive run, we don't expand yet and expect the `can_help_resolve_cells` function above
+to be true for the cell defining the macro, triggering a new topology resolution without needing to fallback to the
+previous workspace.
+"""
+function resolve_topology(
+	session::ServerSession,
+	notebook::Notebook,
+	unresolved_topology::NotebookTopology,
+	old_workspace_name::Symbol;
+	current_roots::Vector{Cell}=Cell[],
+)::NotebookTopology
+
+
+	sn = (session, notebook)
+
+	function macroexpand_cell(cell)
+		try_macroexpand(module_name::Union{Nothing,Symbol}=nothing) = begin
+			success, result = macroexpand_in_workspace(sn, unresolved_topology.codes[cell].parsedcode, cell.cell_id, module_name)
+			if success
+				Success(result)
+			else
+				Failure(result)
+			end
+		end
+
+		result = try_macroexpand()
+		if result isa Success
+			result
+		else
+			if (result.error isa LoadError && result.error.error isa UndefVarError) || result.error isa UndefVarError
+				try_macroexpand(old_workspace_name)
+			else
+				result
+			end
+		end
+	end
+
+	function analyze_macrocell(cell::Cell)
+		if unresolved_topology.nodes[cell].macrocalls ⊆ ExpressionExplorer.can_macroexpand
+			return Skipped()
+		end
+
+		result = macroexpand_cell(cell)
+		if result isa Success
+			(expr, computer_id) = result.result
+			expanded_node = ExpressionExplorer.try_compute_symbolreferences(expr) |> ReactiveNode
+			function_wrapped = ExpressionExplorer.can_be_function_wrapped(expr)
+			Success((expanded_node, function_wrapped, computer_id))
+		else
+			result
+		end
+	end
+
+	run_defined_macros = mapreduce(c -> defined_macros(unresolved_topology, c), union!, current_roots; init=Set{Symbol}())
+
+	# create new node & new codes for macrocalled cells
+	new_nodes = Dict{Cell,ReactiveNode}()
+	new_codes = Dict{Cell,ExprAnalysisCache}()
+	still_unresolved_nodes = Set{Cell}()
+
+	for cell in unresolved_topology.unresolved_cells
+		if unresolved_topology.nodes[cell].macrocalls ⊆ run_defined_macros
+			# Do not try to expand if a newer version of the macro is also scheduled to run in the
+			# current run. The recursive reactive runs will take care of it.
+			push!(still_unresolved_nodes, cell)
+			continue
+		end
+
+		result = try
+			if will_run_code(notebook)
+				analyze_macrocell(cell)
+			else
+				Failure(ErrorException("shutdown"))
+			end
+		catch error
+			@error "Macro call expansion failed with a non-macroexpand error" error
+			Failure(error)
+		end
+		if result isa Success
+			(new_node, function_wrapped, forced_expr_id) = result.result
+			union!(new_node.macrocalls, unresolved_topology.nodes[cell].macrocalls)
+			union!(new_node.references, new_node.macrocalls)
+			new_nodes[cell] = new_node
+
+			# set function_wrapped to the function wrapped analysis of the expanded expression.
+			new_codes[cell] = ExprAnalysisCache(unresolved_topology.codes[cell]; forced_expr_id, function_wrapped)
+		elseif result isa Skipped
+			# Skipped because it has already been resolved during ExpressionExplorer.
+		else
+			@debug "Could not resolve" result cell.code
+			push!(still_unresolved_nodes, cell)
+		end
+	end
+
+	all_nodes = merge(unresolved_topology.nodes, new_nodes)
+	all_codes = merge(unresolved_topology.codes, new_codes)
+	
+	new_unresolved_cells = if length(still_unresolved_nodes) == length(unresolved_topology.unresolved_cells)
+		# then they must equal, and we can skip creating a new one to preserve identity:
+		unresolved_topology.unresolved_cells
+	else
+		ImmutableSet(still_unresolved_nodes; skip_copy=true)
+	end
+
+	NotebookTopology(
+		nodes=all_nodes, 
+		codes=all_codes, 
+		unresolved_cells=new_unresolved_cells,
+		cell_order=unresolved_topology.cell_order,
+	)
+end
+
+"""Tries to add information about macro calls without running any code, using knowledge about common macros.
+So, the resulting reactive nodes may not be absolutely accurate. If you can run code in a session, use `resolve_topology` instead.
+"""
+function static_macroexpand(topology::NotebookTopology, cell::Cell)
+	new_node = ExpressionExplorer.maybe_macroexpand(topology.codes[cell].parsedcode; recursive=true) |>
+		ExpressionExplorer.try_compute_symbolreferences |> ReactiveNode
+	union!(new_node.macrocalls, topology.nodes[cell].macrocalls)
+
+	new_node
+end
+
+"The same as `resolve_topology` but does not require custom code execution, only works with a few `Base` & `PlutoRunner` macros"
+function static_resolve_topology(topology::NotebookTopology)
+	new_nodes = Dict{Cell,ReactiveNode}(cell => static_macroexpand(topology, cell) for cell in topology.unresolved_cells)
+	all_nodes = merge(topology.nodes, new_nodes)
+
+	NotebookTopology(
+		nodes=all_nodes, 
+		codes=topology.codes, 
+		unresolved_cells=topology.unresolved_cells,
+		cell_order=topology.cell_order,
+	)
+end
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 6349ebf813..76e33f7e4c 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -1,28 +1,9 @@
-import REPL:ends_with_semicolon
+import REPL: ends_with_semicolon
 import .Configuration
-import .ExpressionExplorer: FunctionNameSignaturePair, is_joined_funcname, UsingsImports, external_package_names
-import .WorkspaceManager: macroexpand_in_workspace
-import .MoreAnalysis: find_bound_variables
+import .ExpressionExplorer: is_joined_funcname
 
 Base.push!(x::Set{Cell}) = x
 
-"""
-```julia
-set_bond_value_pairs!(session::ServerSession, notebook::Notebook, bond_value_pairs::Vector{Tuple{Symbol, Any}})
-```
-
-Given a list of tuples of the form `(bound variable name, (untransformed) value)`, assign each (transformed) value to the corresponding global bound variable in the notebook workspace.
-
-`bond_value_pairs` can also be an iterator.
-"""
-function set_bond_value_pairs!(session::ServerSession, notebook::Notebook, bond_value_pairs)
-	for (bound_sym, new_value) in bond_value_pairs
-		WorkspaceManager.eval_in_workspace((session, notebook), :($(bound_sym) = Main.PlutoRunner.transform_bond_value($(QuoteNode(bound_sym)), $(new_value))))
-	end
-end
-
-const _empty_bond_value_pairs = zip(Symbol[],Any[])
-
 """
 Run given cells and all the cells that depend on them, based on the topology information before and after the changes.
 """
@@ -34,7 +15,7 @@ function run_reactive!(
     roots::Vector{Cell};
     deletion_hook::Function = WorkspaceManager.move_vars,
     user_requested_run::Bool = true,
-    bond_value_pairs=_empty_bond_value_pairs,
+    bond_value_pairs=zip(Symbol[],Any[]),
 )::TopologicalOrder
     withtoken(notebook.executetoken) do
         run_reactive_core!(
@@ -45,7 +26,7 @@ function run_reactive!(
             roots;
             deletion_hook,
             user_requested_run,
-            bond_value_pairs
+            bond_value_pairs,
         )
     end
 end
@@ -65,7 +46,7 @@ function run_reactive_core!(
     deletion_hook::Function = WorkspaceManager.move_vars,
     user_requested_run::Bool = true,
     already_run::Vector{Cell} = Cell[],
-    bond_value_pairs = _empty_bond_value_pairs,
+    bond_value_pairs=zip(Symbol[],Any[]),
 )::TopologicalOrder
     @assert !isready(notebook.executetoken) "run_reactive_core!() was called with a free notebook.executetoken."
     @assert will_run_code(notebook)
@@ -181,16 +162,16 @@ function run_reactive_core!(
                 (session, notebook), cell,
                 new_topology.nodes[cell], new_topology.codes[cell];
                 user_requested_run = (user_requested_run && cell ∈ roots),
-				capture_stdout = session.options.evaluation.capture_stdout,
+                capture_stdout = session.options.evaluation.capture_stdout,
             )
             any_interrupted |= run.interrupted
 
-			# Support one bond defining another when setting both simultaneously in PlutoSliderServer
-			# https://github.com/fonsp/Pluto.jl/issues/1695
+            # Support one bond defining another when setting both simultaneously in PlutoSliderServer
+            # https://github.com/fonsp/Pluto.jl/issues/1695
 
-			# set the redefined bound variables to their original value from the request
-			defs = notebook.topology.nodes[cell].definitions
-			set_bond_value_pairs!(session, notebook, Iterators.filter(((sym,val),) -> sym ∈ defs, bond_value_pairs))
+            # set the redefined bound variables to their original value from the request
+            defs = notebook.topology.nodes[cell].definitions
+            set_bond_value_pairs!(session, notebook, Iterators.filter(((sym,val),) -> sym ∈ defs, bond_value_pairs))
         end
 
         cell.running = false
@@ -233,6 +214,19 @@ function run_reactive_core!(
     return new_order
 end
 
+"""
+```julia
+set_bond_value_pairs!(session::ServerSession, notebook::Notebook, bond_value_pairs::Vector{Tuple{Symbol, Any}})
+```
+Given a list of tuples of the form `(bound variable name, (untransformed) value)`, assign each (transformed) value to the corresponding global bound variable in the notebook workspace.
+`bond_value_pairs` can also be an iterator.
+"""
+function set_bond_value_pairs!(session::ServerSession, notebook::Notebook, bond_value_pairs)
+	for (bound_sym, new_value) in bond_value_pairs
+		WorkspaceManager.eval_in_workspace((session, notebook), :($(bound_sym) = Main.PlutoRunner.transform_bond_value($(QuoteNode(bound_sym)), $(new_value))))
+	end
+end
+
 run_reactive_async!(session::ServerSession, notebook::Notebook, to_run::Vector{Cell}; kwargs...) = run_reactive_async!(session, notebook, notebook.topology, notebook.topology, to_run; kwargs...)
 
 function run_reactive_async!(session::ServerSession, notebook::Notebook, old::NotebookTopology, new::NotebookTopology, to_run::Vector{Cell}; run_async::Bool=true, kwargs...)::Union{Task,TopologicalOrder}
@@ -250,20 +244,6 @@ function maybe_async(f::Function, async::Bool)
 	end
 end
 
-const lazymap = Base.Generator
-
-function defined_variables(topology::NotebookTopology, cells)
-	lazymap(cells) do cell
-		topology.nodes[cell].definitions
-	end
-end
-
-function defined_functions(topology::NotebookTopology, cells)
-	lazymap(cells) do cell
-		((cell.cell_id, namesig.name) for namesig in topology.nodes[cell].funcdefs_with_signatures)
-	end
-end
-
 "Run a single cell non-reactively, set its output, return run information."
 function run_single!(
 	session_notebook::Union{Tuple{ServerSession,Notebook},WorkspaceManager.Workspace}, 
@@ -332,192 +312,6 @@ end
 
 will_run_code(notebook::Notebook) = notebook.process_status != ProcessStatus.no_process && notebook.process_status != ProcessStatus.waiting_to_restart
 
-is_macro_identifier(symbol::Symbol) = startswith(string(symbol), "@")
-
-function with_new_soft_definitions(topology::NotebookTopology, cell::Cell, soft_definitions)
-    old_node = topology.nodes[cell]
-    new_node = union!(ReactiveNode(), old_node, ReactiveNode(soft_definitions=soft_definitions))
-    NotebookTopology(
-		codes=topology.codes, 
-		nodes=merge(topology.nodes, Dict(cell => new_node)), 
-		unresolved_cells=topology.unresolved_cells,
-		cell_order=topology.cell_order,
-	)
-end
-
-collect_implicit_usings(topology::NotebookTopology, cell::Cell) = ExpressionExplorer.collect_implicit_usings(topology.codes[cell].module_usings_imports)
-
-function cells_with_deleted_macros(old_topology::NotebookTopology, new_topology::NotebookTopology)
-    old_macros = mapreduce(c -> defined_macros(old_topology, c), union!, all_cells(old_topology); init=Set{Symbol}())
-    new_macros = mapreduce(c -> defined_macros(new_topology, c), union!, all_cells(new_topology); init=Set{Symbol}())
-    removed_macros = setdiff(old_macros, new_macros)
-
-    where_referenced(old_topology, removed_macros)
-end
-
-"Returns the set of macros names defined by this cell"
-defined_macros(topology::NotebookTopology, cell::Cell) = defined_macros(topology.nodes[cell])
-defined_macros(node::ReactiveNode) = union!(filter(is_macro_identifier, node.funcdefs_without_signatures), filter(is_macro_identifier, node.definitions)) # macro definitions can come from imports
-
-"Tells whether or not a cell can 'unlock' the resolution of other cells"
-function can_help_resolve_cells(topology::NotebookTopology, cell::Cell)
-    cell_code = topology.codes[cell]
-    cell_node = topology.nodes[cell]
-    macros = defined_macros(cell_node)
-
-	!isempty(cell_code.module_usings_imports.usings) ||
-		(!isempty(macros) && any(calls -> !disjoint(calls, macros), topology.nodes[c].macrocalls for c in topology.unresolved_cells))
-end
-
-# Sorry couldn't help myself - DRAL
-abstract type Result end
-struct Success <: Result
-	result
-end
-struct Failure <: Result
-	error
-end
-struct Skipped <: Result end
-
-"""We still have 'unresolved' macrocalls, use the current and maybe previous workspace to do macro-expansions.
-
-You can optionally specify the roots for the current reactive run. If a cell macro contains only macros that will
-be re-defined during this reactive run, we don't expand yet and expect the `can_help_resolve_cells` function above
-to be true for the cell defining the macro, triggering a new topology resolution without needing to fallback to the
-previous workspace.
-"""
-function resolve_topology(
-	session::ServerSession,
-	notebook::Notebook,
-	unresolved_topology::NotebookTopology,
-	old_workspace_name::Symbol;
-	current_roots::Vector{Cell}=Cell[],
-)::NotebookTopology
-
-
-	sn = (session, notebook)
-
-	function macroexpand_cell(cell)
-		try_macroexpand(module_name::Union{Nothing,Symbol}=nothing) = begin
-			success, result = macroexpand_in_workspace(sn, unresolved_topology.codes[cell].parsedcode, cell.cell_id, module_name)
-			if success
-				Success(result)
-			else
-				Failure(result)
-			end
-		end
-
-		result = try_macroexpand()
-		if result isa Success
-			result
-		else
-			if (result.error isa LoadError && result.error.error isa UndefVarError) || result.error isa UndefVarError
-				try_macroexpand(old_workspace_name)
-			else
-				result
-			end
-		end
-	end
-
-	function analyze_macrocell(cell::Cell)
-		if unresolved_topology.nodes[cell].macrocalls ⊆ ExpressionExplorer.can_macroexpand
-			return Skipped()
-		end
-
-		result = macroexpand_cell(cell)
-		if result isa Success
-			(expr, computer_id) = result.result
-			expanded_node = ExpressionExplorer.try_compute_symbolreferences(expr) |> ReactiveNode
-			function_wrapped = ExpressionExplorer.can_be_function_wrapped(expr)
-			Success((expanded_node, function_wrapped, computer_id))
-		else
-			result
-		end
-	end
-
-	run_defined_macros = mapreduce(c -> defined_macros(unresolved_topology, c), union!, current_roots; init=Set{Symbol}())
-
-	# create new node & new codes for macrocalled cells
-	new_nodes = Dict{Cell,ReactiveNode}()
-	new_codes = Dict{Cell,ExprAnalysisCache}()
-	still_unresolved_nodes = Set{Cell}()
-
-	for cell in unresolved_topology.unresolved_cells
-		if unresolved_topology.nodes[cell].macrocalls ⊆ run_defined_macros
-			# Do not try to expand if a newer version of the macro is also scheduled to run in the
-			# current run. The recursive reactive runs will take care of it.
-			push!(still_unresolved_nodes, cell)
-			continue
-		end
-
-		result = try
-			if will_run_code(notebook)
-				analyze_macrocell(cell)
-			else
-				Failure(ErrorException("shutdown"))
-			end
-		catch error
-			@error "Macro call expansion failed with a non-macroexpand error" error
-			Failure(error)
-		end
-		if result isa Success
-			(new_node, function_wrapped, forced_expr_id) = result.result
-			union!(new_node.macrocalls, unresolved_topology.nodes[cell].macrocalls)
-			union!(new_node.references, new_node.macrocalls)
-			new_nodes[cell] = new_node
-
-			# set function_wrapped to the function wrapped analysis of the expanded expression.
-			new_codes[cell] = ExprAnalysisCache(unresolved_topology.codes[cell]; forced_expr_id, function_wrapped)
-		elseif result isa Skipped
-			# Skipped because it has already been resolved during ExpressionExplorer.
-		else
-			@debug "Could not resolve" result cell.code
-			push!(still_unresolved_nodes, cell)
-		end
-	end
-
-	all_nodes = merge(unresolved_topology.nodes, new_nodes)
-	all_codes = merge(unresolved_topology.codes, new_codes)
-	
-	new_unresolved_cells = if length(still_unresolved_nodes) == length(unresolved_topology.unresolved_cells)
-		# then they must equal, and we can skip creating a new one to preserve identity:
-		unresolved_topology.unresolved_cells
-	else
-		ImmutableSet(still_unresolved_nodes; skip_copy=true)
-	end
-
-	NotebookTopology(
-		nodes=all_nodes, 
-		codes=all_codes, 
-		unresolved_cells=new_unresolved_cells,
-		cell_order=unresolved_topology.cell_order,
-	)
-end
-
-"""Tries to add information about macro calls without running any code, using knowledge about common macros.
-So, the resulting reactive nodes may not be absolutely accurate. If you can run code in a session, use `resolve_topology` instead.
-"""
-function static_macroexpand(topology::NotebookTopology, cell::Cell)
-	new_node = ExpressionExplorer.maybe_macroexpand(topology.codes[cell].parsedcode; recursive=true) |>
-		ExpressionExplorer.try_compute_symbolreferences |> ReactiveNode
-	union!(new_node.macrocalls, topology.nodes[cell].macrocalls)
-
-	new_node
-end
-
-"The same as `resolve_topology` but does not require custom code execution, only works with a few `Base` & `PlutoRunner` macros"
-function static_resolve_topology(topology::NotebookTopology)
-	new_nodes = Dict{Cell,ReactiveNode}(cell => static_macroexpand(topology, cell) for cell in topology.unresolved_cells)
-	all_nodes = merge(topology.nodes, new_nodes)
-
-	NotebookTopology(
-		nodes=all_nodes, 
-		codes=topology.codes, 
-		unresolved_cells=topology.unresolved_cells,
-		cell_order=topology.cell_order,
-	)
-end
-
 ###
 # CONVENIENCE FUNCTIONS
 ###
@@ -711,4 +505,4 @@ function update_skipped_cells_dependency!(notebook::Notebook, topology::Notebook
     for cell in setdiff(notebook.cells, indirectly_skipped)
         cell.depends_on_skipped_cells = false
     end
-end
\ No newline at end of file
+end
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index e8bf3dbfcd..61f775e633 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -310,7 +310,7 @@ responses[:update_notebook] = function response_update_notebook(🙋::ClientRequ
                 mutator(matches..., rest...; request=🙋, patch)
             end
 
-            push!(changes, current_changes...)
+            union!(changes, current_changes)
         end
 
         # We put a flag to check whether any patch changes the skip_as_script metadata. This is to eventually trigger a notebook updated if no reactive_run is part of this update
@@ -368,19 +368,11 @@ function trigger_resolver(resolvers::Dict, path, values=[])
 		throw(BoundsError("resolver path ends at Dict with keys $(keys(resolver))"))
 	end
 	
-	segment = first(path)
-	rest = path[firstindex(path)+1:end]
-	for (key, resolver) in resolvers
-		if key isa Wildcard
-			continue
-		end
-		if key == segment
-			return trigger_resolver(resolver, rest, values)
-		end
-	end
-	
-	if haskey(resolvers, Wildcard())
-		return trigger_resolver(resolvers[Wildcard()], rest, (values..., segment))
+	segment, rest... = path
+	if haskey(resolvers, segment)
+		trigger_resolver(resolvers[segment], rest, values)
+	elseif haskey(resolvers, Wildcard())
+		trigger_resolver(resolvers[Wildcard()], rest, (values..., segment))
     else
         throw(BoundsError("failed to match path $(path), possible keys $(keys(resolver))"))
 	end
diff --git a/src/webserver/Firebasey.jl b/src/webserver/Firebasey.jl
index 863ef08118..ab59d3ffd6 100644
--- a/src/webserver/Firebasey.jl
+++ b/src/webserver/Firebasey.jl
@@ -95,7 +95,7 @@ md"""
 abstract type JSONPatch end
 
 # ╔═╡ bd0d46bb-3e58-4522-bae0-83eb799196c4
-PatchPath = Vector
+const PatchPath = Vector
 
 # ╔═╡ db2d8a3e-2de1-11eb-02b8-9ffbfaeff61c
 struct AddPatch <: JSONPatch
@@ -679,8 +679,7 @@ function getpath(value, path)
 		return value
 	end
 	
-	current = path[firstindex(path)]
-	rest = path[firstindex(path) + 1:end]
+	current, rest... = path
 	if value isa AbstractDict
 		key = force_convert_key(value, current)
 		getpath(getindex(value, key), rest)
@@ -709,7 +708,7 @@ function applypatch!(value, patch::AddPatch)
 		throw("Impossible")
 	else
 		last = patch.path[end]
-		rest = patch.path[firstindex(patch.path):end - 1]
+		rest = patch.path[begin:end - 1]
 		subvalue = getpath(value, rest)
 		if subvalue isa AbstractDict
 			key = force_convert_key(subvalue, last)
@@ -746,7 +745,7 @@ function applypatch!(value, patch::ReplacePatch)
 		throw("Impossible")
 	else
 		last = patch.path[end]
-		rest = patch.path[firstindex(patch.path):end - 1]
+		rest = patch.path[begin:end - 1]
 		subvalue = getpath(value, rest)
 		if subvalue isa AbstractDict
 			key = force_convert_key(subvalue, last)
@@ -783,7 +782,7 @@ function applypatch!(value, patch::RemovePatch)
 		throw("Impossible")
 	else
 		last = patch.path[end]
-		rest = patch.path[firstindex(patch.path):end - 1]
+		rest = patch.path[begin:end - 1]
 		subvalue = getpath(value, rest)
 		if subvalue isa AbstractDict
 			key = force_convert_key(subvalue, last)

From 80c36a222d5722ac2b54cf3571c63cd3abb6d45f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 5 Sep 2022 16:41:45 +0200
Subject: [PATCH 407/821] Fix #2215 (#2261)

---
 frontend/components/Editor.js | 46 +++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 3cd6ed7780..30ac6accb6 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -322,7 +322,7 @@ export class Editor extends Component {
         this.setStatePromise = (fn) => new Promise((r) => this.setState(fn, r))
 
         // these are things that can be done to the local notebook
-        this.actions = {
+        this.real_actions = {
             get_notebook: () => this?.state?.notebook || {},
             send: (message_type, ...args) => this.client.send(message_type, ...args),
             get_published_object: (objectid) => this.state.notebook.published_objects[objectid],
@@ -622,6 +622,7 @@ export class Editor extends Component {
                 return message.versions
             },
         }
+        this.actions = { ...this.real_actions }
 
         const apply_notebook_patches = (patches, /** @type {NotebookData?} */ old_state = null, get_reverse_patches = false) =>
             new Promise((resolve) => {
@@ -822,26 +823,35 @@ patch: ${JSON.stringify(
                 connect_metadata: { notebook_id: this.state.notebook.notebook_id },
             }).then(on_establish_connection)
 
-        this.real_actions = this.actions
-        this.fake_actions =
-            launch_params.slider_server_url != null
-                ? slider_server_actions({
-                      setStatePromise: this.setStatePromise,
-                      actions: this.actions,
-                      launch_params: launch_params,
-                      apply_notebook_patches,
-                      get_original_state: () => this.props.initial_notebook_state,
-                      get_current_state: () => this.state.notebook,
-                  })
-                : nothing_actions({
-                      actions: this.actions,
-                  })
-
         this.on_disable_ui = () => {
             set_disable_ui_css(this.state.disable_ui)
 
-            //@ts-ignore
-            this.actions = this.state.disable_ui || (launch_params.slider_server_url != null && !this.state.connected) ? this.fake_actions : this.real_actions //heyo
+            // Pluto has three modes of operation:
+            // 1. (normal) Connected to a Pluto notebook.
+            // 2. Static HTML with PlutoSliderServer. All edits are ignored, but bond changes are processes by the PlutoSliderServer.
+            // 3. Static HTML without PlutoSliderServer. All interactions are ignored.
+            //
+            // To easily support all three with minimal changes to the source code, we sneakily swap out the `this.actions` object (`pluto_actions` in other source files) with a different one:
+            Object.assign(
+                this.actions,
+                // if we have no pluto server...
+                this.state.disable_ui || (launch_params.slider_server_url != null && !this.state.connected)
+                    ? // then use a modified set of actions
+                      launch_params.slider_server_url != null
+                        ? slider_server_actions({
+                              setStatePromise: this.setStatePromise,
+                              actions: this.actions,
+                              launch_params: launch_params,
+                              apply_notebook_patches,
+                              get_original_state: () => this.props.initial_notebook_state,
+                              get_current_state: () => this.state.notebook,
+                          })
+                        : nothing_actions({
+                              actions: this.actions,
+                          })
+                    : // otherwise, use the real actions
+                      this.real_actions
+            )
         }
         this.on_disable_ui()
 

From 8b58ce52431c47c02dbec2e64a024754b450354a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 5 Sep 2022 20:20:01 +0200
Subject: [PATCH 408/821] logging tweaks

---
 src/notebook/Export.jl     |  2 +-
 src/webserver/WebServer.jl | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/notebook/Export.jl b/src/notebook/Export.jl
index 445179bee7..3c0f56aac6 100644
--- a/src/notebook/Export.jl
+++ b/src/notebook/Export.jl
@@ -30,7 +30,7 @@ function cdnified_editor_html(;
                     URIs.resolvereference("https://cdn.jsdelivr.net/gh/fonsp/Pluto.jl@$(string(PLUTO_VERSION))/frontend-dist/", url) |> string
                 end
             catch e
-                @warn "Could not use bundled CDN version of editor.html. You should only see this message if you are using a fork of Pluto." exception=(e,catch_backtrace())
+                @warn "Could not use bundled CDN version of editor.html. You should only see this message if you are using a fork of Pluto." exception=(e,catch_backtrace()) maxlog=1
                 nothing
             end
         end,
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 3a4540a860..7f2a04640e 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -177,21 +177,27 @@ function run(session::ServerSession)
                                 # This stream contains data received over the WebSocket.
                                 # It is formatted and MsgPack-encoded by send(...) in PlutoConnection.js
                                 local parentbody = nothing
+                                local did_read = false
                                 try
                                     parentbody = unpack(message)
-
+                                    
                                     let
                                         lag = session.options.server.simulated_lag
                                         (lag > 0) && sleep(lag * (0.5 + rand())) # sleep(0) would yield to the process manager which we dont want
                                     end
-
+                                    
+                                    did_read = true
                                     process_ws_message(session, parentbody, clientstream)
                                 catch ex
                                     if ex isa InterruptException || ex isa HTTP.WebSockets.WebSocketError || ex isa EOFError
                                         # that's fine!
                                     else
-                                        bt = stacktrace(catch_backtrace())
-                                        @warn "Reading WebSocket client stream failed for unknown reason:" parentbody exception = (ex, bt)
+                                        bt = catch_backtrace()
+                                        if did_read
+                                            @warn "Processing message failed for unknown reason:" parentbody exception = (ex, bt)
+                                        else
+                                            @warn "Reading WebSocket client stream failed for unknown reason:" parentbody exception = (ex, bt)
+                                        end
                                     end
                                 end
                             end

From 183dc3ad1004ab76272e630b6d6e3e549d763794 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 6 Sep 2022 11:46:04 +0200
Subject: [PATCH 409/821] Improve ARM support for
 `roughly_the_number_of_physical_cpu_cores` (#2263)

---
 src/Configuration.jl | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index 8177c012a1..5e12d5b06f 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -159,12 +159,20 @@ const HISTORY_FILE_DEFAULT = "no"
 
 function roughly_the_number_of_physical_cpu_cores()
     # https://gist.github.com/fonsp/738fe244719cae820245aa479e7b4a8d
-    if Sys.CPU_THREADS == 1
+    threads = Sys.CPU_THREADS
+    num_threads_is_maybe_doubled_for_marketing = Sys.ARCH === :x86_64
+    
+    if threads == 1
         1
-    elseif Sys.CPU_THREADS == 2 || Sys.CPU_THREADS == 3
+    elseif threads == 2 || threads == 3
         2
+    elseif num_threads_is_maybe_doubled_for_marketing
+        # This includes:
+        # - intel hyperthreading
+        # - Apple ARM efficiency cores included in the count (when running the x86 executable)
+        threads ÷ 2
     else
-        Sys.CPU_THREADS ÷ 2
+        threads
     end
 end
 

From c92a8e1df919fa01dfc0a5e00f9bbbe60ac99af8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 6 Sep 2022 19:34:45 +0200
Subject: [PATCH 410/821] Keep track of Pkg install times (#2265)

---
 frontend/components/Editor.js |  7 +++---
 src/evaluation/Run.jl         |  1 +
 src/notebook/Notebook.jl      |  1 +
 src/packages/Packages.jl      | 45 ++++++++++++++++++++++-------------
 src/packages/PkgUtils.jl      |  2 +-
 src/webserver/Dynamic.jl      |  1 +
 test/packages/Basic.jl        |  8 +++++++
 7 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 30ac6accb6..606023e4bd 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -142,10 +142,10 @@ const first_true_key = (obj) => {
  *  queued: boolean,
  *  running: boolean,
  *  errored: boolean,
- *  runtime: ?number,
+ *  runtime: number?,
  *  downstream_cells_map: { string: [string]},
  *  upstream_cells_map: { string: [string]},
- *  precedence_heuristic: ?number,
+ *  precedence_heuristic: number?,
  *  depends_on_disabled_cells: boolean,
  *  depends_on_skipped_cells: boolean,
  *  output: {
@@ -153,7 +153,7 @@ const first_true_key = (obj) => {
  *      persist_js_state: boolean,
  *      last_run_timestamp: number,
  *      mime: string,
- *      rootassignee: ?string,
+ *      rootassignee: string?,
  *      has_pluto_hook_features: boolean,
  *  },
  *  logs: Array<LogEntryData>,
@@ -177,6 +177,7 @@ const first_true_key = (obj) => {
  *  restart_required_msg: string?,
  *  installed_versions: { [pkg_name: string]: string },
  *  terminal_outputs: { [pkg_name: string]: string },
+ *  install_time_ns: number?,
  *  busy_packages: string[],
  *  instantiated: boolean,
  * }}
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 76e33f7e4c..d1b56d5fac 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -479,6 +479,7 @@ function update_from_file(session::ServerSession, notebook::Notebook; kwargs...)
 		if (notebook.nbpkg_ctx isa Nothing) != (just_loaded.nbpkg_ctx isa Nothing)
 			@info "nbpkg status changed, overriding..."
 			notebook.nbpkg_ctx = just_loaded.nbpkg_ctx
+			notebook.nbpkg_install_time_ns = just_loaded.nbpkg_install_time_ns
 		else
 			@info "Old new project" PkgCompat.read_project_file(notebook) PkgCompat.read_project_file(just_loaded)
 			@info "Old new manifest" PkgCompat.read_manifest_file(notebook) PkgCompat.read_manifest_file(just_loaded)
diff --git a/src/notebook/Notebook.jl b/src/notebook/Notebook.jl
index 473d480773..3b7c4e6806 100644
--- a/src/notebook/Notebook.jl
+++ b/src/notebook/Notebook.jl
@@ -50,6 +50,7 @@ Base.@kwdef mutable struct Notebook
     nbpkg_restart_recommended_msg::Union{Nothing,String}=nothing
     nbpkg_restart_required_msg::Union{Nothing,String}=nothing
     nbpkg_terminal_outputs::Dict{String,String}=Dict{String,String}()
+    nbpkg_install_time_ns::Union{Nothing,UInt64}=zero(UInt64)
     nbpkg_busy_packages::Vector{String}=String[]
     nbpkg_installed_versions_cache::Dict{String,String}=Dict{String,String}()
 
diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 53e8194555..bbd91b4762 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -57,13 +57,14 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
     use_plutopkg_new = use_plutopkg(new_topology)
     
     if !use_plutopkg_old && use_plutopkg_new
-        @debug "Started using PlutoPkg!! HELLO reproducibility!"
+        @debug "PlutoPkg: Started using PlutoPkg!! HELLO reproducibility!" notebook.path
 
         👺 = true
         notebook.nbpkg_ctx = PkgCompat.create_empty_ctx()
+        notebook.nbpkg_install_time_ns = 0
     end
     if use_plutopkg_old && !use_plutopkg_new
-        @debug "Stopped using PlutoPkg 💔😟😢"
+        @debug "PlutoPkg: Stopped using PlutoPkg 💔😟😢" notebook.path
 
         no_packages_loaded_yet = (
             notebook.nbpkg_restart_required_msg === nothing &&
@@ -72,8 +73,10 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
         )
         👺 = !no_packages_loaded_yet
         notebook.nbpkg_ctx = nothing
+        notebook.nbpkg_install_time_ns = nothing
     end
     if !use_plutopkg_new
+        notebook.nbpkg_install_time_ns = nothing
         notebook.nbpkg_ctx_instantiated = true
     end
     
@@ -123,12 +126,14 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                         end
                     end
                 end
-
+                
+                to_add = filter(PkgCompat.package_exists, added)
                 to_remove = filter(removed) do p
                     haskey(PkgCompat.project(notebook.nbpkg_ctx).dependencies, p)
                 end
+                @debug "PlutoPkg:" notebook.path to_add to_remove
+                
                 if !isempty(to_remove)
-                    @debug to_remove
                     # See later comment
                     mkeys() = Set(filter(!is_stdlib, [m.name for m in values(PkgCompat.dependencies(notebook.nbpkg_ctx))]))
                     old_manifest_keys = mkeys()
@@ -138,6 +143,7 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                         for p in to_remove
                     ])
 
+                    notebook.nbpkg_install_time_ns = nothing # we lose our estimate of install time
                     # We record the manifest before and after, to prevent recommending a reboot when nothing got removed from the manifest (e.g. when removing GR, but leaving Plots), or when only stdlibs got removed.
                     new_manifest_keys = mkeys()
                     
@@ -147,13 +153,10 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                 
                 # TODO: instead of Pkg.PRESERVE_ALL, we actually want:
                 # "Pkg.PRESERVE_DIRECT, but preserve exact verisons of Base.loaded_modules"
-
-                to_add = filter(PkgCompat.package_exists, added)
                 
                 if !isempty(to_add)
-                    @debug to_add
+                    start_time = time_ns()
                     startlistening(iolistener)
-
                     PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
                         withinteractive(false) do
                             # We temporarily clear the "semver-compatible" [deps] entries, because Pkg already respects semver, unless it doesn't, in which case we don't want to force it.
@@ -190,15 +193,16 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                             println(iolistener.buffer, "\e[32m\e[1mLoading\e[22m\e[39m packages...")
                         end
                     end
-
-                    @debug "PlutoPkg done"
+                    notebook.nbpkg_install_time_ns = notebook.nbpkg_install_time_ns === nothing ? nothing : (notebook.nbpkg_install_time_ns + (time_ns() - start_time))
+                    @debug "PlutoPkg: done" notebook.path 
                 end
 
                 should_instantiate = !notebook.nbpkg_ctx_instantiated || !isempty(to_add) || !isempty(to_remove)
                 if should_instantiate
+                    start_time = time_ns()
                     startlistening(iolistener)
                     PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
-                        @debug "Instantiating"
+                        @debug "PlutoPkg: Instantiating" notebook.path 
                         
                         # Pkg.instantiate assumes that the environment to be instantiated is active, so we will have to modify the LOAD_PATH of this Pluto server
                         # We could also run the Pkg calls on the notebook process, but somehow I think that doing it on the server is more charming, though it requires this workaround.
@@ -213,6 +217,7 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                         @assert LOAD_PATH[1] == env_dir
                         popfirst!(LOAD_PATH)
                     end
+                    notebook.nbpkg_install_time_ns = notebook.nbpkg_install_time_ns === nothing ? nothing : (notebook.nbpkg_install_time_ns + (time_ns() - start_time))
                     notebook.nbpkg_ctx_instantiated = true
                 end
 
@@ -269,15 +274,15 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
 		end
 
 		if pkg_result.did_something
-			@debug "PlutoPkg: success!" pkg_result
+			@debug "PlutoPkg: success!" notebook.path pkg_result 
 
 			if pkg_result.restart_recommended
 				notebook.nbpkg_restart_recommended_msg = "Yes, something changed during regular sync."
-				@debug "PlutoPkg: Notebook restart recommended" notebook.nbpkg_restart_recommended_msg
+				@debug "PlutoPkg: Notebook restart recommended" notebook.path notebook.nbpkg_restart_recommended_msg
 			end
 			if pkg_result.restart_required
 				notebook.nbpkg_restart_required_msg = "Yes, something changed during regular sync."
-				@debug "PlutoPkg: Notebook restart REQUIRED" notebook.nbpkg_restart_required_msg
+				@debug "PlutoPkg: Notebook restart REQUIRED" notebook.path notebook.nbpkg_restart_required_msg
 			end
 
 			notebook.nbpkg_busy_packages = String[]
@@ -306,6 +311,7 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
 		# Clear the embedded Project and Manifest and require a restart from the user.
 		reset_nbpkg(notebook, new_topology; keep_project=false, save=save)
 		notebook.nbpkg_restart_required_msg = "Yes, because sync_nbpkg_core failed. \n\n$(error_text)"
+        notebook.nbpkg_install_time_ns = nothing
         notebook.nbpkg_ctx_instantiated = false
         update_nbpkg_cache!(notebook)
 		send_notebook_changes!(ClientRequest(session=session, notebook=notebook))
@@ -323,6 +329,13 @@ function writebackup(notebook::Notebook)
     backup_path
 end
 
+"""
+Reset the package environment of a notebook. This will remove the `Project.toml` and `Manifest.toml` files from the notebook's secret package environment folder, and if `save` is `true`, it will then save the notebook without embedded Project and Manifest.
+
+If `keep_project` is `true` (default `false`), the `Project.toml` file will be kept, but the `Manifest.toml` file will be removed.
+
+This function is useful when we are not able to resolve/activate/instantiate a notebook's environment after loading, which happens when e.g. the environment was created on a different OS or Julia version.
+"""
 function reset_nbpkg(notebook::Notebook, topology::Union{NotebookTopology,Nothing}=nothing; keep_project::Bool=false, backup::Bool=true, save::Bool=true)
     backup && save && writebackup(notebook)
 
@@ -434,11 +447,11 @@ function update_nbpkg(session, notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.U
 		if pkg_result.did_something
 			if pkg_result.restart_recommended
 				notebook.nbpkg_restart_recommended_msg = "Yes, something changed during regular update_nbpkg."
-				@debug "PlutoPkg: Notebook restart recommended" notebook.nbpkg_restart_recommended_msg
+				@debug "PlutoPkg: Notebook restart recommended" notebook.path notebook.nbpkg_restart_recommended_msg
 			end
 			if pkg_result.restart_required
 				notebook.nbpkg_restart_required_msg = "Yes, something changed during regular update_nbpkg."
-				@debug "PlutoPkg: Notebook restart REQUIRED" notebook.nbpkg_restart_required_msg
+				@debug "PlutoPkg: Notebook restart REQUIRED" notebook.path notebook.nbpkg_restart_required_msg
 			end
 		else
             isfile(bp) && rm(bp)
diff --git a/src/packages/PkgUtils.jl b/src/packages/PkgUtils.jl
index 52f3d91662..e9916a5fb0 100644
--- a/src/packages/PkgUtils.jl
+++ b/src/packages/PkgUtils.jl
@@ -81,7 +81,7 @@ nb_and_dir_environments_equal(notebook_path::String, dir::String) = nb_and_dir_e
 reset_notebook_environment(notebook_path::String; keep_project::Bool=false, backup::Bool=true)
 ```
 
-Remove the embedded `Project.toml` and `Manifest.toml` from a notebook file, modifying the file. If `keep_project` is true, only `Manifest.toml` will be deleted. A backup file is created by default.
+Remove the embedded `Project.toml` and `Manifest.toml` from a notebook file, modifying the file. If `keep_project` is true, only `Manifest.toml` will be deleted. A backup of the notebook file is created by default.
 """
 function reset_notebook_environment(path::String; kwargs...)
     Pluto.reset_nbpkg(
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 61f775e633..835d56f5f8 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -158,6 +158,7 @@ function notebook_to_js(notebook::Notebook)
                 # TODO: cache this
                 "installed_versions" => ctx === nothing ? Dict{String,String}() : notebook.nbpkg_installed_versions_cache,
                 "terminal_outputs" => notebook.nbpkg_terminal_outputs,
+                "install_time_ns" => notebook.nbpkg_install_time_ns,
                 "busy_packages" => notebook.nbpkg_busy_packages,
                 "instantiated" => notebook.nbpkg_ctx_instantiated,
             )
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index eeee6abcc7..4cbdb566d0 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -58,7 +58,9 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
         @test notebook.nbpkg_restart_recommended_msg === nothing
         @test notebook.nbpkg_restart_required_msg === nothing
         @test notebook.nbpkg_ctx_instantiated
+        @test notebook.nbpkg_install_time_ns > 0
         @test notebook.nbpkg_busy_packages |> isempty
+        last_install_time = notebook.nbpkg_install_time_ns
 
         terminals = notebook.nbpkg_terminal_outputs
 
@@ -86,6 +88,10 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
         @test notebook.nbpkg_ctx !== nothing
         @test notebook.nbpkg_restart_recommended_msg === nothing
         @test notebook.nbpkg_restart_required_msg === nothing
+        @test notebook.nbpkg_ctx_instantiated
+        @test notebook.nbpkg_install_time_ns > last_install_time
+        @test notebook.nbpkg_busy_packages |> isempty
+        last_install_time = notebook.nbpkg_install_time_ns
 
         @test haskey(terminals, "PlutoPkgTestB")
         @test terminals["PlutoPkgTestA"] == terminals["PlutoPkgTestD"] == old_A_terminal
@@ -106,6 +112,7 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
             notebook.nbpkg_restart_recommended_msg !==  nothing || notebook.nbpkg_restart_required_msg !== nothing
         )
         @test notebook.nbpkg_restart_required_msg !== nothing
+        @test notebook.nbpkg_install_time_ns > last_install_time
 
         # running cells again should persist the restart message
 
@@ -205,6 +212,7 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
         @test notebook.nbpkg_ctx !== nothing
         @test notebook.nbpkg_restart_recommended_msg !== nothing # recommend restart
         @test notebook.nbpkg_restart_required_msg === nothing
+        @test notebook.nbpkg_install_time_ns === nothing # removing a package means that we lose our estimate
 
         @test count("PlutoPkgTestD", ptoml_contents()) == 0
 

From 1b9baa8750445c47bc5683f72aef779dedc71158 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 6 Sep 2022 19:34:55 +0200
Subject: [PATCH 411/821] Plots.jl GR respect fmt setting for auto choosing
 between SVG PNG (#2266)

---
 src/runner/PlutoRunner.jl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index dc8883fef3..d597748fe0 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1546,7 +1546,17 @@ const integrations = Integration[
                 0
             end
             const max_plot_size = 8000
-            pluto_showable(::MIME"image/svg+xml", p::Plots.Plot{Plots.GRBackend}) = approx_size(p) <= max_plot_size
+            function pluto_showable(::MIME"image/svg+xml", p::Plots.Plot{Plots.GRBackend})
+                format = try
+                    p.attr[:html_output_format]
+                catch
+                    :auto
+                end
+                
+                format === :svg || (
+                    format === :auto && approx_size(p) <= max_plot_size
+                )
+            end
             pluto_showable(::MIME"text/html", p::Plots.Plot{Plots.GRBackend}) = false
         end,
     ),

From 75261d3296f9392e6fa97a9607f2c3a247500e2c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 6 Sep 2022 19:45:07 +0200
Subject: [PATCH 412/821] Show "Estimate runtime" in static HTML (#2267)

---
 frontend/binder.css                    | 17 ++++++++++-
 frontend/common/Serialization.js       |  2 +-
 frontend/components/EditOrRunButton.js | 39 ++++++++++++++++++++++++--
 frontend/components/Editor.js          |  5 ++--
 4 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/frontend/binder.css b/frontend/binder.css
index 5fedf6591b..56d400a161 100644
--- a/frontend/binder.css
+++ b/frontend/binder.css
@@ -143,7 +143,7 @@ body.wiggle_binder .edit_or_run > button {
     color: black;
     color-scheme: light;
     box-shadow: 0px 0px 0px 100vmax #0000004a;
-    font-family: var(--lato-ui-font-stack);
+    font-family: var(--sans-serif-font-stack);
 }
 .binder_help_text a {
     color: black;
@@ -285,3 +285,18 @@ body.wiggle_binder .edit_or_run > button {
     border-radius: 5px;
     width: 100%;
 }
+
+.expected_runtime_box {
+    padding: 0.6em 1em;
+    border-radius: 0.6em;
+    font-style: italic;
+    display: block;
+    background: linear-gradient(45deg, hsl(222deg 52% 87%), #e5f7ff);
+    margin: 2em 0em -2em 0em;
+    color: #323232;
+}
+
+.expected_runtime_box span {
+    font-style: initial;
+    font-weight: bold;
+}
diff --git a/frontend/common/Serialization.js b/frontend/common/Serialization.js
index c45c1cc67d..e1829da54e 100644
--- a/frontend/common/Serialization.js
+++ b/frontend/common/Serialization.js
@@ -51,7 +51,7 @@ export function deserialize_repl(repl_session) {
         .filter((s) => s !== "")
 }
 
-export const detect_deserializer = (topaste) =>
+export const detect_deserializer = (/** @type {string} */ topaste) =>
     topaste.trim().startsWith(JULIA_REPL_PROMPT)
         ? deserialize_repl
         : topaste.match(/# ╔═╡ ........-....-....-....-............/g)?.length
diff --git a/frontend/components/EditOrRunButton.js b/frontend/components/EditOrRunButton.js
index 181008b02e..aad48acaa5 100644
--- a/frontend/components/EditOrRunButton.js
+++ b/frontend/components/EditOrRunButton.js
@@ -1,3 +1,4 @@
+import _ from "../imports/lodash.js"
 import { BackendLaunchPhase } from "../common/Binder.js"
 import { html, useEffect, useState, useRef } from "../imports/Preact.js"
 
@@ -20,11 +21,19 @@ export const RunLocalButton = ({ show, start_local }) => {
     </div>`
 }
 
-export const BinderButton = ({ offer_binder, start_binder, notebookfile }) => {
+/**
+ * @param {{
+ *  notebook: import("./Editor.js").NotebookData,
+ *  notebookfile: string?,
+ *  start_binder: () => Promise<void>,
+ *  offer_binder: boolean,
+ * }} props
+ * */
+export const BinderButton = ({ offer_binder, start_binder, notebookfile, notebook }) => {
     const [popupOpen, setPopupOpen] = useState(false)
     const [showCopyPopup, setShowCopyPopup] = useState(false)
     const notebookfile_ref = useRef("")
-    notebookfile_ref.current = notebookfile
+    notebookfile_ref.current = notebookfile ?? ""
 
     //@ts-ignore
     window.open_edit_or_run_popup = () => {
@@ -63,6 +72,7 @@ export const BinderButton = ({ offer_binder, start_binder, notebookfile }) => {
     }, [start_binder, offer_binder])
 
     const recommend_download = notebookfile_ref.current.startsWith("data:")
+    const runtime_str = expected_runtime_str(notebook)
     return html`<div class="edit_or_run">
         <button
             onClick=${(e) => {
@@ -82,6 +92,9 @@ export const BinderButton = ({ offer_binder, start_binder, notebookfile }) => {
                           ${`To be able to edit code and run cells, you need to run the notebook yourself. `}
                           <b>Where would you like to run the notebook?</b>
                       </p>
+                      ${runtime_str == null
+                          ? null
+                          : html` <div class="expected_runtime_box">${`This notebook takes about `}<span>${runtime_str}</span>${` to run.`}</div>`}
                       <h2 style="margin-top: 3em;">In the cloud <em>(experimental)</em></h2>
                       <div style="padding: 0 2rem;">
                           <button onClick=${start_binder}>
@@ -152,3 +165,25 @@ export const BinderButton = ({ offer_binder, start_binder, notebookfile }) => {
         </div>`}
     </div>`
 }
+
+const expected_runtime = (/** @type {import("./Editor.js").NotebookData} */ notebook) => {
+    return ((notebook.nbpkg?.install_time_ns ?? NaN) + _.sum(Object.values(notebook.cell_results).map((c) => c.runtime ?? 0))) / 1e9
+}
+
+const runtime_overhead = 15 // seconds
+const runtime_multiplier = 1.5
+
+const expected_runtime_str = (/** @type {import("./Editor.js").NotebookData} */ notebook) => {
+    const ex = expected_runtime(notebook)
+    if (isNaN(ex)) {
+        return null
+    }
+
+    const sec = _.round(runtime_overhead + ex * runtime_multiplier, -1)
+    if (sec < 60) {
+        return `${Math.ceil(sec)} second${sec > 1 ? "s" : ""}`
+    } else {
+        const min = sec / 60
+        return `${Math.ceil(min)} minute${min > 1 ? "s" : ""}`
+    }
+}
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 606023e4bd..961e0ea1a2 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1452,6 +1452,7 @@ patch: ${JSON.stringify(
                                           launch_params: launch_params,
                                       })}
                                   notebookfile=${launch_params.notebookfile == null ? null : new URL(launch_params.notebookfile, window.location.href).href}
+                                  notebook=${notebook}
                               />`
                             : null
                     }
@@ -1467,11 +1468,11 @@ patch: ${JSON.stringify(
                         <${Preamble}
                             last_update_time=${this.state.last_update_time}
                             any_code_differs=${status.code_differs}
-                            last_hot_reload_time=${this.state.notebook.last_hot_reload_time}
+                            last_hot_reload_time=${notebook.last_hot_reload_time}
                             connected=${this.state.connected}
                         />
                         <${Notebook}
-                            notebook=${this.state.notebook}
+                            notebook=${notebook}
                             cell_inputs_local=${this.state.cell_inputs_local}
                             disable_input=${this.state.disable_ui || !this.state.connected /* && this.state.backend_launch_phase == null*/}
                             last_created_cell=${this.state.last_created_cell}

From a59045b3170a3674c18fb07761e691d47937dc67 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 7 Sep 2022 16:51:33 +0200
Subject: [PATCH 413/821] Update Test.yml

---
 .github/workflows/Test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 03cd2cc9d4..8b7b207f7e 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -34,7 +34,7 @@ jobs:
             fail-fast: false
             matrix:
                 # We test quite a lot of versions because we do some OS and version specific things unfortunately
-                julia-version: ["1.6", "1.7", "~1.8.0-0"] #, "nightly"]
+                julia-version: ["1.6", "1.7", "1.8"] #, "~1.9.0-0"] #, "nightly"]
                 os: [ubuntu-latest, macOS-latest, windows-latest]
 
         steps:

From 19ac9b1764a3d131021a4e0c85abe61d3d2971a9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 7 Sep 2022 21:10:56 +0200
Subject: [PATCH 414/821] `updated_topology`: maintain identity when there are
 no changes (#2269)

---
 src/analysis/TopologyUpdate.jl |  41 ++++---
 test/Analysis.jl               | 200 +++++++++++++++++++++------------
 test/cell_disabling.jl         |   2 +-
 3 files changed, 158 insertions(+), 85 deletions(-)

diff --git a/src/analysis/TopologyUpdate.jl b/src/analysis/TopologyUpdate.jl
index 47251d4dd7..d9363124d0 100644
--- a/src/analysis/TopologyUpdate.jl
+++ b/src/analysis/TopologyUpdate.jl
@@ -6,7 +6,7 @@ function updated_topology(old_topology::NotebookTopology, notebook::Notebook, ce
 	
 	updated_codes = Dict{Cell,ExprAnalysisCache}()
 	updated_nodes = Dict{Cell,ReactiveNode}()
-	unresolved_cells = copy(old_topology.unresolved_cells.c)
+	
 	for cell in cells
 		old_code = old_topology.codes[cell]
 		if old_code.code !== cell.code
@@ -20,17 +20,9 @@ function updated_topology(old_topology::NotebookTopology, notebook::Notebook, ce
 			# reset computer code
 			updated_codes[cell] = ExprAnalysisCache(old_code; forced_expr_id=nothing, function_wrapped=false)
 		end
-
-		new_reactive_node = get(updated_nodes, cell, old_topology.nodes[cell])
-		if !isempty(new_reactive_node.macrocalls)
-			# The unresolved cells are the cells for wich we cannot create
-			# a ReactiveNode yet, because they contains macrocalls.
-			push!(unresolved_cells, cell) 
-		else
-			pop!(unresolved_cells, cell, nothing)
-		end
 	end
-
+	
+	
 	old_cells = all_cells(old_topology)
 	removed_cells = setdiff(old_cells, notebook.cells)
 	if isempty(removed_cells)
@@ -38,21 +30,42 @@ function updated_topology(old_topology::NotebookTopology, notebook::Notebook, ce
 		new_codes = merge(old_topology.codes, updated_codes)
 		new_nodes = merge(old_topology.nodes, updated_nodes)
 	else
-		setdiff!(unresolved_cells, removed_cells)
 		new_codes = merge(setdiffkeys(old_topology.codes, removed_cells), updated_codes)
 		new_nodes = merge(setdiffkeys(old_topology.nodes, removed_cells), updated_nodes)
 	end
 
+	new_unresolved_set = setdiff!(
+		union!(
+			Set{Cell}(),
+			# all cells that were unresolved before, and did not change code...
+			Iterators.filter(old_topology.unresolved_cells) do c
+				!haskey(updated_nodes, c)
+			end,
+			# ...plus all cells that changed, and now use a macrocall...
+			Iterators.filter(cells) do c
+				!isempty(new_nodes[c].macrocalls)
+			end,
+		),
+		# ...minus cells that were removed
+		removed_cells,
+	)
+		
+	unresolved_cells = if new_unresolved_set == old_topology.unresolved_cells
+		old_topology.unresolved_cells
+	else
+		ImmutableSet(new_unresolved_set; skip_copy=true)
+	end
+
 	cell_order = if old_cells == notebook.cells
 		old_topology.cell_order
 	else
 		ImmutableVector(notebook.cells)
 	end
-
+	
 	NotebookTopology(;
 		nodes=new_nodes,
 		codes=new_codes,
-		unresolved_cells=ImmutableSet(unresolved_cells; skip_copy=true), 
+		unresolved_cells, 
 		cell_order,
 	)
 end
diff --git a/test/Analysis.jl b/test/Analysis.jl
index 38436f468c..e45bf13023 100644
--- a/test/Analysis.jl
+++ b/test/Analysis.jl
@@ -1,78 +1,138 @@
 using Test
-import Pluto: Notebook, ServerSession, ClientSession, Cell, updated_topology, static_resolve_topology, is_just_text
+import Pluto: Notebook, Cell, updated_topology, static_resolve_topology, is_just_text, NotebookTopology
 
 @testset "Analysis" begin
-    notebook = Notebook([
-        Cell(""),
-        Cell("md\"a\""),
-        Cell("html\"a\""),
-        Cell("md\"a \$b\$\""),
-        Cell("md\"a ``b``\""),
-        Cell("""
-        let
-            x = md"a"
-            md"r \$x"
-        end
-        """),
-        Cell("html\"a 7 \$b\""),
+    @testset "is_just_text" begin
+        notebook = Notebook([
+            Cell(""),
+            Cell("md\"a\""),
+            Cell("html\"a\""),
+            Cell("md\"a \$b\$\""),
+            Cell("md\"a ``b``\""),
+            Cell("""
+            let
+                x = md"a"
+                md"r \$x"
+            end
+            """),
+            Cell("html\"a 7 \$b\""),
 
-        Cell("md\"a 8 \$b\""),
-        Cell("@a md\"asdf 9\""),
-        Cell("x()"),
-        Cell("x() = y()"),
-        Cell("12 + 12"),
-        Cell("import Dates"),
-        Cell("import Dates"),
-        Cell("while false end"),
-        Cell("for i in [16]; end"),
-        Cell("[i for i in [17]]"),
-        Cell("module x18 end"),
-        Cell("""
-        module x19
-            exit()
-        end
-        """),
-        Cell("""quote end"""),
-        Cell("""quote x = 21 end"""),
-        Cell("""quote \$(x = 22) end"""),
-        Cell("""asdf"23" """),
-        Cell("""@asdf("24") """),
-        Cell("""@x"""),
-        Cell("""@y z 26"""),
-        Cell("""f(g"27")"""),
-    ])
+            Cell("md\"a 8 \$b\""),
+            Cell("@a md\"asdf 9\""),
+            Cell("x()"),
+            Cell("x() = y()"),
+            Cell("12 + 12"),
+            Cell("import Dates"),
+            Cell("import Dates"),
+            Cell("while false end"),
+            Cell("for i in [16]; end"),
+            Cell("[i for i in [17]]"),
+            Cell("module x18 end"),
+            Cell("""
+            module x19
+                exit()
+            end
+            """),
+            Cell("""quote end"""),
+            Cell("""quote x = 21 end"""),
+            Cell("""quote \$(x = 22) end"""),
+            Cell("""asdf"23" """),
+            Cell("""@asdf("24") """),
+            Cell("""@x"""),
+            Cell("""@y z 26"""),
+            Cell("""f(g"27")"""),
+        ])
+
+        old = notebook.topology
+        new = notebook.topology = updated_topology(old, notebook, notebook.cells) |> static_resolve_topology
 
-    old = notebook.topology
-    new = notebook.topology = updated_topology(old, notebook, notebook.cells) |> static_resolve_topology
+        @testset "Only-text detection" begin
+            @test is_just_text(new, notebook.cells[1])
+            @test is_just_text(new, notebook.cells[2])
+            @test is_just_text(new, notebook.cells[3])
+            @test is_just_text(new, notebook.cells[4])
+            @test is_just_text(new, notebook.cells[5])
+            @test is_just_text(new, notebook.cells[6])
+            @test is_just_text(new, notebook.cells[7])
 
-    @testset "Only-text detection" begin
-        @test is_just_text(new, notebook.cells[1])
-        @test is_just_text(new, notebook.cells[2])
-        @test is_just_text(new, notebook.cells[3])
-        @test is_just_text(new, notebook.cells[4])
-        @test is_just_text(new, notebook.cells[5])
-        @test is_just_text(new, notebook.cells[6])
-        @test is_just_text(new, notebook.cells[7])
+            @test !is_just_text(new, notebook.cells[8])
+            @test !is_just_text(new, notebook.cells[9])
+            @test !is_just_text(new, notebook.cells[10])
+            @test !is_just_text(new, notebook.cells[11])
+            @test !is_just_text(new, notebook.cells[12])
+            @test !is_just_text(new, notebook.cells[13])
+            @test !is_just_text(new, notebook.cells[14])
+            @test !is_just_text(new, notebook.cells[15])
+            @test !is_just_text(new, notebook.cells[16])
+            @test !is_just_text(new, notebook.cells[17])
+            @test !is_just_text(new, notebook.cells[18])
+            @test !is_just_text(new, notebook.cells[19])
+            @test !is_just_text(new, notebook.cells[20])
+            @test !is_just_text(new, notebook.cells[21])
+            @test !is_just_text(new, notebook.cells[22])
+            @test !is_just_text(new, notebook.cells[23])
+            @test !is_just_text(new, notebook.cells[24])
+            @test !is_just_text(new, notebook.cells[25])
+            @test !is_just_text(new, notebook.cells[26])
+            @test !is_just_text(new, notebook.cells[27])
+        end
+    end
 
-        @test !is_just_text(new, notebook.cells[8])
-        @test !is_just_text(new, notebook.cells[9])
-        @test !is_just_text(new, notebook.cells[10])
-        @test !is_just_text(new, notebook.cells[11])
-        @test !is_just_text(new, notebook.cells[12])
-        @test !is_just_text(new, notebook.cells[13])
-        @test !is_just_text(new, notebook.cells[14])
-        @test !is_just_text(new, notebook.cells[15])
-        @test !is_just_text(new, notebook.cells[16])
-        @test !is_just_text(new, notebook.cells[17])
-        @test !is_just_text(new, notebook.cells[18])
-        @test !is_just_text(new, notebook.cells[19])
-        @test !is_just_text(new, notebook.cells[20])
-        @test !is_just_text(new, notebook.cells[21])
-        @test !is_just_text(new, notebook.cells[22])
-        @test !is_just_text(new, notebook.cells[23])
-        @test !is_just_text(new, notebook.cells[24])
-        @test !is_just_text(new, notebook.cells[25])
-        @test !is_just_text(new, notebook.cells[26])
-        @test !is_just_text(new, notebook.cells[27])
+    @testset "updated_topology identity" begin
+        notebook = Notebook([
+            Cell("x = 1")
+            Cell("function f(x)
+                x + 1
+            end")
+            Cell("a = x - 123")
+            Cell("")
+            Cell("")
+            Cell("")
+        ])
+        
+        empty_top = notebook.topology
+        topo = updated_topology(empty_top, notebook, notebook.cells)
+        # updated_topology should preserve the identity of the topology if nothing changed. This means that we can cache the result of other functions in our code!
+        @test topo === updated_topology(topo, notebook, notebook.cells)
+        @test topo === updated_topology(topo, notebook, Cell[])
+        @test topo === static_resolve_topology(topo)
+        
+        # for n in fieldnames(NotebookTopology)
+        #     @test getfield(topo, n) === getfield(top2a, n)
+        # end
+        
+        setcode!(notebook.cells[1], "x = 999")
+        topo_2 = updated_topology(topo, notebook, notebook.cells[1:1])
+        @test topo_2 !== topo
+        
+        
+        setcode!(notebook.cells[4], "@asdf 1 + 2")
+        topo_3 = updated_topology(topo_2, notebook, notebook.cells[4:4])
+        @test topo_3 !== topo_2
+        @test topo_3 !== topo
+        
+        @test topo_3.unresolved_cells |> only === notebook.cells[4]
+        
+        @test topo_3 === updated_topology(topo_3, notebook, notebook.cells[1:3])
+        @test topo_3 === updated_topology(topo_3, notebook, Cell[])
+        # rerunning the cell with the macro does not change the topology because it was already unresolved
+        @test topo_3 === updated_topology(topo_3, notebook, notebook.cells[1:4])
+        
+        # let's pretend that we resolved the macro in the 4th cell
+        topo_3_resolved = NotebookTopology(;
+            nodes=topo_3.nodes, 
+            codes=topo_3.codes, 
+            unresolved_cells=setdiff(topo_3.unresolved_cells, notebook.cells[4:4]),
+            cell_order=topo_3.cell_order,
+        )
+        
+        @test topo_3_resolved === updated_topology(topo_3_resolved, notebook, notebook.cells[1:3])
+        @test topo_3_resolved === updated_topology(topo_3_resolved, notebook, Cell[])
+        # rerunning the cell with the macro makes it unresolved again
+        @test topo_3_resolved !== updated_topology(topo_3_resolved, notebook, notebook.cells[1:4])
+        
+        notebook.cells[4] ∈ updated_topology(topo_3_resolved, notebook, notebook.cells[1:4]).unresolved_cells
+        
+        # @test topo_3 === static_resolve_topology(topo_3)
     end
-end
+end
\ No newline at end of file
diff --git a/test/cell_disabling.jl b/test/cell_disabling.jl
index 1f9602f0d5..19bc64aa83 100644
--- a/test/cell_disabling.jl
+++ b/test/cell_disabling.jl
@@ -31,7 +31,7 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook
 
     # disable first cell
     notebook.cells[1].metadata["disabled"] = true
-    update_run!(🍭, notebook, notebook.cells)
+    update_run!(🍭, notebook, notebook.cells[1])
     should_be_disabled = [1, 3, 5]
     @test get_disabled_cells(notebook) == should_be_disabled
     @test notebook.cells[1].metadata["disabled"] == true

From faa136303f24c66069b9a07f600ac96069541f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Wed, 7 Sep 2022 23:48:11 +0300
Subject: [PATCH 415/821] Environments/cells can render Non-Cell outputs in the
 notebook (#2195)

---
 frontend/components/Editor.js        |  7 ++++-
 frontend/components/NonCellOutput.js | 41 ++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 frontend/components/NonCellOutput.js

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 961e0ea1a2..be9cd28a97 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -28,6 +28,7 @@ import { setup_mathjax } from "../common/SetupMathJax.js"
 import { BinderButton, RunLocalButton } from "./EditOrRunButton.js"
 import { slider_server_actions, nothing_actions } from "../common/SliderServerClient.js"
 import { ProgressBar } from "./ProgressBar.js"
+import { NonCellOutput } from "./NonCellOutput.js"
 import { IsolatedCell } from "./Cell.js"
 import { RawHTMLContainer } from "./CellOutput.js"
 import { RecordingPlaybackUI, RecordingUI } from "./RecordingUI.js"
@@ -766,11 +767,12 @@ patch: ${JSON.stringify(
             Object.assign(this.client, client)
             try {
                 const { default: environment } = await import(this.client.session_options.server.injected_javascript_data_url)
-                const { custom_editor_header_component } = environment({ client, editor: this, imports: { preact } })
+                const { custom_editor_header_component, custom_non_cell_output } = environment({ client, editor: this, imports: { preact } })
                 this.setState({
                     extended_components: {
                         ...this.state.extended_components,
                         CustomHeader: custom_editor_header_component,
+                        NonCellOutputComponents: custom_non_cell_output,
                     },
                 })
             } catch (e) {}
@@ -1508,6 +1510,9 @@ patch: ${JSON.stringify(
                                 }}
                             />`
                         }
+                        <${NonCellOutput} 
+                            notebook_id=${this.state.notebook.notebook_id} 
+                            environment_component=${this.state.extended_components.NonCellOutputComponents} />
                     </${Main}>
                     <${LiveDocs}
                         desired_doc_query=${this.state.desired_doc_query}
diff --git a/frontend/components/NonCellOutput.js b/frontend/components/NonCellOutput.js
new file mode 100644
index 0000000000..099491132a
--- /dev/null
+++ b/frontend/components/NonCellOutput.js
@@ -0,0 +1,41 @@
+import { html, useEffect, useRef, useState } from "../imports/Preact.js"
+/**
+ * Sometimes, we want to render HTML outside of the Cell Output,
+ *   for to add toolboxes like the Table of Contents or something similar.
+ * 
+ * Additionally, the environment may want to inject some non cell/non editor
+ * specific HTML to be rendered in the page. This component acts as a sink for
+ * rendering these usecases.
+ * 
+ * That way, the Cell Output can change with a different lifecycle than
+ * the Non-Cell output and environments can inject UI.
+ * 
+ * This component listens to events like the one below and updates
+ * document.dispatchEvent(
+ *      new CustomEvent("experimental_add_node_non_cell_output", {
+ *          detail: { order: 1, node: html`<div>...</div>`, name: "Name of toolbox" }
+ *      }))
+
+ */
+export const NonCellOutput = ({ environment_component, notebook_id }) => {
+    const surely_the_latest_updated_set = useRef()
+    const [component_set, update_component_set] = useState({})
+    useEffect(() => {
+        const hn = (e) => {
+            try {
+                const { name, node, order } = e.detail
+                surely_the_latest_updated_set.current = { ...surely_the_latest_updated_set.current, [name]: { node, order } }
+                update_component_set(surely_the_latest_updated_set.current)
+            } catch (e) {}
+        }
+        document.addEventListener("experimental_add_node_non_cell_output", hn)
+        return () => document.removeEventListener("experimental_add_node_non_cell_output", hn)
+    }, [surely_the_latest_updated_set])
+
+    let components = Object.values(component_set)
+    components.sort(({ order: o1 }, { order: o2 }) => o1 - o2)
+    components = components.map(({ node }) => node)
+    return html`<div class="non-cell-output">
+        ${environment_component ? html`<${environment_component} notebook_id=${notebook_id} />` : null} ${components}
+    </div>`
+}

From 3007b48f3fa224992ea421bacb85f370dec016f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Wed, 7 Sep 2022 23:48:43 +0300
Subject: [PATCH 416/821] Reload CM when things go south (#1917)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/Cell.js                   | 31 ++++++++++++-------
 frontend/components/CellInput.js              | 25 ++++++++++++---
 .../CellInput/pluto_autocomplete.js           |  4 +++
 frontend/imports/Preact.d.ts                  |  1 +
 frontend/imports/Preact.js                    |  2 ++
 5 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 17a5aa806b..039e8d5178 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -1,5 +1,5 @@
 import _ from "../imports/lodash.js"
-import { html, useState, useEffect, useMemo, useRef, useContext, useLayoutEffect, useCallback } from "../imports/Preact.js"
+import { html, useState, useEffect, useMemo, useRef, useContext, useLayoutEffect, useErrorBoundary, useCallback } from "../imports/Preact.js"
 
 import { CellOutput } from "./CellOutput.js"
 import { CellInput } from "./CellInput.js"
@@ -119,6 +119,19 @@ export const Cell = ({
     const on_focus_neighbor = pluto_actions.focus_on_neighbor
     const on_change = useCallback((val) => pluto_actions.set_local_cell(cell_id, val), [cell_id, pluto_actions])
     const variables = useMemo(() => Object.keys(cell_dependencies?.downstream_cells_map ?? {}), [cell_dependencies])
+
+    // We need to unmount & remount when a destructive error occurs.
+    // For that reason, we will use a simple react key and increment it on error
+    const [key, setKey] = useState(0)
+    const cell_key = useMemo(() => cell_id + key, [cell_id, key])
+
+    const [, resetError] = useErrorBoundary((error) => {
+        console.log(`An error occured in the CodeMirror code, resetting CellInput component. See error below:\n\n${error}\n\n -------------- `)
+        setKey(key + 1)
+        resetError()
+    })
+
+    const remount = useMemo(() => () => setKey(key + 1))
     // cm_forced_focus is null, except when a line needs to be highlighted because it is part of a stack trace
     const [cm_forced_focus, set_cm_forced_focus] = useState(/** @type{any} */ (null))
     const [cm_highlighted_line, set_cm_highlighted_line] = useState(null)
@@ -213,17 +226,12 @@ export const Cell = ({
         set_waiting_to_run_smart(true)
     }, [pluto_actions, cell_id, selected, set_waiting_to_run_smart])
 
-    const skip_as_script_jump = useCallback(
-        on_jump(hasTargetBarrier("skip_as_script"), pluto_actions, cell_id),
-        [pluto_actions, cell_id],
-    )
-    const disabled_jump = useCallback(
-        on_jump(hasTargetBarrier("disabled"), pluto_actions, cell_id),
-        [pluto_actions, cell_id],
-    )
+    const skip_as_script_jump = useCallback(on_jump(hasTargetBarrier("skip_as_script"), pluto_actions, cell_id), [pluto_actions, cell_id])
+    const disabled_jump = useCallback(on_jump(hasTargetBarrier("disabled"), pluto_actions, cell_id), [pluto_actions, cell_id])
 
     return html`
         <pluto-cell
+            key=${cell_key}
             ref=${node_ref}
             class=${cl({
                 queued: queued || (waiting_to_run && is_process_ready),
@@ -286,6 +294,7 @@ export const Cell = ({
                 set_show_logs=${set_show_logs}
                 cm_highlighted_line=${cm_highlighted_line}
                 set_cm_highlighted_line=${set_cm_highlighted_line}
+                onerror=${remount}
             />
             ${show_logs ? html`<${Logs} logs=${Object.values(logs)} line_heights=${line_heights} set_cm_highlighted_line=${set_cm_highlighted_line} />` : null}
             <${RunArea}
@@ -336,8 +345,8 @@ export const Cell = ({
                               body: html`This cell is currently stored in the notebook file as a Julia <em>comment</em>, instead of <em>code</em>.<br />
                                   This way, it will not run when the notebook runs as a script outside of Pluto.<br />
                                   An upstream cell is <b> indirectly</b> <em>disabling in file</em> this one; enable
-                                  <span onClick=${skip_as_script_jump} style="cursor: pointer; text-decoration: underline"> the upstream one</span> to
-                                  affect this cell.`,
+                                  <span onClick=${skip_as_script_jump} style="cursor: pointer; text-decoration: underline"> the upstream one</span> to affect
+                                  this cell.`,
                           })
                       }}
                   ></div>`
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index cea6a51964..c3f46f3a5f 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -63,6 +63,7 @@ import { HighlightLineFacet, highlightLinePlugin } from "./CellInput/highlight_l
 import { commentKeymap } from "./CellInput/comment_mixed_parsers.js"
 import { debug_syntax_plugin } from "./CellInput/debug_syntax_plugin.js"
 import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
+import { is_mac_keyboard } from "../common/KeyboardShortcuts.js"
 
 export const ENABLE_CM_MIXED_PARSER = window.localStorage.getItem("ENABLE_CM_MIXED_PARSER") === "true"
 
@@ -375,10 +376,17 @@ export const CellInput = ({
 }) => {
     let pluto_actions = useContext(PlutoActionsContext)
     const { disabled: running_disabled, skip_as_script } = metadata
-
-    const newcm_ref = useRef(/** @type {EditorView?} */ (null))
-    const dom_node_ref = useRef(/** @type {HTMLElement?} */ (null))
-    const remote_code_ref = useRef(/** @type {string?} */ (null))
+    let [error, set_error] = useState(null)
+    if (error) {
+        const to_throw = error
+        set_error(null)
+        throw to_throw
+    }
+    const newcm_ref = useRef(/** @type {EditorView} */ (null))
+    const dom_node_ref = useRef(/** @type {HTMLElement} */ (null))
+    const remote_code_ref = useRef(null)
+    const on_change_ref = useRef(null)
+    on_change_ref.current = on_change
 
     let nbpkg_compartment = useCompartment(newcm_ref, NotebookpackagesFacet.of(nbpkg))
     let global_definitions_compartment = useCompartment(newcm_ref, GlobalDefinitionsFacet.of(global_definition_locations))
@@ -571,7 +579,6 @@ export const CellInput = ({
         const newcm = (newcm_ref.current = new EditorView({
             state: EditorState.create({
                 doc: local_code,
-
                 extensions: [
                     EditorView.theme({}, { dark: usesDarkTheme }),
                     // Compartments coming from react state/props
@@ -693,6 +700,14 @@ export const CellInput = ({
                     // Enable this plugin if you want to see the lezer tree,
                     // and possible lezer errors and maybe more debug info in the console:
                     // debug_syntax_plugin,
+                    // Handle errors hopefully?
+                    EditorView.exceptionSink.of((exception) => {
+                        set_error(exception)
+                        console.error("EditorView exception!", exception)
+                        // alert(
+                        //     `We ran into an issue! We have lost your cursor 😞😓😿\n If this appears again, please press F12, then click the "Console" tab,  eport an issue at https://github.com/fonsp/Pluto.jl/issues`
+                        // )
+                    }),
                 ],
             }),
             parent: dom_node_ref.current,
diff --git a/frontend/components/CellInput/pluto_autocomplete.js b/frontend/components/CellInput/pluto_autocomplete.js
index 3596a473e0..dbfb382def 100644
--- a/frontend/components/CellInput/pluto_autocomplete.js
+++ b/frontend/components/CellInput/pluto_autocomplete.js
@@ -64,6 +64,10 @@ const tabCompletionState = StateField.define({
 /** @param {EditorView} cm */
 const tab_completion_command = (cm) => {
     // This will return true if the autocomplete select popup is open
+    // To test the exception sink, uncomment these lines:
+    // if (Math.random() > 0.7) {
+    //     throw "LETS CRASH THIS"
+    // }
     if (acceptCompletion(cm)) {
         return true
     }
diff --git a/frontend/imports/Preact.d.ts b/frontend/imports/Preact.d.ts
index f22f8bb5eb..e491d9168b 100644
--- a/frontend/imports/Preact.d.ts
+++ b/frontend/imports/Preact.d.ts
@@ -58,6 +58,7 @@ export declare function useRef<T = any>(initialValue?: T): Ref<T>
 
 export declare function useMemo<T = any>(calculate: () => T, deps?: Array<any>): T
 export declare function useCallback<T = any>(callback: T, deps?: Array<any>): T
+export declare function useErrorBoundary(callback?: (error: any) => Promise<void> | void): [any, () => void];
 
 type UnsubscribeFn = () => void
 type EffectFn = () => void | UnsubscribeFn
diff --git a/frontend/imports/Preact.js b/frontend/imports/Preact.js
index b938009bb2..29d5f06b3d 100644
--- a/frontend/imports/Preact.js
+++ b/frontend/imports/Preact.js
@@ -18,6 +18,7 @@ import {
     useMemo,
     useCallback,
     useContext,
+    useErrorBoundary,
 } from "https://esm.sh/v66/preact@10.6.6/hooks?target=es2020"
 
 import htm from "https://esm.sh/v66/htm@3.1.0?target=es2020"
@@ -35,6 +36,7 @@ export {
     useRef,
     useMemo,
     useCallback,
+    useErrorBoundary,
     createContext,
     createRef,
     useContext,

From 19c48bbb5b89a2e2b24d2105e63b6a3928803c88 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 7 Sep 2022 23:06:53 +0200
Subject: [PATCH 417/821] Include set of disabled cells in `NotebookTopology`
 (#2270)

---
 src/analysis/Topology.jl        |  4 +++-
 src/analysis/TopologyUpdate.jl  | 25 ++++++++++++++++++++++---
 src/evaluation/MacroAnalysis.jl |  5 ++++-
 src/evaluation/Run.jl           |  5 +++--
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/analysis/Topology.jl b/src/analysis/Topology.jl
index 655421706c..d1c22477bc 100644
--- a/src/analysis/Topology.jl
+++ b/src/analysis/Topology.jl
@@ -32,6 +32,7 @@ Base.@kwdef struct NotebookTopology
     cell_order::ImmutableVector{Cell}=ImmutableVector{Cell}()
 
     unresolved_cells::ImmutableSet{Cell} = ImmutableSet{Cell}()
+    disabled_cells::ImmutableSet{Cell} = ImmutableSet{Cell}()
 end
 
 # BIG TODO HERE: CELL ORDER
@@ -48,6 +49,7 @@ function set_unresolved(topology::NotebookTopology, unresolved_cells::Vector{Cel
         nodes=topology.nodes, 
         codes=merge(topology.codes, codes), 
         unresolved_cells=union(topology.unresolved_cells, unresolved_cells),
-        cell_order = topology.cell_order,
+        cell_order=topology.cell_order,
+        disabled_cells=topology.disabled_cells,
     )
 end
diff --git a/src/analysis/TopologyUpdate.jl b/src/analysis/TopologyUpdate.jl
index d9363124d0..0f81070725 100644
--- a/src/analysis/TopologyUpdate.jl
+++ b/src/analysis/TopologyUpdate.jl
@@ -46,26 +46,45 @@ function updated_topology(old_topology::NotebookTopology, notebook::Notebook, ce
 				!isempty(new_nodes[c].macrocalls)
 			end,
 		),
-		# ...minus cells that were removed
+		# ...minus cells that were removed.
 		removed_cells,
 	)
-		
+
+	new_disabled_set = setdiff!(
+		union!(
+			Set{Cell}(),
+			# all cells that were disabled before...
+			old_topology.disabled_cells,
+			# ...plus all cells that changed...
+			cells,
+		),
+		# ...minus cells that changed and are not disabled.
+		Iterators.filter(!is_disabled, cells),
+	)
+
 	unresolved_cells = if new_unresolved_set == old_topology.unresolved_cells
 		old_topology.unresolved_cells
 	else
 		ImmutableSet(new_unresolved_set; skip_copy=true)
 	end
 
+	disabled_cells = if new_disabled_set == old_topology.disabled_cells
+		old_topology.disabled_cells
+	else
+		ImmutableSet(new_disabled_set; skip_copy=true)
+	end
+
 	cell_order = if old_cells == notebook.cells
 		old_topology.cell_order
 	else
-		ImmutableVector(notebook.cells)
+		ImmutableVector(notebook.cells) # makes a copy
 	end
 	
 	NotebookTopology(;
 		nodes=new_nodes,
 		codes=new_codes,
 		unresolved_cells, 
+        disabled_cells,
 		cell_order,
 	)
 end
diff --git a/src/evaluation/MacroAnalysis.jl b/src/evaluation/MacroAnalysis.jl
index 4ef8760978..a9e6d55c97 100644
--- a/src/evaluation/MacroAnalysis.jl
+++ b/src/evaluation/MacroAnalysis.jl
@@ -26,6 +26,7 @@ function with_new_soft_definitions(topology::NotebookTopology, cell::Cell, soft_
 		nodes=merge(topology.nodes, Dict(cell => new_node)), 
 		unresolved_cells=topology.unresolved_cells,
 		cell_order=topology.cell_order,
+        disabled_cells=topology.disabled_cells,
 	)
 end
 
@@ -170,11 +171,12 @@ function resolve_topology(
 		ImmutableSet(still_unresolved_nodes; skip_copy=true)
 	end
 
-	NotebookTopology(
+	NotebookTopology(;
 		nodes=all_nodes, 
 		codes=all_codes, 
 		unresolved_cells=new_unresolved_cells,
 		cell_order=unresolved_topology.cell_order,
+        disabled_cells=unresolved_topology.disabled_cells,
 	)
 end
 
@@ -199,5 +201,6 @@ function static_resolve_topology(topology::NotebookTopology)
 		codes=topology.codes, 
 		unresolved_cells=topology.unresolved_cells,
 		cell_order=topology.cell_order,
+        disabled_cells=topology.disabled_cells,
 	)
 end
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index d1b56d5fac..b3b878c06b 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -76,6 +76,7 @@ function run_reactive_core!(
         ),
         unresolved_cells = new_topology.unresolved_cells,
         cell_order = new_topology.cell_order,
+        disabled_cells=new_topology.disabled_cells,
     )
 
     # save the old topological order - we'll delete variables assigned from its
@@ -92,8 +93,7 @@ function run_reactive_core!(
     to_run_raw = setdiff(union(new_runnable, old_runnable), keys(new_order.errable))::Vector{Cell} # TODO: think if old error cell order matters
 
     # find (indirectly) deactivated cells and update their status
-    disabled_cells = filter(is_disabled, notebook.cells)
-    indirectly_deactivated = collect(topological_order(new_topology, disabled_cells))
+    indirectly_deactivated = collect(topological_order(new_topology, collect(new_topology.disabled_cells)))
     for cell in indirectly_deactivated
         cell.running = false
         cell.queued = false
@@ -375,6 +375,7 @@ function update_save_run!(
 			codes=setdiffkeys(old.codes, to_remove),
 			unresolved_cells=setdiff(old.unresolved_cells, to_remove),
 			cell_order=old.cell_order,
+			disabled_cells=setdiff(old.disabled_cells, to_remove),
 		)
 		
 		# and don't run them

From ab85efca962d009c741d4ec66508d687806e9579 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 8 Sep 2022 00:36:06 +0200
Subject: [PATCH 418/821] Offer popup to enable cell when you double click a
 disabled cell's run button (#2272)

---
 frontend/components/Cell.js      | 27 ++++++++++++++++++-----
 frontend/components/CellInput.js | 18 ++++++---------
 frontend/components/RunArea.js   | 38 ++++++++++++++++++++++++++++++--
 3 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 039e8d5178..c43b2b4f54 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -136,12 +136,6 @@ export const Cell = ({
     const [cm_forced_focus, set_cm_forced_focus] = useState(/** @type{any} */ (null))
     const [cm_highlighted_line, set_cm_highlighted_line] = useState(null)
 
-    const any_logs = useMemo(() => !_.isEmpty(logs), [logs])
-    const set_show_logs = (show_logs) =>
-        pluto_actions.update_notebook((notebook) => {
-            notebook.cell_inputs[cell_id].metadata.show_logs = show_logs
-        })
-
     useEffect(() => {
         const focusListener = (e) => {
             if (e.detail.cell_id === cell_id) {
@@ -225,6 +219,25 @@ export const Cell = ({
         pluto_actions.set_and_run_multiple(pluto_actions.get_selected_cells(cell_id, selected))
         set_waiting_to_run_smart(true)
     }, [pluto_actions, cell_id, selected, set_waiting_to_run_smart])
+    const set_show_logs = useCallback(
+        (show_logs) =>
+            pluto_actions.update_notebook((notebook) => {
+                notebook.cell_inputs[cell_id].metadata.show_logs = show_logs
+            }),
+        [pluto_actions, cell_id]
+    )
+    const set_cell_disabled = useCallback(
+        async (new_val) => {
+            await pluto_actions.update_notebook((notebook) => {
+                notebook.cell_inputs[cell_id].metadata["disabled"] = new_val
+            })
+            // we also 'run' the cell if it is disabled, this will make the backend propage the disabled state to dependent cells
+            await on_submit()
+        },
+        [pluto_actions, cell_id, on_submit]
+    )
+
+    const any_logs = useMemo(() => !_.isEmpty(logs), [logs])
 
     const skip_as_script_jump = useCallback(on_jump(hasTargetBarrier("skip_as_script"), pluto_actions, cell_id), [pluto_actions, cell_id])
     const disabled_jump = useCallback(on_jump(hasTargetBarrier("disabled"), pluto_actions, cell_id), [pluto_actions, cell_id])
@@ -292,6 +305,7 @@ export const Cell = ({
                 any_logs=${any_logs}
                 show_logs=${show_logs}
                 set_show_logs=${set_show_logs}
+                set_cell_disabled=${set_cell_disabled}
                 cm_highlighted_line=${cm_highlighted_line}
                 set_cm_highlighted_line=${set_cm_highlighted_line}
                 onerror=${remount}
@@ -305,6 +319,7 @@ export const Cell = ({
                 on_interrupt=${() => {
                     pluto_actions.interrupt_remote(cell_id)
                 }}
+                set_cell_disabled=${set_cell_disabled}
                 runtime=${runtime}
                 running=${running}
                 code_differs=${class_code_differs}
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index c3f46f3a5f..92582c4349 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -370,6 +370,7 @@ export const CellInput = ({
     any_logs,
     show_logs,
     set_show_logs,
+    set_cell_disabled,
     cm_highlighted_line,
     metadata,
     global_definition_locations,
@@ -382,11 +383,9 @@ export const CellInput = ({
         set_error(null)
         throw to_throw
     }
-    const newcm_ref = useRef(/** @type {EditorView} */ (null))
-    const dom_node_ref = useRef(/** @type {HTMLElement} */ (null))
-    const remote_code_ref = useRef(null)
-    const on_change_ref = useRef(null)
-    on_change_ref.current = on_change
+    const newcm_ref = useRef(/** @type {EditorView?} */ (null))
+    const dom_node_ref = useRef(/** @type {HTMLElement?} */ (null))
+    const remote_code_ref = useRef(/** @type {string?} */ (null))
 
     let nbpkg_compartment = useCompartment(newcm_ref, NotebookpackagesFacet.of(nbpkg))
     let global_definitions_compartment = useCompartment(newcm_ref, GlobalDefinitionsFacet.of(global_definition_locations))
@@ -833,12 +832,13 @@ export const CellInput = ({
                 any_logs=${any_logs}
                 show_logs=${show_logs}
                 set_show_logs=${set_show_logs}
+                set_cell_disabled=${set_cell_disabled}
             />
         </pluto-input>
     `
 }
 
-const InputContextMenu = ({ on_delete, cell_id, run_cell, skip_as_script, running_disabled, any_logs, show_logs, set_show_logs }) => {
+const InputContextMenu = ({ on_delete, cell_id, run_cell, skip_as_script, running_disabled, any_logs, show_logs, set_show_logs, set_cell_disabled }) => {
     const timeout = useRef(null)
     let pluto_actions = useContext(PlutoActionsContext)
     const [open, setOpen] = useState(false)
@@ -857,11 +857,7 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, skip_as_script, runnin
         const new_val = !running_disabled
         e.preventDefault()
         e.stopPropagation()
-        await pluto_actions.update_notebook((notebook) => {
-            notebook.cell_inputs[cell_id].metadata["disabled"] = new_val
-        })
-        // we also 'run' the cell if it is disabled, this will make the backend propage the disabled state to dependent cells
-        await run_cell()
+        await set_cell_disabled(new_val)
     }
     const toggle_logs = () => set_show_logs(!show_logs)
 
diff --git a/frontend/components/RunArea.js b/frontend/components/RunArea.js
index e17303a8c4..2c3bca724e 100644
--- a/frontend/components/RunArea.js
+++ b/frontend/components/RunArea.js
@@ -3,8 +3,20 @@ import { html, useContext, useEffect, useMemo, useState } from "../imports/Preac
 
 import { in_textarea_or_input } from "../common/KeyboardShortcuts.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
+import { open_pluto_popup } from "./Popup.js"
 
-export const RunArea = ({ runtime, running, queued, code_differs, on_run, on_interrupt, depends_on_disabled_cells, running_disabled, on_jump }) => {
+export const RunArea = ({
+    runtime,
+    running,
+    queued,
+    code_differs,
+    on_run,
+    on_interrupt,
+    set_cell_disabled,
+    depends_on_disabled_cells,
+    running_disabled,
+    on_jump,
+}) => {
     const on_save = on_run /* because disabled cells save without running */
 
     const local_time_running_ms = useMillisSinceTruthy(running)
@@ -27,9 +39,31 @@ export const RunArea = ({ runtime, running, queued, code_differs, on_run, on_int
         run: "Run cell",
     }
 
+    const on_double_click = (/** @type {MouseEvent} */ e) => {
+        console.log(running_disabled)
+        if (running_disabled)
+            open_pluto_popup({
+                type: "info",
+                source_element: /** @type {HTMLElement?} */ (e.target),
+                body: html`${`This cell is disabled. `}
+                    <a
+                        href="#"
+                        onClick=${(e) => {
+                            //@ts-ignore
+                            set_cell_disabled(false)
+
+                            e.preventDefault()
+                            window.dispatchEvent(new CustomEvent("close pluto popup"))
+                        }}
+                        >Enable this cell</a
+                    >
+                    ${` to run the code.`}`,
+            })
+    }
+
     return html`
         <pluto-runarea class=${action}>
-            <button onClick=${fmap[`on_${action}`]} class="runcell" title=${titlemap[action]}>
+            <button onDblClick=${on_double_click} onClick=${fmap[`on_${action}`]} class="runcell" title=${titlemap[action]}>
                 <span></span>
             </button>
             <span class="runtime">${prettytime(running ? local_time_running_ns ?? runtime : runtime)}</span>

From 7adc68991d7b9d2da35a9b9d14c74c936d5fe474 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Mon, 19 Sep 2022 19:01:04 +0200
Subject: [PATCH 419/821] Add query suggestions in live docs (#2282)

* Handle 1.8 invalid module display

Introduced in https://github.com/JuliaLang/julia/pull/43932

* Show similar query suggestions in live docs

* Add test
---
 frontend/components/CellOutput.js |  3 +-
 frontend/components/LiveDocs.js   |  2 ++
 src/runner/PlutoRunner.jl         | 53 +++++++++++++++++++++++++++++--
 src/webserver/REPLTools.jl        |  4 +--
 test/MacroAnalysis.jl             |  9 ++++++
 5 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 6f10ccf613..2923c3b8df 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -514,7 +514,7 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
                 try {
                     container.querySelectorAll("code").forEach((code_element) => {
                         code_element.classList.forEach((className) => {
-                            if (className.startsWith("language-")) {
+                            if (className.startsWith("language-") && !className.endsWith("undefined")) {
                                 // Remove "language-"
                                 let language = className.substring(9)
                                 highlight(code_element, language)
@@ -561,6 +561,7 @@ export let highlight = (code_element, language) => {
                     // its shows up as a comment and can be confusing
                     doc: code_element.innerText
                         .trim()
+                        .replace(/Main.var\"workspace#\d+\"\./, "")
                         .replace(/Main.workspace#\d+\./, "")
                         .replace(/Main.workspace#(\d+)/, 'Main.var"workspace#$1"'),
 
diff --git a/frontend/components/LiveDocs.js b/frontend/components/LiveDocs.js
index ba75d01b4c..8de2d639a9 100644
--- a/frontend/components/LiveDocs.js
+++ b/frontend/components/LiveDocs.js
@@ -8,7 +8,9 @@ import { PlutoActionsContext } from "../common/PlutoContext.js"
 
 const without_workspace_stuff = (str) =>
     str
+        .replace(/Main\.var&quot;workspace\#\d+&quot;\./g, "") // remove workspace modules from variable names
         .replace(/Main\.workspace\#\d+\./g, "") // remove workspace modules from variable names
+        .replace(/ in Main\.var&quot;workspace\#\d+&quot;/g, "") // remove workspace modules from method lists
         .replace(/ in Main\.workspace\#\d+/g, "") // remove workspace modules from method lists
         .replace(/#&#61;&#61;#[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\:\d+/g, "") // remove UUIDs from filenames
 
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index d597748fe0..c5df1cb1ab 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -28,6 +28,7 @@ import Base: show, istextmime
 import UUIDs: UUID, uuid4
 import Dates: DateTime
 import Logging
+import REPL
 
 export @bind
 
@@ -1737,10 +1738,33 @@ binding_from(s::Symbol, workspace::Module) = Docs.Binding(workspace, s)
 binding_from(r::GlobalRef, workspace::Module) = Docs.Binding(r.mod, r.name)
 binding_from(other, workspace::Module) = error("Invalid @var syntax `$other`.")
 
+const DOC_SUGGESTION_LIMIT = 10
+
+struct Suggestion
+    match::String
+    query::String
+end
+
+# inspired from REPL.printmatch()
+function Base.show(io::IO, ::MIME"text/html", suggestion::Suggestion)
+    print(io, "<a href=\"@ref\"><code>")
+    is, _ = REPL.bestmatch(suggestion.query, suggestion.match)
+    for (i, char) in enumerate(suggestion.match)
+        esc_c = get(Markdown._htmlescape_chars, char, char)
+        if i in is
+            print(io, "<b>", esc_c, "</b>")
+        else
+            print(io, esc_c)
+        end
+    end
+    print(io, "</code></a>")
+end
+
 "You say doc_fetcher, I say You say doc_fetcher, I say You say doc_fetcher, I say You say doc_fetcher, I say ...!!!!"
 function doc_fetcher(query, workspace::Module)
     try
-        value = binding_from(Meta.parse(query), workspace)
+        parsed_query = Meta.parse(query)
+        value = binding_from(parsed_query, workspace)
         doc_md = Docs.doc(value)
 
         if !showable(MIME("text/html"), doc_md)
@@ -1748,7 +1772,32 @@ function doc_fetcher(query, workspace::Module)
             # which is a bit silly, but turns out it actuall is markdown if you look hard enough.
             doc_md = Markdown.parse(repr(doc_md))
         end
-        
+
+        # Add suggestions results if no docstring was found
+        if parsed_query isa Symbol &&
+            !Docs.defined(value) &&
+            doc_md isa Markdown.MD &&
+            haskey(doc_md.meta, :results) &&
+            isempty(doc_md.meta[:results])
+
+            suggestions = REPL.accessible(workspace)
+            suggestions_scores = map(s -> REPL.fuzzyscore(query, s), suggestions)
+            removed_indices = [i for (i, s) in enumerate(suggestions_scores) if s < 0]
+            deleteat!(suggestions_scores, removed_indices)
+            deleteat!(suggestions, removed_indices)
+
+            perm = sortperm(suggestions_scores; lt=Base.:>)
+            permute!(suggestions, perm)
+            links = map(s -> Suggestion(s, query), @view(suggestions[begin:min(end,DOC_SUGGESTION_LIMIT)]))
+
+            if length(links) > 0
+                push!(doc_md.content,
+                      Markdown.HorizontalRule(),
+                      Markdown.Paragraph(["Similar result$(length(links) > 1 ? "s" : ""):"]),
+                      Markdown.List(links))
+            end
+        end
+
         (repr(MIME("text/html"), doc_md), :👍)
     catch ex
         (nothing, :👎)
diff --git a/src/webserver/REPLTools.jl b/src/webserver/REPLTools.jl
index d1147bb8de..d6a09b7c93 100644
--- a/src/webserver/REPLTools.jl
+++ b/src/webserver/REPLTools.jl
@@ -117,9 +117,9 @@ responses[:docs] = function response_docs(🙋::ClientRequest)
         query = "@$(query[begin:end-1])_str"
     end
 
-    doc_html, status = if REPL.lookup_doc(Symbol(query)) isa Markdown.MD
+    doc_html, status = if (doc_md = Docs.doc(Docs.Binding(Base, Symbol(query)))) isa Markdown.MD &&
+            haskey(doc_md.meta, :results) && !isempty(doc_md.meta[:results])
         # available in Base, no need to ask worker
-        doc_md = REPL.lookup_doc(Symbol(query))
         (repr(MIME("text/html"), doc_md), :👍)
     else
         workspace = WorkspaceManager.get_workspace((🙋.session, 🙋.notebook); allow_creation=false)
diff --git a/test/MacroAnalysis.jl b/test/MacroAnalysis.jl
index 396c732b22..d96d15cd82 100644
--- a/test/MacroAnalysis.jl
+++ b/test/MacroAnalysis.jl
@@ -826,6 +826,15 @@ import Memoize: @memoize
 
         trigger, bool, int = notebook.cells
 
+        workspace = WorkspaceManager.get_workspace((🍭, notebook))
+        workspace_module = getproperty(Main, workspace.module_name)
+
+        # Propose suggestions when no binding is found
+        doc_content, status = PlutoRunner.doc_fetcher("filer", workspace_module)
+        @test status == :👍
+        @test occursin("Similar results:", doc_content)
+        @test occursin("<b>f</b><b>i</b><b>l</b>t<b>e</b><b>r</b>", doc_content)
+
         update_run!(🍭, notebook, notebook.cells)
         @test all(noerror, notebook.cells)
         @test occursin("::Bool", bool.output.body)

From 73bb1abc5980e4defc7a41bf1c40547f5fa54d4f Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Mon, 19 Sep 2022 22:57:45 +0200
Subject: [PATCH 420/821] Replace search param with hash in filename (#2284)

---
 .../parcel-resolver-like-a-browser/https-resolver.js  | 11 +++++++++--
 src/webserver/Static.jl                               |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js b/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
index 864687547d..d17540df00 100644
--- a/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
+++ b/frontend-bundler/parcel-resolver-like-a-browser/https-resolver.js
@@ -4,6 +4,7 @@ let fetch = require("node-fetch")
 let fs = require("fs/promises")
 let mkdirp = require("mkdirp")
 let { URL } = require("url")
+let crypto = require("crypto")
 
 let DONT_INCLUDE = { isExcluded: true }
 
@@ -61,12 +62,18 @@ module.exports = new Resolver({
             let found_extension = /\.[a-zA-Z][a-zA-Z0-9]+$/.exec(url.pathname)?.[0]
 
             let extension_to_add = found_extension ?? (dependency.specifierType === "esm" ? ".mjs" : "")
+
+            let search_component = ""
+            if (url.search !== "") {
+                search_component = "." + crypto.createHmac("sha256", "42").update(url.search).digest("hex").slice(0, 10)
+            }
+
             // If a search is given in the URL, this will search be appended to the path, so we need to repeat the extension.
-            let should_add_extension = url.search !== "" || found_extension == null
+            let should_add_extension = search_component !== "" || found_extension == null
             let suffix = should_add_extension ? extension_to_add : ""
 
             // Create a folder structure and file for the import. This folder structure will match the URL structure, to make sure that relative imports still work.
-            let filename_parts = (url.pathname.slice(1) + encodeURIComponent(url.search) + suffix).split("/")
+            let filename_parts = (url.pathname.slice(1) + search_component + suffix).split("/")
             let url_to_path = path.join(url.protocol.slice(0, -1), url.hostname, ...filename_parts)
             let fullpath = path.join(my_temp_cave, url_to_path)
             let folder = path.dirname(fullpath)
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index acb767e494..7fa00c51c2 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -369,7 +369,7 @@ function http_router_for(session::ServerSession)
     
     function serve_asset(request::HTTP.Request)
         uri = HTTP.URI(request.target)
-        filepath = project_relative_path(frontend_directory(), relpath(uri.path, "/"))
+        filepath = project_relative_path(frontend_directory(), relpath(HTTP.unescapeuri(uri.path), "/"))
         asset_response(filepath; cacheable=should_cache(filepath))
     end
     HTTP.register!(router, "GET", "/**", serve_asset)

From 41f9cfbb4d75c16ce662d14c1bac61192b0f71f4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 20 Sep 2022 14:21:00 +0200
Subject: [PATCH 421/821] tweak test

i forgot why i did this yesterday
---
 test/Analysis.jl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/Analysis.jl b/test/Analysis.jl
index e45bf13023..1c1efa9d68 100644
--- a/test/Analysis.jl
+++ b/test/Analysis.jl
@@ -124,6 +124,7 @@ import Pluto: Notebook, Cell, updated_topology, static_resolve_topology, is_just
             codes=topo_3.codes, 
             unresolved_cells=setdiff(topo_3.unresolved_cells, notebook.cells[4:4]),
             cell_order=topo_3.cell_order,
+			disabled_cells=topo_3.disabled_cells,
         )
         
         @test topo_3_resolved === updated_topology(topo_3_resolved, notebook, notebook.cells[1:3])

From 10ad307bba97c4ead8cfb17f6b5089fb098690b4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 20 Sep 2022 15:47:57 +0200
Subject: [PATCH 422/821] Use HTTP.setheader instead of push!(response.headers

---
 src/webserver/Static.jl | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index 7fa00c51c2..0a3e00863e 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -53,10 +53,10 @@ function asset_response(path; cacheable::Bool=false)
     if isfile(path)
         data = read(path)
         response = HTTP.Response(200, data)
-        push!(response.headers, "Content-Type" => MIMEs.contenttype_from_mime(MIMEs.mime_from_path(path, MIME"application/octet-stream"())))
-        push!(response.headers, "Content-Length" => string(length(data)))
-        push!(response.headers, "Access-Control-Allow-Origin" => "*")
-        cacheable && push!(response.headers, "Cache-Control" => "public, max-age=$(30day), immutable")
+        HTTP.setheader(response, "Content-Type" => MIMEs.contenttype_from_mime(MIMEs.mime_from_path(path, MIME"application/octet-stream"())))
+        HTTP.setheader(response, "Content-Length" => string(length(data)))
+        HTTP.setheader(response, "Access-Control-Allow-Origin" => "*")
+        cacheable && HTTP.setheader(response, "Cache-Control" => "public, max-age=$(30day), immutable")
         response
     else
         default_404()
@@ -76,14 +76,14 @@ function error_response(
         "\$BODY" => htmlesc(body))
 
     response = HTTP.Response(status_code, filled_in)
-    push!(response.headers, "Content-Type" => MIMEs.contenttype_from_mime(MIME"text/html"()))
+    HTTP.setheader(response, "Content-Type" => MIMEs.contenttype_from_mime(MIME"text/html"()))
     response
 end
 
 function notebook_response(notebook; home_url="./", as_redirect=true)
     if as_redirect
         response = HTTP.Response(302, "")
-        push!(response.headers, "Location" => home_url * "edit?id=" * string(notebook.notebook_id))
+        HTTP.setheader(response, "Location" => home_url * "edit?id=" * string(notebook.notebook_id))
         return response
     else
         HTTP.Response(200, string(notebook.notebook_id))
@@ -147,7 +147,7 @@ function http_router_for(session::ServerSession)
     security = session.options.security
 
     function add_set_secret_cookie!(response::HTTP.Response)
-        push!(response.headers, "Set-Cookie" => "secret=$(session.secret); SameSite=Strict; HttpOnly")
+        HTTP.setheader(response, "Set-Cookie" => "secret=$(session.secret); SameSite=Strict; HttpOnly")
         response
     end
 
@@ -166,7 +166,7 @@ function http_router_for(session::ServerSession)
                 add_set_secret_cookie!(response)
                 if !required
                     filter!(p -> p[1] != "Access-Control-Allow-Origin", response.headers)
-                    push!(response.headers, "Access-Control-Allow-Origin" => "*")
+                    HTTP.setheader(response, "Access-Control-Allow-Origin" => "*")
                 end
                 response
             else
@@ -305,8 +305,8 @@ function http_router_for(session::ServerSession)
         try
             notebook = notebook_from_uri(request)
             response = HTTP.Response(200, sprint(save_notebook, notebook))
-            push!(response.headers, "Content-Type" => "text/julia; charset=utf-8")
-            push!(response.headers, "Content-Disposition" => "inline; filename=\"$(basename(notebook.path))\"")
+            HTTP.setheader(response, "Content-Type" => "text/julia; charset=utf-8")
+            HTTP.setheader(response, "Content-Disposition" => "inline; filename=\"$(basename(notebook.path))\"")
             response
         catch e
             return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
@@ -321,8 +321,8 @@ function http_router_for(session::ServerSession)
         try
             notebook = notebook_from_uri(request)
             response = HTTP.Response(200, Pluto.pack(Pluto.notebook_to_js(notebook)))
-            push!(response.headers, "Content-Type" => "application/octet-stream")
-            push!(response.headers, "Content-Disposition" => "inline; filename=\"$(without_pluto_file_extension(basename(notebook.path))).plutostate\"")
+            HTTP.setheader(response, "Content-Type" => "application/octet-stream")
+            HTTP.setheader(response, "Content-Disposition" => "inline; filename=\"$(without_pluto_file_extension(basename(notebook.path))).plutostate\"")
             response
         catch e
             return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
@@ -337,8 +337,8 @@ function http_router_for(session::ServerSession)
         try
             notebook = notebook_from_uri(request)
             response = HTTP.Response(200, generate_html(notebook))
-            push!(response.headers, "Content-Type" => "text/html; charset=utf-8")
-            push!(response.headers, "Content-Disposition" => "inline; filename=\"$(basename(notebook.path)).html\"")
+            HTTP.setheader(response, "Content-Type" => "text/html; charset=utf-8")
+            HTTP.setheader(response, "Content-Disposition" => "inline; filename=\"$(basename(notebook.path)).html\"")
             response
         catch e
             return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))

From bea076825a60a862e9b183d5f1bf624796eee1f0 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 20 Sep 2022 16:39:55 +0200
Subject: [PATCH 423/821] Show loading screen on main menu when navigating away
 (#2292)

---
 frontend/components/welcome/Open.js    |  7 +--
 frontend/components/welcome/Recent.js  | 11 +++--
 frontend/components/welcome/Welcome.js | 64 +++++++++++++++++---------
 frontend/index.css                     | 14 ++++++
 frontend/index.js                      |  1 +
 5 files changed, 69 insertions(+), 28 deletions(-)

diff --git a/frontend/components/welcome/Open.js b/frontend/components/welcome/Open.js
index 3c513fd90a..018defd6fd 100644
--- a/frontend/components/welcome/Open.js
+++ b/frontend/components/welcome/Open.js
@@ -11,17 +11,18 @@ import { guess_notebook_location } from "../../common/NotebookLocationFromURL.js
  *  connected: Boolean,
  *  show_samples: Boolean,
  *  CustomPicker: {text: String, placeholder: String}?,
+ *  on_start_navigation: (string) => void,
  * }} props
  */
-export const Open = ({ client, connected, CustomPicker, show_samples }) => {
+export const Open = ({ client, connected, CustomPicker, show_samples, on_start_navigation }) => {
     const on_open_path = async (new_path) => {
         const processed = await guess_notebook_location(new_path)
         if (processed.type === "path") {
-            document.body.classList.add("loading")
+            on_start_navigation(processed.path_or_url)
             window.location.href = link_open_path(processed.path_or_url)
         } else {
             if (confirm("Are you sure? This will download and run the file at\n\n" + processed.path_or_url)) {
-                document.body.classList.add("loading")
+                on_start_navigation(processed.path_or_url)
                 window.location.href = link_open_url(processed.path_or_url)
             }
         }
diff --git a/frontend/components/welcome/Recent.js b/frontend/components/welcome/Recent.js
index 815987456e..ac81a507c6 100644
--- a/frontend/components/welcome/Recent.js
+++ b/frontend/components/welcome/Recent.js
@@ -48,9 +48,10 @@ const shortest_path = (path, allpaths) => {
  *  connected: Boolean,
  *  remote_notebooks: Array<import("./Welcome.js").NotebookListEntry>,
  *  CustomRecent: preact.ReactElement?,
+ *  on_start_navigation: (string) => void,
  * }} props
  */
-export const Recent = ({ client, connected, remote_notebooks, CustomRecent }) => {
+export const Recent = ({ client, connected, remote_notebooks, CustomRecent, on_start_navigation }) => {
     const [combined_notebooks, set_combined_notebooks] = useState(/** @type {Array<CombinedNotebook>?} */ (null))
     const combined_notebooks_ref = useRef(combined_notebooks)
     combined_notebooks_ref.current = combined_notebooks
@@ -188,7 +189,7 @@ export const Recent = ({ client, connected, remote_notebooks, CustomRecent }) =>
                           title=${nb.path}
                           onClick=${(e) => {
                               if (!running) {
-                                  document.body.classList.add("loading")
+                                  on_start_navigation(shortest_path(nb.path, all_paths))
                                   set_notebook_state(nb.path, {
                                       transitioning: true,
                                   })
@@ -204,7 +205,11 @@ export const Recent = ({ client, connected, remote_notebooks, CustomRecent }) =>
             <h2>My work</h2>
             <ul id="recent" class="show-scrollbar">
                 <li class="new">
-                    <a href="new"
+                    <a
+                        href="new"
+                        onClick=${(e) => {
+                            on_start_navigation("new notebook")
+                        }}
                         ><button><span class="ionicon"></span></button>Create a <strong>new notebook</strong></a
                     >
                 </li>
diff --git a/frontend/components/welcome/Welcome.js b/frontend/components/welcome/Welcome.js
index 2b58bc3177..f8b49a617c 100644
--- a/frontend/components/welcome/Welcome.js
+++ b/frontend/components/welcome/Welcome.js
@@ -1,5 +1,5 @@
 import _ from "../../imports/lodash.js"
-import { html, useEffect, useState, useRef } from "../../imports/Preact.js"
+import { html, useEffect, useState, useRef, useLayoutEffect } from "../../imports/Preact.js"
 import * as preact from "../../imports/Preact.js"
 
 import { create_pluto_connection } from "../../common/PlutoConnection.js"
@@ -75,27 +75,47 @@ export const Welcome = () => {
 
     const { show_samples, CustomRecent, CustomPicker } = extended_components
 
-    return html`
-        <section id="title">
-            <h1>welcome to <img src=${url_logo_big} /></h1>
-            <!-- <a id="github" href="https://github.com/fonsp/Pluto.jl"
+    const [navigating_away, set_navigation_away] = useState(/** @type {string?} */ (null))
+
+    useLayoutEffect(() => {
+        if (navigating_away != null) document.body.classList.add("loading")
+    }, [navigating_away])
+
+    return navigating_away != null
+        ? html`<div class="navigating-away-banner"><h2>Loading ${navigating_away}...</h2></div>`
+        : html`
+              <section id="title">
+                  <h1>welcome to <img src=${url_logo_big} /></h1>
+                  <!-- <a id="github" href="https://github.com/fonsp/Pluto.jl"
                 ><img src="https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/logo-github.svg"
             /></a> -->
-        </section>
-        <section id="mywork">
-            <div>
-                <${Recent} client=${client_ref.current} connected=${connected} remote_notebooks=${remote_notebooks} CustomRecent=${CustomRecent} />
-            </div>
-        </section>
-        <section id="open">
-            <div>
-                <${Open} client=${client_ref.current} connected=${connected} CustomPicker=${CustomPicker} show_samples=${show_samples} />
-            </div>
-        </section>
-        <section id="featured">
-            <div>
-                <${Featured} />
-            </div>
-        </section>
-    `
+              </section>
+              <section id="mywork">
+                  <div>
+                      <${Recent}
+                          client=${client_ref.current}
+                          connected=${connected}
+                          remote_notebooks=${remote_notebooks}
+                          CustomRecent=${CustomRecent}
+                          on_start_navigation=${set_navigation_away}
+                      />
+                  </div>
+              </section>
+              <section id="open">
+                  <div>
+                      <${Open}
+                          client=${client_ref.current}
+                          connected=${connected}
+                          CustomPicker=${CustomPicker}
+                          show_samples=${show_samples}
+                          on_start_navigation=${set_navigation_away}
+                      />
+                  </div>
+              </section>
+              <section id="featured">
+                  <div>
+                      <${Featured} />
+                  </div>
+              </section>
+          `
 }
diff --git a/frontend/index.css b/frontend/index.css
index da21f1be91..65cd31760a 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -422,3 +422,17 @@ featured-card.special::before {
     /* border: 2px solid #ffca62; */
     pointer-events: none;
 }
+
+.navigating-away-banner {
+    width: 100vw;
+    min-height: 70vh;
+    place-content: center;
+    display: grid;
+    padding: 3em;
+}
+
+.navigating-away-banner h2 {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
diff --git a/frontend/index.js b/frontend/index.js
index 4ba142026d..bffd178ba6 100644
--- a/frontend/index.js
+++ b/frontend/index.js
@@ -3,4 +3,5 @@ import "./common/NodejsCompatibilityPolyfill.js"
 
 import { Welcome } from "./components/welcome/Welcome.js"
 
+// @ts-ignore
 render(html`<${Welcome} />`, document.querySelector("#app"))

From 22045d21f88a90ea3c9ea606b6e6630b5bec81e5 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 21 Sep 2022 14:54:51 +0200
Subject: [PATCH 424/821] Workaround Ctrl+C on Julia 1.8 (#2293)

---
 src/webserver/SessionActions.jl |  4 ++--
 src/webserver/WebServer.jl      | 24 +++++++++++++-----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 1904c63017..e1288a75ef 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -103,12 +103,11 @@ function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
             
             @info "Updating from file..."
             
-            
             sleep(0.1) ## There seems to be a synchronization issue if your OS is VERYFAST
             wait_until_file_unchanged(nb.path, .3)
             
             # call update_from_file. If it returns false, that means that the notebook file was corrupt, so we try again, a maximum of 10 times.
-            for i in 1:10
+            for _ in 1:10
                 if update_from_file(session, nb)
                     break
                 end
@@ -122,6 +121,7 @@ function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
     end
 
     in_session() = get(session.notebooks, nb.notebook_id, nothing) === nb
+    
     session.options.server.auto_reload_from_file && @asynclog try
         while in_session()
             if !isfile(nb.path)
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 7f2a04640e..f8ea1b18fd 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -146,7 +146,7 @@ function run(session::ServerSession)
 
     on_shutdown() = @sync begin
         # Triggered by HTTP.jl
-        @info("\n\nClosing Pluto... Restart Julia for a fresh session. \n\nHave a nice day! 🎈\n\n")
+        @info("\nClosing Pluto... Restart Julia for a fresh session. \n\nHave a nice day! 🎈\n\n")
         # TODO: put do_work tokens back 
         @async swallow_exception(() -> close(serversocket), Base.IOError)
         for client in values(session.connected_clients)
@@ -293,7 +293,7 @@ function run(session::ServerSession)
     end
 
     # Start this in the background, so that the first notebook launch (which will trigger registry update) will be faster
-    @asynclog withtoken(pkg_token) do
+    initial_registry_update_task = @asynclog withtoken(pkg_token) do
         will_update = !PkgCompat.check_registry_age()
         PkgCompat.update_registries(; force = false)
         will_update && println("    Updating registry done ✓")
@@ -301,17 +301,19 @@ function run(session::ServerSession)
 
     try
         # create blocking call and switch the scheduler back to the server task, so that interrupts land there
-        wait(server)
-    catch e
-        if e isa InterruptException
-            close(server)
-        elseif e isa TaskFailedException
-            @debug "Error is " exception = e stacktrace = catch_backtrace()
-            # nice!
-        else
-            rethrow(e)
+        while isopen(server)
+            sleep(.1)
         end
+    catch e
+        println()
+        println()
+        close(server)
+        wait(server)
+        wait(initial_registry_update_task)
+        (e isa InterruptException) || rethrow(e)
     end
+    
+    nothing
 end
 precompile(run, (ServerSession, HTTP.Handlers.Router{Symbol("##001")}))
 

From 3f2aa4b8a0a36fa8aa2de67a006cf3bb7a06cdad Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 21 Sep 2022 15:03:25 +0200
Subject: [PATCH 425/821] Fix auto scrolling during multi cell selection

---
 frontend/components/SelectionArea.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/SelectionArea.js b/frontend/components/SelectionArea.js
index 6a0f514c7c..7f145bb7dd 100644
--- a/frontend/components/SelectionArea.js
+++ b/frontend/components/SelectionArea.js
@@ -124,7 +124,7 @@ export const SelectionArea = ({ on_selection, set_scroller, cell_order }) => {
                 return A.start_left < B.end_left && A.end_left > B.start_left && A.start_top < B.end_top && A.end_top > B.start_top
             })
 
-            set_scroller({ up: selection.start.y > new_selection_end.y, down: selection.start.y < new_selection_end.y })
+            set_scroller({ up: true, down: true })
             on_selection(in_selection.map((x) => x.id))
             set_selection({ start: selection.start, end: new_selection_end })
         })

From a6279f3ce6041c782c42543ba88cb1b72879a3d7 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 21 Sep 2022 15:12:25 +0200
Subject: [PATCH 426/821] Fix #2271

---
 frontend/editor.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 95fbf24223..ace8f5e3ff 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1577,7 +1577,8 @@ pluto-input > button.input_context_menu ul {
         z-index: 31;
     }
     pluto-input > button.input_context_menu ul {
-        left: calc(100% - var(--width) - 36px);
+        right: 0px;
+        left: unset;
     }
 }
 .input_context_menu li {

From ea7ccff3f28ac79d13e77486eea4aa7f58562a39 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 21 Sep 2022 15:14:18 +0200
Subject: [PATCH 427/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 47ea4bcaf7..ca1a7306cc 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.11"
+version = "0.19.12"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 61b80d9d4068818c4521f77522eb72d3ddf1003b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 21 Sep 2022 15:27:15 +0200
Subject: [PATCH 428/821] =?UTF-8?q?=F0=9F=A7=B9=20remove=20fakeclient=20fr?=
 =?UTF-8?q?om=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/packages/Basic.jl | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index 4cbdb566d0..ca73ee615b 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -24,9 +24,7 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
 
     # We have our own registry for these test! Take a look at https://github.com/JuliaPluto/PlutoPkgTestRegistry#readme for more info about the test packages and their dependencies.
     @testset "Basic" begin
-        fakeclient = ClientSession(:fake, nothing)
         🍭 = ServerSession()
-        🍭.connected_clients[fakeclient.id] = fakeclient
 
         # See https://github.com/JuliaPluto/PlutoPkgTestRegistry
 
@@ -44,7 +42,6 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
             Cell("eval(:(import DataFrames))"),
             Cell("import HelloWorldC_jll"),
         ])
-        fakeclient.connected_notebook = notebook
 
         @test !notebook.nbpkg_ctx_instantiated
         
@@ -224,16 +221,13 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
     simple_import_notebook = read(simple_import_path, String)
 
     @testset "Manifest loading" begin
-        fakeclient = ClientSession(:fake, nothing)
         🍭 = ServerSession()
-        🍭.connected_clients[fakeclient.id] = fakeclient
 
         dir = mktempdir()
         path = joinpath(dir, "hello.jl")
         write(path, simple_import_notebook)
 
         notebook = SessionActions.open(🍭, path; run_async=false)
-        fakeclient.connected_notebook = notebook
         
         @test num_backups_in(dir) == 0
 
@@ -252,10 +246,7 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
 
 
     @testset "Pkg cell -- dynamically added" begin
-        fakeclient = ClientSession(:fake, nothing)
         🍭 = ServerSession()
-        🍭.connected_clients[fakeclient.id] = fakeclient
-
         
         notebook = Notebook([
             Cell("1"),
@@ -265,7 +256,6 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
             Cell("5"),
             Cell("6"),
         ])
-        fakeclient.connected_notebook = notebook
 
         update_save_run!(🍭, notebook, notebook.cells)
 
@@ -309,11 +299,8 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
     end
     
     pkg_cell_notebook = read(joinpath(@__DIR__, "pkg_cell.jl"), String)
-    
     @testset "Pkg cell -- loaded from file" begin
-        fakeclient = ClientSession(:fake, nothing)
         🍭 = ServerSession()
-        🍭.connected_clients[fakeclient.id] = fakeclient
 
         dir = mktempdir()
         for n in ["Project.toml", "Manifest.toml"]
@@ -326,7 +313,6 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
         @test num_backups_in(dir) == 0
 
         notebook = SessionActions.open(🍭, path; run_async=false)
-        fakeclient.connected_notebook = notebook
         nb_contents() = read(notebook.path, String)
         
         @test num_backups_in(dir) == 0
@@ -368,17 +354,14 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
     end
 
     @testset "DrWatson cell" begin
-        fakeclient = ClientSession(:fake, nothing)
         🍭 = ServerSession()            
         🍭.options.evaluation.workspace_use_distributed = false
-        🍭.connected_clients[fakeclient.id] = fakeclient
 
         notebook = Notebook([
             Cell("using Plots"),
             Cell("@quickactivate"),
             Cell("using DrWatson"),
         ])
-        fakeclient.connected_notebook = notebook
 
         notebook.topology = Pluto.updated_topology(Pluto.NotebookTopology(cell_order=Pluto.ImmutableVector(notebook.cells)), notebook, notebook.cells) |> Pluto.static_resolve_topology
 
@@ -392,13 +375,9 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
     end
 
     pre_pkg_notebook = read(joinpath(@__DIR__, "old_import.jl"), String)
-
     local post_pkg_notebook = nothing
-
     @testset "File format -- Backwards compat" begin
-        fakeclient = ClientSession(:fake, nothing)
         🍭 = ServerSession()
-        🍭.connected_clients[fakeclient.id] = fakeclient
 
         dir = mktempdir()
         path = joinpath(dir, "hello.jl")
@@ -407,7 +386,6 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
         @test num_backups_in(dir) == 0
 
         notebook = SessionActions.open(🍭, path; run_async=false)
-        fakeclient.connected_notebook = notebook
         nb_contents() = read(notebook.path, String)
         
         @test num_backups_in(dir) == 0
@@ -510,9 +488,7 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
             original_path = joinpath(@__DIR__, "$(name).jl")
             original_contents = read(original_path, String)
 
-            fakeclient = ClientSession(:fake, nothing)
             🍭 = ServerSession()
-            🍭.connected_clients[fakeclient.id] = fakeclient
     
             dir = mktempdir()
             path = joinpath(dir, "hello.jl")
@@ -521,7 +497,6 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
             @test num_backups_in(dir) == 0
     
             notebook = SessionActions.open(🍭, path; run_async=false)
-            fakeclient.connected_notebook = notebook
             nb_contents() = read(notebook.path, String)
 
             should_restart = (
@@ -606,9 +581,7 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
     # end
     
     @testset "Race conditions" begin
-        fakeclient = ClientSession(:fake, nothing)
         🍭 = ServerSession()
-        🍭.connected_clients[fakeclient.id] = fakeclient
         lag = 0.2
         🍭.options.server.simulated_pkg_lag = lag
 
@@ -626,7 +599,6 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
             Cell("import PlutoPkgTestE"), # cell 9
             Cell("PlutoPkgTestE.MY_VERSION |> Text"),
         ])
-        fakeclient.connected_notebook = notebook
 
         @test !notebook.nbpkg_ctx_instantiated
         

From 2750fa0500d5ea3649bda36e0f7a468730454429 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 21 Sep 2022 16:49:28 +0200
Subject: [PATCH 429/821] Recover gracefully from loading a notebook with
 non-existing versions (#2294)

---
 src/packages/Packages.jl                    | 12 ++-
 src/packages/PkgCompat.jl                   | 13 +++
 test/packages/Basic.jl                      | 25 ++++++
 test/packages/future_nonexisting_version.jl | 98 +++++++++++++++++++++
 4 files changed, 146 insertions(+), 2 deletions(-)
 create mode 100644 test/packages/future_nonexisting_version.jl

diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index bbd91b4762..c621924e6f 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -120,8 +120,16 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                                 Pkg.resolve(notebook.nbpkg_ctx)
                             catch e
                                 @warn "Failed to resolve Pkg environment. Removing Manifest and trying again..." exception=e
-                                reset_nbpkg(notebook, new_topology; keep_project=true, save=false, backup=false)
-                                Pkg.resolve(notebook.nbpkg_ctx)
+                                reset_nbpkg(notebook; keep_project=true, save=false, backup=false)
+                                try
+                                    Pkg.resolve(notebook.nbpkg_ctx)
+                                catch e
+                                    @warn "Failed to resolve Pkg environment. Removing Project compat entires and Manifest and trying again..." exception=e
+                                    reset_nbpkg(notebook; keep_project=true, save=false, backup=false)
+                                    notebook.nbpkg_ctx = PkgCompat.clear_compat_entries(notebook.nbpkg_ctx)
+                                    
+                                    Pkg.resolve(notebook.nbpkg_ctx)
+                                end
                             end
                         end
                     end
diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index 000cb3a8f6..b0766a641b 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -461,6 +461,19 @@ function write_auto_compat_entries(ctx::PkgContext)::PkgContext
 end
 
 
+# ✅ Public API
+"""
+Remove all [`compat`](https://pkgdocs.julialang.org/v1/compatibility/) entries from the `Project.toml`.
+"""
+function clear_compat_entries(ctx::PkgContext)::PkgContext
+	if isfile(project_file(ctx))
+		_modify_compat(empty!, ctx)
+	else
+		ctx
+	end
+end
+
+
 # ✅ Public API
 """
 Remove any automatically-generated [`compat`](https://pkgdocs.julialang.org/v1/compatibility/) entries from the `Project.toml`. This will undo the effects of [`write_auto_compat_entries`](@ref) but leave other (e.g. manual) compat entries intact. Return the new `PkgContext`.
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index ca73ee615b..f64466899f 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -243,6 +243,31 @@ const pluto_test_registry_spec = Pkg.RegistrySpec(;
 
         WorkspaceManager.unmake_workspace((🍭, notebook))
     end
+    
+    future_notebook = read(joinpath(@__DIR__, "future_nonexisting_version.jl"), String)
+    @testset "Recovery from unavailable versions" begin
+        🍭 = ServerSession()
+
+        dir = mktempdir()
+        path = joinpath(dir, "hello.jl")
+        write(path, future_notebook)
+
+        notebook = SessionActions.open(🍭, path; run_async=false)
+        
+        @test num_backups_in(dir) == 0
+
+
+        @test notebook.nbpkg_ctx !== nothing
+        @test notebook.nbpkg_restart_recommended_msg === nothing
+        @test notebook.nbpkg_restart_required_msg === nothing
+
+        @test noerror(notebook.cells[1])
+        @test noerror(notebook.cells[2])
+
+        @test notebook.cells[2].output.body == "0.3.1"
+
+        WorkspaceManager.unmake_workspace((🍭, notebook))
+    end
 
 
     @testset "Pkg cell -- dynamically added" begin
diff --git a/test/packages/future_nonexisting_version.jl b/test/packages/future_nonexisting_version.jl
new file mode 100644
index 0000000000..8b2093e210
--- /dev/null
+++ b/test/packages/future_nonexisting_version.jl
@@ -0,0 +1,98 @@
+### A Pluto.jl notebook ###
+# v0.15.0
+
+using Markdown
+using InteractiveUtils
+
+# ╔═╡ c581d17a-c965-11eb-1607-bbeb44933d25
+# This file imports a future version of PlutoPkgTestA: 99.99.99, which does not actually exist.
+
+# It is generated by modifying the simple_import.jl file by hand.
+
+import PlutoPkgTestA
+
+# ╔═╡ aef57966-ea36-478f-8724-e71430f10be9
+PlutoPkgTestA.MY_VERSION |> Text
+
+# ╔═╡ 00000000-0000-0000-0000-000000000001
+PLUTO_PROJECT_TOML_CONTENTS = """
+[deps]
+PlutoPkgTestA = "419c6f8d-b8cd-4309-abdc-cee491252f94"
+
+[compat]
+PlutoPkgTestA = "~99.99.99"
+"""
+
+# ╔═╡ 00000000-0000-0000-0000-000000000002
+PLUTO_MANIFEST_TOML_CONTENTS = """
+# This file is machine-generated - editing it directly is not advised
+
+[[Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+
+[[Dates]]
+deps = ["Printf"]
+uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
+
+[[InteractiveUtils]]
+deps = ["Markdown"]
+uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+
+[[LibGit2]]
+deps = ["Printf"]
+uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
+
+[[Libdl]]
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
+[[Logging]]
+uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
+
+[[Markdown]]
+deps = ["Base64"]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+
+[[Pkg]]
+deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
+uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+
+[[PlutoPkgTestA]]
+deps = ["Pkg"]
+git-tree-sha1 = "6c9aa67135641123c559d59ba88e8cb938999999"
+uuid = "419c6f8d-b8cd-4309-abdc-cee491252f94"
+version = "99.99.99"
+
+[[Printf]]
+deps = ["Unicode"]
+uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[[REPL]]
+deps = ["InteractiveUtils", "Markdown", "Sockets"]
+uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+
+[[Random]]
+deps = ["Serialization"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+
+[[Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[Sockets]]
+uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
+
+[[UUIDs]]
+deps = ["Random", "SHA"]
+uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
+[[Unicode]]
+uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
+"""
+
+# ╔═╡ Cell order:
+# ╠═c581d17a-c965-11eb-1607-bbeb44933d25
+# ╠═aef57966-ea36-478f-8724-e71430f10be9
+# ╟─00000000-0000-0000-0000-000000000001
+# ╟─00000000-0000-0000-0000-000000000002

From 289c1d61022dd218af8e90d58e8967b44b101aee Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 21 Sep 2022 16:49:40 +0200
Subject: [PATCH 430/821] Compare metadata when reloading from file (#2291)

---
 src/evaluation/Run.jl  | 33 ++++++++++++--------------
 src/notebook/Cell.jl   |  5 ++++
 test/ReloadFromFile.jl | 54 +++++++++++++++++++++++++++++++++++++++---
 3 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index b3b878c06b..2d79cc6460 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -398,22 +398,18 @@ update_save_run!(session::ServerSession, notebook::Notebook, cell::Cell; kwargs.
 update_run!(args...; kwargs...) = update_save_run!(args...; save=false, kwargs...)
 
 function notebook_differences(from::Notebook, to::Notebook)
-	old_codes = Dict(
-		id => c.code
-		for (id,c) in from.cells_dict
-	)
-	new_codes = Dict(
-		id => c.code
-		for (id,c) in to.cells_dict
-	)
+	from_cells = from.cells_dict
+	to_cells = to.cells_dict
 
 	(
 		# it's like D3 joins: https://observablehq.com/@d3/learn-d3-joins#cell-528
-		added = setdiff(keys(new_codes), keys(old_codes)),
-		removed = setdiff(keys(old_codes), keys(new_codes)),
+		added = setdiff(keys(to_cells), keys(from_cells)),
+		removed = setdiff(keys(from_cells), keys(to_cells)),
 		changed = let
-			remained = keys(old_codes) ∩ keys(new_codes)
-			filter(id -> old_codes[id] != new_codes[id], remained)
+			remained = keys(from_cells) ∩ keys(to_cells)
+			filter(remained) do id
+				from_cells[id].code != to_cells[id].code || from_cells[id].metadata != to_cells[id].metadata
+			end
 		end,
 		
 		order_changed = from.cell_order != to.cell_order,
@@ -438,11 +434,6 @@ function update_from_file(session::ServerSession, notebook::Notebook; kwargs...)
 		return false
 	end::Notebook
 	
-	new_codes = Dict(
-		id => c.code
-		for (id,c) in just_loaded.cells_dict
-	)
-
 	d = notebook_differences(notebook, just_loaded)
 	
 	added = d.added
@@ -469,10 +460,16 @@ function update_from_file(session::ServerSession, notebook::Notebook; kwargs...)
 		delete!(notebook.cells_dict, c)
 	end
 	for c in changed
-		notebook.cells_dict[c].code = new_codes[c]
+		notebook.cells_dict[c].code = just_loaded.cells_dict[c].code
+		notebook.cells_dict[c].metadata = just_loaded.cells_dict[c].metadata
 	end
 
+	for c in keys(notebook.cells_dict) ∩ keys(just_loaded.cells_dict)
+		notebook.cells_dict[c].code_folded = just_loaded.cells_dict[c].code_folded
+	end
+	
 	notebook.cell_order = just_loaded.cell_order
+	notebook.metadata = just_loaded.metadata
 	
 	if include_nbpg && nbpkg_changed
 		@info "nbpkgs not equal" (notebook.nbpkg_ctx isa Nothing) (just_loaded.nbpkg_ctx isa Nothing)
diff --git a/src/notebook/Cell.jl b/src/notebook/Cell.jl
index e90b4194d3..ef8313c28b 100644
--- a/src/notebook/Cell.jl
+++ b/src/notebook/Cell.jl
@@ -81,6 +81,11 @@ end
 
 "Returns whether or not the cell is **explicitely** disabled."
 is_disabled(c::Cell) = get(c.metadata, METADATA_DISABLED_KEY, DEFAULT_CELL_METADATA[METADATA_DISABLED_KEY])
+set_disabled(c::Cell, value::Bool) = if value == DEFAULT_CELL_METADATA[METADATA_DISABLED_KEY]
+    delete!(c.metadata, METADATA_DISABLED_KEY)
+else
+    c.metadata[METADATA_DISABLED_KEY] = value
+end
 can_show_logs(c::Cell) = get(c.metadata, METADATA_SHOW_LOGS_KEY, DEFAULT_CELL_METADATA[METADATA_SHOW_LOGS_KEY])
 is_skipped_as_script(c::Cell) = get(c.metadata, METADATA_SKIP_AS_SCRIPT_KEY, DEFAULT_CELL_METADATA[METADATA_SKIP_AS_SCRIPT_KEY])
 must_be_commented_in_file(c::Cell) = is_disabled(c) || is_skipped_as_script(c) || c.depends_on_disabled_cells || c.depends_on_skipped_cells
\ No newline at end of file
diff --git a/test/ReloadFromFile.jl b/test/ReloadFromFile.jl
index a6a5eadbb6..2ebc96f047 100644
--- a/test/ReloadFromFile.jl
+++ b/test/ReloadFromFile.jl
@@ -1,5 +1,5 @@
 using Test
-import Pluto: Configuration, Notebook, ServerSession, ClientSession, update_run!, Cell, WorkspaceManager, SessionActions
+import Pluto: Configuration, Notebook, ServerSession, ClientSession, update_run!, Cell, WorkspaceManager, SessionActions, save_notebook
 import Pluto.Configuration: Options, EvaluationOptions
 import Distributed
 using Pluto.WorkspaceManager: poll
@@ -85,14 +85,62 @@ import Pkg
     # notebook order reversed again, but cell should not re-run
     @test original_rand_output == notebook.cells[3].output.body
 
-
+    
+        
     ###
     sleep(timeout_between_tests)
     
-    file4 = read(joinpath(@__DIR__, "packages", "simple_stdlib_import.jl"), String)
+    file4 = read(notebook.path, String)
+    notebook.cells[3].code_folded = true
+    save_notebook(notebook)
+    sleep(timeout_between_tests)
+    
+    file5 = read(notebook.path, String)
+    @test file4 != file5
+    
+    @test notebook.cells[3].code_folded
     write(notebook.path, file4)
     
     
+    @test poll(10) do
+        notebook.cells[3].code_folded == false
+    end
+    
+    # cell folded, but cell should not re-run
+    @test original_rand_output == notebook.cells[3].output.body
+
+    
+        
+    ###
+    sleep(timeout_between_tests)
+    
+    
+    file6 = read(notebook.path, String)
+    Pluto.set_disabled(notebook.cells[3], true)
+    save_notebook(notebook)
+    sleep(timeout_between_tests)
+    
+    file7 = read(notebook.path, String)
+    @test file6 != file7
+    @test Pluto.is_disabled(notebook.cells[3])
+    
+    write(notebook.path, file6)
+    @test poll(10) do
+        !Pluto.is_disabled(notebook.cells[3])
+    end
+    
+    # cell disabled and re-enabled, so it should re-run
+    @test original_rand_output != notebook.cells[3].output.body
+
+    
+
+    ###
+    sleep(timeout_between_tests)
+    
+    file8 = read(joinpath(@__DIR__, "packages", "simple_stdlib_import.jl"), String)
+    write(notebook.path, file8)
+    
+    
     @test poll(10) do
         notebook.cells[2].output.body == "false"
     end

From c7792dd43a9cd7ea3fd1f204fe83eebf01d4d771 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 21 Sep 2022 17:21:42 +0200
Subject: [PATCH 431/821] hide pkg update button when not connected

---
 frontend/components/Editor.js |  5 ++++-
 frontend/components/Popup.js  | 14 ++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index be9cd28a97..2394272b7f 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1519,7 +1519,10 @@ patch: ${JSON.stringify(
                         on_update_doc_query=${this.actions.set_doc_query}
                         notebook=${this.state.notebook}
                     />
-                    <${Popup} notebook=${this.state.notebook}/>
+                    <${Popup} 
+                        notebook=${this.state.notebook}
+                        disable_input=${this.state.disable_ui || !this.state.connected /* && this.state.backend_launch_phase == null*/}
+                    />
                     <${UndoDelete}
                         recently_deleted=${this.state.recently_deleted}
                         on_click=${() => {
diff --git a/frontend/components/Popup.js b/frontend/components/Popup.js
index e33e128ffb..8e7a59e533 100644
--- a/frontend/components/Popup.js
+++ b/frontend/components/Popup.js
@@ -39,7 +39,7 @@ export const open_pluto_popup = (/** @type{PkgPopupDetails | MiscPopupDetails} *
     )
 }
 
-export const Popup = ({ notebook }) => {
+export const Popup = ({ notebook, disable_input }) => {
     const [recent_event, set_recent_event] = useState(/** @type{(PkgPopupDetails | MiscPopupDetails)?} */ (null))
     const recent_source_element_ref = useRef(/** @type{HTMLElement?} */ (null))
     const pos_ref = useRef("")
@@ -94,7 +94,12 @@ export const Popup = ({ notebook }) => {
         style="${pos_ref.current}"
     >
         ${type === "nbpkg"
-            ? html`<${PkgPopup} notebook=${notebook} recent_event=${recent_event} clear_recent_event=${() => set_recent_event(null)} />`
+            ? html`<${PkgPopup}
+                  notebook=${notebook}
+                  disable_input=${disable_input}
+                  recent_event=${recent_event}
+                  clear_recent_event=${() => set_recent_event(null)}
+              />`
             : type === "info"
             ? html`<div>${recent_event?.body}</div>`
             : null}
@@ -106,9 +111,10 @@ export const Popup = ({ notebook }) => {
  * notebook: import("./Editor.js").NotebookData,
  * recent_event: PkgPopupDetails,
  * clear_recent_event: () => void,
+ * disable_input: boolean,
  * }} props
  */
-const PkgPopup = ({ notebook, recent_event, clear_recent_event }) => {
+const PkgPopup = ({ notebook, recent_event, clear_recent_event, disable_input }) => {
     let pluto_actions = useContext(PlutoActionsContext)
     const [pkg_status, set_pkg_status] = useState(/** @type{import("./PkgStatusMark.js").PackageStatus?} */ (null))
 
@@ -171,7 +177,7 @@ const PkgPopup = ({ notebook, recent_event, clear_recent_event }) => {
                 class="pkg-update"
                 target="_blank"
                 title="Update packages"
-                style=${(!!showupdate ? "" : "opacity: .4;") + (recent_event?.is_disable_pkg ? "display: none;" : "")}
+                style=${(!!showupdate ? "" : "opacity: .4;") + (recent_event?.is_disable_pkg || disable_input ? "display: none;" : "")}
                 href="#"
                 onClick=${(e) => {
                     if (busy) {

From ae47b70c9cc8d1da60cab5bd682ce7928bfb2e99 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 21 Sep 2022 17:21:46 +0200
Subject: [PATCH 432/821] Update featured_sources.js

---
 frontend/featured_sources.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/featured_sources.js b/frontend/featured_sources.js
index 4af889fd10..15976c33d4 100644
--- a/frontend/featured_sources.js
+++ b/frontend/featured_sources.js
@@ -2,8 +2,8 @@ export default {
     // check out https://github.com/JuliaPluto/pluto-developer-instructions/blob/main/How%20to%20update%20the%20featured%20notebooks.md to learn more
     sources: [
         {
-            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@b31a1701ebe14b3cc9cc8a06849153161e6f6972/pluto_export.json",
-            integrity: "sha256-JHf0MqoVjk8ISe2GJ9qBC3gj/3I86SiZbgp07eJYZD4=",
+            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@6828b12/pluto_export.json",
+            integrity: "sha256-RKFITj6QfwcuqpQE3nhVyhNO5REaCuo84HQulf32l7A=",
         },
     ],
 }

From b9158e0bd84e3394829ae3391decddd9f0fe5be9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 21 Sep 2022 22:02:44 +0200
Subject: [PATCH 433/821] whitespace

from #2249

Co-Authored-By: Paul Berg <9824244+Pangoraw@users.noreply.github.com>
---
 src/evaluation/WorkspaceManager.jl | 124 ++++++++++++++---------------
 src/runner/PlutoRunner.jl          |  16 ++--
 2 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index e972505e54..e34d82df87 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -48,7 +48,7 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
 
     pid = if use_distributed
         @debug "Creating workspace process" notebook.path length(notebook.cells)
-        create_workspaceprocess(;compiler_options=_merge_notebook_compiler_options(notebook, session.options.compiler))
+        create_workspaceprocess(; compiler_options=_merge_notebook_compiler_options(notebook, session.options.compiler))
     else
         pid = Distributed.myid()
         if !(isdefined(Main, :PlutoRunner) && Main.PlutoRunner isa Module)
@@ -61,7 +61,7 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
     end
 
     Distributed.remotecall_eval(Main, [pid], :(PlutoRunner.notebook_id[] = $(notebook.notebook_id)))
-    
+
     remote_log_channel = Core.eval(Main, quote
         $(Distributed).RemoteChannel(() -> eval(quote
         
@@ -75,18 +75,18 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
             channel
         end), $pid)
     end)
-    
+
     run_channel = Core.eval(Main, quote
         $(Distributed).RemoteChannel(() -> eval(:(Main.PlutoRunner.run_channel)), $pid)
     end)
     module_name = create_emptyworkspacemodule(pid)
-    
+
     original_LOAD_PATH, original_ACTIVE_PROJECT = Distributed.remotecall_eval(Main, pid, :(Base.LOAD_PATH, Base.ACTIVE_PROJECT[]))
-    
+
     workspace = Workspace(;
         pid,
         notebook_id=notebook.notebook_id,
-        remote_log_channel, 
+        remote_log_channel,
         module_name,
         original_LOAD_PATH,
         original_ACTIVE_PROJECT,
@@ -109,17 +109,17 @@ function use_nbpkg_environment((session, notebook)::SN, workspace=nothing)
     if workspace.nbpkg_was_active == enabled
         return
     end
-    
+
     workspace = workspace !== nothing ? workspace : get_workspace((session, notebook))
     if workspace.discarded
         return
     end
-    
+
     workspace.nbpkg_was_active = enabled
     if workspace.pid != Distributed.myid()
         new_LP = enabled ? ["@", "@stdlib"] : workspace.original_LOAD_PATH
         new_AP = enabled ? PkgCompat.env_dir(notebook.nbpkg_ctx) : workspace.original_ACTIVE_PROJECT
-        
+
         Distributed.remotecall_eval(Main, [workspace.pid], quote
             copy!(LOAD_PATH, $(new_LP))
             Base.ACTIVE_PROJECT[] = $(new_AP)
@@ -146,10 +146,10 @@ function start_relaying_self_updates((session, notebook)::SN, run_channel::Distr
 end
 
 function start_relaying_logs((session, notebook)::SN, log_channel::Distributed.RemoteChannel)
-    update_throttled, flush_throttled = Pluto.throttled(0.1) do 
+    update_throttled, flush_throttled = Pluto.throttled(0.1) do
         Pluto.send_notebook_changes!(Pluto.ClientRequest(session=session, notebook=notebook))
     end
-    
+
     while true
         try
             next_log::Dict{String,Any} = take!(log_channel)
@@ -164,32 +164,32 @@ function start_relaying_logs((session, notebook)::SN, log_channel::Distributed.R
             begin
                 source_cell_id = if match !== nothing
                     # the log originated from within the notebook
-                    
+
                     UUID(fn[match[end]+1:end])
                 else
                     # the log originated from a function call defined outside of the notebook
-                    
+
                     # we will show the log at the currently running cell, at "line -1", i.e. without line info.
                     next_log["line"] = -1
                     running_cell_id
                 end
-                
+
                 if running_cell_id != source_cell_id
                     # the log originated from a function in another cell of the notebook
                     # we will show the log at the currently running cell, at "line -1", i.e. without line info.
                     next_log["line"] = -1
                 end
             end
-            
+
             source_cell = get(notebook.cells_dict, source_cell_id, nothing)
             running_cell = get(notebook.cells_dict, running_cell_id, nothing)
-            
+
             display_cell = if running_cell === nothing || (source_cell !== nothing && source_cell.output.has_pluto_hook_features)
                 source_cell
             else
                 running_cell
             end
-            
+
             @assert !isnothing(display_cell)
 
             maybe_max_log = findfirst(((key, _),) -> key == "maxlog", next_log["kwargs"])
@@ -257,7 +257,7 @@ const Distributed_expr = :(
 # NOTE: this function only start a worker process using given
 # compiler options, it does not resolve paths for notebooks
 # compiler configurations passed to it should be resolved before this
-function create_workspaceprocess(;compiler_options=CompilerOptions())::Integer
+function create_workspaceprocess(; compiler_options=CompilerOptions())::Integer
     # run on proc 1 in case Pluto is being used inside a notebook process
     # Workaround for "only process 1 can add/remove workers"
     pid = Distributed.remotecall_eval(Main, 1, quote
@@ -288,15 +288,15 @@ function get_workspace(session_notebook::SN; allow_creation::Bool=true)::Union{N
         @debug "This should not happen" notebook.process_status
         error("Cannot run code in this notebook: it has already shut down.")
     end
-    
-    task = !allow_creation ? 
-        get(workspaces, notebook.notebook_id, nothing) :
-        get!(workspaces, notebook.notebook_id) do
-            Task(() -> make_workspace(session_notebook))
-        end
-    
+
+    task = !allow_creation ?
+           get(workspaces, notebook.notebook_id, nothing) :
+           get!(workspaces, notebook.notebook_id) do
+        Task(() -> make_workspace(session_notebook))
+    end
+
     isnothing(task) && return nothing
-    
+
     istaskstarted(task) || schedule(task)
     fetch(task)
 end
@@ -349,8 +349,8 @@ function distributed_exception_result(exs::CompositeException, workspace::Worksp
     ex = exs.exceptions |> first
 
     if ex isa Distributed.RemoteException &&
-        ex.pid == workspace.pid &&
-        ex.captured.ex isa InterruptException
+       ex.pid == workspace.pid &&
+       ex.captured.ex isa InterruptException
 
         (
             output_formatted=PlutoRunner.format_output(CapturedException(InterruptException(), [])),
@@ -390,19 +390,19 @@ end
 
 `expr` has to satisfy `ExpressionExplorer.is_toplevel_expr`."
 function eval_format_fetch_in_workspace(
-        session_notebook::Union{SN,Workspace},
-        expr::Expr,
-        cell_id::UUID;
-        ends_with_semicolon::Bool=false,
-        function_wrapped_info::Union{Nothing,Tuple}=nothing,
-        forced_expr_id::Union{PlutoRunner.ObjectID,Nothing}=nothing,
-        known_published_objects::Vector{String}=String[],
-        user_requested_run::Bool=true,
-        capture_stdout::Bool=true,
-    )::PlutoRunner.FormattedCellResult
+    session_notebook::Union{SN,Workspace},
+    expr::Expr,
+    cell_id::UUID;
+    ends_with_semicolon::Bool=false,
+    function_wrapped_info::Union{Nothing,Tuple}=nothing,
+    forced_expr_id::Union{PlutoRunner.ObjectID,Nothing}=nothing,
+    known_published_objects::Vector{String}=String[],
+    user_requested_run::Bool=true,
+    capture_stdout::Bool=true
+)::PlutoRunner.FormattedCellResult
 
     workspace = get_workspace(session_notebook)
-    
+
     is_on_this_process = workspace.pid == Distributed.myid()
 
     # if multiple notebooks run on the same process, then we need to `cd` between the different notebook paths
@@ -412,16 +412,16 @@ function eval_format_fetch_in_workspace(
         end
         use_nbpkg_environment(session_notebook, workspace)
     end
-    
+
     # run the code 🏃‍♀️
-    
+
     # a try block (on this process) to catch an InterruptException
     take!(workspace.dowork_token)
     early_result = try
         # we use [pid] instead of pid to prevent fetching output
         Distributed.remotecall_eval(Main, [workspace.pid], :(PlutoRunner.run_expression(
-            getfield(Main, $(QuoteNode(workspace.module_name))), 
-            $(QuoteNode(expr)), 
+            getfield(Main, $(QuoteNode(workspace.module_name))),
+            $(QuoteNode(expr)),
             $(workspace.notebook_id),
             $cell_id,
             $function_wrapped_info,
@@ -438,25 +438,25 @@ function eval_format_fetch_in_workspace(
     end
 
     early_result === nothing ?
-        format_fetch_in_workspace(workspace, cell_id, ends_with_semicolon, known_published_objects) :
-        early_result
+    format_fetch_in_workspace(workspace, cell_id, ends_with_semicolon, known_published_objects) :
+    early_result
 end
 
 "Evaluate expression inside the workspace - output is not fetched, errors are rethrown. For internal use."
 function eval_in_workspace(session_notebook::Union{SN,Workspace}, expr)
     workspace = get_workspace(session_notebook)
-    
+
     Distributed.remotecall_eval(Main, [workspace.pid], :(Core.eval($(workspace.module_name), $(expr |> QuoteNode))))
     nothing
 end
 
 function format_fetch_in_workspace(
-        session_notebook::Union{SN,Workspace},
-        cell_id,
-        ends_with_semicolon,
-        known_published_objects::Vector{String}=String[],
-        showmore_id::Union{PlutoRunner.ObjectDimPair,Nothing}=nothing,
-    )::PlutoRunner.FormattedCellResult
+    session_notebook::Union{SN,Workspace},
+    cell_id,
+    ends_with_semicolon,
+    known_published_objects::Vector{String}=String[],
+    showmore_id::Union{PlutoRunner.ObjectDimPair,Nothing}=nothing,
+)::PlutoRunner.FormattedCellResult
     workspace = get_workspace(session_notebook)
 
     # instead of fetching the output value (which might not make sense in our context, since the user can define structs, types, functions, etc), we format the cell output on the worker, and fetch the formatted output.
@@ -464,12 +464,12 @@ function format_fetch_in_workspace(
         try
             Distributed.remotecall_eval(Main, workspace.pid, :(PlutoRunner.formatted_result_of(
                 $(workspace.notebook_id),
-                $cell_id, 
-                $ends_with_semicolon, 
+                $cell_id,
+                $ends_with_semicolon,
                 $known_published_objects,
                 $showmore_id,
                 getfield(Main, $(QuoteNode(workspace.module_name))),
-                )))
+            )))
         catch ex
             distributed_exception_result(CompositeException([ex]), workspace)
         end
@@ -488,13 +488,13 @@ function collect_soft_definitions(session_notebook::SN, modules::Set{Expr})
 end
 
 
-function macroexpand_in_workspace(session_notebook::Union{SN,Workspace}, macrocall, cell_uuid, module_name = nothing)::Tuple{Bool, Any}
+function macroexpand_in_workspace(session_notebook::Union{SN,Workspace}, macrocall, cell_id, module_name=nothing)::Tuple{Bool,Any}
     workspace = get_workspace(session_notebook)
     module_name = module_name === nothing ? workspace.module_name : module_name
 
     Distributed.remotecall_eval(Main, workspace.pid, quote
         try
-            (true, PlutoRunner.try_macroexpand($(module_name), $(cell_uuid), $(macrocall |> QuoteNode)))
+            (true, PlutoRunner.try_macroexpand($(module_name), $(workspace.notebook_id), $(cell_id), $(macrocall |> QuoteNode)))
         catch error
             # We have to be careful here, for example a thrown `MethodError()` will contain the called method and arguments.
             # which normally would be very useful for debugging, but we can't serialize it!
@@ -511,7 +511,7 @@ end
 "Evaluate expression inside the workspace - output is returned. For internal use."
 function eval_fetch_in_workspace(session_notebook::Union{SN,Workspace}, expr)
     workspace = get_workspace(session_notebook)
-    
+
     Distributed.remotecall_eval(Main, workspace.pid, :(Core.eval($(workspace.module_name), $(expr |> QuoteNode))))
 end
 
@@ -525,12 +525,12 @@ end
 function move_vars(session_notebook::Union{SN,Workspace}, old_workspace_name::Symbol, new_workspace_name::Union{Nothing,Symbol}, to_delete::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, module_imports_to_move::Set{Expr}, invalidated_cell_uuids::Set{UUID}; kwargs...)
     workspace = get_workspace(session_notebook)
     new_workspace_name = something(new_workspace_name, workspace.module_name)
-    
+
     Distributed.remotecall_eval(Main, [workspace.pid], :(PlutoRunner.move_vars($(old_workspace_name |> QuoteNode), $(new_workspace_name |> QuoteNode), $to_delete, $methods_to_delete, $module_imports_to_move, $invalidated_cell_uuids)))
 end
 
 move_vars(session_notebook::Union{SN,Workspace}, to_delete::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, module_imports_to_move::Set{Expr}, invalidated_cell_uuids::Set{UUID}; kwargs...) =
-move_vars(session_notebook, bump_workspace_module(session_notebook)..., to_delete, methods_to_delete, module_imports_to_move, invalidated_cell_uuids; kwargs...)
+    move_vars(session_notebook, bump_workspace_module(session_notebook)..., to_delete, methods_to_delete, module_imports_to_move, invalidated_cell_uuids; kwargs...)
 
 # TODO: delete me
 @deprecate(
@@ -586,7 +586,7 @@ end
 "Force interrupt (SIGINT) a workspace, return whether successful"
 function interrupt_workspace(session_notebook::Union{SN,Workspace}; verbose=true)::Bool
     workspace = get_workspace(session_notebook; allow_creation=false)
-    
+
     if !(workspace isa Workspace)
         # verbose && @info "Can't interrupt this notebook: it is not running."
         return false
@@ -626,7 +626,7 @@ function interrupt_workspace(session_notebook::Union{SN,Workspace}; verbose=true
         end
 
         verbose && println("Still running... starting sequence")
-        while !isready(workspace.dowork_token)    
+        while !isready(workspace.dowork_token)
             for _ in 1:5
                 verbose && print(" 🔥 ")
                 Distributed.interrupt(workspace.pid)
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index c5df1cb1ab..a93bab3219 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -265,10 +265,10 @@ module CantReturnInPluto
     replace_returns_with_error_in_interpolation(ex) = ex
 end
 
-function try_macroexpand(mod, cell_uuid, expr)
+function try_macroexpand(mod::Module, notebook_id::UUID, cell_id::UUID, expr)
     # Remove the precvious cached expansion, so when we error somewhere before we update,
     # the old one won't linger around and get run accidentally.
-    delete!(cell_expanded_exprs, cell_uuid)
+    delete!(cell_expanded_exprs, cell_id)
 
     # Remove toplevel block, as that screws with the computer and everything
     expr_not_toplevel = if expr.head == :toplevel || expr.head == :block
@@ -288,14 +288,14 @@ function try_macroexpand(mod, cell_uuid, expr)
     expr_without_globalrefs = globalref_to_workspaceref(expr_without_return)
 
     has_pluto_hook_features = has_hook_style_pluto_properties_in_expr(expr_without_globalrefs)
-    expr_to_save = replace_pluto_properties_in_expr(expr_without_globalrefs,
-        cell_id=cell_uuid,
-        rerun_cell_function=() -> rerun_cell_from_notebook(cell_uuid),
-        register_cleanup_function=(fn) -> UseEffectCleanups.register_cleanup(fn, cell_uuid),
+    expr_to_save = replace_pluto_properties_in_expr(expr_without_globalrefs;
+        cell_id,
+        rerun_cell_function=() -> rerun_cell_from_notebook(cell_id),
+        register_cleanup_function=(fn) -> UseEffectCleanups.register_cleanup(fn, cell_id),
     )
 
     did_mention_expansion_time = false
-    cell_expanded_exprs[cell_uuid] = CachedMacroExpansion(
+    cell_expanded_exprs[cell_id] = CachedMacroExpansion(
         expr_hash(expr),
         expr_to_save,
         elapsed_ns,
@@ -525,7 +525,7 @@ function run_expression(
     # .... But ideally we wouldn't re-macroexpand and store the error the first time (TODO-ish)
     if !haskey(cell_expanded_exprs, cell_id) || cell_expanded_exprs[cell_id].original_expr_hash != expr_hash(expr)
         try
-            try_macroexpand(m, cell_id, expr)
+            try_macroexpand(m, notebook_id, cell_id, expr)
         catch e
             result = CapturedException(e, stacktrace(catch_backtrace()))
             cell_results[cell_id], cell_runtimes[cell_id] = (result, nothing)

From 343e239109f6c799938eda1aa75c27c3ef55b14d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 22 Sep 2022 16:03:28 +0200
Subject: [PATCH 434/821] Tests: retry auto reload tests 3 times

---
 test/ReloadFromFile.jl | 65 +++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 23 deletions(-)

diff --git a/test/ReloadFromFile.jl b/test/ReloadFromFile.jl
index 2ebc96f047..06277a77cd 100644
--- a/test/ReloadFromFile.jl
+++ b/test/ReloadFromFile.jl
@@ -5,8 +5,23 @@ import Distributed
 using Pluto.WorkspaceManager: poll
 import Pkg
 
+
+function retry(f::Function, n)
+    try
+        f()
+    catch e
+        if n > 0
+            retry(f, n - 1)
+        else
+            rethrow(e)
+        end
+    end
+end
+
 @testset "Reload from file" begin
     
+    retry(3) do
+    
     🍭 = ServerSession()
     🍭.options.evaluation.workspace_use_distributed = false
     🍭.options.server.auto_reload_from_file = true
@@ -34,18 +49,18 @@ import Pkg
     
     write(notebook.path, file1)
     
-    @test poll(30) do
+    @assert poll(30) do
         length(notebook.cells) == 3
     end
-    @test poll(5) do
+    @assert poll(5) do
         notebook.cells[1].output.body == "123"
     end
-    @test poll(5) do
+    @assert poll(5) do
         all(c -> !c.running, notebook.cells)
     end
     
-    @test notebook.cells[2].output.body == "246"
-    @test notebook.cells[3] |> noerror
+    @assert notebook.cells[2].output.body == "246"
+    @assert notebook.cells[3] |> noerror
     
     original_rand_output = notebook.cells[3].output.body
     
@@ -58,12 +73,12 @@ import Pkg
     file2 = sprint(Pluto.save_notebook, nb2)
     write(notebook.path, file2)
     
-    @test poll(10) do
+    @assert poll(10) do
         notebook.cells[3].output.body == "123"
     end
     
     # notebook order reversed, but cell should not re-run
-    @test original_rand_output == notebook.cells[1].output.body
+    @assert original_rand_output == notebook.cells[1].output.body
     
     
     ###
@@ -74,16 +89,16 @@ import Pkg
     write(notebook.path, file3)
     
     
-    @test poll(10) do
+    @assert poll(10) do
         notebook.cells[1].output.body == "6"
     end
-    @test poll(5) do
+    @assert poll(5) do
         all(c -> !c.running, notebook.cells)
     end
-    @test notebook.cells[2].output.body == "12"
+    @assert notebook.cells[2].output.body == "12"
     
     # notebook order reversed again, but cell should not re-run
-    @test original_rand_output == notebook.cells[3].output.body
+    @assert original_rand_output == notebook.cells[3].output.body
 
     
         
@@ -96,18 +111,18 @@ import Pkg
     sleep(timeout_between_tests)
     
     file5 = read(notebook.path, String)
-    @test file4 != file5
+    @assert file4 != file5
     
-    @test notebook.cells[3].code_folded
+    @assert notebook.cells[3].code_folded
     write(notebook.path, file4)
     
     
-    @test poll(10) do
+    @assert poll(10) do
         notebook.cells[3].code_folded == false
     end
     
     # cell folded, but cell should not re-run
-    @test original_rand_output == notebook.cells[3].output.body
+    @assert original_rand_output == notebook.cells[3].output.body
 
     
         
@@ -121,18 +136,19 @@ import Pkg
     sleep(timeout_between_tests)
     
     file7 = read(notebook.path, String)
-    @test file6 != file7
-    @test Pluto.is_disabled(notebook.cells[3])
+    @assert file6 != file7
+    @assert Pluto.is_disabled(notebook.cells[3])
     
     write(notebook.path, file6)
-    @test poll(10) do
+    @assert poll(10) do
         !Pluto.is_disabled(notebook.cells[3])
     end
     
     # cell disabled and re-enabled, so it should re-run
-    @test original_rand_output != notebook.cells[3].output.body
+    @assert poll(10) do
+        original_rand_output != notebook.cells[3].output.body
+    end
 
-    
 
     ###
     sleep(timeout_between_tests)
@@ -141,9 +157,12 @@ import Pkg
     write(notebook.path, file8)
     
     
-    @test poll(10) do
+    @assert poll(10) do
         notebook.cells[2].output.body == "false"
     end
-    @test length(notebook.cells) == 2
-    @test notebook.nbpkg_restart_required_msg !== nothing
+    
+    @assert length(notebook.cells) == 2
+    @assert notebook.nbpkg_restart_required_msg !== nothing
+end
+@test true
 end
\ No newline at end of file

From 57f4572a9c68dcf0e9bb7d98b9966c0e4dbd2604 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Fri, 23 Sep 2022 20:09:04 +0200
Subject: [PATCH 435/821] Add unicode preview for auto-complete (#2285)

* Add unicode preview for auto-complete

* Don't apply in strings, just complete (for markdown + latex)
---
 .../CellInput/pluto_autocomplete.js           | 43 +++++++++++++++----
 frontend/editor.css                           |  7 +++
 src/runner/PlutoRunner.jl                     | 41 ++++++++++++------
 3 files changed, 69 insertions(+), 22 deletions(-)

diff --git a/frontend/components/CellInput/pluto_autocomplete.js b/frontend/components/CellInput/pluto_autocomplete.js
index dbfb382def..31c5ae4bf6 100644
--- a/frontend/components/CellInput/pluto_autocomplete.js
+++ b/frontend/components/CellInput/pluto_autocomplete.js
@@ -146,26 +146,34 @@ let match_latex_complete = (ctx) => ctx.matchBefore(/\\[^\s"'.`]*/)
 let match_symbol_complete = (ctx) => ctx.matchBefore(/\.\:[^\s"'`()\[\].]*/)
 /** Are we matching exactly `~/`? */
 let match_expanduser_complete = (ctx) => ctx.matchBefore(/~\//)
+/** Are we matching inside a string */
+function match_string_complete(ctx) {
+    const tree = syntaxTree(ctx.state)
+    const node = tree.resolve(ctx.pos)
+    if (node == null || (node.name !== "TripleString" && node.name !== "String")) {
+        return false
+    }
+    return true
+}
 
 /** Use the completion results from the Julia server to create CM completion objects, but only for path completions (TODO: broken) and latex completions. */
 let julia_special_completions_to_cm = (/** @type {PlutoRequestAutocomplete} */ request_autocomplete) => async (ctx) => {
-    let unicode_match = match_latex_complete(ctx) || match_expanduser_complete(ctx)
-    if (unicode_match == null) return null
-
     let to_complete = ctx.state.sliceDoc(0, ctx.pos)
     let { start, stop, results } = await request_autocomplete({ text: to_complete })
 
+    let should_apply_unicode_completion = !match_string_complete(ctx)
+
     return {
         from: start,
         to: stop,
         // This is an important one when you not only complete, but also replace something.
         // @codemirror/autocomplete automatically filters out results otherwise >:(
         filter: false,
-        // TODO Add "detail" that shows the unicode character
-        // TODO Add "apply" with the unicode character so it autocompletes that immediately
-        options: results.map(([text], i) => {
+        options: results.map(([text, _, __, ___, ____, detail]) => {
             return {
                 label: text,
+                apply: detail && should_apply_unicode_completion ? detail : text,
+                detail,
             }
         }),
         // TODO Do something docs_prefix ish when we also have the apply text
@@ -273,8 +281,24 @@ const julia_code_completions_to_cm = (/** @type {PlutoRequestAutocomplete} */ re
     }
 }
 
+const pluto_completion_fetcher = (request_autocomplete) => {
+    const unicode_completions = julia_special_completions_to_cm(request_autocomplete)
+    const code_completions = julia_code_completions_to_cm(request_autocomplete)
+
+    return (ctx) => {
+        let unicode_match = match_latex_complete(ctx) || match_expanduser_complete(ctx)
+        if (unicode_match === null) {
+            return code_completions(ctx)
+        } else {
+            return unicode_completions(ctx)
+        }
+    }
+}
+
 const complete_anyword = async (ctx) => {
     const results_from_cm = await autocomplete.completeAnyWord(ctx)
+    if (results_from_cm === null) return null
+
     return {
         from: results_from_cm.from,
         options: results_from_cm.options.map(({ label }, i) => ({
@@ -315,7 +339,7 @@ const local_variables_completion = (ctx) => {
 
 /**
  * @typedef PlutoAutocompleteResults
- * @type {{ start: number, stop: number, results: Array<[string, (string | null), boolean, boolean, (string | null)]> }}
+ * @type {{ start: number, stop: number, results: Array<[string, (string | null), boolean, boolean, (string | null), (string | null)]> }}
  *
  * @typedef PlutoRequestAutocomplete
  * @type {(options: { text: string }) => Promise<PlutoAutocompleteResults>}
@@ -351,8 +375,9 @@ export let pluto_autocomplete = ({ request_autocomplete, on_update_doc_query })
         autocompletion({
             activateOnTyping: false,
             override: [
-                julia_special_completions_to_cm(memoize_last_request_autocomplete),
-                julia_code_completions_to_cm(memoize_last_request_autocomplete),
+                pluto_completion_fetcher(memoize_last_request_autocomplete),
+                // julia_special_completions_to_cm(memoize_last_request_autocomplete),
+                // julia_code_completions_to_cm(memoize_last_request_autocomplete),
                 complete_anyword,
                 // TODO: Disabled because of performance problems, see https://github.com/fonsp/Pluto.jl/pull/1925. Remove `complete_anyword` once fixed. See https://github.com/fonsp/Pluto.jl/pull/2013
                 // local_variables_completion,
diff --git a/frontend/editor.css b/frontend/editor.css
index ace8f5e3ff..f190f621a8 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2687,6 +2687,13 @@ pluto-input .cm-editor .cm-tooltip.cm-tooltip-autocomplete > ul > li {
 .cm-editor .cm-tooltip.cm-tooltip-autocomplete > ul > li[aria-selected] .cm-completionLabel {
     border-color: transparent;
 }
+.cm-editor .cm-tooltip.cm-tooltip-autocomplete > ul > li .cm-completionDetail {
+    float: right;
+    margin-right: 0.5em;
+    font-size: 0.8em;
+    font-family: 'JuliaMono';
+    font-style: normal;
+}
 
 .cm-editor .cm-tooltip.cm-tooltip-autocomplete li.c_notexported {
     color: var(--cm-editor-li-notexported-color);
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index a93bab3219..50da8c8507 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -23,7 +23,7 @@ using Markdown
 import Markdown: html, htmlinline, LaTeX, withtag, htmlesc
 import Distributed
 import Base64
-import FuzzyCompletions: Completion, ModuleCompletion, PropertyCompletion, FieldCompletion, PathCompletion, DictCompletion, completions, completion_text, score
+import FuzzyCompletions: Completion, BslashCompletion, ModuleCompletion, PropertyCompletion, FieldCompletion, PathCompletion, DictCompletion, completions, completion_text, score
 import Base: show, istextmime
 import UUIDs: UUID, uuid4
 import Dates: DateTime
@@ -1621,6 +1621,14 @@ catch
 end
 completion_description(::Completion) = nothing
 
+completion_detail(::Completion) = nothing
+completion_detail(completion::BslashCompletion) =
+    haskey(REPL.REPLCompletions.latex_symbols, completion.bslash) ?
+        REPL.REPLCompletions.latex_symbols[completion.bslash] :
+    haskey(REPL.REPLCompletions.emoji_symbols, completion.bslash) ?
+        REPL.REPLCompletions.emoji_symbols[completion.bslash] :
+        nothing
+
 function is_pluto_workspace(m::Module)
     mod_name = nameof(m) |> string
     startswith(mod_name, "workspace#")
@@ -1639,12 +1647,16 @@ function completions_exported(cs::Vector{<:Completion})
     end
 end
 
-completion_from_notebook(c::ModuleCompletion) = is_pluto_workspace(c.parent) && c.mod != "include" && c.mod != "eval"
+completion_from_notebook(c::ModuleCompletion) =
+    is_pluto_workspace(c.parent) &&
+    c.mod != "include" &&
+    c.mod != "eval" &&
+    !startswith(c.mod, "#")
 completion_from_notebook(c::Completion) = false
 
-only_special_completion_types(c::PathCompletion) = :path
-only_special_completion_types(c::DictCompletion) = :dict
-only_special_completion_types(c::Completion) = nothing
+only_special_completion_types(::PathCompletion) = :path
+only_special_completion_types(::DictCompletion) = :dict
+only_special_completion_types(::Completion) = nothing
 
 "You say Linear, I say Algebra!"
 function completion_fetcher(query, pos, workspace::Module)
@@ -1664,13 +1676,16 @@ function completion_fetcher(query, pos, workspace::Module)
         filter!(isenough ∘ score, results) # too many candiates otherwise
     end
 
-    texts = completion_text.(results)
-    descriptions = completion_description.(results)
     exported = completions_exported(results)
-    from_notebook = completion_from_notebook.(results)
-    completion_type = only_special_completion_types.(results)
-
-    smooshed_together = collect(zip(texts, descriptions, exported, from_notebook, completion_type))
+    smooshed_together = [
+        (completion_text(result),
+         completion_description(result),
+         rexported,
+         completion_from_notebook(result),
+         only_special_completion_types(result),
+         completion_detail(result))
+        for (result, rexported) in zip(results, exported)
+    ]
 
     p = if endswith(query, '.')
         sortperm(smooshed_together; alg=MergeSort, by=basic_completion_priority)
@@ -1680,8 +1695,8 @@ function completion_fetcher(query, pos, workspace::Module)
         sortperm(scores .+ 3.0 * exported; alg=MergeSort, rev=true)
     end
 
-    final = smooshed_together[p]
-    (final, loc, found)
+    permute!(smooshed_together, p)
+    (smooshed_together, loc, found)
 end
 
 is_dot_completion(::Union{ModuleCompletion,PropertyCompletion,FieldCompletion}) = true

From d5123e6fdf4cbe3ccea1904a5d8b615735569676 Mon Sep 17 00:00:00 2001
From: Alberto Mengali <disberd@gmail.com>
Date: Mon, 26 Sep 2022 19:06:59 +0200
Subject: [PATCH 436/821] Attach hljs to the window object to allow custom
 highlighting within code blocks (#2244)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/imports/highlightjs.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/imports/highlightjs.js b/frontend/imports/highlightjs.js
index 17ffd64503..f10ca1e001 100644
--- a/frontend/imports/highlightjs.js
+++ b/frontend/imports/highlightjs.js
@@ -8,4 +8,8 @@ import hljs_juliarepl from "https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@
 hljs.registerLanguage("julia", hljs_julia)
 hljs.registerLanguage("julia-repl", hljs_juliarepl)
 
+// Attach the highlighter object to the window to allow custom highlighting from the frontend. See https://github.com/fonsp/Pluto.jl/pull/2244
+//@ts-ignore
+window.hljs = hljs
+
 export default hljs

From a9fe37f84fc09dde1e61e8de0e465c498516cd14 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 27 Sep 2022 16:53:11 +0200
Subject: [PATCH 437/821] Don't do #2075 when running in CI

---
 src/packages/PkgCompat.jl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index b0766a641b..4cde461dc2 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -196,11 +196,15 @@ end
 
 # ✅ Public API
 """
-Check when the registries were last updated. If it is recent (max 7 days), `Pkg.UPDATED_REGISTRY_THIS_SESSION` is set to `true`, which will prevent Pkg from doing an automatic registry update.
+Check when the registries were last updated. If it is recent (max 7 days), then `Pkg.UPDATED_REGISTRY_THIS_SESSION[]` is set to `true`, which will prevent Pkg from doing an automatic registry update.
 
 Returns the new value of `Pkg.UPDATED_REGISTRY_THIS_SESSION`.
 """
 function check_registry_age(max_age_ms = 1000.0 * 60 * 60 * 24 * 7)::Bool
+	if get(ENV, "GITHUB_ACTIONS", "false") == "true"
+		# don't do this optimization in CI
+		return false
+	end
 	paths = _get_registry_paths()
 	isempty(paths) && return _updated_registries_compat[]
 	

From 89e10b8c9a342bf922a65472aca212d6273bf8cb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 27 Sep 2022 18:35:57 +0200
Subject: [PATCH 438/821] nothing

---
 frontend/editor.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index f190f621a8..610b1d971e 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2691,7 +2691,7 @@ pluto-input .cm-editor .cm-tooltip.cm-tooltip-autocomplete > ul > li {
     float: right;
     margin-right: 0.5em;
     font-size: 0.8em;
-    font-family: 'JuliaMono';
+    font-family: var(--julia-mono-font-stack);
     font-style: normal;
 }
 

From fa4e5fe2c309e9b6dcbb5ed0d7b009578708c4ef Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Mon, 3 Oct 2022 14:50:57 +0200
Subject: [PATCH 439/821] Fix method invalidations around `Base.convert`
 (#2300)

---
 src/notebook/Cell.jl       |  6 +----
 src/webserver/Dynamic.jl   |  2 +-
 src/webserver/Firebasey.jl | 45 ++++++++++++++++++++++++--------------
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/notebook/Cell.jl b/src/notebook/Cell.jl
index ef8313c28b..48f4862bad 100644
--- a/src/notebook/Cell.jl
+++ b/src/notebook/Cell.jl
@@ -74,10 +74,6 @@ function Base.convert(::Type{Cell}, cell::Dict)
         metadata=cell["metadata"],
     )
 end
-function Base.convert(::Type{UUID}, string::String)
-    UUID(string)
-end
-
 
 "Returns whether or not the cell is **explicitely** disabled."
 is_disabled(c::Cell) = get(c.metadata, METADATA_DISABLED_KEY, DEFAULT_CELL_METADATA[METADATA_DISABLED_KEY])
@@ -88,4 +84,4 @@ else
 end
 can_show_logs(c::Cell) = get(c.metadata, METADATA_SHOW_LOGS_KEY, DEFAULT_CELL_METADATA[METADATA_SHOW_LOGS_KEY])
 is_skipped_as_script(c::Cell) = get(c.metadata, METADATA_SKIP_AS_SCRIPT_KEY, DEFAULT_CELL_METADATA[METADATA_SKIP_AS_SCRIPT_KEY])
-must_be_commented_in_file(c::Cell) = is_disabled(c) || is_skipped_as_script(c) || c.depends_on_disabled_cells || c.depends_on_skipped_cells
\ No newline at end of file
+must_be_commented_in_file(c::Cell) = is_disabled(c) || is_skipped_as_script(c) || c.depends_on_disabled_cells || c.depends_on_skipped_cells
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 835d56f5f8..8d24353ecd 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -181,7 +181,7 @@ function send_notebook_changes!(🙋::ClientRequest; commentary::Any=nothing)
         if client.connected_notebook !== nothing && client.connected_notebook.notebook_id == 🙋.notebook.notebook_id
             current_dict = get(current_state_for_clients, client, :empty)
             patches = Firebasey.diff(current_dict, notebook_dict)
-            patches_as_dicts::Array{Dict} = patches
+            patches_as_dicts::Array{Dict} = Firebasey._convert(Array{Dict}, patches)
             current_state_for_clients[client] = deep_enough_copy(notebook_dict)
 
             # Make sure we do send a confirmation to the client who made the request, even without changes
diff --git a/src/webserver/Firebasey.jl b/src/webserver/Firebasey.jl
index ab59d3ffd6..99a18e731c 100644
--- a/src/webserver/Firebasey.jl
+++ b/src/webserver/Firebasey.jl
@@ -1,5 +1,5 @@
 ### A Pluto.jl notebook ###
-# v0.19.9
+# v0.19.12
 
 using Markdown
 using InteractiveUtils
@@ -227,11 +227,6 @@ function Base.convert(::Type{Dict}, patch::RemovePatch)
 	Dict{String,Any}("op" => "remove", "path" => patch.path)
 end
 
-# ╔═╡ fafcb8b8-cde9-4f99-9bab-8128025953a4
-function Base.convert(::Type{<:Dict}, patch::ReplacePatch)
-	Dict{String,Any}("op" => "replace", "path" => patch.path, "value" => patch.value)
-end
-
 # ╔═╡ 921a130e-b028-4f91-b077-3bd79dcb6c6d
 function Base.convert(::Type{JSONPatch}, patch_dict::Dict)
 	op = patch_dict["op"]
@@ -258,12 +253,6 @@ Base.convert(Dict, AddPatch([:x, :y], 10))
 Base.convert(Dict, RemovePatch([:x, :y]))
   ╠═╡ =#
 
-# ╔═╡ 7feeee3a-3aec-47ce-b8d7-74a0d9b0b381
-# ╠═╡ skip_as_script = true
-#=╠═╡
-Base.convert(Dict, ReplacePatch([:x, :y], 10))
-  ╠═╡ =#
-
 # ╔═╡ 6d67f8a5-0e0c-4b6e-a267-96b34d580946
 # ╠═╡ skip_as_script = true
 #=╠═╡
@@ -702,6 +691,28 @@ end
 md"### applypatch! AddPatch"
   ╠═╡ =#
 
+# ╔═╡ d7ea6052-9d9f-48e3-92fb-250afd69e417
+begin
+    _convert(::Type{Base.UUID}, s::String) = Base.UUID(s)
+    _convert(::Type{T}, a::AbstractArray) where {T<:Array} = _convert.(eltype(T), a)
+    _convert(x, y) = convert(x, y)
+
+    function _convert(::Type{<:Dict}, patch::ReplacePatch)
+        Dict{String,Any}("op" => "replace", "path" => patch.path, "value" => patch.value)
+    end
+
+    function _setproperty!(x, f::Symbol, v)
+        type = fieldtype(typeof(x), f)
+        return setfield!(x, f, _convert(type, v))
+    end
+end
+
+# ╔═╡ 7feeee3a-3aec-47ce-b8d7-74a0d9b0b381
+# ╠═╡ skip_as_script = true
+#=╠═╡
+_convert(Dict, ReplacePatch([:x, :y], 10))
+  ╠═╡ =#
+
 # ╔═╡ dd87ca7e-2de1-11eb-2ec3-d5721c32f192
 function applypatch!(value, patch::AddPatch)
 	if length(patch.path) == 0
@@ -721,7 +732,7 @@ function applypatch!(value, patch::AddPatch)
 			if strict_applypatch[]
 				@assert getproperty(subvalue, key) === nothing
 			end
-			setproperty!(subvalue, key, patch.value)
+			_setproperty!(subvalue, key, patch.value)
 		end
 	end
 	return value
@@ -758,7 +769,7 @@ function applypatch!(value, patch::ReplacePatch)
 			if strict_applypatch[]
 				@assert getproperty(subvalue, key) !== nothing
 			end
-			setproperty!(subvalue, key, patch.value)
+			_setproperty!(subvalue, key, patch.value)
 		end
 	end
 	return value
@@ -795,7 +806,7 @@ function applypatch!(value, patch::RemovePatch)
 			if strict_applypatch[]
 				@assert getproperty(subvalue, key) !== nothing
 			end
-			setproperty!(subvalue, key, nothing)
+			_setproperty!(subvalue, key, nothing)
 		end
 	end
 	return value
@@ -1037,7 +1048,7 @@ end
 
 # ╔═╡ 34d86e02-dd34-4691-bb78-3023568a5d16
 #=╠═╡
-@track Base.convert(JSONPatch, convert(Dict, replace_patch)) == replace_patch
+@track Base.convert(JSONPatch, _convert(Dict, replace_patch)) == replace_patch
   ╠═╡ =#
 
 # ╔═╡ 95ff676d-73c8-44cb-ac35-af94418737e9
@@ -1147,7 +1158,6 @@ end
 # ╟─07eeb122-6706-4544-a007-1c8d6581eec8
 # ╠═b48e2c08-a94a-4247-877d-949d92dde626
 # ╟─c59b30b9-f702-41f1-bb2e-1736c8cd5ede
-# ╠═fafcb8b8-cde9-4f99-9bab-8128025953a4
 # ╟─7feeee3a-3aec-47ce-b8d7-74a0d9b0b381
 # ╠═921a130e-b028-4f91-b077-3bd79dcb6c6d
 # ╟─6d67f8a5-0e0c-4b6e-a267-96b34d580946
@@ -1220,6 +1230,7 @@ end
 # ╠═48a45941-2489-4666-b4e5-88d3f82e5145
 # ╠═752b2da3-ff24-4758-8843-186368069888
 # ╟─3e285076-1d97-4728-87cf-f71b22569e57
+# ╠═d7ea6052-9d9f-48e3-92fb-250afd69e417
 # ╠═dd87ca7e-2de1-11eb-2ec3-d5721c32f192
 # ╟─c3e4738f-4568-4910-a211-6a46a9d447ee
 # ╟─a11e4082-4ff4-4c1b-9c74-c8fa7dcceaa6

From 9f2b7e838c76450db41e41b9cbfba5f119064771 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 5 Oct 2022 16:21:35 +0200
Subject: [PATCH 440/821] =?UTF-8?q?=F0=9F=8D=94=20Logs:=20Vertical=20layou?=
 =?UTF-8?q?t=20(#2297)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/CellInput.js              |   1 +
 .../components/CellInput/highlight_line.js    |   3 +-
 frontend/components/Logs.js                   | 176 +++++--------
 frontend/dark_color.css                       |  13 +-
 frontend/editor.css                           | 237 ++++++++----------
 frontend/light_color.css                      |  13 +-
 6 files changed, 196 insertions(+), 247 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 92582c4349..3b95ffa7bd 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -585,6 +585,7 @@ export const CellInput = ({
                     highlighted_line_compartment,
                     global_definitions_compartment,
                     editable_compartment,
+                    highlightLinePlugin(),
 
                     // This is waaaay in front of the keys it is supposed to override,
                     // Which is necessary because it needs to run before *any* keymap,
diff --git a/frontend/components/CellInput/highlight_line.js b/frontend/components/CellInput/highlight_line.js
index cdf9082fc6..f66346f878 100644
--- a/frontend/components/CellInput/highlight_line.js
+++ b/frontend/components/CellInput/highlight_line.js
@@ -9,7 +9,7 @@ const highlighted_line = Decoration.line({
  */
 function create_line_decorations(view) {
     let line_number = view.state.facet(HighlightLineFacet)
-    if (line_number == null || line_number == undefined || line_number > view.state.doc.lines) {
+    if (line_number == null || line_number == undefined || line_number < 0 || line_number > view.state.doc.lines) {
         return Decoration.set([])
     }
 
@@ -36,6 +36,7 @@ export const highlightLinePlugin = () =>
              * @param {EditorView} view
              */
             constructor(view) {
+                this.decorations = Decoration.set([])
                 this.updateDecos(view)
             }
 
diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
index 80126d2728..406b30b67c 100644
--- a/frontend/components/Logs.js
+++ b/frontend/components/Logs.js
@@ -5,9 +5,8 @@ import { SimpleOutputBody } from "./TreeView.js"
 import { help_circle_icon, open_pluto_popup } from "./Popup.js"
 import AnsiUp from "../imports/AnsiUp.js"
 
-// Defined in editor.css
-const GRID_WIDTH = 10
-const RESIZE_THROTTLE = 60
+const LOGS_VISIBLE_START = 60
+const LOGS_VISIBLE_END = 20
 const PROGRESS_LOG_LEVEL = "LogLevel(-1)"
 
 const is_progress_log = (log) => {
@@ -15,9 +14,6 @@ const is_progress_log = (log) => {
 }
 
 export const Logs = ({ logs, line_heights, set_cm_highlighted_line }) => {
-    const container = useRef(/** @type {HTMLElement?} */ (null))
-    const [from, setFrom] = useState(0)
-    const [to, setTo] = useState(Math.round(1000 / GRID_WIDTH))
     const progress_logs = logs.filter(is_progress_log)
     const latest_progress_logs = progress_logs.reduce((progress_logs, log) => ({ ...progress_logs, [log.id]: log }), {})
     const [_, grouped_progress_and_logs] = logs.reduce(
@@ -32,51 +28,35 @@ export const Logs = ({ logs, line_heights, set_cm_highlighted_line }) => {
         },
         [{}, []]
     )
-    const logsWidth = grouped_progress_and_logs.length * GRID_WIDTH
 
-    const logsStyle = useMemo(
-        () => `grid-template-rows: ${line_heights.map((y) => y + "px").join(" ")} repeat(auto-fill, 15px); width: ${logsWidth}px;`,
-        [logsWidth, line_heights]
-    )
-
-    useEffect(() => {
-        const elem = container.current
-        if (!elem) return
-        const fn = () => {
-            const w = elem.clientWidth
-            const scroll_left = elem.scrollLeft
-            setFrom(Math.min(logs.length - 1, Math.round((scroll_left - w) / GRID_WIDTH)))
-            setTo(Math.round((scroll_left + 2 * w) / GRID_WIDTH))
-        }
-        const l = fn // _.throttle(fn, RESIZE_THROTTLE)
-        document.addEventListener("resize", l)
-        elem.addEventListener("scroll", l)
-        return () => {
-            elem.removeEventListener("scroll", l)
-            document.removeEventListener("resize", l)
-        }
-    }, [container.current, logsWidth])
     const is_hidden_input = line_heights[0] === 0
     if (logs.length === 0) {
         return null
     }
 
+    const dot = (log, i) => html`<${Dot}
+        set_cm_highlighted_line=${set_cm_highlighted_line}
+        level=${log.level}
+        msg=${log.msg}
+        kwargs=${log.kwargs}
+        key=${i}
+        y=${is_hidden_input ? 0 : log.line - 1}
+    /> `
+
     return html`
-        <pluto-logs-container ref=${container}>
-            <pluto-logs style="${logsStyle}">
-                ${grouped_progress_and_logs.map((log, i) => {
-                    return html`<${Dot}
-                        set_cm_highlighted_line=${set_cm_highlighted_line}
-                        show=${logs.length < 50 || (from <= i && i < to)}
-                        level=${log.level}
-                        msg=${log.msg}
-                        kwargs=${log.kwargs}
-                        mykey=${`log${i}`}
-                        key=${i}
-                        x=${i}
-                        y=${is_hidden_input ? 0 : log.line - 1}
-                    /> `
-                })}
+        <pluto-logs-container>
+            <pluto-logs>
+                ${grouped_progress_and_logs.length <= LOGS_VISIBLE_END + LOGS_VISIBLE_START
+                    ? grouped_progress_and_logs.map(dot)
+                    : [
+                          ...grouped_progress_and_logs.slice(0, LOGS_VISIBLE_START).map(dot),
+                          html`<pluto-log-truncated>
+                              ${grouped_progress_and_logs.length - LOGS_VISIBLE_START - LOGS_VISIBLE_END} logs not shown...
+                          </pluto-log-truncated>`,
+                          ...grouped_progress_and_logs
+                              .slice(-LOGS_VISIBLE_END)
+                              .map((log, i) => dot(log, i + grouped_progress_and_logs.length - LOGS_VISIBLE_END)),
+                      ]}
             </pluto-logs>
         </pluto-logs-container>
     `
@@ -95,14 +75,7 @@ const Progress = ({ progress }) => {
 
 const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${"adsf"} mime=${pair[1]} body=${pair[0]} persist_js_state=${false} />`
 
-const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
-    const node_ref = useRef(/** @type{HTMLElement?} */ (null))
-    // const label_ref = useRef(null)
-    // useEffect(() => {
-    //     label_ref.current.innerHTML = body
-    // }, [body])
-    const [inspecting, set_inspecting] = useState(false)
-
+const Dot = ({ set_cm_highlighted_line, msg, kwargs, y, level }) => {
     const is_progress = is_progress_log({ level, kwargs })
     const is_stdout = level === "LogLevel(-555)"
     let progress = null
@@ -117,77 +90,44 @@ const Dot = ({ set_cm_highlighted_line, show, msg, kwargs, x, y, level }) => {
         }
 
         level = "Progress"
-        y = 0
     }
     if (is_stdout) {
         level = "Stdout"
     }
 
-    useLayoutEffect(() => {
-        if (!node_ref.current) return
-        node_ref.current.style.gridColumn = `${x + 1}`
-        node_ref.current.style.gridRow = `${y + 1}`
-    }, [node_ref.current, x, y])
-
-    useLayoutEffect(() => {
-        if (inspecting && show) {
-            const f = (e) => {
-                if (!e.target.closest || e.target.closest("pluto-log-dot-positioner") !== node_ref.current) {
-                    set_inspecting(false)
-                    set_cm_highlighted_line(null)
-                }
-            }
-            window.addEventListener("click", f)
-            window.addEventListener("blur", f)
-
-            return () => {
-                window.removeEventListener("click", f)
-                window.removeEventListener("blur", f)
-            }
-        }
-    }, [inspecting])
-
-    return show
-        ? html`<pluto-log-dot-positioner
-              ref=${node_ref}
-              class=${cl({ inspecting })}
-              onClick=${() => {
-                  set_inspecting(true)
-                  is_progress || set_cm_highlighted_line(y + 1)
-              }}
-              onMouseenter=${() => is_progress || set_cm_highlighted_line(y + 1)}
-              onMouseleave=${() => set_cm_highlighted_line(null)}
-          >
-              <pluto-log-dot-sizer>
-                  ${is_stdout
-                      ? html`<${MoreInfo}
-                            body=${html`This text was written to the ${" "}<a href="https://en.wikipedia.org/wiki/Standard_streams" target="_blank"
-                                    >terminal stream</a
-                                >${" "}while running the cell. It is not the${" "}<em>output value</em>${" "}of this cell.`}
-                        />`
-                      : null}
-                  <pluto-log-dot class=${level}
-                      >${is_progress
-                          ? html`<${Progress} progress=${progress} />`
-                          : is_stdout
-                          ? html`<${MoreInfo}
-                                    body=${html`${"This text was written to the "}
-                                        <a href="https://en.wikipedia.org/wiki/Standard_streams" target="_blank">terminal stream</a
-                                        >${" while running the cell. "}<span style="opacity: .5"
-                                            >${"(It is not the "}<em>return value</em>${" of the cell.)"}</span
-                                        >`}
-                                />
-                                <${LogViewAnsiUp} value=${msg[0]} />`
-                          : html`${mimepair_output(msg)}${kwargs.map(
-                                ([k, v]) =>
-                                    html`
-                                        <pluto-log-dot-kwarg><pluto-key>${k}</pluto-key> <pluto-value>${mimepair_output(v)}</pluto-value></pluto-log-dot-kwarg>
-                                    `
-                            )}`}</pluto-log-dot
-                  >
-              </pluto-log-dot-sizer>
-          </pluto-log-dot-positioner>`
-        : html`<pluto-log-dot-positioner ref=${node_ref}></pluto-log-dot-positioner>`
+    return html`<pluto-log-dot-positioner
+        class=${cl({ [level]: true })}
+        onMouseenter=${() => is_progress || set_cm_highlighted_line(y + 1)}
+        onMouseleave=${() => {
+            console.log("leaving!")
+            set_cm_highlighted_line(null)
+        }}
+    >
+        <pluto-log-icon></pluto-log-icon>
+        ${is_stdout
+            ? html`<${MoreInfo}
+                  body=${html`This text was written to the ${" "}<a href="https://en.wikipedia.org/wiki/Standard_streams" target="_blank">terminal stream</a
+                      >${" "}while running the cell. It is not the${" "}<em>output value</em>${" "}of this cell.`}
+              />`
+            : null}
+        <pluto-log-dot class=${level}
+            >${is_progress
+                ? html`<${Progress} progress=${progress} />`
+                : is_stdout
+                ? html`<${MoreInfo}
+                          body=${html`${"This text was written to the "}
+                              <a href="https://en.wikipedia.org/wiki/Standard_streams" target="_blank">terminal stream</a>${" while running the cell. "}<span
+                                  style="opacity: .5"
+                                  >${"(It is not the "}<em>return value</em>${" of the cell.)"}</span
+                              >`}
+                      />
+                      <${LogViewAnsiUp} value=${msg[0]} />`
+                : html`${mimepair_output(msg)}${kwargs.map(
+                      ([k, v]) =>
+                          html` <pluto-log-dot-kwarg><pluto-key>${k}</pluto-key> <pluto-value>${mimepair_output(v)}</pluto-value></pluto-log-dot-kwarg> `
+                  )}`}</pluto-log-dot
+        >
+    </pluto-log-dot-positioner>`
 }
 
 const MoreInfo = (/** @type{{body: import("../imports/Preact.js").ReactElement}} */ { body }) => {
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index c29eb738b0..b6cdcb3a7c 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -66,10 +66,21 @@
         --shoulder-hover-bg-color: rgba(255, 255, 255, 0.05);
 
         /* Logs */
-        --pluto-logs-bg-color: hsl(240deg 10% 29%);
+        --pluto-logs-bg-color: hsl(0deg 0% 17%);
+        --pluto-logs-key-color: rgba(255, 255, 255, 0.6);
         --pluto-logs-progress-fill: #5f7f5b;
+        --pluto-logs-progress-bg: #3d3d3d;
         --pluto-logs-progress-border: hsl(210deg 35% 72%);
 
+        --pluto-logs-info-color: #484848;
+        --pluto-logs-info-accent-color: inherit;
+        --pluto-logs-warn-color: rgb(80 76 38);
+        --pluto-logs-warn-accent-color: rgb(239 231 135);
+        --pluto-logs-danger-color: rgb(100 47 39);
+        --pluto-logs-danger-accent-color: rgb(255 147 132);
+        --pluto-logs-debug-color: hsl(288deg 19% 25%);
+        --pluto-logs-debug-accent-color: hsl(283deg 56% 79%);
+
         /*Top navbar styling*/
         --nav-h1-text-color: white;
         --nav-filepicker-color: #b6b6b6;
diff --git a/frontend/editor.css b/frontend/editor.css
index 610b1d971e..0d63063965 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -34,9 +34,8 @@
     --sans-serif-font-stack: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
     --lato-ui-font-stack: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, Helvetica, Arial, "Apple Color Emoji",
         "Segoe UI Emoji", "Segoe UI Symbol", system-ui, sans-serif;
-    --system-ui-font-stack: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, Helvetica, Arial, "Apple Color Emoji",
+    --system-ui-font-stack: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, Helvetica, Arial, "Apple Color Emoji",
         "Segoe UI Emoji", "Segoe UI Symbol", system-ui, sans-serif;
-
     color-scheme: light dark;
 }
 
@@ -2327,71 +2326,19 @@ nav#undo_delete.hidden {
 
 pluto-logs-container {
     display: block;
-    width: max(100px, 100vw - (700px + 25px));
+
     /* Show logs up to the RunArea */
-    max-height: calc(100% + 14px);
-    position: absolute;
     z-index: 25;
-    right: min(-100px, -100vw + (700px + 25px));
-    top: 1px;
-    overflow-x: auto;
-    /* overflow-y: hidden; */
-    background: hsl(0deg 0% 100% / 81%);
-}
-
-/* @media screen and (max-width: calc(700px + 25px + 6px + 150px)) { */
-pluto-logs {
-    display: flex !important;
-}
-
-pluto-logs-container {
-    position: static;
-    /* right: min(-6px, 700px + 25px - 100vw); */
-    /* width: 20px; */
-    /* transition: width ease-in-out 100ms; */
-    /* padding-left: 80px; */
-    width: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+    max-height: 50vh;
+    margin-right: 1.3rem;
 }
 
 pluto-logs-container:not(:empty) {
     background: var(--pluto-logs-bg-color);
-    padding: 10px;
-}
-
-pluto-logs-container:focus-within,
-pluto-logs-container:hover {
-    /* width: 30vw; */
-}
-
-pluto-logs-container pluto-logs {
-    /* grid-template-columns: repeat(auto-fill, 0px); */
-}
-pluto-logs-container:focus-within pluto-logs,
-pluto-logs-container:hover pluto-logs {
-    /* grid-template-columns: repeat(auto-fill, 10px); */
-}
-/* 
-    pluto-log-dot-positioner {
-        flex: 0 0 auto;
-        width: auto;
-    }
-    pluto-log-dot-sizer {
-        width: auto;
-    } */
-/* } */
-/* 
-@media screen and (min-width: calc(700px + 25px + 6px + 500px)) and (max-width: calc(700px + 25px + 6px + 500px + 500px)) {
-    pluto-logs-container {
-        right: calc(-500px - 6px);
-        width: calc(500px + 6px);
-    }
+    padding: 6px;
 }
-@media screen and (min-width: calc(700px + 25px + 6px + 500px + 500px)) {
-    pluto-logs-container {
-        width: calc(0.5 * (6px + 100vw - (700px + 25px)));
-        right: calc(-0.5 * (6px + 100vw - (700px + 25px)));
-    }
-} */
 
 pluto-logs-container pluto-progress-bars pluto-progress:not(:first-child) {
     margin-top: 10px;
@@ -2399,12 +2346,13 @@ pluto-logs-container pluto-progress-bars pluto-progress:not(:first-child) {
 
 pluto-logs-container pluto-progress-bar {
     --c: var(--pluto-logs-progress-fill);
-    padding: 1px 3px;
+    padding: 0.3em 0.6em;
     background: linear-gradient(90deg, var(--c), var(--c));
     background-repeat: no-repeat;
     width: 100%;
     transition: background-size cubic-bezier(0.14, 0.71, 0, 0.99) 2s, opacity linear 0.2s;
-    /* background-color: salmon; */
+    display: grid;
+    align-items: center;
 }
 
 pluto-logs-container pluto-progress-bar.collapsed {
@@ -2412,90 +2360,115 @@ pluto-logs-container pluto-progress-bar.collapsed {
 }
 
 pluto-logs {
-    display: grid;
-    grid-auto-rows: 15px;
-    flex-direction: row;
-    grid-template-rows: repeat(auto-fill, 15px);
-    grid-template-columns: repeat(auto-fill, 10px);
-    grid-auto-flow: column;
+    display: flex;
+    flex-direction: column;
 }
 
 pluto-logs:not(:first-child):not(:empty) {
     margin-top: 10px;
 }
 
-pluto-log-dot-positioner {
-    display: block;
-    width: 10px;
-    transition: transform 100ms ease-in-out;
+pluto-log-dot {
+    /* part 2 */
+    /* box-shadow: -2px 0px 1px #00000014; */
+    font-family: "Roboto Mono", monospace;
+    font-size: 0.6rem;
+    position: relative;
+    display: flex;
+    flex-grow: 1;
+    flex-direction: column;
+    padding: 1px 3px;
+    min-width: 18px;
+    min-height: 18px;
+    /* border-radius: 7px; */
+    padding: 0.6em 0.9em 0.6em 0.3em;
 }
 
-pluto-log-dot-positioner:hover,
-pluto-log-dot-positioner.inspecting {
-    z-index: 5;
-    /* transform: translate(0px, -5px); */
+pluto-log-dot-positioner {
+    /* border-bottom: 1px solid #71717140; */
+    display: flex;
+    flex-direction: row;
+    --bg-color: var(--pluto-logs-info-color);
+    --accent-color: var(--pluto-logs-info-accent-color);
+    --icon-image: unset;
+    background: var(--bg-color);
+    color: var(--accent-color);
+    margin: 2px;
+    border-radius: 6px;
+    /* border: 2px solid var(--accent-color); */
+    /* border: 2px solid #0000001c; */
+    /* box-shadow: 0px 0px 6px #00000036; */
+    background: linear-gradient(148deg, var(--bg-color), transparent);
+    background-size: 200% 100%;
 }
 
-/* pluto-log-dot-positioner {
-    transform: translateX(0px);
-} */
-pluto-log-dot-positioner.inspecting {
-    transform: translateX(5px);
-}
-pluto-log-dot-positioner.inspecting pluto-log-dot {
-    box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
-}
-pluto-log-dot-positioner.inspecting ~ pluto-log-dot-positioner {
-    transform: translateX(10px);
+pluto-log-dot-positioner:last-child {
+    /* border-bottom: none; */
 }
 
-pluto-log-dot-sizer {
-    display: block;
-    width: max-content;
-    transform: translateZ(10px);
-    max-width: 600px;
-    z-index: 300;
-    pointer-events: none; /* part 1: because the hit box is larger than the action log dot */
+pluto-log-truncated {
+    display: grid;
+    place-items: center;
+    font-family: var(--system-ui-font-stack);
+    opacity: 0.7;
+    padding: 0.7em;
+    font-style: italic;
 }
-pluto-log-dot {
-    pointer-events: auto; /* part 2 */
-    box-shadow: -2px 0px 1px #00000014;
-    font-family: "Roboto Mono", monospace;
-    font-size: 0.6rem;
 
-    /* position: absolute; */
+pluto-log-icon::before {
+    content: "";
+    width: 1em;
+    height: 1em;
+    background-image: var(--icon-image);
+    background-size: 1em;
+    filter: var(--image-filters);
     display: inline-flex;
-    flex-direction: column;
-    padding: 1px 3px;
-    min-width: 18px;
-    min-height: 18px;
-    border-radius: 7px;
+    margin: 0.3em;
 }
-pluto-log-dot {
-    background: var(--jl-info-color);
-    border: 3px solid var(--jl-info-accent-color);
+
+pluto-log-dot-positioner.Info {
+    --icon-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/information-circle-outline.svg");
 }
-pluto-log-dot.Warn {
-    background: var(--jl-warn-color);
-    border: 3px solid var(--jl-warn-accent-color);
+pluto-log-dot-positioner.Info pluto-log-icon::before {
+    opacity: 0.4;
 }
-pluto-log-dot.Error {
-    background: var(--jl-danger-color);
-    border: 3px solid var(--jl-danger-accent-color);
+pluto-log-dot-positioner.Warn {
+    --bg-color: var(--pluto-logs-warn-color);
+    --accent-color: var(--pluto-logs-warn-accent-color);
+    --icon-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/warning-outline.svg");
+}
+pluto-log-dot-positioner.Error {
+    --bg-color: var(--pluto-logs-danger-color);
+    --accent-color: var(--pluto-logs-danger-accent-color);
+    --icon-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-circle-outline.svg");
+}
+pluto-log-dot-positioner.Debug {
+    --bg-color: var(--pluto-logs-debug-color);
+    --accent-color: var(--pluto-logs-debug-accent-color);
+    --icon-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/information-circle-outline.svg");
+}
+pluto-log-dot-positioner.Stdout {
+    --icon-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/terminal-outline.svg");
 }
-pluto-log-dot.Debug {
-    background: var(--jl-debug-color);
-    border: 3px solid var(--jl-debug-accent-color);
+pluto-log-dot-positioner.Stdout pluto-log-icon::before {
+    opacity: 0.4;
 }
+
 pluto-log-dot.Progress {
-    width: 100px;
-    background: #94949466;
-    border: 3px solid var(--pluto-logs-progress-border);
     overflow: hidden;
     padding: 0px;
+    flex: 0 1 200px;
+    display: flex;
+    flex-direction: row;
+    align-items: stretch;
+    align-self: center;
+    outline: 3px solid var(--pluto-logs-progress-border);
+    outline-offset: -2px;
+    border-radius: 6px;
+    background: var(--pluto-logs-progress-bg);
+    font-size: 0.7rem;
 }
 pluto-log-dot.Stdout {
-    /* filter: sepia(0.3); */
     --inner: hsl(36deg 20% 37%);
     --outer: hsl(31deg 12% 28%);
     background: radial-gradient(var(--inner), var(--inner) 20%, var(--outer));
@@ -2503,14 +2476,15 @@ pluto-log-dot.Stdout {
     border: 6px solid #b7b7b7;
     text-shadow: 1px 1px 2px #0000005e;
     min-width: 18em;
+    border-radius: 8px;
 }
 pluto-log-dot.Stdout::after,
 pluto-log-dot.Stdout::before {
     content: " ";
-    left: 6px;
-    right: 6px;
-    top: 6px;
-    bottom: 6px;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
     position: absolute;
     display: block;
     pointer-events: none;
@@ -2581,7 +2555,7 @@ pluto-log-dot-kwarg > * {
     flex: 0 1 auto;
 }
 pluto-log-dot-kwarg > pluto-key {
-    color: var(--pluto-schema-types-color);
+    color: var(--pluto-logs-key-color);
     margin-right: calc(1em - 30px);
 }
 pluto-log-dot-kwarg > pluto-key::after {
@@ -2589,6 +2563,7 @@ pluto-log-dot-kwarg > pluto-key::after {
 }
 pluto-log-dot-kwarg > pluto-value {
     margin-left: 30px;
+    overflow-x: auto;
 }
 /* PRESENTATION MODE */
 
@@ -2991,3 +2966,13 @@ pluto-cell.hooked_up pluto-output {
     justify-content: flex-end;
     gap: 0.5em;
 }
+
+pluto-logs-container > header {
+    font-family: "Roboto Mono", monospace;
+    font-size: 1.3rem;
+    padding: 0.2em;
+    padding-bottom: 0;
+    opacity: 0.6;
+    font-weight: 700;
+    /* background: #494949; */
+}
diff --git a/frontend/light_color.css b/frontend/light_color.css
index a8b832b94a..e443706d26 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -69,10 +69,21 @@
         --shoulder-hover-bg-color: rgba(0, 0, 0, 0.05);
 
         /* Logs */
-        --pluto-logs-bg-color: #efeff3;
+        --pluto-logs-bg-color: hsl(0deg 0% 98%);
+        --pluto-logs-key-color: rgb(0 0 0 / 51%);
         --pluto-logs-progress-fill: #ffffff;
+        --pluto-logs-progress-bg: #e7e7e7;
         --pluto-logs-progress-border: hsl(210deg 16% 74%);
 
+        --pluto-logs-info-color: white;
+        --pluto-logs-info-accent-color: inherit;
+        --pluto-logs-warn-color: rgb(236 234 213);
+        --pluto-logs-warn-accent-color: #665f26;
+        --pluto-logs-danger-color: rgb(245 218 215);
+        --pluto-logs-danger-accent-color: rgb(172 66 52);
+        --pluto-logs-debug-color: rgb(236 223 247);
+        --pluto-logs-debug-accent-color: rgb(100 50 179);
+
         /*Top navbar styling*/
         --nav-h1-text-color: black;
         --nav-filepicker-color: #6f6f6f;

From 490174487535a9a8fc82f691d765a532001500bb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 5 Oct 2022 16:21:46 +0200
Subject: [PATCH 441/821] PlutoPkg: if Pkg.resolve fails, try updating the
 registries (#2298)

---
 src/Pluto.jl               |   1 +
 src/packages/IOListener.jl |  32 ++++++++++++
 src/packages/Packages.jl   | 104 ++++++++++++++-----------------------
 src/packages/PkgCompat.jl  |   6 +--
 4 files changed, 75 insertions(+), 68 deletions(-)
 create mode 100644 src/packages/IOListener.jl

diff --git a/src/Pluto.jl b/src/Pluto.jl
index 88e0cafce5..01b2878730 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -72,6 +72,7 @@ include("./analysis/MoreAnalysis.jl")
 
 include("./evaluation/WorkspaceManager.jl")
 include("./evaluation/MacroAnalysis.jl")
+include("./packages/IOListener.jl")
 include("./packages/Packages.jl")
 include("./packages/PkgUtils.jl")
 include("./evaluation/Run.jl")
diff --git a/src/packages/IOListener.jl b/src/packages/IOListener.jl
new file mode 100644
index 0000000000..1de8d18c12
--- /dev/null
+++ b/src/packages/IOListener.jl
@@ -0,0 +1,32 @@
+
+"A polling system to watch for writes to an IOBuffer. Up-to-date content will be passed as string to the `callback` function."
+Base.@kwdef struct IOListener
+    callback::Function
+    buffer::IOBuffer=IOBuffer()
+    interval::Real=1.0/60
+    running::Ref{Bool}=Ref(false)
+    last_size::Ref{Int}=Ref(-1)
+end
+function trigger(listener::IOListener)
+    new_size = listener.buffer.size
+    if new_size > listener.last_size[]
+        listener.last_size[] = new_size
+        new_contents = String(listener.buffer.data[1:new_size])
+        listener.callback(new_contents)
+    end
+end
+function startlistening(listener::IOListener)
+    if !listener.running[]
+        listener.running[] = true
+        @async while listener.running[]
+            trigger(listener)
+            sleep(listener.interval)
+        end
+    end
+end
+function stoplistening(listener::IOListener)
+    if listener.running[]
+        listener.running[] = false
+        trigger(listener)
+    end
+end
diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index c621924e6f..b284673507 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -113,26 +113,7 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                 PkgCompat.refresh_registry_cache()
 
                 if !notebook.nbpkg_ctx_instantiated
-                    notebook.nbpkg_ctx = PkgCompat.clear_stdlib_compat_entries(notebook.nbpkg_ctx)
-                    PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
-                        withinteractive(false) do
-                            try
-                                Pkg.resolve(notebook.nbpkg_ctx)
-                            catch e
-                                @warn "Failed to resolve Pkg environment. Removing Manifest and trying again..." exception=e
-                                reset_nbpkg(notebook; keep_project=true, save=false, backup=false)
-                                try
-                                    Pkg.resolve(notebook.nbpkg_ctx)
-                                catch e
-                                    @warn "Failed to resolve Pkg environment. Removing Project compat entires and Manifest and trying again..." exception=e
-                                    reset_nbpkg(notebook; keep_project=true, save=false, backup=false)
-                                    notebook.nbpkg_ctx = PkgCompat.clear_compat_entries(notebook.nbpkg_ctx)
-                                    
-                                    Pkg.resolve(notebook.nbpkg_ctx)
-                                end
-                            end
-                        end
-                    end
+                    resolve_with_auto_fixes(notebook, iolistener)
                 end
                 
                 to_add = filter(PkgCompat.package_exists, added)
@@ -337,6 +318,43 @@ function writebackup(notebook::Notebook)
     backup_path
 end
 
+"""
+Run `Pkg.resolve` on the notebook's package environment. Keep trying more and more invasive strategies to fix problems until the operation succeeds.
+"""
+function resolve_with_auto_fixes(notebook::Notebook, iolistener::IOListener)
+    
+    notebook.nbpkg_ctx = PkgCompat.clear_stdlib_compat_entries(notebook.nbpkg_ctx)
+    
+    PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
+        withinteractive(false) do
+            try
+                Pkg.resolve(notebook.nbpkg_ctx)
+            catch e
+                @warn "Failed to resolve Pkg environment. Updating registries and trying again..." exception=e
+                
+                PkgCompat.update_registries(; force=true)
+                try
+                    Pkg.resolve(notebook.nbpkg_ctx)
+                catch e
+                    @warn "Failed to resolve Pkg environment. Removing Manifest and trying again..." exception=e
+                    
+                    reset_nbpkg(notebook; keep_project=true, save=false, backup=false)
+                    try
+                        Pkg.resolve(notebook.nbpkg_ctx)
+                    catch e
+                        @warn "Failed to resolve Pkg environment. Removing Project compat entries and Manifest and trying again..." exception=e
+                        
+                        reset_nbpkg(notebook; keep_project=true, save=false, backup=false)
+                        notebook.nbpkg_ctx = PkgCompat.clear_compat_entries(notebook.nbpkg_ctx)
+                        
+                        Pkg.resolve(notebook.nbpkg_ctx)
+                    end
+                end
+            end
+        end
+    end
+end
+
 """
 Reset the package environment of a notebook. This will remove the `Project.toml` and `Manifest.toml` files from the notebook's secret package environment folder, and if `save` is `true`, it will then save the notebook without embedded Project and Manifest.
 
@@ -384,19 +402,7 @@ function update_nbpkg_core(notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.UPLEV
             PkgCompat.refresh_registry_cache()
 
             if !notebook.nbpkg_ctx_instantiated
-                notebook.nbpkg_ctx = PkgCompat.clear_stdlib_compat_entries(notebook.nbpkg_ctx)
-                PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
-                    withinteractive(false) do
-                        PkgCompat.update_registries(;force=false)
-                        try
-                            Pkg.resolve(notebook.nbpkg_ctx)
-                        catch e
-                            @warn "Failed to resolve Pkg environment. Removing Manifest and trying again..." exception=e
-                            reset_nbpkg(notebook; keep_project=true, save=false, backup=false)
-                            Pkg.resolve(notebook.nbpkg_ctx)
-                        end
-                    end
-                end
+                resolve_with_auto_fixes(notebook, iolistener)
             end
 
             startlistening(iolistener)
@@ -526,35 +532,3 @@ function withinteractive(f::Function, value::Bool)
         end
     end
 end
-
-"A polling system to watch for writes to an IOBuffer. Up-to-date content will be passed as string to the `callback` function."
-Base.@kwdef struct IOListener
-    callback::Function
-    buffer::IOBuffer=IOBuffer()
-    interval::Real=1.0/60
-    running::Ref{Bool}=Ref(false)
-    last_size::Ref{Int}=Ref(-1)
-end
-function trigger(listener::IOListener)
-    new_size = listener.buffer.size
-    if new_size > listener.last_size[]
-        listener.last_size[] = new_size
-        new_contents = String(listener.buffer.data[1:new_size])
-        listener.callback(new_contents)
-    end
-end
-function startlistening(listener::IOListener)
-    if !listener.running[]
-        listener.running[] = true
-        @async while listener.running[]
-            trigger(listener)
-            sleep(listener.interval)
-        end
-    end
-end
-function stoplistening(listener::IOListener)
-    if listener.running[]
-        listener.running[] = false
-        trigger(listener)
-    end
-end
diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index 4cde461dc2..8e5f90759f 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -198,7 +198,7 @@ end
 """
 Check when the registries were last updated. If it is recent (max 7 days), then `Pkg.UPDATED_REGISTRY_THIS_SESSION[]` is set to `true`, which will prevent Pkg from doing an automatic registry update.
 
-Returns the new value of `Pkg.UPDATED_REGISTRY_THIS_SESSION`.
+Returns the new value of `Pkg.UPDATED_REGISTRY_THIS_SESSION[]`.
 """
 function check_registry_age(max_age_ms = 1000.0 * 60 * 60 * 24 * 7)::Bool
 	if get(ENV, "GITHUB_ACTIONS", "false") == "true"
@@ -208,7 +208,7 @@ function check_registry_age(max_age_ms = 1000.0 * 60 * 60 * 24 * 7)::Bool
 	paths = _get_registry_paths()
 	isempty(paths) && return _updated_registries_compat[]
 	
-	ages = map(paths) do p
+	mtimes = map(paths) do p
 		try
 			mtime(p)
 		catch
@@ -216,7 +216,7 @@ function check_registry_age(max_age_ms = 1000.0 * 60 * 60 * 24 * 7)::Bool
 		end
 	end
 	
-	if all(ages .> time() - max_age_ms)
+	if all(mtimes .> time() - max_age_ms)
 		_updated_registries_compat[] = true
 	end
 	_updated_registries_compat[]

From 6fd558b6c9eb8eb17d3dfa2c7b41192e9272f5c0 Mon Sep 17 00:00:00 2001
From: kcin96 <26337751+kcin96@users.noreply.github.com>
Date: Wed, 5 Oct 2022 15:31:06 +0100
Subject: [PATCH 442/821] Using RegistryInstances.jl to avoid some Pkg internal
 API #2118 (#2289)

Co-authored-by: Nicholas Ting Yik Ming <nicholasting@Nicholass-MacBook-Pro.local>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 Project.toml               |  4 +-
 src/packages/PkgCompat.jl  | 75 +++++++++++++-------------------------
 test/helpers.jl            | 10 +++++
 test/packages/Basic.jl     | 11 +-----
 test/packages/PkgCompat.jl | 24 ++++++++++++
 5 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/Project.toml b/Project.toml
index ca1a7306cc..e4c9a6bb95 100644
--- a/Project.toml
+++ b/Project.toml
@@ -21,6 +21,7 @@ MsgPack = "99f44e22-a591-53d1-9472-aa23ef4bd671"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 PrecompileSignatures = "91cefc8d-f054-46dc-8f8c-26e11d7c5411"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+RegistryInstances = "2792f1a3-b283-48e8-9a74-f99dce5104f3"
 RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
@@ -36,6 +37,7 @@ HypertextLiteral = "0.7, 0.8, 0.9"
 MIMEs = "0.1"
 MsgPack = "1.1"
 PrecompileSignatures = "3"
+RegistryInstances = "0.1"
 RelocatableFolders = "0.1, 0.2, 0.3"
 Tables = "1"
 URIs = "1.3"
@@ -43,12 +45,12 @@ julia = "^1.6"
 
 [extras]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
+Memoize = "c03570c3-d221-55d1-a50c-7939bbd78826"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
-Memoize = "c03570c3-d221-55d1-a50c-7939bbd78826"
 
 [targets]
 test = ["DataFrames", "OffsetArrays", "Random", "Sockets", "Test", "TimerOutputs", "Memoize"]
diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index 8e5f90759f..939ec7a075 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -4,7 +4,7 @@ export package_versions, package_completions
 
 import Pkg
 import Pkg.Types: VersionRange
-
+import RegistryInstances
 import ..Pluto
 
 # Should be in Base
@@ -142,34 +142,15 @@ end
 # REGISTRIES
 ###
 
-# (⛔️ Internal API)
-"Return paths to all installed registries."
-_get_registry_paths() = @static if isdefined(Pkg, :Types) && isdefined(Pkg.Types, :registries)
-	Pkg.Types.registries()
-elseif isdefined(Pkg, :Registry) && isdefined(Pkg.Registry, :reachable_registries)
-	registry_specs = Pkg.Registry.reachable_registries()
-	[s.path for s in registry_specs]
-elseif isdefined(Pkg, :Types) && isdefined(Pkg.Types, :collect_registries)
-	registry_specs = Pkg.Types.collect_registries()
-	[s.path for s in registry_specs]
-else
-	String[]
-end
+# (✅ "Public" API using RegistryInstances)
+"Return all installed registries as `RegistryInstances.RegistryInstance` structs."
+_get_registries() = RegistryInstances.reachable_registries()
 
-# (⛔️ Internal API)
-_get_registries() = map(_get_registry_paths()) do r
-	@static if isdefined(Pkg, :Registry) && isdefined(Pkg.Registry, :RegistryInstance)
-		Pkg.Registry.RegistryInstance(r)
-	else
-		r => Pkg.Types.read_registry(joinpath(r, "Registry.toml"))
-	end
-end
-
-# (⛔️ Internal API)
-"Contains all registries as `Pkg.Types.Registry` structs."
+# (✅ "Public" API using RegistryInstances)
+"The cached output value of `_get_registries`."
 const _parsed_registries = Ref(_get_registries())
 
-# (⛔️ Internal API)
+# (✅ "Public" API using RegistryInstances)
 "Re-parse the installed registries from disk."
 function refresh_registry_cache()
 	_parsed_registries[] = _get_registries()
@@ -205,7 +186,7 @@ function check_registry_age(max_age_ms = 1000.0 * 60 * 60 * 24 * 7)::Bool
 		# don't do this optimization in CI
 		return false
 	end
-	paths = _get_registry_paths()
+	paths = [s.path for s in _get_registries()]
 	isempty(paths) && return _updated_registries_compat[]
 	
 	mtimes = map(paths) do p
@@ -294,7 +275,7 @@ end
 # Package versions
 ###
 
-# (⛔️ Internal API)
+# (✅ "Public" API)
 """
 Return paths to all found registry entries of a given package name.
 
@@ -306,17 +287,17 @@ julia> Pluto.PkgCompat._registry_entries("Pluto")
 ```
 """
 function _registry_entries(package_name::AbstractString, registries::Vector=_parsed_registries[])::Vector{String}
-	flatmap(registries) do (rpath, r)
-		packages = values(r["packages"])
+	flatmap(registries) do reg
+		packages = values(reg.pkgs)
 		String[
-			joinpath(rpath, d["path"])
+			joinpath(reg.path, d.path)
 			for d in packages
-			if d["name"] == package_name
+			if d.name == package_name
 		]
 	end
 end
 
-# (⛔️ Internal API)
+# (🐸 "Public API", but using PkgContext)
 function _package_versions_from_path(registry_entry_fullpath::AbstractString)::Vector{VersionNumber}
 	# compat
     vd = @static if isdefined(Pkg, :Operations) && isdefined(Pkg.Operations, :load_versions) && hasmethod(Pkg.Operations.load_versions, (String,))
@@ -327,8 +308,7 @@ function _package_versions_from_path(registry_entry_fullpath::AbstractString)::V
 	vd |> keys |> collect
 end
 
-# ⚠️ Internal API with fallback
-# See https://github.com/JuliaLang/Pkg.jl/issues/2607
+# ✅ "Public" API using RegistryInstances
 """
 Return all registered versions of the given package. Returns `["stdlib"]` for standard libraries, and a `Vector{VersionNumber}` for registered packages.
 """
@@ -337,23 +317,18 @@ function package_versions(package_name::AbstractString)::Vector
         ["stdlib"]
     else
 		try
-			@static(if isdefined(Pkg, :Registry) && isdefined(Pkg.Registry, :uuids_from_name)
-				flatmap(_parsed_registries[]) do reg
-					uuids_with_name = Pkg.Registry.uuids_from_name(reg, package_name)
-					flatmap(uuids_with_name) do u
-						pkg = get(reg, u, nothing)
-						if pkg !== nothing
-							info = Pkg.Registry.registry_info(pkg)
-							collect(keys(info.version_info))
-						else
-							[]
-						end
+			flatmap(_parsed_registries[]) do reg
+				uuids_with_name = RegistryInstances.uuids_from_name(reg, package_name)
+				flatmap(uuids_with_name) do u
+					pkg = get(reg, u, nothing)
+					if pkg !== nothing
+						info = RegistryInstances.registry_info(pkg)
+						collect(keys(info.version_info))
+					else
+						[]
 					end
 				end
-			else
-				ps = _registry_entries(package_name)
-				flatmap(_package_versions_from_path, ps)
-			end) |> sort
+			end
 		catch e
 			@warn "Pkg compat: failed to get installable versions." exception=(e,catch_backtrace())
 			["latest"]
diff --git a/test/helpers.jl b/test/helpers.jl
index ee5c51b3e5..c254a748f2 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -17,6 +17,7 @@ using Sockets
 using Test
 using HTTP
 import Distributed
+import Pkg
 
 function Base.show(io::IO, s::SymbolsState)
     print(io, "SymbolsState([")
@@ -234,3 +235,12 @@ function verify_no_running_processes()
         @error "Not all notebook processes were closed during tests!" Distributed.procs()
     end
 end
+
+# We have our own registry for these test! Take a look at https://github.com/JuliaPluto/PlutoPkgTestRegistry#readme for more info about the test packages and their dependencies.
+
+const pluto_test_registry_spec = Pkg.RegistrySpec(;
+    url="https://github.com/JuliaPluto/PlutoPkgTestRegistry", 
+    uuid=Base.UUID("96d04d5f-8721-475f-89c4-5ee455d3eda0"),
+    name="PlutoPkgTestRegistry",
+)
+
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index f64466899f..5df3a3135b 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -8,21 +8,12 @@ import Pluto.PkgUtils
 import Pluto.PkgCompat
 import Distributed
 
-# We have our own registry for these test! Take a look at https://github.com/JuliaPluto/PlutoPkgTestRegistry#readme for more info about the test packages and their dependencies.
-
-const pluto_test_registry_spec = Pkg.RegistrySpec(;
-    url="https://github.com/JuliaPluto/PlutoPkgTestRegistry", 
-    uuid=Base.UUID("96d04d5f-8721-475f-89c4-5ee455d3eda0"),
-    name="PlutoPkgTestRegistry",
-)
-
 
 @testset "Built-in Pkg" begin
     
-    # Pkg.Registry.rm("General")
+    # We have our own registry for these test! Take a look at https://github.com/JuliaPluto/PlutoPkgTestRegistry#readme for more info about the test packages and their dependencies.
     Pkg.Registry.add(pluto_test_registry_spec)
 
-    # We have our own registry for these test! Take a look at https://github.com/JuliaPluto/PlutoPkgTestRegistry#readme for more info about the test packages and their dependencies.
     @testset "Basic" begin
         🍭 = ServerSession()
 
diff --git a/test/packages/PkgCompat.jl b/test/packages/PkgCompat.jl
index 9ca319b6fb..b600f3df15 100644
--- a/test/packages/PkgCompat.jl
+++ b/test/packages/PkgCompat.jl
@@ -6,6 +6,7 @@ import Pkg
 
 
 @testset "PkgCompat" begin
+    PkgCompat.refresh_registry_cache()
 
     @testset "Available versions" begin
         vs = PkgCompat.package_versions("HTTP")
@@ -28,6 +29,29 @@ import Pkg
 
         @test isempty(vs)
         @test !PkgCompat.package_exists("Dateskjashdfkjahsdfkjh")
+        
+    end
+    
+    @testset "Registry queries" begin
+        Pkg.Registry.add(pluto_test_registry_spec)
+        PkgCompat.refresh_registry_cache()
+        
+        es = PkgCompat._registry_entries("PlutoPkgTestA")
+        @test length(es) == 1
+        @test occursin("P/PlutoPkgTestA", only(es))
+        @test occursin("PlutoPkgTestRegistry", only(es))
+        
+        es = PkgCompat._registry_entries("Pluto")
+        @test length(es) == 1
+        @test occursin("P/Pluto", only(es))
+        @test occursin("General", only(es))
+        
+        es = PkgCompat._registry_entries("HelloWorldC_jll")
+        @test length(es) == 1
+        @test occursin(joinpath("H", "HelloWorldC_jll"), only(es))
+        @test occursin("General", only(es))
+        
+        Pkg.Registry.rm(pluto_test_registry_spec)
     end
 
     @testset "Installed versions" begin

From 9ad421a9fc28693c8935fb4434cefa908584f1ed Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 5 Oct 2022 17:48:29 +0200
Subject: [PATCH 443/821] small performance optimization for topological_order

---
 src/analysis/topological_order.jl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/analysis/topological_order.jl b/src/analysis/topological_order.jl
index 4f21de965b..a2b0bb6146 100644
--- a/src/analysis/topological_order.jl
+++ b/src/analysis/topological_order.jl
@@ -19,7 +19,7 @@ function topological_order(topology::NotebookTopology, roots::AbstractVector{Cel
 			return Ok()
 		elseif haskey(errable, cell)
 			return Ok()
-		elseif length(entries) > 0 && entries[end] == cell
+		elseif length(entries) > 0 && entries[end] === cell
 			return Ok() # a cell referencing itself is legal
 		elseif cell in entries
 			currently_in = setdiff(entries, exits)
@@ -49,7 +49,7 @@ function topological_order(topology::NotebookTopology, roots::AbstractVector{Cel
 		end
 		referencers = where_referenced(topology, cell) |> Iterators.reverse
 		for c in (allow_multiple_defs ? referencers : union(assigners, referencers))
-			if c != cell
+			if c !== cell
 				child_result = bfs(c)
 
 				# No cycle for this child or the cycle has no soft edges
@@ -74,7 +74,7 @@ function topological_order(topology::NotebookTopology, roots::AbstractVector{Cel
 					delete!(errable, cycled_cell)
 				end
 				# 2. Remove the current child (c) from the entries if it was just added
-				if entries[end] == c
+				if entries[end] === c
 					pop!(entries)
 				end
 

From e2b94400f2074a188f660b6f161fbf911da64d5d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 5 Oct 2022 19:07:03 +0200
Subject: [PATCH 444/821] fix windows test

---
 test/packages/PkgCompat.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/packages/PkgCompat.jl b/test/packages/PkgCompat.jl
index b600f3df15..ad0bdc0298 100644
--- a/test/packages/PkgCompat.jl
+++ b/test/packages/PkgCompat.jl
@@ -48,7 +48,7 @@ import Pkg
         
         es = PkgCompat._registry_entries("HelloWorldC_jll")
         @test length(es) == 1
-        @test occursin(joinpath("H", "HelloWorldC_jll"), only(es))
+        @test occursin("H/HelloWorldC_jll", only(es))
         @test occursin("General", only(es))
         
         Pkg.Registry.rm(pluto_test_registry_spec)

From 0e4f16f03c40beeeb4a4215b405f4421fefc7dca Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Wed, 5 Oct 2022 21:53:36 +0200
Subject: [PATCH 445/821] Allow rich MIME override (#2299)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 src/Configuration.jl               |  8 +++++++-
 src/evaluation/WorkspaceManager.jl |  2 ++
 src/runner/PlutoRunner.jl          | 16 ++++++++++++----
 test/Configuration.jl              | 23 +++++++++++++++++++++--
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index 5e12d5b06f..920782d25d 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -131,22 +131,26 @@ const RUN_NOTEBOOK_ON_LOAD_DEFAULT = true
 const WORKSPACE_USE_DISTRIBUTED_DEFAULT = true
 const LAZY_WORKSPACE_CREATION_DEFAULT = false
 const CAPTURE_STDOUT_DEFAULT = true
+const WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT = nothing
 
 """
     EvaluationOptions([; kwargs...])
 
-Options to change Pluto's evaluation behaviour during internal testing. These options are not intended to be changed during normal use.
+Options to change Pluto's evaluation behaviour during internal testing and by downstream packages.
+These options are not intended to be changed during normal use.
 
 - `run_notebook_on_load::Bool = $RUN_NOTEBOOK_ON_LOAD_DEFAULT` Whether to evaluate a notebook on load.
 - `workspace_use_distributed::Bool = $WORKSPACE_USE_DISTRIBUTED_DEFAULT` Whether to start notebooks in a separate process.
 - `lazy_workspace_creation::Bool = $LAZY_WORKSPACE_CREATION_DEFAULT`
 - `capture_stdout::Bool = $CAPTURE_STDOUT_DEFAULT`
+- `workspace_custom_startup_expr::Union{Nothing,Expr} = $WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT` An expression to be evaluated in the workspace process before running notebook code.
 """
 @option mutable struct EvaluationOptions
     run_notebook_on_load::Bool = RUN_NOTEBOOK_ON_LOAD_DEFAULT
     workspace_use_distributed::Bool = WORKSPACE_USE_DISTRIBUTED_DEFAULT
     lazy_workspace_creation::Bool = LAZY_WORKSPACE_CREATION_DEFAULT
     capture_stdout::Bool = CAPTURE_STDOUT_DEFAULT
+    workspace_custom_startup_expr::Union{Nothing,Expr} = WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT
 end
 
 const COMPILE_DEFAULT = nothing
@@ -253,6 +257,7 @@ function from_flat_kwargs(;
         workspace_use_distributed::Bool = WORKSPACE_USE_DISTRIBUTED_DEFAULT,
         lazy_workspace_creation::Bool = LAZY_WORKSPACE_CREATION_DEFAULT,
         capture_stdout::Bool = CAPTURE_STDOUT_DEFAULT,
+        workspace_custom_startup_expr::Union{Nothing,Expr} = WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT,
         compile::Union{Nothing,String} = COMPILE_DEFAULT,
         sysimage::Union{Nothing,String} = SYSIMAGE_DEFAULT,
         banner::Union{Nothing,String} = BANNER_DEFAULT,
@@ -292,6 +297,7 @@ function from_flat_kwargs(;
         workspace_use_distributed,
         lazy_workspace_creation,
         capture_stdout,
+        workspace_custom_startup_expr,
     )
     compiler = CompilerOptions(;
         compile,
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index e34d82df87..c556e97e15 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -60,6 +60,8 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
         pid
     end
 
+    Distributed.remotecall_eval(Main, [pid], session.options.evaluation.workspace_custom_startup_expr)
+
     Distributed.remotecall_eval(Main, [pid], :(PlutoRunner.notebook_id[] = $(notebook.notebook_id)))
 
     remote_log_channel = Core.eval(Main, quote
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 50da8c8507..5a3d69cbf6 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -947,7 +947,7 @@ const default_stdout_iocontext = IOContext(devnull,
     :is_pluto => false,
 )
 
-const imagemimes = [MIME"image/svg+xml"(), MIME"image/png"(), MIME"image/jpg"(), MIME"image/jpeg"(), MIME"image/bmp"(), MIME"image/gif"()]
+const imagemimes = MIME[MIME"image/svg+xml"(), MIME"image/png"(), MIME"image/jpg"(), MIME"image/jpeg"(), MIME"image/bmp"(), MIME"image/gif"()]
 # in descending order of coolness
 # text/plain always matches - almost always
 """
@@ -955,7 +955,7 @@ The MIMEs that Pluto supports, in order of how much I like them.
 
 `text/plain` should always match - the difference between `show(::IO, ::MIME"text/plain", x)` and `show(::IO, x)` is an unsolved mystery.
 """
-const allmimes = [MIME"application/vnd.pluto.table+object"(); MIME"application/vnd.pluto.divelement+object"(); MIME"text/html"(); imagemimes; MIME"application/vnd.pluto.tree+object"(); MIME"text/latex"(); MIME"text/plain"()]
+const allmimes = MIME[MIME"application/vnd.pluto.table+object"(); MIME"application/vnd.pluto.divelement+object"(); MIME"text/html"(); imagemimes; MIME"application/vnd.pluto.tree+object"(); MIME"text/latex"(); MIME"text/plain"()]
 
 
 """
@@ -1086,11 +1086,19 @@ function use_tree_viewer_for_struct(@nospecialize(x::T))::Bool where T
     end
 end
 
+"""
+    is_mime_enabled(::MIME) -> Bool
+
+Return whether the argument's mimetype is enabled.
+This defaults to `true`, but additional dispatches can be set to `false` by downstream packages.
+"""
+is_mime_enabled(::MIME) = true
+
 "Return the first mimetype in `allmimes` which can show `x`."
 function mimetype(x)
     # ugly code to fix an ugly performance problem
     for m in allmimes
-        if pluto_showable(m, x)
+        if pluto_showable(m, x) && is_mime_enabled(m)
             return m
         end
     end
@@ -1105,7 +1113,7 @@ Like two-argument `Base.show`, except:
 function show_richest(io::IO, @nospecialize(x))::Tuple{<:Any,MIME}
     mime = mimetype(x)
 
-    if mime isa MIME"text/plain" && use_tree_viewer_for_struct(x)
+    if mime isa MIME"text/plain" && is_mime_enabled(MIME"application/vnd.pluto.tree+object"()) && use_tree_viewer_for_struct(x)
         tree_data(x, io), MIME"application/vnd.pluto.tree+object"()
     elseif mime isa MIME"application/vnd.pluto.tree+object"
         try
diff --git a/test/Configuration.jl b/test/Configuration.jl
index c45d0751d0..0b6b131618 100644
--- a/test/Configuration.jl
+++ b/test/Configuration.jl
@@ -61,8 +61,6 @@ end
     port = 1238
     options = Pluto.Configuration.from_flat_kwargs(; port, launch_browser=false, workspace_use_distributed=false)
     🍭 = Pluto.ServerSession(; options)
-    fakeclient = ClientSession(:fake, nothing)
-    🍭.connected_clients[fakeclient.id] = fakeclient
     host = 🍭.options.server.host
     secret = 🍭.secret
     println("Launching test server...")
@@ -164,6 +162,27 @@ end
 
 end
 
+@testset "disable mimetype via workspace_custom_startup_expr" begin
+    🍭 = ServerSession()
+    🍭.options.evaluation.workspace_use_distributed = true
+    🍭.options.evaluation.workspace_custom_startup_expr = quote
+        PlutoRunner.is_mime_enabled(m::MIME"application/vnd.pluto.tree+object") = false
+    end
+
+    nb = Pluto.Notebook([
+        Pluto.Cell("x = [1, 2]")
+        Pluto.Cell("struct Foo; x; end")
+        Pluto.Cell("Foo(x)")
+    ])
+
+    Pluto.update_run!(🍭, nb, nb.cells)
+    @test nb.cells[1].output.body == repr(MIME"text/plain"(), [1,2])
+    @test nb.cells[1].output.mime isa MIME"text/plain"
+    @test nb.cells[3].output.mime isa MIME"text/plain"
+
+    Pluto.WorkspaceManager.unmake_workspace((🍭, nb))
+end
+
 # TODO are the processes closed properly?
 # TODO we reuse the same port without awaiting the shutdown of the previous server
 

From bf9f128be27967ca625d3fa44d2abe41217cccfb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 5 Oct 2022 22:13:55 +0200
Subject: [PATCH 446/821] Performance: skip save during bond runs

---
 src/evaluation/Run.jl | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 2d79cc6460..42b68a4af3 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -13,6 +13,7 @@ function run_reactive!(
     old_topology::NotebookTopology,
     new_topology::NotebookTopology,
     roots::Vector{Cell};
+	save::Bool=true,
     deletion_hook::Function = WorkspaceManager.move_vars,
     user_requested_run::Bool = true,
     bond_value_pairs=zip(Symbol[],Any[]),
@@ -24,6 +25,7 @@ function run_reactive!(
             old_topology,
             new_topology,
             roots;
+			save,
             deletion_hook,
             user_requested_run,
             bond_value_pairs,
@@ -43,6 +45,7 @@ function run_reactive_core!(
     old_topology::NotebookTopology,
     new_topology::NotebookTopology,
     roots::Vector{Cell};
+	save::Bool=true,
     deletion_hook::Function = WorkspaceManager.move_vars,
     user_requested_run::Bool = true,
     already_run::Vector{Cell} = Cell[],
@@ -118,7 +121,7 @@ function run_reactive_core!(
     end
 
 	# Save the notebook. This is the only time that we save the notebook, so any state changes that influence the file contents (like `depends_on_disabled_cells`) should be behind this point.
-	save_notebook(session, notebook)
+	save && save_notebook(session, notebook)
 
     # Send intermediate updates to the clients at most 20 times / second during a reactive run. (The effective speed of a slider is still unbounded, because the last update is not throttled.)
     # flush_send_notebook_changes_throttled, 
@@ -196,7 +199,7 @@ function run_reactive_core!(
             update_dependency_cache!(notebook)
             save_notebook(session, notebook)
 
-            return run_reactive_core!(session, notebook, new_topology, new_new_topology, to_run; deletion_hook, user_requested_run, already_run = to_run[1:i])
+            return run_reactive_core!(session, notebook, new_topology, new_new_topology, to_run; save, deletion_hook, user_requested_run, already_run = to_run[1:i])
         elseif !isempty(implicit_usings)
             new_soft_definitions = WorkspaceManager.collect_soft_definitions((session, notebook), implicit_usings)
             notebook.topology = new_new_topology = with_new_soft_definitions(new_topology, cell, new_soft_definitions)
@@ -205,7 +208,7 @@ function run_reactive_core!(
             update_dependency_cache!(notebook)
             save_notebook(session, notebook)
 
-            return run_reactive_core!(session, notebook, new_topology, new_new_topology, to_run; deletion_hook, user_requested_run, already_run = to_run[1:i])
+            return run_reactive_core!(session, notebook, new_topology, new_new_topology, to_run; save, deletion_hook, user_requested_run, already_run = to_run[1:i])
         end
     end
 
@@ -387,7 +390,7 @@ function update_save_run!(
             sync_nbpkg(session, notebook, old, new; save=(save && !session.options.server.disable_writing_notebook_files), take_token=false)
             if !(isempty(to_run_online) && session.options.evaluation.lazy_workspace_creation) && will_run_code(notebook)
                 # not async because that would be double async
-                run_reactive_core!(session, notebook, old, new, to_run_online; kwargs...)
+                run_reactive_core!(session, notebook, old, new, to_run_online; save, kwargs...)
                 # run_reactive_async!(session, notebook, old, new, to_run_online; deletion_hook=deletion_hook, run_async=false, kwargs...)
             end
         end

From e2e29017cccca7e513ce4a6ee39184be2a582f3e Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Wed, 5 Oct 2022 23:32:56 +0200
Subject: [PATCH 447/821] Allow downstream packages to disable stacktrace
 prettification (#2302)

---
 src/runner/PlutoRunner.jl | 46 +++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 5a3d69cbf6..765b59cc02 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -986,33 +986,41 @@ format_output(@nospecialize(x); context=default_iocontext) = format_output_defau
 
 format_output(::Nothing; context=default_iocontext) = ("", MIME"text/plain"())
 
+"Downstream packages can set this to false to obtain unprettified stack traces."
+const PRETTY_STACKTRACES = Ref(true)
+
 function format_output(val::CapturedException; context=default_iocontext)
-    ## We hide the part of the stacktrace that belongs to Pluto's evalling of user code.
-    stack = [s for (s, _) in val.processed_bt]
+    stacktrace = if PRETTY_STACKTRACES[]
+        ## We hide the part of the stacktrace that belongs to Pluto's evalling of user code.
+        stack = [s for (s, _) in val.processed_bt]
+
+        # function_wrap_index = findfirst(f -> occursin("function_wrapped_cell", String(f.func)), stack)
 
-    # function_wrap_index = findfirst(f -> occursin("function_wrapped_cell", String(f.func)), stack)
+        function_wrap_index = findlast(f -> occursin("#==#", String(f.file)), stack)
 
-    function_wrap_index = findlast(f -> occursin("#==#", String(f.file)), stack)
+        if function_wrap_index === nothing
+            for _ in 1:2
+                until = findfirst(b -> b.func == :eval, reverse(stack))
+                stack = until === nothing ? stack : stack[1:end - until]
+            end
+        else
+            stack = stack[1:function_wrap_index]
+        end
 
-    if function_wrap_index === nothing
-        for _ in 1:2
-            until = findfirst(b -> b.func == :eval, reverse(stack))
-            stack = until === nothing ? stack : stack[1:end - until]
+        pretty = map(stack) do s
+            Dict(
+                :call => pretty_stackcall(s, s.linfo),
+                :inlined => s.inlined,
+                :file => basename(String(s.file)),
+                :path => String(s.file),
+                :line => s.line,
+            )
         end
     else
-        stack = stack[1:function_wrap_index]
+        val
     end
 
-    pretty = map(stack) do s
-        Dict(
-            :call => pretty_stackcall(s, s.linfo),
-            :inlined => s.inlined,
-            :file => basename(String(s.file)),
-            :path => String(s.file),
-            :line => s.line,
-        )
-    end
-    Dict{Symbol,Any}(:msg => sprint(try_showerror, val.ex), :stacktrace => pretty), MIME"application/vnd.pluto.stacktrace+object"()
+    Dict{Symbol,Any}(:msg => sprint(try_showerror, val.ex), :stacktrace => stacktrace), MIME"application/vnd.pluto.stacktrace+object"()
 end
 
 function format_output(binding::Base.Docs.Binding; context=default_iocontext)

From 1e803843d7c8ee742e1e6c22624f99ab83660b18 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 6 Oct 2022 00:46:35 +0200
Subject: [PATCH 448/821] =?UTF-8?q?=F0=9F=A7=B9=20remove=20fakeclient=20in?=
 =?UTF-8?q?=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/Bonds.jl            |  7 -------
 test/DependencyCache.jl  |  4 ----
 test/Dynamic.jl          |  5 -----
 test/Events.jl           |  4 ----
 test/Logging.jl          |  3 ---
 test/MacroAnalysis.jl    |  6 ------
 test/Notebook.jl         | 11 -----------
 test/React.jl            | 26 --------------------------
 test/ReloadFromFile.jl   |  5 -----
 test/RichOutput.jl       |  9 ---------
 test/WorkspaceManager.jl | 16 ----------------
 test/cell_disabling.jl   |  4 ----
 12 files changed, 100 deletions(-)

diff --git a/test/Bonds.jl b/test/Bonds.jl
index d8469e2b16..21ab86d598 100644
--- a/test/Bonds.jl
+++ b/test/Bonds.jl
@@ -7,8 +7,6 @@ import Distributed
 
     🍭 = ServerSession()
     🍭.options.evaluation.workspace_use_distributed = false
-    fakeclient = ClientSession(:fake, nothing)
-    🍭.connected_clients[fakeclient.id] = fakeclient
     
     @testset "AbstractPlutoDingetjes.jl" begin
         🍭.options.evaluation.workspace_use_distributed = true
@@ -178,7 +176,6 @@ import Distributed
                 # 34
                 Cell("@bind pv5 PossibleValuesTest(1:10)"),
             ])
-        fakeclient.connected_notebook = notebook
         
         
         function set_bond_value(name, value, is_first_value=false)
@@ -326,9 +323,6 @@ import Distributed
 
     @testset "Dependent Bound Variables" begin
         🍭 = ServerSession()
-        🍭.options.evaluation.workspace_use_distributed = false
-        fakeclient = ClientSession(:fake, nothing)
-        🍭.connected_clients[fakeclient.id] = fakeclient
         🍭.options.evaluation.workspace_use_distributed = true
         notebook = Notebook([
             Cell(raw"""@bind x HTML("<input type=range min=1 max=10>")"""),
@@ -362,7 +356,6 @@ import Distributed
             Cell(raw"""hello2"""), #11
             Cell(raw"""using AbstractPlutoDingetjes"""),
         ])
-        fakeclient.connected_notebook = notebook
         update_run!(🍭, notebook, notebook.cells)
 
         function set_bond_values!(notebook:: Notebook, bonds:: Dict; is_first_value=false)
diff --git a/test/DependencyCache.jl b/test/DependencyCache.jl
index 96d69bbd6d..77b2c0b660 100644
--- a/test/DependencyCache.jl
+++ b/test/DependencyCache.jl
@@ -7,9 +7,6 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook
     🍭 = ServerSession()
     🍭.options.evaluation.workspace_use_distributed = false
 
-    fakeclient = ClientSession(:fake, nothing)
-    🍭.connected_clients[fakeclient.id] = fakeclient
-
     notebook = Notebook([
                 Cell("x = 1"), # prerequisite of test cell
                 Cell("f(x) = x + y"), # depends on test cell
@@ -23,7 +20,6 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook
                 Cell("g(6) + g(6,6)"),
                 Cell("using Dates"),
             ])
-    fakeclient.connected_notebook = notebook
     update_run!(🍭, notebook, notebook.cells)
     state = Pluto.notebook_to_js(notebook)
 
diff --git a/test/Dynamic.jl b/test/Dynamic.jl
index b3bc9d4b44..fcdcadc984 100644
--- a/test/Dynamic.jl
+++ b/test/Dynamic.jl
@@ -35,8 +35,6 @@ end
         client = ClientSession(:buffery, buffer)
 
         🍭 = ServerSession()
-        # 🍭.connected_clients[client.id] = client
-
 
         notebook = Notebook([
             Cell(
@@ -179,10 +177,8 @@ end
     end
 
     @testset "PlutoRunner API" begin
-        fakeclient = ClientSession(:fake, nothing)
         🍭 = ServerSession()
         🍭.options.evaluation.workspace_use_distributed = true
-        🍭.connected_clients[fakeclient.id] = fakeclient
 
         notebook = Notebook([
             Cell("PlutoRunner.notebook_id[] |> Text"),
@@ -203,7 +199,6 @@ end
             Cell("x = Dict(:a => 6)"),
             Cell("PlutoRunner.publish_to_js(x)"),
         ])
-        fakeclient.connected_notebook = notebook
 
         update_save_run!(🍭, notebook, notebook.cells)
         @test notebook.cells[1].output.body == notebook.notebook_id |> string
diff --git a/test/Events.jl b/test/Events.jl
index 990b223b6e..1dbfdaee03 100644
--- a/test/Events.jl
+++ b/test/Events.jl
@@ -16,15 +16,11 @@ import UUIDs: UUID
     🍭.options.server.on_event = test_listener
     🍭.options.evaluation.workspace_use_distributed = false
 
-    fakeclient = ClientSession(:fake, nothing)
-    🍭.connected_clients[fakeclient.id] = fakeclient
     notebook = Notebook([
         Cell("[1,1,[1]]"),
         Cell("Dict(:a => [:b, :c])"),
     ])
 
-    fakeclient.connected_notebook = notebook
-
     update_run!(🍭, notebook, notebook.cells)
     WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     @test_broken events[1:3] == ["NewNotebookEvent", "OpenNotebookEvent" , "FileSaveEvent"]
diff --git a/test/Logging.jl b/test/Logging.jl
index 1a29535d8f..125f048f2f 100644
--- a/test/Logging.jl
+++ b/test/Logging.jl
@@ -7,9 +7,6 @@ using Pluto.WorkspaceManager: poll
     🍭 = ServerSession()
     🍭.options.evaluation.workspace_use_distributed = true
 
-    fakeclient = ClientSession(:fake, nothing)
-    🍭.connected_clients[fakeclient.id] = fakeclient
-    
     notebook = Notebook(Cell.([
         "println(123)",
         "println(stdout, 123)",
diff --git a/test/MacroAnalysis.jl b/test/MacroAnalysis.jl
index d96d15cd82..59e79157c3 100644
--- a/test/MacroAnalysis.jl
+++ b/test/MacroAnalysis.jl
@@ -7,9 +7,6 @@ import Memoize: @memoize
     🍭 = ServerSession()
     🍭.options.evaluation.workspace_use_distributed = false
 
-    fakeclient = ClientSession(:fake, nothing)
-    🍭.connected_clients[fakeclient.id] = fakeclient
-
     @testset "Base macro call" begin
         notebook = Notebook([
             Cell("@enum Fruit 🍎 🍐"),
@@ -887,9 +884,6 @@ import Memoize: @memoize
         🍭 = ServerSession()
         🍭.options.evaluation.workspace_use_distributed = false
 
-        fakeclient = ClientSession(:fake, nothing)
-        🍭.connected_clients[fakeclient.id] = fakeclient
-
         notebook = Notebook([
             Cell("using Memoize"),
             Cell("""
diff --git a/test/Notebook.jl b/test/Notebook.jl
index 24ee129a0c..7e7d5480ec 100644
--- a/test/Notebook.jl
+++ b/test/Notebook.jl
@@ -190,11 +190,6 @@ end
     🍭 = ServerSession()
     for (name, nb) in nbs
         nb.path = tempname() * "é🧡💛.jl"
-
-        client = ClientSession(Symbol("client", rand(UInt16)), nothing)
-        client.connected_notebook = nb
-
-        🍭.connected_clients[client.id] = client
     end
 
     @testset "I/O basic" begin
@@ -209,8 +204,6 @@ end
     @testset "Cell Metadata" begin
         🍭 = ServerSession()
         🍭.options.evaluation.workspace_use_distributed = false
-        fakeclient = ClientSession(:fake, nothing)
-        🍭.connected_clients[fakeclient.id] = fakeclient
 
         @testset "Disabling & Metadata" begin
             nb = cell_metadata_notebook()
@@ -246,8 +239,6 @@ end
     @testset "Notebook Metadata" begin
         🍭 = ServerSession()
         🍭.options.evaluation.workspace_use_distributed = false
-        fakeclient = ClientSession(:fake, nothing)
-        🍭.connected_clients[fakeclient.id] = fakeclient
 
         nb = notebook_metadata_notebook()
         update_run!(🍭, nb, nb.cells)
@@ -273,8 +264,6 @@ end
     @testset "Skip as script" begin
         🍭 = ServerSession()
         🍭.options.evaluation.workspace_use_distributed = false
-        fakeclient = ClientSession(:fake, nothing)
-        🍭.connected_clients[fakeclient.id] = fakeclient
 
         nb = skip_as_script_notebook()
         update_run!(🍭, nb, nb.cells)
diff --git a/test/React.jl b/test/React.jl
index a4b112a02c..eb1b5e0d7a 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -7,9 +7,6 @@ import Distributed
     🍭 = ServerSession()
     🍭.options.evaluation.workspace_use_distributed = false
 
-    fakeclient = ClientSession(:fake, nothing)
-    🍭.connected_clients[fakeclient.id] = fakeclient
-
     @testset "Basic $(parallel ? "distributed" : "single-process")" for parallel in [false, true]
         🍭.options.evaluation.workspace_use_distributed = parallel
         
@@ -28,7 +25,6 @@ import Distributed
             Cell("import Distributed"),
             Cell("Distributed.myid()"),
         ])
-        fakeclient.connected_notebook = notebook
 
         @test !haskey(WorkspaceManager.workspaces, notebook.notebook_id)
 
@@ -95,7 +91,6 @@ import Distributed
             Cell("g(x) = 5"),
             Cell("g = 6"),
         ])
-        fakeclient.connected_notebook = notebook
     
 
         update_run!(🍭, notebook, notebook.cells[1])
@@ -218,7 +213,6 @@ import Distributed
         write(file, read(normpath(Pluto.project_relative_path("src", "webserver", "Firebasey.jl"))))
 
         notebook = Pluto.load_notebook_nobackup(file)
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells)
 
@@ -313,7 +307,6 @@ import Distributed
             Cell("using Dates"),
             Cell("July"),
         ])
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells[1:1])
 
@@ -333,7 +326,6 @@ import Distributed
             Cell("December"),
             Cell(""),
         ])
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells)
 
@@ -365,7 +357,6 @@ import Distributed
             Cell("archive_artifact"),
             Cell("using Unknown.Package"),
         ])
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells)
 
@@ -389,7 +380,6 @@ import Distributed
             Cell(""),
         ])
 
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells)
 
@@ -417,7 +407,6 @@ import Distributed
             "December = 3",
         ]))
 
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells)
 
@@ -450,7 +439,6 @@ import Distributed
             "b = 10",
         ]))
 
-        fakeclient.connected_notebook = notebook
         update_run!(🍭, notebook, notebook.cells)
 
         @test :conj ∈ notebook.topology.nodes[notebook.cells[3]].soft_definitions
@@ -476,7 +464,6 @@ import Distributed
             "MyStruct(1.) |> inv"
         ]))
         cell(idx) = notebook.cells[idx]
-        fakeclient.connected_notebook = notebook
         update_run!(🍭, notebook, notebook.cells)
 
         @test cell(1) |> noerror
@@ -505,7 +492,6 @@ import Distributed
             "inv(a)",
         ]))
         cell(idx) = notebook.cells[idx]
-        fakeclient.connected_notebook = notebook
         update_run!(🍭, notebook, notebook.cells)
 
         @test all(noerror, notebook.cells)
@@ -537,7 +523,6 @@ import Distributed
             "Base.inv(x::Float64) = a",
             "d = Float64(c)",
         ]))
-        fakeclient.connected_notebook = notebook
         update_run!(🍭, notebook, notebook.cells)
 
         @test all(noerror, notebook.cells)
@@ -552,7 +537,6 @@ import Distributed
             "Base.inv(::Float64) = y",
             "inv(1.0)",
         ]))
-        fakeclient.connected_notebook = notebook
         update_run!(🍭, notebook, notebook.cells)
 
         @test notebook.cells[end].errored == true
@@ -575,7 +559,6 @@ import Distributed
             "",
         ]))
         cell(idx) = notebook.cells[idx]
-        fakeclient.connected_notebook = notebook
         update_run!(🍭, notebook, notebook.cells)
 
         output_21 = cell(2).output.body
@@ -683,7 +666,6 @@ import Distributed
                     e14
                 end"""),
         ])
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells[1:4])
         @test notebook.cells[1] |> noerror
@@ -902,7 +884,6 @@ import Distributed
             Cell("j(x) = (x > 0) ? f(x-1) : :done")
             Cell("f(8)")
         ])
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells[1:3])
         @test occursinerror("Cyclic reference", notebook.cells[1])
@@ -1003,7 +984,6 @@ import Distributed
             Cell("struct a; x end"),
             Cell("a")
         ])
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells[1:2])
         @test notebook.cells[1].output.body == notebook.cells[2].output.body
@@ -1045,7 +1025,6 @@ import Distributed
 
             Cell("h(4)"),
         ])
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells[1])
         @test notebook.cells[1].output.body == "f" || startswith(notebook.cells[1].output.body, "f (generic function with ")
@@ -1071,7 +1050,6 @@ import Distributed
         notebook = Notebook([
         Cell("x = 3")
     ])
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells[1])
         setcode!(notebook.cells[1], "x = x + 1")
@@ -1138,7 +1116,6 @@ import Distributed
         Cell("using Dates"),
         Cell("year(DateTime(31))"),
     ])
-    fakeclient.connected_notebook = notebook
 
     @testset "Changing functions" begin
 
@@ -1299,7 +1276,6 @@ import Distributed
             Cell("h = [x -> x + b][1]"),
             Cell("h(8)"),
         ])
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells[1:2])
         @test notebook.cells[1].output.body == "1"
@@ -1355,7 +1331,6 @@ import Distributed
             Cell("map(14:14) do i; global apple = orange; end"),
             Cell("orange = 15"),
         ])
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells[1])
         update_run!(🍭, notebook, notebook.cells[2])
@@ -1651,7 +1626,6 @@ import Distributed
             Cell("g(x) = x + y"),
             Cell("y = 22"),
         ])
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells[1])
 
diff --git a/test/ReloadFromFile.jl b/test/ReloadFromFile.jl
index 06277a77cd..01bf9358ca 100644
--- a/test/ReloadFromFile.jl
+++ b/test/ReloadFromFile.jl
@@ -27,14 +27,9 @@ end
     🍭.options.server.auto_reload_from_file = true
     
     
-    
     timeout_between_tests = 🍭.options.server.auto_reload_from_file_cooldown * 1.5
 
-    fakeclient = ClientSession(:fake, nothing)
-    🍭.connected_clients[fakeclient.id] = fakeclient
-    
     notebook = SessionActions.new(🍭; run_async=false)
-    fakeclient.connected_notebook = notebook
     
     ### 
     sleep(timeout_between_tests)
diff --git a/test/RichOutput.jl b/test/RichOutput.jl
index 26d1abb445..6675aa4008 100644
--- a/test/RichOutput.jl
+++ b/test/RichOutput.jl
@@ -7,8 +7,6 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
 
     🍭 = ServerSession()
     🍭.options.evaluation.workspace_use_distributed = false
-    fakeclient = ClientSession(:fake, nothing)
-    🍭.connected_clients[fakeclient.id] = fakeclient
     
     @testset "Tree viewer" begin
         @testset "Basics" begin
@@ -44,7 +42,6 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
                     Cell("[ rand(50,50) ]"),
                     Cell("[ rand(500,500) ]"),
                 ])
-            fakeclient.connected_notebook = notebook
 
             update_run!(🍭, notebook, notebook.cells)
 
@@ -122,7 +119,6 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
                     C(3)
                 end"""),
             ])
-            fakeclient.connected_notebook = notebook
 
             update_run!(🍭, notebook, notebook.cells)
             
@@ -173,7 +169,6 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
                 Cell("OneTwoThree()"),
                 
             ])
-            fakeclient.connected_notebook = notebook
 
             update_run!(🍭, notebook, notebook.cells)
             
@@ -224,7 +219,6 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
                     x[] = (1,x)
                 end"""),
             ])
-            fakeclient.connected_notebook = notebook
 
             update_run!(🍭, notebook, notebook.cells)
 
@@ -263,7 +257,6 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
                 ]"""),
                 Cell("Union{}[]"),
             ])
-        fakeclient.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells)
 
@@ -334,7 +327,6 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
             Cell("0 + 10;\n10;"),
             Cell("0 + 11;\n11"),
         ])
-        fakeclient.connected_notebook = notebook
 
         @testset "Strange code"  begin
             update_run!(🍭, notebook, notebook.cells[1])
@@ -403,7 +395,6 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
         @testset "$(wrapped ? "With" : "Without") function wrapping" for wrapped in [false, true]
             notebook = wrapped ? notebook1 : notebook2
             
-            fakeclient.connected_notebook = notebook
 
             @test_nowarn update_run!(🍭, notebook, notebook.cells[1:5])
 
diff --git a/test/WorkspaceManager.jl b/test/WorkspaceManager.jl
index 218587e1e6..92975be90a 100644
--- a/test/WorkspaceManager.jl
+++ b/test/WorkspaceManager.jl
@@ -8,24 +8,15 @@ import Distributed
 # basic functionality is already tested by the reactivity tests
 
     @testset "Multiple notebooks" begin
-
-        fakeclientA = ClientSession(:fakeA, nothing)
-        fakeclientB = ClientSession(:fakeB, nothing)
         🍭 = ServerSession()
         🍭.options.evaluation.workspace_use_distributed = true
-        🍭.connected_clients[fakeclientA.id] = fakeclientA
-        🍭.connected_clients[fakeclientB.id] = fakeclientB
-
 
         notebookA = Notebook([
             Cell("x = 3")
         ])
-        fakeclientA.connected_notebook = notebookA
-
         notebookB = Notebook([
             Cell("x")
         ])
-        fakeclientB.connected_notebook = notebookB
 
         @test notebookA.path != notebookB.path
 
@@ -42,10 +33,8 @@ import Distributed
         WorkspaceManager.unmake_workspace((🍭, notebookB))
     end
     @testset "Variables with secret names" begin
-        fakeclient = ClientSession(:fake, nothing)
         🍭 = ServerSession()
         🍭.options.evaluation.workspace_use_distributed = false
-        🍭.connected_clients[fakeclient.id] = fakeclient
 
         notebook = Notebook([
             Cell("result = 1"),
@@ -53,7 +42,6 @@ import Distributed
             Cell("elapsed_ns = 3"),
             Cell("elapsed_ns"),
         ])
-        fakeclient.connected_notebook = notebook
 
         update_save_run!(🍭, notebook, notebook.cells[1:4])
         @test notebook.cells[1].output.body == "1"
@@ -65,11 +53,8 @@ import Distributed
     end
 
     Sys.iswindows() || @testset "Pluto inside Pluto" begin
-
-        client = ClientSession(:fakeA, nothing)
         🍭 = ServerSession()
         🍭.options.evaluation.workspace_use_distributed = true
-        🍭.connected_clients[client.id] = client
 
         notebook = Notebook([
             Cell("""begin
@@ -88,7 +73,6 @@ import Distributed
             Cell("length(nb.cells)"),
             Cell(""),
         ])
-        client.connected_notebook = notebook
 
         update_run!(🍭, notebook, notebook.cells)
 
diff --git a/test/cell_disabling.jl b/test/cell_disabling.jl
index 19bc64aa83..5e1dcd0308 100644
--- a/test/cell_disabling.jl
+++ b/test/cell_disabling.jl
@@ -6,9 +6,6 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook
     🍭 = ServerSession()
     🍭.options.evaluation.workspace_use_distributed = false
 
-    fakeclient = ClientSession(:fake, nothing)
-    🍭.connected_clients[fakeclient.id] = fakeclient
-
     notebook = Notebook([
                 Cell("""y = begin
                     1 + x
@@ -19,7 +16,6 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook
                 Cell("w = z^5"),
                 Cell(""),
             ])
-    fakeclient.connected_notebook = notebook
     update_run!(🍭, notebook, notebook.cells)
 
     # helper functions

From 95ece0da3e8c37acc1327bd2404548287627164c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 7 Oct 2022 13:22:38 +0200
Subject: [PATCH 449/821] Allow solving multiple definitions by disabling one,
 attempt 2 (#2303)

---
 src/analysis/Topology.jl          |  11 ++
 src/analysis/topological_order.jl |  48 +++++++-
 src/evaluation/Run.jl             |  42 ++++---
 test/cell_disabling.jl            | 186 +++++++++++++++++++++++++++++-
 4 files changed, 264 insertions(+), 23 deletions(-)

diff --git a/src/analysis/Topology.jl b/src/analysis/Topology.jl
index d1c22477bc..b1f2f32237 100644
--- a/src/analysis/Topology.jl
+++ b/src/analysis/Topology.jl
@@ -53,3 +53,14 @@ function set_unresolved(topology::NotebookTopology, unresolved_cells::Vector{Cel
         disabled_cells=topology.disabled_cells,
     )
 end
+
+
+function Base.setdiff(topology::NotebookTopology, cells::Vector{Cell})
+    NotebookTopology(
+        nodes=setdiffkeys(topology.nodes, cells),
+        codes=setdiffkeys(topology.codes, cells),
+        unresolved_cells=ImmutableSet{Cell}(setdiff(topology.unresolved_cells.c, cells); skip_copy=true),
+        cell_order=ImmutableVector{Cell}(setdiff(topology.cell_order.c, cells); skip_copy=true),
+        disabled_cells=ImmutableSet{Cell}(setdiff(topology.disabled_cells.c, cells); skip_copy=true),
+    )
+end
diff --git a/src/analysis/topological_order.jl b/src/analysis/topological_order.jl
index a2b0bb6146..4853ef4445 100644
--- a/src/analysis/topological_order.jl
+++ b/src/analysis/topological_order.jl
@@ -7,8 +7,33 @@ end
 
 @deprecate topological_order(::Notebook, topology::NotebookTopology, args...; kwargs...) topological_order(topology, args...; kwargs...)
 
-"Return a `TopologicalOrder` that lists the cells to be evaluated in a single reactive run, in topological order. Includes the given roots."
-function topological_order(topology::NotebookTopology, roots::AbstractVector{Cell}; allow_multiple_defs=false)::TopologicalOrder
+"""
+Return a `TopologicalOrder` that lists the cells to be evaluated in a single reactive run, in topological order. Includes the given roots.
+
+# Keyword arguments
+
+- `allow_multiple_defs::Bool = false`
+  
+  If `false` (default), multiple definitions are not allowed. When a cell is found that defines a variable that is also defined by another cell (this other cell is called a *fellow assigner*), then both cells are marked as `errable` and not `runnable`.
+  
+  If `true`, then multiple definitions are allowed, in the sense that we ignore the existance of other cells that define the same variable.
+
+
+- `skip_at_partial_multiple_defs::Bool = false`
+  
+  If `true` (not default), and `allow_multiple_defs = true` (not default), then the search stops going downward when finding a cell that has fellow assigners, *unless all fellow assigners can be reached by the `roots`*, in which case we continue searching downward.
+
+  In other words, if there is a set of fellow assigners that can only be reached **partially** by the roots, then this set blocks the search, and cells that depend on the set are not found.
+"""
+function topological_order(topology::NotebookTopology, roots::AbstractVector{Cell}; 
+	allow_multiple_defs::Bool=false,
+	skip_at_partial_multiple_defs::Bool=false,
+)::TopologicalOrder
+
+	if skip_at_partial_multiple_defs
+		@assert allow_multiple_defs
+	end
+
 	entries = Cell[]
 	exits = Cell[]
 	errable = Dict{Cell,ReactivityError}()
@@ -42,13 +67,28 @@ function topological_order(topology::NotebookTopology, roots::AbstractVector{Cel
 		push!(entries, cell)
 
 		assigners = where_assigned(topology, cell)
+		referencers = where_referenced(topology, cell) |> Iterators.reverse
+		
 		if !allow_multiple_defs && length(assigners) > 1
 			for c in assigners
 				errable[c] = MultipleDefinitionsError(topology, c, assigners)
 			end
 		end
-		referencers = where_referenced(topology, cell) |> Iterators.reverse
-		for c in (allow_multiple_defs ? referencers : union(assigners, referencers))
+		
+		should_continue_search_down = !skip_at_partial_multiple_defs || all(c -> c === cell || c ∈ exits, assigners)
+		should_search_fellow_assigners_if_any = !allow_multiple_defs
+		
+		to_search_next = if should_continue_search_down
+			if should_search_fellow_assigners_if_any
+				union(assigners, referencers)
+			else
+				referencers
+			end
+		else
+			Cell[]
+		end
+		
+		for c in to_search_next
 			if c !== cell
 				child_result = bfs(c)
 
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 42b68a4af3..ff106ef5e7 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -63,6 +63,9 @@ function run_reactive_core!(
         # update cache and save notebook because the dependencies might have changed after expanding macros
         update_dependency_cache!(notebook)
     end
+	
+    # find (indirectly) skipped-as-script cells and update their status
+    update_skipped_cells_dependency!(notebook, new_topology)
 
     removed_cells = setdiff(all_cells(old_topology), all_cells(new_topology))
     roots = vcat(roots, removed_cells)
@@ -81,42 +84,45 @@ function run_reactive_core!(
         cell_order = new_topology.cell_order,
         disabled_cells=new_topology.disabled_cells,
     )
+	
+	
+    # find (indirectly) deactivated cells and update their status
+    indirectly_deactivated = collect(topological_order(new_topology, collect(new_topology.disabled_cells); allow_multiple_defs=true, skip_at_partial_multiple_defs=true))
+	
+    for cell in indirectly_deactivated
+        cell.running = false
+        cell.queued = false
+        cell.depends_on_disabled_cells = true
+    end
+	
+	new_topology = setdiff(new_topology, indirectly_deactivated)
 
     # save the old topological order - we'll delete variables assigned from its
     # and re-evalutate its cells unless the cells have already run previously in the reactive run
     old_order = topological_order(old_topology, roots)
 
-    old_runnable = setdiff(old_order.runnable, already_run)
+    old_runnable = setdiff(old_order.runnable, already_run, indirectly_deactivated)
     to_delete_vars = union!(Set{Symbol}(), defined_variables(old_topology, old_runnable)...)
     to_delete_funcs = union!(Set{Tuple{UUID,FunctionName}}(), defined_functions(old_topology, old_runnable)...)
-
+	
+	
+	new_roots = setdiff(union(roots, keys(old_order.errable)), indirectly_deactivated)
     # get the new topological order
-    new_order = topological_order(new_topology, union(roots, keys(old_order.errable)))
+    new_order = topological_order(new_topology, new_roots)
     new_runnable = setdiff(new_order.runnable, already_run)
-    to_run_raw = setdiff(union(new_runnable, old_runnable), keys(new_order.errable))::Vector{Cell} # TODO: think if old error cell order matters
+    to_run = setdiff(union(new_runnable, old_runnable), keys(new_order.errable))::Vector{Cell} # TODO: think if old error cell order matters
 
-    # find (indirectly) deactivated cells and update their status
-    indirectly_deactivated = collect(topological_order(new_topology, collect(new_topology.disabled_cells)))
-    for cell in indirectly_deactivated
-        cell.running = false
-        cell.queued = false
-        cell.depends_on_disabled_cells = true
-    end
-
-    # find (indirectly) skipped cells and update their status
-    update_skipped_cells_dependency!(notebook, new_topology)
-
-    to_run = setdiff(to_run_raw, indirectly_deactivated)
 
     # change the bar on the sides of cells to "queued"
     for cell in to_run
         cell.queued = true
         cell.depends_on_disabled_cells = false
     end
-
+	
     for (cell, error) in new_order.errable
         cell.running = false
         cell.queued = false
+		cell.depends_on_disabled_cells = false
         relay_reactivity_error!(cell, error)
     end
 
@@ -504,7 +510,7 @@ function update_skipped_cells_dependency!(notebook::Notebook, topology::Notebook
     for cell in indirectly_skipped
         cell.depends_on_skipped_cells = true
     end
-    for cell in setdiff(notebook.cells, indirectly_skipped)
+	for cell in setdiff(notebook.cells, indirectly_skipped)
         cell.depends_on_skipped_cells = false
     end
 end
diff --git a/test/cell_disabling.jl b/test/cell_disabling.jl
index 5e1dcd0308..66cd79b760 100644
--- a/test/cell_disabling.jl
+++ b/test/cell_disabling.jl
@@ -1,11 +1,195 @@
 using Test
 using Pluto
-using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook
+using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook, set_disabled, is_disabled
+
+
+
+
 
 @testset "Cell Disabling" begin
     🍭 = ServerSession()
     🍭.options.evaluation.workspace_use_distributed = false
 
+    notebook = Notebook([
+                Cell("const a = 1")
+                Cell("const b = 2")
+                Cell("const c = 3")
+                Cell("const d = 4")
+                
+                Cell("const x = a")    # 5
+                # these cells will be uncommented later
+                Cell("# const x = b")  # 6
+                Cell("# const x = c")  # 7
+                
+                Cell("const z = x")    # 8
+                Cell("# const z = d")  # 9
+                
+                Cell("const y = z")    # 10
+                
+                Cell("things = []")    # 11
+                Cell("""begin
+                    cool = 1
+                    push!(things, 1)
+                end""")                # 12
+                Cell("""begin
+                    # cool = 2
+                    # push!(things, 2)
+                end""")                # 13
+                Cell("cool; length(things)")   # 14
+            ])
+    update_run!(🍭, notebook, notebook.cells)
+
+    # helper functions
+    id(i) = notebook.cells[i].cell_id
+    c(i) = notebook.cells[i]
+    get_indirectly_disabled_cells(notebook) = [i for (i, c) in pairs(notebook.cells) if c.depends_on_disabled_cells]
+
+    
+    
+    @test !any(is_disabled, notebook.cells)
+    @test get_indirectly_disabled_cells(notebook) == []
+    @test all(noerror, notebook.cells)
+    
+    ###
+    setcode!(c(6), "const x = b")
+    update_run!(🍭, notebook, c(6))
+    
+    @test c(5).errored
+    @test c(6).errored
+    @test c(8).errored
+    @test c(10).errored
+    @test get_indirectly_disabled_cells(notebook) == []
+    
+    ###
+    set_disabled(c(1), true)
+    update_run!(🍭, notebook, c(1))
+    
+    @test noerror(c(1))
+    @test noerror(c(6))
+    @test noerror(c(8))
+    @test noerror(c(10))
+    @test get_indirectly_disabled_cells(notebook) == [1, 5]
+    
+    update_run!(🍭, notebook, c(5:6))
+    @test noerror(c(1))
+    @test noerror(c(6))
+    @test noerror(c(8))
+    @test noerror(c(10))    
+    @test get_indirectly_disabled_cells(notebook) == [1, 5]
+    
+    ###
+    set_disabled(c(1), false)
+    update_run!(🍭, notebook, c(1))
+    
+    @test noerror(c(1))
+    @test c(5).errored
+    @test c(6).errored
+    @test c(8).errored
+    @test c(10).errored
+    @test get_indirectly_disabled_cells(notebook) == []
+    
+    ###
+    set_disabled(c(5), true)
+    update_run!(🍭, notebook, c(5))
+    
+    @test noerror(c(1))
+    @test noerror(c(6))
+    @test noerror(c(8))
+    @test noerror(c(10))
+    @test get_indirectly_disabled_cells(notebook) == [5]
+    
+    ###
+    set_disabled(c(1), true)
+    update_run!(🍭, notebook, c(1))
+    
+    @test noerror(c(1))
+    @test noerror(c(6))
+    @test noerror(c(8))
+    @test noerror(c(10))
+    @test get_indirectly_disabled_cells(notebook) == [1, 5]
+    
+    
+    ###
+    set_disabled(c(5), false)
+    setcode!(c(7), "const x = c")
+    update_run!(🍭, notebook, c([5,7]))
+    
+    @test c(5).errored
+    @test c(6).errored
+    @test c(7).errored
+    @test c(8).errored
+    @test c(10).errored
+    @test get_indirectly_disabled_cells(notebook) == [1, 5]
+    
+    ###
+    set_disabled(c(2), true)
+    update_run!(🍭, notebook, c(2))
+    
+    @test noerror(c(3))
+    @test noerror(c(7))
+    @test noerror(c(8))
+    @test noerror(c(10))
+    @test get_indirectly_disabled_cells(notebook) == [1, 2, 5, 6]
+    
+    
+    ###
+    setcode!(c(9), "const z = d")
+    update_run!(🍭, notebook, c([9]))
+    
+    @test noerror(c(7))
+    @test c(8).errored
+    @test c(9).errored
+    @test c(10).errored
+    @test get_indirectly_disabled_cells(notebook) == [1, 2, 5, 6]
+    
+    
+    ###
+    set_disabled(c(4), true)
+    update_run!(🍭, notebook, c(4))
+    
+    @test noerror(c(3))
+    @test noerror(c(4))
+    @test noerror(c(7))
+    @test noerror(c(8))
+    @test noerror(c(10))
+    @test get_indirectly_disabled_cells(notebook) == [1, 2, 4, 5, 6, 9]
+    
+    
+    
+    ### check that they really don't run when disabled
+    @test c(14).output.body == "1"
+    
+    setcode!(c(13), replace(c(13).code, "#" => ""))
+    update_run!(🍭, notebook, c([11,13]))
+    
+    
+    @test c(12).errored
+    @test c(13).errored
+    @test c(14).errored
+    
+    set_disabled(c(13), true)
+    update_run!(🍭, notebook, c([13]))
+    
+    @test noerror(c(12))
+    @test noerror(c(14))
+    
+    @test c(14).output.body == "1"
+    update_run!(🍭, notebook, c([11]))
+    @test c(14).output.body == "1"
+    update_run!(🍭, notebook, c([12]))
+    update_run!(🍭, notebook, c([12]))
+    @test c(14).output.body == "3"
+    
+end
+
+
+
+
+
+@testset "Cell Disabling 1" begin
+    🍭 = ServerSession()
+    🍭.options.evaluation.workspace_use_distributed = false
+
     notebook = Notebook([
                 Cell("""y = begin
                     1 + x

From f4bd3d4e89b391b5d92154b02ccb3195b9240660 Mon Sep 17 00:00:00 2001
From: Dhruv <51574716+Illusion47586@users.noreply.github.com>
Date: Fri, 7 Oct 2022 18:58:34 +0530
Subject: [PATCH 450/821] Preparations for native Windows app (#2177)

Co-authored-by: Connor Burns <ctrekker4@gmail.com>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/Desktop.d.ts               | 55 +++++++++++++++++++++++++++++
 frontend/components/Editor.js       | 33 ++++++++++++++++-
 frontend/components/ExportBanner.js | 16 +++++++--
 frontend/components/FilePicker.js   | 49 +++++++++++++++++++------
 frontend/components/welcome/Open.js | 22 ++++++++++--
 frontend/editor.css                 | 38 ++++++++++++++++----
 frontend/index.css                  | 25 ++++++++++++-
 frontend/welcome.css                | 14 ++++++--
 src/webserver/Dynamic.jl            | 11 +-----
 src/webserver/SessionActions.jl     | 14 +++++++-
 src/webserver/Static.jl             | 49 +++++++++++++++++++++++++
 tsconfig.json                       |  2 +-
 12 files changed, 289 insertions(+), 39 deletions(-)
 create mode 100644 frontend/Desktop.d.ts

diff --git a/frontend/Desktop.d.ts b/frontend/Desktop.d.ts
new file mode 100644
index 0000000000..44d98d1749
--- /dev/null
+++ b/frontend/Desktop.d.ts
@@ -0,0 +1,55 @@
+declare global {
+    /**
+     * This namespace is meant for [PlutoDesktop](https://github.com/JuliaPluto/PlutoDesktop)
+     * related types and interfaces.
+     */
+    namespace Desktop {
+        /**
+         * This enum has to be in sync with the enum "PlutoExport"
+         * defined in PlutoDesktop/{branch:master}/types/enums.ts
+         *
+         * @note Unfortunately enums can't be exported from .d.ts files.
+         * Inorder to use this, just map integers to the enum values
+         * - PlutoExport.FILE -> **0**
+         * - PlutoExport.HTML -> **1**
+         * - PlutoExport.STATE -> **2**
+         * - PlutoExport.PDF -> **3**
+         */
+        enum PlutoExport {
+            FILE,
+            HTML,
+            STATE,
+            PDF,
+        }
+
+        /**
+         * This type has to be in sync with the interface "Window"
+         * defined in PlutoDesktop/{branch:master}/src/renderer/preload.d.ts
+         */
+        type PlutoDesktop = {
+            ipcRenderer: {
+                sendMessage(channel: String, args: unknown[]): void
+                on(channel: string, func: (...args: unknown[]) => void): (() => void) | undefined
+                once(channel: string, func: (...args: unknown[]) => void): void
+            }
+            fileSystem: {
+                /**
+                 * @param type [default = 'new'] whether you want to open a new notebook
+                 * open a notebook from a path or from a url
+                 * @param pathOrURL location to the file, not needed if opening a new file,
+                 * opens that notebook. If false and no path is there, opens the file selector.
+                 * If true, opens a new blank notebook.
+                 */
+                openNotebook(type?: "url" | "path" | "new", pathOrURL?: string): void
+                shutdownNotebook(id?: string): void
+                moveNotebook(id?: string): void
+                exportNotebook(id: string, type: PlutoExport): void
+            }
+        }
+    }
+    interface Window {
+        plutoDesktop?: Desktop.PlutoDesktop
+    }
+}
+
+export {}
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 2394272b7f..2f757bc2cd 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -862,7 +862,7 @@ patch: ${JSON.stringify(
             if (!this.state.static_preview && document.visibilityState === "visible") {
                 // view stats on https://stats.plutojl.org/
                 //@ts-ignore
-                count_stat(`editing/${window?.version_info?.pluto ?? "unknown"}`)
+                count_stat(`editing/${window?.version_info?.pluto ?? "unknown"}${window.plutoDesktop ? "-desktop" : ""}`)
             }
         }, 1000 * 15 * 60)
         setInterval(() => {
@@ -1046,6 +1046,35 @@ patch: ${JSON.stringify(
             }
         }
 
+        this.desktop_submit_file_change = async () => {
+            this.setState({ moving_file: true })
+            /**
+             * `window.plutoDesktop?.ipcRenderer` is basically what allows the
+             * frontend to communicate with the electron side. It is an IPC
+             * bridge between render process and main process. More info
+             * [here](https://www.electronjs.org/docs/latest/api/ipc-renderer).
+             *
+             * "PLUTO-MOVE-NOTEBOOK" is an event triggered in the main process
+             * once the move is complete, we listen to it using `once`.
+             * More info [here](https://www.electronjs.org/docs/latest/api/ipc-renderer#ipcrendereroncechannel-listener)
+             */
+            window.plutoDesktop?.ipcRenderer.once("PLUTO-MOVE-NOTEBOOK", async (/** @type {string?} */ loc) => {
+                if (!!loc)
+                    await this.setStatePromise(
+                        immer((state) => {
+                            state.notebook.in_temp_dir = false
+                            state.notebook.path = loc
+                        })
+                    )
+                this.setState({ moving_file: false })
+                // @ts-ignore
+                document.activeElement?.blur()
+            })
+
+            // ask the electron backend to start moving the notebook. The event above will be fired once it is done.
+            window.plutoDesktop?.fileSystem.moveNotebook()
+        }
+
         this.delete_selected = (verb) => {
             if (this.state.selected_cells.length > 0) {
                 this.actions.confirm_delete_multiple(verb, this.state.selected_cells)
@@ -1346,6 +1375,7 @@ patch: ${JSON.stringify(
                     <${ProgressBar} notebook=${this.state.notebook} backend_launch_phase=${this.state.backend_launch_phase} status=${status}/>
                     <header id="pluto-nav" className=${export_menu_open ? "show_export" : ""}>
                         <${ExportBanner}
+                            notebook_id=${this.state.notebook.notebook_id}
                             notebookfile_url=${this.export_url("notebookfile")}
                             notebookexport_url=${this.export_url("notebookexport")}
                             open=${export_menu_open}
@@ -1382,6 +1412,7 @@ patch: ${JSON.stringify(
                                           client=${this.client}
                                           value=${notebook.in_temp_dir ? "" : notebook.path}
                                           on_submit=${this.submit_file_change}
+                                          on_desktop_submit=${this.desktop_submit_file_change}
                                           suggest_new_file=${{
                                               base: this.client.session_options == null ? "" : this.client.session_options.server.notebook_path_suggestion,
                                               name: notebook.shortpath,
diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index 531306b0e7..458af3e9c7 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -29,17 +29,27 @@ const Square = ({ fill }) => html`
 //@ts-ignore
 window.enable_secret_pluto_recording = true
 
-export const ExportBanner = ({ onClose, notebookfile_url, notebookexport_url, start_recording }) => {
+export const ExportBanner = ({ notebook_id, onClose, notebookfile_url, notebookexport_url, start_recording }) => {
+    // @ts-ignore
+    const isDesktop = !!window.plutoDesktop
+
+    const exportNotebook = (/** @type {{ preventDefault: () => void; }} */ e, /** @type {Desktop.PlutoExport} */ type) => {
+        if (isDesktop) {
+            e.preventDefault()
+            window.plutoDesktop?.fileSystem.exportNotebook(notebook_id, type)
+        }
+    }
+
     return html`
         <aside id="export">
             <div id="container">
                 <div class="export_title">export</div>
                 <!-- no "download" attribute here: we want the jl contents to be shown in a new tab -->
-                <a href=${notebookfile_url} target="_blank" class="export_card">
+                <a href=${notebookfile_url} target="_blank" class="export_card" onClick=${(e) => exportNotebook(e, 0)}>
                     <header><${Triangle} fill="#a270ba" /> Notebook file</header>
                     <section>Download a copy of the <b>.jl</b> script.</section>
                 </a>
-                <a href=${notebookexport_url} target="_blank" class="export_card" download="">
+                <a href=${notebookexport_url} target="_blank" class="export_card" download="" onClick=${(e) => exportNotebook(e, 1)}>
                     <header><${Square} fill="#E86F51" /> Static HTML</header>
                     <section>An <b>.html</b> file for your web page, or to share online.</section>
                 </a>
diff --git a/frontend/components/FilePicker.js b/frontend/components/FilePicker.js
index 29c530bc35..95675a627d 100644
--- a/frontend/components/FilePicker.js
+++ b/frontend/components/FilePicker.js
@@ -15,6 +15,7 @@ import {
     Compartment,
     StateEffect,
 } from "../imports/CodemirrorPlutoSetup.js"
+import { guess_notebook_location } from "../common/NotebookLocationFromURL.js"
 
 let { autocompletion, completionKeymap } = autocomplete
 
@@ -48,6 +49,12 @@ const set_cm_value = (/** @type{EditorView} */ cm, /** @type {string} */ value,
     }
 }
 
+const is_desktop = !!window.plutoDesktop
+
+if (is_desktop) {
+    console.log("Running in Desktop Environment! Found following properties/methods:", window.plutoDesktop)
+}
+
 /**
  * @typedef FilePickerProps
  * @type {{
@@ -56,6 +63,7 @@ const set_cm_value = (/** @type{EditorView} */ cm, /** @type {string} */ value,
  *  button_label: String,
  *  placeholder: String,
  *  on_submit: (new_path: String) => Promise<void>,
+ *  on_desktop_submit?: (loc?: string) => Promise<void>,
  *  client: import("../common/PlutoConnection.js").PlutoConnection,
  * }}
  * @augments Component<FilePickerProps,{}>
@@ -65,6 +73,7 @@ export class FilePicker extends Component {
         super(props)
         this.state = {
             is_button_disabled: true,
+            url_value: "",
         }
         this.forced_value = ""
         /** @type {EditorView?} */
@@ -86,14 +95,19 @@ export class FilePicker extends Component {
             if (!this.cm) return true
             const cm = this.cm
 
-            const my_val = cm.state.doc.toString()
-            if (my_val === this.forced_value) {
-                this.suggest_not_tmp()
-                return true
+            // ingore if running in desktop environment
+            if (!is_desktop) {
+                const my_val = cm.state.doc.toString()
+                if (my_val === this.forced_value) {
+                    this.suggest_not_tmp()
+                    return true
+                }
             }
             run(async () => {
                 try {
-                    await this.props.on_submit(cm.state.doc.toString())
+                    if (is_desktop && this.props.on_desktop_submit) {
+                        await this.props.on_desktop_submit((await guess_notebook_location(this.state.url_value)).path_or_url)
+                    } else await this.props.on_submit(cm.state.doc.toString())
                     cm.dom.blur()
                 } catch (error) {
                     set_cm_value(cm, this.props.value, true)
@@ -229,7 +243,7 @@ export class FilePicker extends Component {
                 ],
             }),
         })
-        this.base.insertBefore(this.cm.dom, this.base.firstElementChild)
+        if (!is_desktop) this.base.insertBefore(this.cm.dom, this.base.firstElementChild)
 
         // window.addEventListener("resize", () => {
         //     if (!this.cm.hasFocus()) {
@@ -238,11 +252,24 @@ export class FilePicker extends Component {
         // })
     }
     render() {
-        return html`
-            <pluto-filepicker>
-                <button onClick=${this.on_submit} disabled=${this.state.is_button_disabled}>${this.props.button_label}</button>
-            </pluto-filepicker>
-        `
+        return is_desktop
+            ? html`<div class="desktop_picker_group">
+                  <input
+                      value=${this.state.url_value}
+                      placeholder="Enter notebook URL..."
+                      onChange=${(v) => {
+                          this.setState({ url_value: v.target.value })
+                      }}
+                  />
+                  <div onClick=${this.on_submit} class="desktop_picker">
+                      <button>${this.props.button_label}</button>
+                  </div>
+              </div>`
+            : html`
+                  <pluto-filepicker>
+                      <button onClick=${this.on_submit} disabled=${this.state.is_button_disabled}>${this.props.button_label}</button>
+                  </pluto-filepicker>
+              `
     }
 
     request_path_completions() {
diff --git a/frontend/components/welcome/Open.js b/frontend/components/welcome/Open.js
index 018defd6fd..b5697a93f8 100644
--- a/frontend/components/welcome/Open.js
+++ b/frontend/components/welcome/Open.js
@@ -28,6 +28,14 @@ export const Open = ({ client, connected, CustomPicker, show_samples, on_start_n
         }
     }
 
+    const desktop_on_open_path = async (_p) => {
+        window.plutoDesktop?.fileSystem.openNotebook("path")
+    }
+
+    const desktop_on_open_url = async (url) => {
+        window.plutoDesktop?.fileSystem.openNotebook("url", url)
+    }
+
     const picker = CustomPicker ?? {
         text: "Open a notebook",
         placeholder: "Enter path or URL...",
@@ -35,15 +43,25 @@ export const Open = ({ client, connected, CustomPicker, show_samples, on_start_n
 
     return html`<${PasteHandler} />
         <h2>${picker.text}</h2>
-        <div id="new">
+        <div id="new" class=${!!window.plutoDesktop ? "desktop_opener" : ""}>
             <${FilePicker}
                 key=${picker.placeholder}
                 client=${client}
                 value=""
                 on_submit=${on_open_path}
-                button_label="Open"
+                on_desktop_submit=${desktop_on_open_path}
+                button_label=${window.plutoDesktop ? "Open Local File" : "Open File"}
                 placeholder=${picker.placeholder}
             />
+            ${window.plutoDesktop &&
+            html`<${FilePicker}
+                key=${picker.placeholder}
+                client=${client}
+                value=""
+                on_desktop_submit=${desktop_on_open_url}
+                button_label="Open from URL"
+                placeholder=${picker.placeholder}
+            />`}
         </div>`
 }
 
diff --git a/frontend/editor.css b/frontend/editor.css
index 0d63063965..cc5c35f004 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -620,14 +620,16 @@ nav#at_the_top img#logo-small {
     }
 }
 
-nav#at_the_top > pluto-filepicker {
+nav#at_the_top > pluto-filepicker,
+nav#at_the_top > div.desktop_picker {
     width: 210px;
     flex-grow: 1;
     display: flex;
     flex-direction: row;
 }
 
-nav#at_the_top > pluto-filepicker .cm-editor {
+nav#at_the_top > pluto-filepicker .cm-editor,
+nav#at_the_top > div.desktop_picker span {
     height: calc(1rem + 4px + 4px + 4px);
     display: inline-block;
     min-width: 10rem;
@@ -652,7 +654,8 @@ pluto-filepicker .cm-scroller::-webkit-scrollbar {
     display: none; /* Safari and Chrome */
 }
 
-pluto-filepicker button {
+pluto-filepicker button,
+div.desktop_picker button {
     cursor: pointer;
     height: auto;
 }
@@ -661,6 +664,21 @@ pluto-filepicker button:disabled {
     cursor: not-allowed;
 }
 
+/* .desktop_picker button {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+} */
+
+div.desktop_picker span {
+    white-space: nowrap;
+    overflow-x: hidden;
+    text-overflow: ellipsis;
+    vertical-align: middle;
+    padding: 0 5px;
+    line-height: 1.8;
+    cursor: pointer;
+}
+
 button.start_stop_recording,
 button.toggle_export,
 .export_small_btns button {
@@ -718,22 +736,28 @@ nav#at_the_top:after {
 }
 
 @media (any-pointer: fine) {
-    nav#at_the_top > pluto-filepicker .cm-editor {
+    nav#at_the_top > pluto-filepicker .cm-editor,
+    nav#at_the_top > div.desktop_picker span {
         border: 2px solid transparent;
         border-right: none;
         transition: border 0.15s ease-in-out;
     }
-    nav#at_the_top > pluto-filepicker button {
+    nav#at_the_top > pluto-filepicker button,
+    nav#at_the_top > div.desktop_picker button {
         opacity: 0;
         transition: opacity 0.15s ease-in-out;
     }
     header:hover > nav#at_the_top > pluto-filepicker .cm-editor,
-    header:focus-within > nav#at_the_top > pluto-filepicker .cm-editor {
+    header:focus-within > nav#at_the_top > pluto-filepicker .cm-editor,
+    header:hover > nav#at_the_top > div.desktop_picker span,
+    header:focus-within > nav#at_the_top > div.desktop_picker span {
         border: 2px solid var(--footer-input-border-color);
         border-right: none;
     }
     header:hover > nav#at_the_top > pluto-filepicker button,
-    header:focus-within > nav#at_the_top > pluto-filepicker button {
+    header:focus-within > nav#at_the_top > pluto-filepicker button,
+    header:hover > nav#at_the_top > div.desktop_picker button,
+    header:focus-within > nav#at_the_top > div.desktop_picker button {
         opacity: 1;
     }
 }
diff --git a/frontend/index.css b/frontend/index.css
index 65cd31760a..deb9dbbfc6 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -82,6 +82,12 @@ pluto-filepicker {
     background: var(--white);
 }
 
+.desktop_picker {
+    display: flex;
+    flex-direction: row;
+    margin-left: 5px;
+}
+
 pluto-filepicker .cm-editor {
     height: calc(1rem + 4px + 4px + 4px);
     display: inline-block;
@@ -110,7 +116,8 @@ pluto-filepicker .cm-scroller::-webkit-scrollbar {
     display: none; /* Safari and Chrome */
 }
 
-pluto-filepicker button {
+pluto-filepicker button,
+.desktop_picker button {
     margin: 0px;
     background: var(--footer-filepicker-focus-color);
     border-radius: 3px;
@@ -122,6 +129,22 @@ pluto-filepicker button {
     font-size: 0.75rem;
 }
 
+.desktop_picker_group {
+    display: inline-flex;
+}
+
+.desktop_picker_group > input {
+    margin-left: 1em;
+}
+
+.desktop_picker > button {
+    cursor: pointer;
+}
+
+.desktop_picker > button.full_width {
+    width: 100%;
+}
+
 pluto-filepicker button {
     cursor: pointer;
     border-top-left-radius: 0;
diff --git a/frontend/welcome.css b/frontend/welcome.css
index 94eaaa6fc7..8b588eeef6 100644
--- a/frontend/welcome.css
+++ b/frontend/welcome.css
@@ -89,9 +89,19 @@ section#open {
     border-radius: 0.6rem;
     margin: 1rem;
     /* border: 0.3rem solid #d6e0d8; */
+}
+
+#new.desktop_opener {
     display: flex;
-    flex-direction: column;
-    align-content: stretch;
+    flex-direction: row;
+    align-content: center;
+    justify-content: space-around;
+    box-shadow: none;
+    position: relative;
+}
+
+#new.desktop_opener .desktop_picker {
+    width: 100%;
 }
 
 section {
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 8d24353ecd..239268c87b 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -229,16 +229,7 @@ const no_changes = Changed[]
 
 const effects_of_changed_state = Dict(
     "path" => function(; request::ClientRequest, patch::Firebasey.ReplacePatch)
-        newpath = tamepath(patch.value)
-        # SessionActions.move(request.session, request.notebook, newpath)
-
-        if isfile(newpath)
-            error("File exists already - you need to delete the old file manually.")
-        else
-            move_notebook!(request.notebook, newpath; disable_writing_notebook_files=request.session.options.server.disable_writing_notebook_files)
-            putplutoupdates!(request.session, clientupdate_notebook_list(request.session.notebooks))
-            WorkspaceManager.cd_workspace((request.session, request.notebook), newpath)
-        end
+        SessionActions.move(request.session, request.notebook, patch.value)
         return no_changes
     end,
     "process_status" => function(; request::ClientRequest, patch::Firebasey.ReplacePatch)
diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index e1288a75ef..68c6542524 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -1,6 +1,6 @@
 module SessionActions
 
-import ..Pluto: Pluto, ServerSession, Notebook, Cell, emptynotebook, tamepath, new_notebooks_directory, without_pluto_file_extension, numbered_until_new, cutename, readwrite, update_save_run!, update_from_file, wait_until_file_unchanged, putnotebookupdates!, putplutoupdates!, load_notebook, clientupdate_notebook_list, WorkspaceManager, try_event_call, NewNotebookEvent, OpenNotebookEvent, ShutdownNotebookEvent, @asynclog, ProcessStatus, maybe_convert_path_to_wsl
+import ..Pluto: Pluto, ServerSession, Notebook, Cell, emptynotebook, tamepath, new_notebooks_directory, without_pluto_file_extension, numbered_until_new, cutename, readwrite, update_save_run!, update_from_file, wait_until_file_unchanged, putnotebookupdates!, putplutoupdates!, load_notebook, clientupdate_notebook_list, WorkspaceManager, try_event_call, NewNotebookEvent, OpenNotebookEvent, ShutdownNotebookEvent, @asynclog, ProcessStatus, maybe_convert_path_to_wsl, move_notebook!
 using FileWatching
 import ..Pluto.DownloadCool: download_cool
 import HTTP
@@ -260,4 +260,16 @@ function shutdown(session::ServerSession, notebook::Notebook; keep_in_session::B
     try_event_call(session, ShutdownNotebookEvent(notebook))
 end
 
+function move(session::ServerSession, notebook::Notebook, newpath::String)
+    newpath = tamepath(newpath)
+
+    if isfile(newpath)
+        error("File exists already - you need to delete the old file manually.")
+    else
+        move_notebook!(notebook, newpath; disable_writing_notebook_files=session.options.server.disable_writing_notebook_files)
+        putplutoupdates!(session, clientupdate_notebook_list(session.notebooks))
+        WorkspaceManager.cd_workspace((session, notebook), newpath)
+    end 
+end
+
 end
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index 0a3e00863e..f2ddf9950e 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -271,6 +271,55 @@ function http_router_for(session::ServerSession)
 
     HTTP.register!(router, "GET", "/open", serve_openfile)
     HTTP.register!(router, "POST", "/open", serve_openfile)
+
+
+    # normally shutdown is done through Dynamic.jl, with the exception of shutdowns made from the desktop app
+    serve_shutdown = with_authentication(;
+        required=security.require_secret_for_access || 
+        security.require_secret_for_open_links
+    ) do request::HTTP.Request
+        notebook = notebook_from_uri(request)
+        SessionActions.shutdown(session, notebook)
+        return HTTP.Response(200)
+    end
+
+    HTTP.register!(router, "GET", "/shutdown", serve_shutdown)
+    HTTP.register!(router, "POST", "/shutdown", serve_shutdown)
+
+
+    # used in desktop app
+    # looks like `/move?id=<notebook-id>&newpath=<new-notebook-path>``
+    serve_move = with_authentication(;
+        required=security.require_secret_for_access || 
+        security.require_secret_for_open_links
+    ) do request::HTTP.Request
+        uri = HTTP.URI(request.target)        
+        query = HTTP.queryparams(uri)
+
+        notebook = notebook_from_uri(request)
+        newpath = query["newpath"]
+        
+        try
+            SessionActions.move(session, notebook, newpath)
+            HTTP.Response(200, notebook.path)
+        catch e
+            error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
+        end
+    end
+
+    HTTP.register!(router, "GET", "/move", serve_move)
+    HTTP.register!(router, "POST", "/move", serve_move)
+
+
+    serve_notebooklist = with_authentication(;
+        required=security.require_secret_for_access || 
+        security.require_secret_for_open_links
+    ) do request::HTTP.Request
+        return HTTP.Response(200, pack(Dict(k => v.path for (k, v) in session.notebooks)))
+    end
+
+    HTTP.register!(router, "GET", "/notebooklist", serve_notebooklist)
+
     
     serve_sample = with_authentication(;
         required=security.require_secret_for_access || 
diff --git a/tsconfig.json b/tsconfig.json
index 2f93cd9f1c..710ed84a27 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,6 +13,6 @@
         "strictNullChecks": true,
         "skipDefaultLibCheck": true
     },
-    "include": ["frontend/**/*.js", "node_modules/**/*.js"],
+    "include": ["frontend/**/*.js", "node_modules/**/*.js", "frontend/Desktop.d.ts"],
     "exclude": ["frontend/components/CellInput/tests/"]
 }

From 1d7068788b4f4028ba0d3ec60dbef1ae9706627d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 7 Oct 2022 15:44:18 +0200
Subject: [PATCH 451/821] =?UTF-8?q?=F0=9F=AA=B2=20Fix=20#2301?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/welcome/Welcome.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/frontend/components/welcome/Welcome.js b/frontend/components/welcome/Welcome.js
index f8b49a617c..e030f3a2e1 100644
--- a/frontend/components/welcome/Welcome.js
+++ b/frontend/components/welcome/Welcome.js
@@ -75,14 +75,20 @@ export const Welcome = () => {
 
     const { show_samples, CustomRecent, CustomPicker } = extended_components
 
-    const [navigating_away, set_navigation_away] = useState(/** @type {string?} */ (null))
+    // When block_screen_with_this_text is null (default), all is fine. When it is a string, we show a big banner with that text, and disable all other UI. https://github.com/fonsp/Pluto.jl/pull/2292
+    const [block_screen_with_this_text, set_block_screen_with_this_text] = useState(/** @type {string?} */ (null))
 
-    useLayoutEffect(() => {
-        if (navigating_away != null) document.body.classList.add("loading")
-    }, [navigating_away])
+    const on_start_navigation = (value) => {
+        // Instead of calling set_block_screen_with_this_text(value) directly, we wait for the beforeunload to happen, and then we do it. If this event does not happen within 1 second, then that means that the user right-clicked, or Ctrl+Clicked (to open in a new tab), and we don't want to clear the main menu. https://github.com/fonsp/Pluto.jl/issues/2301
+        const handler = (e) => {
+            set_block_screen_with_this_text(value)
+        }
+        window.addEventListener("beforeunload", handler)
+        setTimeout(() => window.removeEventListener("beforeunload", handler), 1000)
+    }
 
-    return navigating_away != null
-        ? html`<div class="navigating-away-banner"><h2>Loading ${navigating_away}...</h2></div>`
+    return block_screen_with_this_text != null
+        ? html`<div class="navigating-away-banner"><h2>Loading ${block_screen_with_this_text}...</h2></div>`
         : html`
               <section id="title">
                   <h1>welcome to <img src=${url_logo_big} /></h1>
@@ -97,7 +103,7 @@ export const Welcome = () => {
                           connected=${connected}
                           remote_notebooks=${remote_notebooks}
                           CustomRecent=${CustomRecent}
-                          on_start_navigation=${set_navigation_away}
+                          on_start_navigation=${on_start_navigation}
                       />
                   </div>
               </section>
@@ -108,7 +114,7 @@ export const Welcome = () => {
                           connected=${connected}
                           CustomPicker=${CustomPicker}
                           show_samples=${show_samples}
-                          on_start_navigation=${set_navigation_away}
+                          on_start_navigation=${on_start_navigation}
                       />
                   </div>
               </section>

From 70ee00344838eba30caccca7f88dd90b2a31740a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 7 Oct 2022 15:44:27 +0200
Subject: [PATCH 452/821] some more tests

---
 test/cell_disabling.jl | 56 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/test/cell_disabling.jl b/test/cell_disabling.jl
index 66cd79b760..f5f9575dd3 100644
--- a/test/cell_disabling.jl
+++ b/test/cell_disabling.jl
@@ -155,6 +155,62 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook, set_disa
     @test get_indirectly_disabled_cells(notebook) == [1, 2, 4, 5, 6, 9]
     
     
+    ###
+    set_disabled(c(1), true)
+    set_disabled(c(2), false)
+    set_disabled(c(3), true)
+    set_disabled(c(4), false)
+    
+    set_disabled(c(5), true)
+    set_disabled(c(6), true)
+    set_disabled(c(7), false)
+    
+    set_disabled(c(8), false)
+    set_disabled(c(9), true)
+    
+    setcode!(c(10), "const x = 123123")
+    set_disabled(c(10), false)
+    
+    update_run!(🍭, notebook, c(1:10))
+    
+    
+    @test noerror(c(1))
+    @test noerror(c(2))
+    @test noerror(c(3))
+    @test noerror(c(4))
+    
+    @test noerror(c(8))
+    @test noerror(c(10))
+    
+    @test get_indirectly_disabled_cells(notebook) == [1, 3, 5, 6, 7, 9]
+    
+    ###
+    set_disabled(c(3), false)
+    update_run!(🍭, notebook, c(3))
+    
+    @test get_indirectly_disabled_cells(notebook) == [1, 5, 6, 9]
+    @test c(7).errored
+    @test c(8).errored
+    @test c(10).errored
+    
+    ###
+    set_disabled(c(10), true)
+    update_run!(🍭, notebook, c(10))
+    
+    @test get_indirectly_disabled_cells(notebook) == [1, 5, 6, 9, 10]
+    @test noerror(c(7))
+    @test noerror(c(8))
+    
+    ###
+    set_disabled(c(7), true)
+    set_disabled(c(10), false)
+    update_run!(🍭, notebook, c([7,10]))
+    
+    @test get_indirectly_disabled_cells(notebook) == [1, 5, 6, 7, 9]
+    @test noerror(c(7))
+    @test noerror(c(8))
+    @test noerror(c(10))
+    
     
     ### check that they really don't run when disabled
     @test c(14).output.body == "1"

From 36232b497678941f8d8845a4246da8ac281cb045 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 9 Oct 2022 12:35:01 +0200
Subject: [PATCH 453/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index e4c9a6bb95..7736236318 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.12"
+version = "0.19.13"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 02eeb614142861c742a4ff635f23aaf332979916 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 12 Oct 2022 12:34:34 +0200
Subject: [PATCH 454/821] Don't put fake bind macro in file if all bind users
 are disabled cells

---
 src/notebook/saving and loading.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/notebook/saving and loading.jl b/src/notebook/saving and loading.jl
index abc9209577..912b6a6c32 100644
--- a/src/notebook/saving and loading.jl	
+++ b/src/notebook/saving and loading.jl	
@@ -48,7 +48,7 @@ function save_notebook(io::IO, notebook::Notebook)
     println(io, "using Markdown")
     println(io, "using InteractiveUtils")
     # Super Advanced Code Analysis™ to add the @bind macro to the saved file if it's used somewhere.
-    if any(occursin("@bind", c.code) for c in notebook.cells)
+    if any(!must_be_commented_in_file(c) && occursin("@bind", c.code) for c in notebook.cells)
         println(io, "")
         println(io, "# This Pluto notebook uses @bind for interactivity. When running this notebook outside of Pluto, the following 'mock version' of @bind gives bound variables a default value (instead of an error).")
         println(io, PlutoRunner.fake_bind)

From d458e26408e887ba2f4c84203dc3617342962cb9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 12 Oct 2022 12:44:03 +0200
Subject: [PATCH 455/821] =?UTF-8?q?=F0=9F=90=9E=20Delete=20duplicate=20std?=
 =?UTF-8?q?out=20log=20info=20bubble?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Logs.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
index 406b30b67c..bf89de2c70 100644
--- a/frontend/components/Logs.js
+++ b/frontend/components/Logs.js
@@ -104,12 +104,6 @@ const Dot = ({ set_cm_highlighted_line, msg, kwargs, y, level }) => {
         }}
     >
         <pluto-log-icon></pluto-log-icon>
-        ${is_stdout
-            ? html`<${MoreInfo}
-                  body=${html`This text was written to the ${" "}<a href="https://en.wikipedia.org/wiki/Standard_streams" target="_blank">terminal stream</a
-                      >${" "}while running the cell. It is not the${" "}<em>output value</em>${" "}of this cell.`}
-              />`
-            : null}
         <pluto-log-dot class=${level}
             >${is_progress
                 ? html`<${Progress} progress=${progress} />`
@@ -123,8 +117,7 @@ const Dot = ({ set_cm_highlighted_line, msg, kwargs, y, level }) => {
                       />
                       <${LogViewAnsiUp} value=${msg[0]} />`
                 : html`${mimepair_output(msg)}${kwargs.map(
-                      ([k, v]) =>
-                          html` <pluto-log-dot-kwarg><pluto-key>${k}</pluto-key> <pluto-value>${mimepair_output(v)}</pluto-value></pluto-log-dot-kwarg> `
+                      ([k, v]) => html`<pluto-log-dot-kwarg><pluto-key>${k}</pluto-key><pluto-value>${mimepair_output(v)}</pluto-value></pluto-log-dot-kwarg>`
                   )}`}</pluto-log-dot
         >
     </pluto-log-dot-positioner>`

From 0221f16b9128a798850decacf994834d0843e21d Mon Sep 17 00:00:00 2001
From: mickronome <mickronome@gmail.com>
Date: Wed, 12 Oct 2022 13:30:04 +0200
Subject: [PATCH 456/821] Fixes "UndefVarError: expr not defined" in
 replace_returns_with_error_in_interpolation (#2308)

---
 src/runner/PlutoRunner.jl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 765b59cc02..30e957a112 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -254,9 +254,9 @@ module CantReturnInPluto
     replace_returns_with_error(other) = other
 
     "Go through a quoted expression and remove returns"
-    function replace_returns_with_error_in_interpolation(ex::Expr)
-        if ex.head == :$
-            Expr(:$, replace_returns_with_error_in_interpolation(ex.args[1]))
+    function replace_returns_with_error_in_interpolation(expr::Expr)
+        if expr.head == :$
+            Expr(:$, replace_returns_with_error_in_interpolation(expr.args[1]))
         else
             # We are still in a quote, so we do go deeper, but we keep ignoring everything except :$'s
             Expr(expr.head, map(arg -> replace_returns_with_error_in_interpolation(arg), expr.args)...)

From 338ca1952485190b315680f0fe70faf2b99adc07 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 12 Oct 2022 13:37:10 +0200
Subject: [PATCH 457/821] tweak file picker button

---
 frontend/components/welcome/Open.js | 2 +-
 frontend/index.css                  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/components/welcome/Open.js b/frontend/components/welcome/Open.js
index b5697a93f8..98561c0663 100644
--- a/frontend/components/welcome/Open.js
+++ b/frontend/components/welcome/Open.js
@@ -50,7 +50,7 @@ export const Open = ({ client, connected, CustomPicker, show_samples, on_start_n
                 value=""
                 on_submit=${on_open_path}
                 on_desktop_submit=${desktop_on_open_path}
-                button_label=${window.plutoDesktop ? "Open Local File" : "Open File"}
+                button_label=${window.plutoDesktop ? "Open File" : "Open"}
                 placeholder=${picker.placeholder}
             />
             ${window.plutoDesktop &&
diff --git a/frontend/index.css b/frontend/index.css
index deb9dbbfc6..a4ae4b25e2 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -94,7 +94,6 @@ pluto-filepicker .cm-editor {
     width: 100%;
     font-style: normal;
     font-weight: 500;
-
     font-family: var(--inter-ui-font-stack);
     font-size: 0.75rem;
     letter-spacing: 1px;
@@ -105,8 +104,9 @@ pluto-filepicker .cm-editor {
     border-right: none;
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
-    flex: 1 1 100%;
-    width: 0px; /* min-width: 0px; */
+    flex: 1 1 auto;
+    width: 0px;
+    /* min-width: 0px; */
 }
 
 pluto-filepicker .cm-scroller {
@@ -149,6 +149,7 @@ pluto-filepicker button {
     cursor: pointer;
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
+    flex: 0 1 auto;
 }
 
 pluto-filepicker button:disabled {

From 6a6c296993fb3ff8e6adde6f68a35e86e23062aa Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 13 Oct 2022 22:31:22 +0200
Subject: [PATCH 458/821] Update bug_report.md

---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index caa87d86f7..cbc026e816 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,7 +9,7 @@ assignees: ''
 
 Thank you for reporting an issue about Pluto! Let's get it fixed!
 
-# To report an issue, you need two things:
+# To report an issue, you need three things:
 1. 📹 A video recording demonstrating the problem. (You can drag a video file into this box)
 2. 📝 A short Pluto notebook file. (Upload the notebook file to https://gist.github.com/ and include the link.)
 3. 🤕 Try to clearly explain what the problem is, it might not be obvious to others! Instead of saying: "This does not work.", try to say: "I expected ..., but instead I am seeing ..."

From 33b506b359cd41adb56bb9496d18062bc00486f1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 14 Oct 2022 17:45:13 +0200
Subject: [PATCH 459/821] =?UTF-8?q?=F0=9F=90=A2=20Fix=20always-global=20sc?=
 =?UTF-8?q?ope=20of=20`abstract=20type`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/analysis/ExpressionExplorer.jl |  7 +------
 test/ExpressionExplorer.jl         | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 29948a4704..972a62bdac 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -545,12 +545,7 @@ function explore_struct!(ex::Expr, scopestate::ScopeState)
 end
 
 function explore_abstract!(ex::Expr, scopestate::ScopeState)
-    equiv_func = Expr(:function, ex.args...)
-    inner_symstate = explore!(equiv_func, scopestate)
-
-    abstracttypename = first(keys(inner_symstate.funcdefs)).name |> join_funcname_parts
-    push!(inner_symstate.assignments, abstracttypename)
-    return inner_symstate
+    explore_struct!(Expr(:struct, false, ex.args[1], Expr(:block, nothing)), scopestate)
 end
 
 function explore_function_macro!(ex::Expr, scopestate::ScopeState)
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index df2ce81d03..55acb8aa33 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -82,10 +82,16 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(:([a..., b]), [:a, :b], [], [], [])
         @test testee(:(struct a; b; c; end), [], [:a], [], [
             :a => ([], [], [], [])
-            ])
+        ])
+        @test testee(:(abstract type a end), [], [:a], [], [
+            :a => ([], [], [], [])
+        ])
         @test testee(:(let struct a; b; c; end end), [], [:a], [], [
             :a => ([], [], [], [])
-            ])
+        ])
+        @test testee(:(let abstract type a end end), [], [:a], [], [
+            :a => ([], [], [], [])
+        ])
 
         @test testee(:(module a; f(x) = x; z = r end), [], [:a], [], [])
     end
@@ -127,6 +133,15 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(:(struct a{A,B<:C{A}}; i::A; j::B end), [], [:a], [], [:a => ([:C], [], [], [])])
         @test testee(:(struct a{A,B<:C{<:A}} <: D{A,B}; i::A; j::B end), [], [:a], [], [:a => ([:C, :D], [], [], [])])
         @test testee(:(struct a{A,DD<:B.C{D.E{A}}} <: K.A{A} i::A; j::DD; k::C end), [], [:a], [], [:a => ([:B, :C, :D, :K], [], [], [])])
+        
+        @test testee(:(abstract type a <: b end), [], [:a], [], [:a => ([:b], [], [], [])])
+        @test testee(:(abstract type a{T,S} end), [], [:a], [], [:a => ([], [], [], [])])
+        @test testee(:(abstract type a{T} <: b end), [], [:a], [], [:a => ([:b], [], [], [])])
+        @test testee(:(abstract type a{T} <: b{T} end), [], [:a], [], [:a => ([:b], [], [], [])])
+        @test testee(:(abstract type a end), [], [:a], [], [:a => ([], [], [], [])])
+        @test testee(:(abstract type a{A,B<:C{A}} end), [], [:a], [], [:a => ([:C], [], [], [])])
+        @test testee(:(abstract type a{A,B<:C{<:A}} <: D{A,B} end), [], [:a], [], [:a => ([:C, :D], [], [], [])])
+        @test testee(:(abstract type a{A,DD<:B.C{D.E{A}}} <: K.A{A} end), [], [:a], [], [:a => ([:B, :D, :K], [], [], [])])
         # @test_broken testee(:(struct a; c; a(x=y) = new(x,z); end), [], [:a], [], [:a => ([:y, :z], [], [], [])], verbose=false)
     end
     @testset "Assignment operator & modifiers" begin

From 9c1244ba76f1096ee44cc67adf7ad452558c83e2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 14 Oct 2022 19:53:40 +0200
Subject: [PATCH 460/821] Tweak context menu disable button

---
 frontend/components/CellInput.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 3b95ffa7bd..f60cee2474 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -61,9 +61,7 @@ import { bracketMatching } from "./CellInput/block_matcher_plugin.js"
 import { cl } from "../common/ClassTable.js"
 import { HighlightLineFacet, highlightLinePlugin } from "./CellInput/highlight_line.js"
 import { commentKeymap } from "./CellInput/comment_mixed_parsers.js"
-import { debug_syntax_plugin } from "./CellInput/debug_syntax_plugin.js"
 import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
-import { is_mac_keyboard } from "../common/KeyboardShortcuts.js"
 
 export const ENABLE_CM_MIXED_PARSER = window.localStorage.getItem("ENABLE_CM_MIXED_PARSER") === "true"
 
@@ -856,8 +854,6 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, skip_as_script, runnin
     }
     const toggle_running_disabled = async (e) => {
         const new_val = !running_disabled
-        e.preventDefault()
-        e.stopPropagation()
         await set_cell_disabled(new_val)
     }
     const toggle_logs = () => set_show_logs(!show_logs)

From b123511c466e85e12d34f74d0ee9bf0aca1854ff Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 17 Oct 2022 14:10:46 +0200
Subject: [PATCH 461/821] Bundle action: check for empty files (#2320)

---
 .github/workflows/Bundle.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/Bundle.yml b/.github/workflows/Bundle.yml
index a9cd41993a..ce60739ec3 100644
--- a/.github/workflows/Bundle.yml
+++ b/.github/workflows/Bundle.yml
@@ -36,6 +36,7 @@ jobs:
                   node-version: 17.x
                   cache: "npm"
                   cache-dependency-path: frontend-bundler/package-lock.json
+
             - run: npm install
               working-directory: frontend-bundler
             
@@ -43,6 +44,13 @@ jobs:
               working-directory: frontend-bundler
               run: |
                 (npm run build) || (npm run build) || (npm run build)
+                
+            - name: Check for corrupt files
+              working-directory: frontend-dist
+              run: |
+                if [[ $(find . -empty) ]]; then
+                    exit 1
+                fi
 
             # Push the rebuild frontend-dist to the release branch.
             # Needs to be `add --force` because frontend-dist is normally gitignored.

From 9aad08d1f8878d8ff59cfb674088627f49f2a4ff Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 17 Oct 2022 14:27:35 +0200
Subject: [PATCH 462/821] PlutoPkg: prevent crash in _modify_compat if
 Project.toml does not exist

---
 src/packages/PkgCompat.jl | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index 939ec7a075..fe17ca0536 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -405,14 +405,20 @@ project_key_order(key::String) =
 
 # ✅ Public API
 function _modify_compat(f!::Function, ctx::PkgContext)::PkgContext
-	toml = Pkg.TOML.parsefile(project_file(ctx))
-	compat = get!(Dict, toml, "compat")
-
+	project_path = project_file(ctx)
+	
+	toml = if isfile(project_path)
+		Pkg.TOML.parsefile(project_path)
+	else
+		Dict{String,Any}()
+	end
+	compat = get!(Dict{String,Any}, toml, "compat")
+	
 	f!(compat)
 
 	isempty(compat) && delete!(toml, "compat")
 
-	write(project_file(ctx), sprint() do io
+	write(project_path, sprint() do io
 		Pkg.TOML.print(io, toml; sorted=true, by=(key -> (project_key_order(key), key)))
 	end)
 	

From 240ec4f2f5cf07e7eb18739d0c0d9a5d38a03b58 Mon Sep 17 00:00:00 2001
From: "Sergio A. Vargas" <savargasqu+git@unal.edu.co>
Date: Tue, 18 Oct 2022 04:18:30 -0500
Subject: [PATCH 463/821] Refactor WorkspaceManager (#2318)

---
 src/evaluation/WorkspaceManager.jl | 258 ++++++++++++++++-------------
 test/React.jl                      |   2 +-
 test/webserver.jl                  |   2 +-
 3 files changed, 149 insertions(+), 113 deletions(-)

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index c556e97e15..314dc99a01 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -8,7 +8,11 @@ import ..Pluto.ExpressionExplorer: FunctionName
 import ..PlutoRunner
 import Distributed
 
-"Contains the Julia process (in the sense of `Distributed.addprocs`) to evaluate code in. Each notebook gets at most one `Workspace` at any time, but it can also have no `Workspace` (it cannot `eval` code in this case)."
+"""
+Contains the Julia process (in the sense of `Distributed.addprocs`) to evaluate code in.
+Each notebook gets at most one `Workspace` at any time, but it can also have no `Workspace`
+(it cannot `eval` code in this case).
+"""
 Base.@kwdef mutable struct Workspace
     pid::Integer
     notebook_id::UUID
@@ -22,29 +26,32 @@ Base.@kwdef mutable struct Workspace
     original_ACTIVE_PROJECT::Union{Nothing,String}=nothing
 end
 
-"These expressions get evaluated whenever a new `Workspace` process is created."
-process_preamble() = quote
-    ccall(:jl_exit_on_sigint, Cvoid, (Cint,), 0)
-    include($(project_relative_path(joinpath("src", "runner"), "Loader.jl")))
-    ENV["GKSwstype"] = "nul"
-    ENV["JULIA_REVISE_WORKER_ONLY"] = "1"
-end
+const SN = Tuple{ServerSession, Notebook}
+
+const active_workspaces = Dict{UUID,Task}()
 
-const workspaces = Dict{UUID,Task}()
 "Set of notebook IDs that we will never make a process for again."
 const discarded_workspaces = Set{UUID}()
 
-const SN = Tuple{ServerSession,Notebook}
+const Distributed_expr = quote
+    Base.loaded_modules[Base.PkgId(Base.UUID("8ba89e20-285c-5b6f-9357-94700520ee1b"), "Distributed")]
+end
+
+"These expressions get evaluated whenever a new `Workspace` process is created."
+function process_preamble()
+    quote
+        Base.exit_on_sigint(false)
+        include($(project_relative_path(joinpath("src", "runner"), "Loader.jl")))
+        ENV["GKSwstype"] = "nul"
+        ENV["JULIA_REVISE_WORKER_ONLY"] = "1"
+    end
+end
 
-"""Create a workspace for the notebook, optionally in the main process."""
+"Create a workspace for the notebook, optionally in the main process."
 function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false)::Workspace
     is_offline_renderer || (notebook.process_status = ProcessStatus.starting)
 
-    use_distributed = if is_offline_renderer
-        false
-    else
-        session.options.evaluation.workspace_use_distributed
-    end
+    use_distributed = !is_offline_renderer && session.options.evaluation.workspace_use_distributed
 
     pid = if use_distributed
         @debug "Creating workspace process" notebook.path length(notebook.cells)
@@ -52,7 +59,7 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
     else
         pid = Distributed.myid()
         if !(isdefined(Main, :PlutoRunner) && Main.PlutoRunner isa Module)
-            # we make PlutoRunner available in Main, right now it's only defined inside this Pluto module.
+            # Make PlutoRunner available in Main, right now it's only defined inside this Pluto module.
             @eval Main begin
                 PlutoRunner = $(PlutoRunner)
             end
@@ -62,18 +69,18 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
 
     Distributed.remotecall_eval(Main, [pid], session.options.evaluation.workspace_custom_startup_expr)
 
-    Distributed.remotecall_eval(Main, [pid], :(PlutoRunner.notebook_id[] = $(notebook.notebook_id)))
+    Distributed.remotecall_eval(Main, [pid], quote
+        PlutoRunner.notebook_id[] = $(notebook.notebook_id)
+    end)
 
     remote_log_channel = Core.eval(Main, quote
         $(Distributed).RemoteChannel(() -> eval(quote
-        
             channel = Channel{Any}(10)
             Main.PlutoRunner.setup_plutologger(
-                $($(notebook.notebook_id)), 
-                channel; 
+                $($(notebook.notebook_id)),
+                channel;
                 make_global=$($(use_distributed))
             )
-            
             channel
         end), $pid)
     end)
@@ -81,6 +88,7 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
     run_channel = Core.eval(Main, quote
         $(Distributed).RemoteChannel(() -> eval(:(Main.PlutoRunner.run_channel)), $pid)
     end)
+
     module_name = create_emptyworkspacemodule(pid)
 
     original_LOAD_PATH, original_ACTIVE_PROJECT = Distributed.remotecall_eval(Main, pid, :(Base.LOAD_PATH, Base.ACTIVE_PROJECT[]))
@@ -108,14 +116,10 @@ end
 
 function use_nbpkg_environment((session, notebook)::SN, workspace=nothing)
     enabled = notebook.nbpkg_ctx !== nothing
-    if workspace.nbpkg_was_active == enabled
-        return
-    end
+    workspace.nbpkg_was_active == enabled && return
 
     workspace = workspace !== nothing ? workspace : get_workspace((session, notebook))
-    if workspace.discarded
-        return
-    end
+    workspace.discarded && return
 
     workspace.nbpkg_was_active = enabled
     if workspace.pid != Distributed.myid()
@@ -127,7 +131,7 @@ function use_nbpkg_environment((session, notebook)::SN, workspace=nothing)
             Base.ACTIVE_PROJECT[] = $(new_AP)
         end)
     else
-        # uhmmmmmm TODO
+        # TODO
     end
 end
 
@@ -159,26 +163,24 @@ function start_relaying_logs((session, notebook)::SN, log_channel::Distributed.R
             fn = next_log["file"]
             match = findfirst("#==#", fn)
 
-            # We always show the log at the currently running cell, which is given by
+            # Show the log at the currently running cell, which is given by
             running_cell_id = next_log["cell_id"]::UUID
 
             # Some logs originate from outside of the running code, through function calls. Some code here to deal with that:
             begin
                 source_cell_id = if match !== nothing
-                    # the log originated from within the notebook
-
+                    # The log originated from within the notebook
                     UUID(fn[match[end]+1:end])
                 else
-                    # the log originated from a function call defined outside of the notebook
-
-                    # we will show the log at the currently running cell, at "line -1", i.e. without line info.
+                    # The log originated from a function call defined outside of the notebook.
+                    # Show the log at the currently running cell, at "line -1", i.e. without line info.
                     next_log["line"] = -1
                     running_cell_id
                 end
 
                 if running_cell_id != source_cell_id
-                    # the log originated from a function in another cell of the notebook
-                    # we will show the log at the currently running cell, at "line -1", i.e. without line info.
+                    # The log originated from a function in another cell of the notebook
+                    # Show the log at the currently running cell, at "line -1", i.e. without line info.
                     next_log["line"] = -1
                 end
             end
@@ -226,7 +228,7 @@ end
 "Call `cd(\$path)` inside the workspace. This is done when creating a workspace, and whenever the notebook changes path."
 function cd_workspace(workspace, path::AbstractString)
     eval_in_workspace(workspace, quote
-        cd($(path |> dirname))
+        cd(dirname($path))
     end)
 end
 
@@ -241,21 +243,18 @@ end
 
 function possible_bond_values(session_notebook::SN, n::Symbol; get_length::Bool=false)
     workspace = get_workspace(session_notebook)
-    pid = workspace.pid
 
-    Distributed.remotecall_eval(Main, pid, quote
+    Distributed.remotecall_eval(Main, workspace.pid, quote
         PlutoRunner.possible_bond_values($(QuoteNode(n)); get_length=$(get_length))
     end)
 end
 
 function create_emptyworkspacemodule(pid::Integer)::Symbol
-    Distributed.remotecall_eval(Main, pid, :(PlutoRunner.increment_current_module()))
+    Distributed.remotecall_eval(Main, pid, quote
+        PlutoRunner.increment_current_module()
+    end)
 end
 
-const Distributed_expr = :(
-    Base.loaded_modules[Base.PkgId(Base.UUID("8ba89e20-285c-5b6f-9357-94700520ee1b"), "Distributed")]
-)
-
 # NOTE: this function only start a worker process using given
 # compiler options, it does not resolve paths for notebooks
 # compiler configurations passed to it should be resolved before this
@@ -269,12 +268,13 @@ function create_workspaceprocess(; compiler_options=CompilerOptions())::Integer
     Distributed.remotecall_eval(Main, [pid], process_preamble())
 
     # so that we NEVER break the workspace with an interrupt 🤕
-    @async Distributed.remotecall_eval(Main, [pid],
-        :(while true
+    @async Distributed.remotecall_eval(Main, [pid], quote
+        while true
             try
                 wait()
             catch end
-        end))
+        end
+    end)
 
     pid
 end
@@ -291,14 +291,15 @@ function get_workspace(session_notebook::SN; allow_creation::Bool=true)::Union{N
         error("Cannot run code in this notebook: it has already shut down.")
     end
 
-    task = !allow_creation ?
-           get(workspaces, notebook.notebook_id, nothing) :
-           get!(workspaces, notebook.notebook_id) do
-        Task(() -> make_workspace(session_notebook))
+    task = if !allow_creation
+        get(active_workspaces, notebook.notebook_id, nothing)
+    else
+        get!(active_workspaces, notebook.notebook_id) do
+            Task(() -> make_workspace(session_notebook))
+        end
     end
 
     isnothing(task) && return nothing
-
     istaskstarted(task) || schedule(task)
     fetch(task)
 end
@@ -313,7 +314,7 @@ function unmake_workspace(session_notebook::SN; async::Bool=false, verbose::Bool
     allow_restart || push!(discarded_workspaces, notebook.notebook_id)
 
     if workspace.pid != Distributed.myid()
-        filter!(p -> fetch(p.second).pid != workspace.pid, workspaces)
+        filter!(p -> fetch(p.second).pid != workspace.pid, active_workspaces)
         t = @async begin
             interrupt_workspace(workspace; verbose=false)
             # run on proc 1 in case Pluto is being used inside a notebook process
@@ -345,15 +346,12 @@ function distributed_exception_result(ex::Base.IOError, workspace::Workspace)
     )
 end
 
-
-
 function distributed_exception_result(exs::CompositeException, workspace::Workspace)
-    ex = exs.exceptions |> first
+    ex = first(exs.exceptions)
 
     if ex isa Distributed.RemoteException &&
-       ex.pid == workspace.pid &&
-       ex.captured.ex isa InterruptException
-
+        ex.pid == workspace.pid &&
+        ex.captured.ex isa InterruptException
         (
             output_formatted=PlutoRunner.format_output(CapturedException(InterruptException(), [])),
             errored=true,
@@ -388,9 +386,12 @@ function distributed_exception_result(exs::CompositeException, workspace::Worksp
 end
 
 
-"Evaluate expression inside the workspace - output is fetched and formatted, errors are caught and formatted. Returns formatted output and error flags.
+"""
+Evaluate expression inside the workspace - output is fetched and formatted,
+errors are caught and formatted. Returns formatted output and error flags.
 
-`expr` has to satisfy `ExpressionExplorer.is_toplevel_expr`."
+`expr` has to satisfy `ExpressionExplorer.is_toplevel_expr`.
+"""
 function eval_format_fetch_in_workspace(
     session_notebook::Union{SN,Workspace},
     expr::Expr,
@@ -415,40 +416,46 @@ function eval_format_fetch_in_workspace(
         use_nbpkg_environment(session_notebook, workspace)
     end
 
-    # run the code 🏃‍♀️
+    # Run the code 🏃
 
-    # a try block (on this process) to catch an InterruptException
+    # A try block (on this process) to catch an InterruptException
     take!(workspace.dowork_token)
     early_result = try
-        # we use [pid] instead of pid to prevent fetching output
-        Distributed.remotecall_eval(Main, [workspace.pid], :(PlutoRunner.run_expression(
-            getfield(Main, $(QuoteNode(workspace.module_name))),
-            $(QuoteNode(expr)),
-            $(workspace.notebook_id),
-            $cell_id,
-            $function_wrapped_info,
-            $forced_expr_id;
-            user_requested_run=$user_requested_run,
-            capture_stdout=$(capture_stdout && !is_on_this_process),
-        )))
+        # Use [pid] instead of pid to prevent fetching output
+        Distributed.remotecall_eval(Main, [workspace.pid], quote
+            PlutoRunner.run_expression(
+                getfield(Main, $(QuoteNode(workspace.module_name))),
+                $(QuoteNode(expr)),
+                $(workspace.notebook_id),
+                $cell_id,
+                $function_wrapped_info,
+                $forced_expr_id;
+                user_requested_run=$user_requested_run,
+                capture_stdout=$(capture_stdout && !is_on_this_process),
+            )
+        end)
         put!(workspace.dowork_token)
         nothing
-    catch exs
-        # We don't use a `finally` because the token needs to be back asap for the interrupting code to pick it up.
+    catch e
+        # Don't use a `finally` because the token needs to be back asap for the interrupting code to pick it up.
         put!(workspace.dowork_token)
-        distributed_exception_result(exs, workspace)
+        distributed_exception_result(e, workspace)
     end
 
-    early_result === nothing ?
-    format_fetch_in_workspace(workspace, cell_id, ends_with_semicolon, known_published_objects) :
-    early_result
+    if early_result === nothing
+        format_fetch_in_workspace(workspace, cell_id, ends_with_semicolon, known_published_objects)
+    else
+        early_result
+    end
 end
 
 "Evaluate expression inside the workspace - output is not fetched, errors are rethrown. For internal use."
 function eval_in_workspace(session_notebook::Union{SN,Workspace}, expr)
     workspace = get_workspace(session_notebook)
 
-    Distributed.remotecall_eval(Main, [workspace.pid], :(Core.eval($(workspace.module_name), $(expr |> QuoteNode))))
+    Distributed.remotecall_eval(Main, [workspace.pid], quote
+        Core.eval($(workspace.module_name), $(QuoteNode(expr)))
+    end)
     nothing
 end
 
@@ -461,42 +468,42 @@ function format_fetch_in_workspace(
 )::PlutoRunner.FormattedCellResult
     workspace = get_workspace(session_notebook)
 
-    # instead of fetching the output value (which might not make sense in our context, since the user can define structs, types, functions, etc), we format the cell output on the worker, and fetch the formatted output.
+    # Instead of fetching the output value (which might not make sense in our context,
+    # since the user can define structs, types, functions, etc),
+    # we format the cell output on the worker, and fetch the formatted output.
     withtoken(workspace.dowork_token) do
         try
-            Distributed.remotecall_eval(Main, workspace.pid, :(PlutoRunner.formatted_result_of(
-                $(workspace.notebook_id),
-                $cell_id,
-                $ends_with_semicolon,
-                $known_published_objects,
-                $showmore_id,
-                getfield(Main, $(QuoteNode(workspace.module_name))),
-            )))
-        catch ex
-            distributed_exception_result(CompositeException([ex]), workspace)
+            Distributed.remotecall_eval(Main, workspace.pid, quote
+                PlutoRunner.formatted_result_of(
+                    $(workspace.notebook_id),
+                    $cell_id,
+                    $ends_with_semicolon,
+                    $known_published_objects,
+                    $showmore_id,
+                    getfield(Main, $(QuoteNode(workspace.module_name))),
+                )
+            end)
+        catch e
+            distributed_exception_result(CompositeException([e]), workspace)
         end
     end
 end
 
 function collect_soft_definitions(session_notebook::SN, modules::Set{Expr})
     workspace = get_workspace(session_notebook)
-    module_name = workspace.module_name
-
-    ex = quote
-        PlutoRunner.collect_soft_definitions($module_name, $modules)
-    end
 
-    Distributed.remotecall_eval(Main, workspace.pid, ex)
+    Distributed.remotecall_eval(Main, workspace.pid, quote
+        PlutoRunner.collect_soft_definitions($(workspace.module_name), $modules)
+    end)
 end
 
-
 function macroexpand_in_workspace(session_notebook::Union{SN,Workspace}, macrocall, cell_id, module_name=nothing)::Tuple{Bool,Any}
     workspace = get_workspace(session_notebook)
     module_name = module_name === nothing ? workspace.module_name : module_name
 
     Distributed.remotecall_eval(Main, workspace.pid, quote
         try
-            (true, PlutoRunner.try_macroexpand($(module_name), $(workspace.notebook_id), $(cell_id), $(macrocall |> QuoteNode)))
+            (true, PlutoRunner.try_macroexpand($module_name, $(workspace.notebook_id), $cell_id, $(QuoteNode(macrocall))))
         catch error
             # We have to be careful here, for example a thrown `MethodError()` will contain the called method and arguments.
             # which normally would be very useful for debugging, but we can't serialize it!
@@ -514,25 +521,52 @@ end
 function eval_fetch_in_workspace(session_notebook::Union{SN,Workspace}, expr)
     workspace = get_workspace(session_notebook)
 
-    Distributed.remotecall_eval(Main, workspace.pid, :(Core.eval($(workspace.module_name), $(expr |> QuoteNode))))
+    Distributed.remotecall_eval(Main, workspace.pid, quote
+        Core.eval($(workspace.module_name), $(QuoteNode(expr)))
+    end)
 end
 
 function do_reimports(session_notebook::Union{SN,Workspace}, module_imports_to_move::Set{Expr})
     workspace = get_workspace(session_notebook)
-    workspace_name = workspace.module_name
-    Distributed.remotecall_eval(Main, [workspace.pid], :(PlutoRunner.do_reimports($(workspace_name), $module_imports_to_move)))
+
+    Distributed.remotecall_eval(Main, [workspace.pid], quote
+        PlutoRunner.do_reimports($(workspace.module_name), $module_imports_to_move)
+    end)
 end
 
-"Move variables to a new module. A given set of variables to be 'deleted' will not be moved to the new module, making them unavailable. "
-function move_vars(session_notebook::Union{SN,Workspace}, old_workspace_name::Symbol, new_workspace_name::Union{Nothing,Symbol}, to_delete::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, module_imports_to_move::Set{Expr}, invalidated_cell_uuids::Set{UUID}; kwargs...)
+"""
+Move variables to a new module. Variables to be 'deleted' will not be moved to
+the new module, making them unavailable.
+"""
+function move_vars(
+    session_notebook::Union{SN,Workspace},
+    old_workspace_name::Symbol,
+    new_workspace_name::Union{Nothing,Symbol},
+    to_delete::Set{Symbol},
+    methods_to_delete::Set{Tuple{UUID,FunctionName}},
+    module_imports_to_move::Set{Expr},
+    invalidated_cell_uuids::Set{UUID};
+    kwargs...
+    )
+
     workspace = get_workspace(session_notebook)
     new_workspace_name = something(new_workspace_name, workspace.module_name)
 
-    Distributed.remotecall_eval(Main, [workspace.pid], :(PlutoRunner.move_vars($(old_workspace_name |> QuoteNode), $(new_workspace_name |> QuoteNode), $to_delete, $methods_to_delete, $module_imports_to_move, $invalidated_cell_uuids)))
+    Distributed.remotecall_eval(Main, [workspace.pid], quote
+        PlutoRunner.move_vars(
+            $(QuoteNode(old_workspace_name)),
+            $(QuoteNode(new_workspace_name)),
+            $to_delete,
+            $methods_to_delete,
+            $module_imports_to_move,
+            $invalidated_cell_uuids,
+        )
+    end)
 end
 
-move_vars(session_notebook::Union{SN,Workspace}, to_delete::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, module_imports_to_move::Set{Expr}, invalidated_cell_uuids::Set{UUID}; kwargs...) =
+function move_vars(session_notebook::Union{SN,Workspace}, to_delete::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, module_imports_to_move::Set{Expr}, invalidated_cell_uuids::Set{UUID}; kwargs...)
     move_vars(session_notebook, bump_workspace_module(session_notebook)..., to_delete, methods_to_delete, module_imports_to_move, invalidated_cell_uuids; kwargs...)
+end
 
 # TODO: delete me
 @deprecate(
@@ -605,10 +639,12 @@ function interrupt_workspace(session_notebook::Union{SN,Workspace}; verbose=true
         https://docs.microsoft.com/en-us/windows/wsl"
         return false
     end
+
     if workspace.pid == Distributed.myid()
         verbose && @warn """Cells in this workspace can't be stopped, because it is not running in a separate workspace. Use `ENV["PLUTO_WORKSPACE_USE_DISTRIBUTED"]` to control whether future workspaces are generated in a separate process."""
         return false
     end
+
     if isready(workspace.dowork_token)
         verbose && @info "Tried to stop idle workspace - ignoring."
         return true
@@ -642,10 +678,10 @@ function interrupt_workspace(session_notebook::Union{SN,Workspace}; verbose=true
         verbose && println()
         verbose && println("Cell interrupted!")
         true
-    catch ex
-        if !(ex isa KeyError)
+    catch e
+        if !(e isa KeyError)
             @warn "Interrupt failed for unknown reason"
-            showerror(ex, stacktrace(catch_backtrace()))
+            showerror(e, stacktrace(catch_backtrace()))
         end
         false
     end
diff --git a/test/React.jl b/test/React.jl
index eb1b5e0d7a..eff57fc685 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -26,7 +26,7 @@ import Distributed
             Cell("Distributed.myid()"),
         ])
 
-        @test !haskey(WorkspaceManager.workspaces, notebook.notebook_id)
+        @test !haskey(WorkspaceManager.active_workspaces, notebook.notebook_id)
 
         update_run!(🍭, notebook, notebook.cells[1:2])
         @test notebook.cells[1].output.body == notebook.cells[2].output.body
diff --git a/test/webserver.jl b/test/webserver.jl
index 9afbd3bdf1..0d94e1887c 100644
--- a/test/webserver.jl
+++ b/test/webserver.jl
@@ -91,7 +91,7 @@ end
     
     # right now, the notebook was only added to the session and assigned an ID. Let's wait for it to get a process:
     @test poll(60) do
-        haskey(WorkspaceManager.workspaces, notebook.notebook_id)
+        haskey(WorkspaceManager.active_workspaces, notebook.notebook_id)
     end
     sleep(1)
     

From 583bb9ddfcc09a7c4dcf13d06ac8ce6040f3c678 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 18 Oct 2022 19:03:39 +0200
Subject: [PATCH 464/821] Update Logs.js

---
 frontend/components/Logs.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
index bf89de2c70..a7922fbddb 100644
--- a/frontend/components/Logs.js
+++ b/frontend/components/Logs.js
@@ -99,7 +99,6 @@ const Dot = ({ set_cm_highlighted_line, msg, kwargs, y, level }) => {
         class=${cl({ [level]: true })}
         onMouseenter=${() => is_progress || set_cm_highlighted_line(y + 1)}
         onMouseleave=${() => {
-            console.log("leaving!")
             set_cm_highlighted_line(null)
         }}
     >

From 5f5a1b8399e6fae46b0467bc6c26e1bf815dacc0 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Oct 2022 00:19:42 +0200
Subject: [PATCH 465/821] Automatically disable older cells to solve multiple
 defs (#2273)

Co-authored-by: Rik Huijzer <rikhuijzer@pm.me>
---
 frontend/components/Editor.js      | 16 +++++-
 frontend/components/ProgressBar.js |  6 +--
 frontend/components/Scroller.js    |  7 +++
 frontend/components/UndoDelete.js  | 30 ++++++++++++
 frontend/editor.css                | 10 +++-
 src/analysis/Topology.jl           |  3 ++
 src/analysis/topological_order.jl  |  7 ++-
 src/evaluation/Run.jl              | 79 +++++++++++++++++++++++++++---
 src/webserver/Dynamic.jl           | 21 ++++++--
 9 files changed, 159 insertions(+), 20 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 2f757bc2cd..76477ef330 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -14,7 +14,7 @@ import { NotebookMemo as Notebook } from "./Notebook.js"
 import { LiveDocs } from "./LiveDocs.js"
 import { DropRuler } from "./DropRuler.js"
 import { SelectionArea } from "./SelectionArea.js"
-import { UndoDelete } from "./UndoDelete.js"
+import { RecentlyDisabledInfo, UndoDelete } from "./UndoDelete.js"
 import { SlideControls } from "./SlideControls.js"
 import { Scroller } from "./Scroller.js"
 import { ExportBanner } from "./ExportBanner.js"
@@ -290,6 +290,7 @@ export class Editor extends Component {
             cell_inputs_local: /** @type {{ [id: string]: CellInputData }} */ ({}),
             desired_doc_query: null,
             recently_deleted: /** @type {Array<{ index: number, cell: CellInputData }>} */ ([]),
+            recently_auto_disabled_cells: /** @type {Map<string,[string,string]>} */ ({}),
             last_update_time: 0,
 
             disable_ui: launch_params.disable_ui,
@@ -589,7 +590,14 @@ export class Editor extends Component {
                             }
                         })
                     )
-                    await this.client.send("run_multiple_cells", { cells: cell_ids }, { notebook_id: this.state.notebook.notebook_id })
+                    const result = await this.client.send("run_multiple_cells", { cells: cell_ids }, { notebook_id: this.state.notebook.notebook_id })
+                    console.log(result)
+                    const { disabled_cells } = result.message
+                    if (Object.entries(disabled_cells).length > 0) {
+                        await this.setStatePromise({
+                            recently_auto_disabled_cells: disabled_cells,
+                        })
+                    }
                 }
             },
             /**
@@ -1554,6 +1562,10 @@ patch: ${JSON.stringify(
                         notebook=${this.state.notebook}
                         disable_input=${this.state.disable_ui || !this.state.connected /* && this.state.backend_launch_phase == null*/}
                     />
+                    <${RecentlyDisabledInfo} 
+                        recently_auto_disabled_cells=${this.state.recently_auto_disabled_cells}
+                        notebook=${this.state.notebook}
+                    />
                     <${UndoDelete}
                         recently_deleted=${this.state.recently_deleted}
                         on_click=${() => {
diff --git a/frontend/components/ProgressBar.js b/frontend/components/ProgressBar.js
index 29e1db5648..bcfee5ea4a 100644
--- a/frontend/components/ProgressBar.js
+++ b/frontend/components/ProgressBar.js
@@ -1,5 +1,6 @@
 import _ from "../imports/lodash.js"
 import { html, useContext, useEffect, useMemo, useState } from "../imports/Preact.js"
+import { scroll_cell_into_view } from "./Scroller.js"
 
 export const useDelayed = (value, delay = 500) => {
     const [current, set_current] = useState(null)
@@ -75,10 +76,7 @@ export const ProgressBar = ({ notebook, backend_launch_phase, status }) => {
             if (!binder_loading) {
                 const running_cell = Object.values(notebook.cell_results).find((c) => c.running) ?? Object.values(notebook.cell_results).find((c) => c.queued)
                 if (running_cell) {
-                    document.getElementById(running_cell.cell_id)?.scrollIntoView({
-                        block: "center",
-                        behavior: "smooth",
-                    })
+                    scroll_cell_into_view(running_cell.cell_id)
                 }
             }
         }}
diff --git a/frontend/components/Scroller.js b/frontend/components/Scroller.js
index 5eb9002d72..b3483c4424 100644
--- a/frontend/components/Scroller.js
+++ b/frontend/components/Scroller.js
@@ -52,3 +52,10 @@ export const Scroller = ({ active }) => {
 
     return null
 }
+
+export const scroll_cell_into_view = (/** @type {string} */ cell_id) => {
+    document.getElementById(cell_id)?.scrollIntoView({
+        block: "center",
+        behavior: "smooth",
+    })
+}
diff --git a/frontend/components/UndoDelete.js b/frontend/components/UndoDelete.js
index ee358615ec..5da10f367b 100644
--- a/frontend/components/UndoDelete.js
+++ b/frontend/components/UndoDelete.js
@@ -1,5 +1,7 @@
 import { html, useState, useEffect } from "../imports/Preact.js"
 import { cl } from "../common/ClassTable.js"
+import { open_pluto_popup } from "./Popup.js"
+import { scroll_cell_into_view } from "./Scroller.js"
 
 export const UndoDelete = ({ recently_deleted, on_click }) => {
     const [hidden, set_hidden] = useState(true)
@@ -39,3 +41,31 @@ export const UndoDelete = ({ recently_deleted, on_click }) => {
         </nav>
     `
 }
+
+/**
+ * @param {{
+ *  notebook: import("./Editor.js").NotebookData,
+ *  recently_auto_disabled_cells: Map<string,[string,string]>,
+ * }} props
+ * */
+export const RecentlyDisabledInfo = ({ notebook, recently_auto_disabled_cells }) => {
+    useEffect(() => {
+        Object.entries(recently_auto_disabled_cells).forEach(([cell_id, reason]) => {
+            open_pluto_popup({
+                type: "info",
+                source_element: document.getElementById(reason[0]),
+                body: html`<a
+                        href=${`#${cell_id}`}
+                        onClick=${(e) => {
+                            scroll_cell_into_view(cell_id)
+                            e.preventDefault()
+                            e.stopPropagation()
+                        }}
+                        >Another cell</a
+                    >${` has been disabled because it also defined `}<code class="auto_disabled_variable">${reason[1]}</code>.`,
+            })
+        })
+    }, [recently_auto_disabled_cells])
+
+    return null
+}
diff --git a/frontend/editor.css b/frontend/editor.css
index cc5c35f004..b99412aca6 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1810,6 +1810,13 @@ pluto-popup > * {
     /* Slightly changes the layout of the three pkg buttons... in just the way that we want it! */
     position: absolute;
 }
+
+pluto-popup code.auto_disabled_variable {
+    font-family: var(--julia-mono-font-stack);
+    font-size: 0.8rem;
+    font-variant-ligatures: none;
+}
+
 pluto-popup > pkg-popup {
     background: var(--pkg-popup-bg);
     border: 3px solid var(--pkg-popup-border-color);
@@ -2847,7 +2854,8 @@ pluto-cell.code_differs .cm-editor .cm-gutters {
 }
 
 .cm-completionIcon-c_Any::before,
-pluto-output > assignee {
+pluto-output > assignee,
+pluto-popup code.auto_disabled_variable {
     color: var(--cm-var-color) !important;
     font-weight: 700;
 }
diff --git a/src/analysis/Topology.jl b/src/analysis/Topology.jl
index b1f2f32237..fe4b32a127 100644
--- a/src/analysis/Topology.jl
+++ b/src/analysis/Topology.jl
@@ -39,6 +39,9 @@ end
 all_cells(topology::NotebookTopology) = topology.cell_order.c
 
 is_resolved(topology::NotebookTopology) = isempty(topology.unresolved_cells)
+is_resolved(topology::NotebookTopology, c::Cell) = c in topology.unresolved_cells
+
+is_disabled(topology::NotebookTopology, c::Cell) = c in topology.disabled_cells
 
 function set_unresolved(topology::NotebookTopology, unresolved_cells::Vector{Cell})
     codes = Dict{Cell,ExprAnalysisCache}(
diff --git a/src/analysis/topological_order.jl b/src/analysis/topological_order.jl
index 4853ef4445..8acd976b8a 100644
--- a/src/analysis/topological_order.jl
+++ b/src/analysis/topological_order.jl
@@ -147,7 +147,7 @@ end
 
 Base.collect(notebook_topo_order::TopologicalOrder) = union(notebook_topo_order.runnable, keys(notebook_topo_order.errable))
 
-function disjoint(a::Set, b::Set)
+function disjoint(a, b)
 	!any(x in a for x in b)
 end
 
@@ -177,7 +177,10 @@ end
 
 "Return the cells that also assign to any variable or method defined by the given cell. If more than one cell is returned (besides the given cell), then all of them should throw a `MultipleDefinitionsError`. Non-recursive: only direct dependencies are found."
 function where_assigned(topology::NotebookTopology, myself::Cell)::Vector{Cell}
-	self = topology.nodes[myself]
+	where_assigned(topology, topology.nodes[myself])
+end
+
+function where_assigned(topology::NotebookTopology, self::ReactiveNode)::Vector{Cell}
 	return filter(all_cells(topology)) do cell
 		other = topology.nodes[cell]
 		!(
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index ff106ef5e7..ee6ac305a6 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -321,10 +321,6 @@ end
 
 will_run_code(notebook::Notebook) = notebook.process_status != ProcessStatus.no_process && notebook.process_status != ProcessStatus.waiting_to_restart
 
-###
-# CONVENIENCE FUNCTIONS
-###
-
 
 "Do all the things!"
 function update_save_run!(
@@ -334,10 +330,30 @@ function update_save_run!(
 	save::Bool=true, 
 	run_async::Bool=false, 
 	prerender_text::Bool=false, 
+	auto_solve_multiple_defs::Bool=false,
+	on_auto_solve_multiple_defs::Union{Nothing,Function}=nothing,
 	kwargs...
 )
 	old = notebook.topology
 	new = notebook.topology = updated_topology(old, notebook, cells) # macros are not yet resolved
+	
+	# _assume `auto_solve_multiple_defs == false` if you want to skip some details_
+	if auto_solve_multiple_defs
+		to_disable_dict = cells_to_disable_to_resolve_multiple_defs(old, new, cells)
+		
+		if !isempty(to_disable_dict)
+			to_disable = keys(to_disable_dict)
+			@debug "Using augmented topology" cell_id.(to_disable)
+			
+			foreach(c -> set_disabled(c, true), to_disable)
+			
+			cells = union(cells, to_disable)
+			# need to update the topology because the topology also keeps track of disabled cells
+			new = notebook.topology = updated_topology(new, notebook, to_disable)
+		end
+		
+		isnothing(on_auto_solve_multiple_defs) || on_auto_solve_multiple_defs(to_disable_dict)
+	end
 
 	update_dependency_cache!(notebook)
 	save && save_notebook(session, notebook)
@@ -406,6 +422,55 @@ end
 update_save_run!(session::ServerSession, notebook::Notebook, cell::Cell; kwargs...) = update_save_run!(session, notebook, [cell]; kwargs...)
 update_run!(args...; kwargs...) = update_save_run!(args...; save=false, kwargs...)
 
+
+function cells_to_disable_to_resolve_multiple_defs(old::NotebookTopology, new::NotebookTopology, cells::Vector{Cell})::Dict{Cell,Any}
+	# keys are cells to disable
+	# values are the reason why
+	to_disable_and_why = Dict{Cell,Any}()
+	
+	for cell in cells
+		new_node = new.nodes[cell]
+		
+		fellow_assigners_old = filter!(c -> !is_disabled(old, c), where_assigned(old, new_node))
+		fellow_assigners_new = filter!(c -> !is_disabled(new, c), where_assigned(new, new_node))
+		
+		if length(fellow_assigners_new) > length(fellow_assigners_old)
+			other_definers = setdiff(fellow_assigners_new, (cell,))
+			
+			@debug "Solving multiple defs" cell.cell_id cell_id.(other_definers) disjoint(cells, other_definers)
+
+			# we want cell to be the only element of cells that defines this varialbe, i.e. all other definers must have been created previously
+			if disjoint(cells, other_definers)
+				# all fellow cells (including the current cell) should meet some criteria:
+				all_fellows_are_simple_enough = all(fellow_assigners_new) do c
+					node = new.nodes[c]
+					
+					# all must be true:
+					return (
+						length(node.definitions) == 1 && # for more than one defined variable, we might confuse the user, or disable more things than we want to.
+						disjoint(node.references, node.definitions) && # avoid self-reference like `x = x + 1`
+						isempty(node.funcdefs_without_signatures) &&
+						isempty(node.macrocalls)
+					)
+				end
+				
+				if all_fellows_are_simple_enough 
+					for c in other_definers
+						# if the cell is already disabled (indirectly), then we don't need to disable it. probably.
+						if !c.depends_on_disabled_cells
+							to_disable_and_why[c] = (cell_id(cell), only(new.nodes[c].definitions))
+						end
+					end
+				end
+			end
+		end
+	end
+	
+	to_disable_and_why
+end
+
+
+
 function notebook_differences(from::Notebook, to::Notebook)
 	from_cells = from.cells_dict
 	to_cells = to.cells_dict
@@ -507,10 +572,10 @@ end
 function update_skipped_cells_dependency!(notebook::Notebook, topology::NotebookTopology=notebook.topology)
     skipped_cells = filter(is_skipped_as_script, notebook.cells)
     indirectly_skipped = collect(topological_order(topology, skipped_cells))
+    for cell in notebook.cells
+        cell.depends_on_skipped_cells = false
+    end
     for cell in indirectly_skipped
         cell.depends_on_skipped_cells = true
     end
-	for cell in setdiff(notebook.cells, indirectly_skipped)
-        cell.depends_on_skipped_cells = false
-    end
 end
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 239268c87b..e0090c4806 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -175,7 +175,7 @@ const current_state_for_clients = WeakKeyDict{ClientSession,Any}()
 """
 Update the local state of all clients connected to this notebook.
 """
-function send_notebook_changes!(🙋::ClientRequest; commentary::Any=nothing)
+function send_notebook_changes!(🙋::ClientRequest; commentary::Any=nothing, skip_send::Bool=false)
     notebook_dict = notebook_to_js(🙋.notebook)
     for (_, client) in 🙋.session.connected_clients
         if client.connected_notebook !== nothing && client.connected_notebook.notebook_id == 🙋.notebook.notebook_id
@@ -187,7 +187,7 @@ function send_notebook_changes!(🙋::ClientRequest; commentary::Any=nothing)
             # Make sure we do send a confirmation to the client who made the request, even without changes
             is_response = 🙋.initiator !== nothing && client == 🙋.initiator.client
 
-            if !isempty(patches) || is_response
+            if !skip_send && (!isempty(patches) || is_response)
                 response = Dict(
                     :patches => patches_as_dicts,
                     :response => is_response ? commentary : nothing
@@ -407,11 +407,24 @@ responses[:run_multiple_cells] = function response_run_multiple_cells(🙋::Clie
 
     if will_run_code(🙋.notebook)
         foreach(c -> c.queued = true, cells)
-        send_notebook_changes!(🙋)
+        # run send_notebook_changes! without actually sending it, to update current_state_for_clients for our client with c.queued = true.
+        # later, during update_save_run!, the cell will actually run, eventually setting c.queued = false again, which will be sent to the client through a patch update. 
+        # We *need* to send *something* to the client, because of https://github.com/fonsp/Pluto.jl/pull/1892, but we also don't want to send unnecessary updates. We can skip sending this update, because update_save_run! will trigger a send_notebook_changes! very very soon.
+        send_notebook_changes!(🙋; skip_send=true)
+    end
+    
+    function on_auto_solve_multiple_defs(disabled_cells_dict)
+        response = Dict{Symbol,Any}(
+            :disabled_cells => Dict{UUID,Any}(cell_id(k) => v for (k,v) in disabled_cells_dict),
+        )
+        putclientupdates!(🙋.session, 🙋.initiator, UpdateMessage(:run_feedback, response, 🙋.notebook, nothing, 🙋.initiator))
     end
     
     # save=true fixes the issue where "Submit all changes" or `Ctrl+S` has no effect.
-    update_save_run!(🙋.session, 🙋.notebook, cells; run_async=true, save=true)
+    update_save_run!(🙋.session, 🙋.notebook, cells; 
+        run_async=true, save=true, 
+        auto_solve_multiple_defs=true, on_auto_solve_multiple_defs
+    )
 end
 
 responses[:get_all_notebooks] = function response_get_all_notebooks(🙋::ClientRequest)

From 953145f0a6c5d521ba896a614a161e92d2f7b10d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Oct 2022 19:39:15 +0200
Subject: [PATCH 466/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 7736236318..5039a19577 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.13"
+version = "0.19.14"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 9deef46fe37eee7ab928adf3bdc8cc709a188399 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Oct 2022 20:30:30 +0200
Subject: [PATCH 467/821] =?UTF-8?q?=F0=9F=A7=B9=20console.log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Editor.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 76477ef330..f144b01577 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -591,7 +591,6 @@ export class Editor extends Component {
                         })
                     )
                     const result = await this.client.send("run_multiple_cells", { cells: cell_ids }, { notebook_id: this.state.notebook.notebook_id })
-                    console.log(result)
                     const { disabled_cells } = result.message
                     if (Object.entries(disabled_cells).length > 0) {
                         await this.setStatePromise({

From 715b1b2ee0531cb25b4d135ea92a9488e5f1fc28 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Oct 2022 20:39:41 +0200
Subject: [PATCH 468/821] =?UTF-8?q?=F0=9F=90=9D=20Fix=20nested=20embed=5Fd?=
 =?UTF-8?q?isplay,=20by=20fixing=20return=20values=20of=20"nested"=20<scri?=
 =?UTF-8?q?pt>=20(#2329)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/CellOutput.js | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 2923c3b8df..4335ea485b 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -231,6 +231,15 @@ let execute_dynamic_function = async ({ environment, code }) => {
     return result
 }
 
+/**
+ * It is possible for `execute_scripttags` to run during the execution of `execute_scripttags`, and this variable counts the depth of this nesting.
+ *
+ * One case where nesting occurs is when using PlutoRunner.embed_display. In its HTML render, it outputs a `<script>`, which will render a `<pluto-display>` element with content. If that content contains a `<script>` tag, then it will be executed during the execution of the original script, etc.
+ *
+ * See https://github.com/fonsp/Pluto.jl/pull/2329
+ */
+let nested_script_execution_level = 0
+
 /**
  * Runs the code `fn` with `document.currentScript` being set to a new script_element thats
  * is placed on the page where `script_element` was.
@@ -251,13 +260,14 @@ let execute_inside_script_tag_that_replaces = async (script_element, fn) => {
         //@ts-ignore because of https://github.com/microsoft/TypeScript-DOM-lib-generator/issues/1260
         new_script_tag.attributes.setNamedItem(attr.cloneNode(true))
     }
+    const container_name = `____FUNCTION_TO_RUN_INSIDE_SCRIPT_${nested_script_execution_level}`
     new_script_tag.textContent = `{
-        window.____FUNCTION_TO_RUN_INSIDE_SCRIPT.result = window.____FUNCTION_TO_RUN_INSIDE_SCRIPT.function_to_run(window.____FUNCTION_TO_RUN_INSIDE_SCRIPT.currentScript)
+        window.${container_name}.result = window.${container_name}.function_to_run(window.${container_name}.currentScript)
     }`
 
     // @ts-ignore
     // I use this long variable name to pass the function and result to and from the script we created
-    window.____FUNCTION_TO_RUN_INSIDE_SCRIPT = { function_to_run: fn, currentScript: new_script_tag, result: null }
+    window[container_name] = { function_to_run: fn, currentScript: new_script_tag, result: null }
     // Put the script in the DOM, this will run the script
     const parent = script_element.parentNode
     if (parent == null) {
@@ -265,9 +275,9 @@ let execute_inside_script_tag_that_replaces = async (script_element, fn) => {
     }
     parent.replaceChild(new_script_tag, script_element)
     // @ts-ignore - Get the result back
-    let result = await window.____FUNCTION_TO_RUN_INSIDE_SCRIPT.result
+    let result = await window[container_name].result
     // @ts-ignore - Reset the global variable "just in case"
-    window.____FUNCTION_TO_RUN_INSIDE_SCRIPT = { function_to_run: fn, result: null }
+    window[container_name] = { function_to_run: fn, result: null }
 
     return { node: new_script_tag, result: result }
 }
@@ -307,6 +317,7 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
 
     // Run scripts sequentially
     for (let node of script_nodes) {
+        nested_script_execution_level += 1
         if (node.src != null && node.src !== "") {
             // If it has a remote src="", de-dupe and copy the script to head
             let script_el = Array.from(document.head.querySelectorAll("script")).find((s) => s.src === node.src)
@@ -334,6 +345,7 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
         } else {
             // If there is no src="", we take the content and run it in an observablehq-like environment
             try {
+                let code = node.innerText
                 let script_id = node.id
                 let old_result = script_id ? previous_results_map.get(script_id) : null
 
@@ -372,7 +384,7 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
 
                                 ...observablehq_for_cells,
                             },
-                            code: node.innerText,
+                            code,
                         })
                     })
 
@@ -397,6 +409,7 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
                 // TODO: relay to user
             }
         }
+        nested_script_execution_level -= 1
     }
     return results_map
 }

From 7d2eff1e2ae0d854a2224cd3996f4495a999cfeb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 19 Oct 2022 22:29:25 +0200
Subject: [PATCH 469/821] Fix MsgPack for a TypedArray with custom view over a
 buffer (#2331)

---
 frontend/common/MsgPack.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/common/MsgPack.js b/frontend/common/MsgPack.js
index 7d139e302e..25e9f9ae0a 100644
--- a/frontend/common/MsgPack.js
+++ b/frontend/common/MsgPack.js
@@ -3,7 +3,7 @@ import msgpack from "../imports/msgpack-lite.js"
 
 // based on https://github.com/kawanet/msgpack-lite/blob/5b71d82cad4b96289a466a6403d2faaa3e254167/lib/ext-packer.js
 const codec = msgpack.createCodec()
-const packTypedArray = (x) => new Uint8Array(x.buffer)
+const packTypedArray = (x) => new Uint8Array(x.buffer, x.byteOffset, x.byteLength)
 codec.addExtPacker(0x11, Int8Array, packTypedArray)
 codec.addExtPacker(0x12, Uint8Array, packTypedArray)
 codec.addExtPacker(0x13, Int16Array, packTypedArray)

From b7ba4f911b19ac4f643cf92b7507db88dc5cca4a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 21 Oct 2022 14:59:30 +0200
Subject: [PATCH 470/821] Pasting notebook file into main menu: show loading
 screen and prevent pasting twice

---
 frontend/components/PasteHandler.js    | 79 +++++++++++++-------------
 frontend/components/welcome/Open.js    |  2 +-
 frontend/components/welcome/Welcome.js | 14 +++--
 3 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/frontend/components/PasteHandler.js b/frontend/components/PasteHandler.js
index ace7666f76..3ecc856af1 100644
--- a/frontend/components/PasteHandler.js
+++ b/frontend/components/PasteHandler.js
@@ -1,4 +1,4 @@
-import { html, useEffect } from "../imports/Preact.js"
+import { html, useEffect, useRef } from "../imports/Preact.js"
 import { link_edit } from "./welcome/Open.js"
 
 const detectNotebook = (inputtext) => {
@@ -40,51 +40,52 @@ const readFile = (file) =>
         fr.readAsText(file)
     })
 
-const processFile = async (ev) => {
-    let notebook
-    console.log(ev)
-    // Don't do anything if paste on CodeMirror
-    if ((ev?.path ?? ev?.composedPath()).filter((node) => node?.classList?.contains(".cm-editor"))?.length > 0) {
-        return
-    }
-    switch (ev.type) {
-        case "paste":
-            notebook = detectNotebook(ev.clipboardData.getData("text/plain"))
-            break
-        case "dragstart": {
-            ev.dataTransfer.dropEffect = "move"
+export const PasteHandler = ({ on_start_navigation }) => {
+    const processFile = async (ev) => {
+        let notebook
+        console.log(ev)
+        // Don't do anything if paste on CodeMirror
+        if ((ev?.path ?? ev?.composedPath()).filter((node) => node?.classList?.contains(".cm-editor"))?.length > 0) {
             return
         }
-        case "dragover": {
-            ev.preventDefault()
+        switch (ev.type) {
+            case "paste":
+                notebook = detectNotebook(ev.clipboardData.getData("text/plain"))
+                break
+            case "dragstart": {
+                ev.dataTransfer.dropEffect = "move"
+                return
+            }
+            case "dragover": {
+                ev.preventDefault()
+                return
+            }
+            case "drop": {
+                ev.preventDefault()
+                notebook = ev.dataTransfer.types.includes("Files")
+                    ? await readFile(ev.dataTransfer.files[0]).then(({ file }) => file)
+                    : detectNotebook(await readMovedText(ev.dataTransfer.items[0]))
+                break
+            }
+        }
+        if (!notebook) {
+            // Notebook not found! Doing nothing :)
             return
         }
-        case "drop": {
-            ev.preventDefault()
-            notebook = ev.dataTransfer.types.includes("Files")
-                ? await readFile(ev.dataTransfer.files[0]).then(({ file }) => file)
-                : detectNotebook(await readMovedText(ev.dataTransfer.items[0]))
-            break
+        on_start_navigation("notebook from clipboard", false)
+        document.body.classList.add("loading")
+        const response = await fetch("./notebookupload", {
+            method: "POST",
+            body: notebook,
+        })
+        if (response.ok) {
+            window.location.href = link_edit(await response.text())
+        } else {
+            let b = await response.blob()
+            window.location.href = URL.createObjectURL(b)
         }
     }
-    if (!notebook) {
-        // Notebook not found! Doing nothing :)
-        return
-    }
-    document.body.classList.add("loading")
-    const response = await fetch("./notebookupload", {
-        method: "POST",
-        body: notebook,
-    })
-    if (response.ok) {
-        window.location.href = link_edit(await response.text())
-    } else {
-        let b = await response.blob()
-        window.location.href = URL.createObjectURL(b)
-    }
-}
 
-export const PasteHandler = () => {
     useEffect(() => {
         document.addEventListener("paste", processFile)
         document.addEventListener("drop", processFile)
diff --git a/frontend/components/welcome/Open.js b/frontend/components/welcome/Open.js
index 98561c0663..70aac04696 100644
--- a/frontend/components/welcome/Open.js
+++ b/frontend/components/welcome/Open.js
@@ -41,7 +41,7 @@ export const Open = ({ client, connected, CustomPicker, show_samples, on_start_n
         placeholder: "Enter path or URL...",
     }
 
-    return html`<${PasteHandler} />
+    return html`<${PasteHandler} on_start_navigation=${on_start_navigation} />
         <h2>${picker.text}</h2>
         <div id="new" class=${!!window.plutoDesktop ? "desktop_opener" : ""}>
             <${FilePicker}
diff --git a/frontend/components/welcome/Welcome.js b/frontend/components/welcome/Welcome.js
index e030f3a2e1..de8a3b3c5a 100644
--- a/frontend/components/welcome/Welcome.js
+++ b/frontend/components/welcome/Welcome.js
@@ -78,13 +78,17 @@ export const Welcome = () => {
     // When block_screen_with_this_text is null (default), all is fine. When it is a string, we show a big banner with that text, and disable all other UI. https://github.com/fonsp/Pluto.jl/pull/2292
     const [block_screen_with_this_text, set_block_screen_with_this_text] = useState(/** @type {string?} */ (null))
 
-    const on_start_navigation = (value) => {
-        // Instead of calling set_block_screen_with_this_text(value) directly, we wait for the beforeunload to happen, and then we do it. If this event does not happen within 1 second, then that means that the user right-clicked, or Ctrl+Clicked (to open in a new tab), and we don't want to clear the main menu. https://github.com/fonsp/Pluto.jl/issues/2301
-        const handler = (e) => {
+    const on_start_navigation = (value, expect_navigation = true) => {
+        if (expect_navigation) {
+            // Instead of calling set_block_screen_with_this_text(value) directly, we wait for the beforeunload to happen, and then we do it. If this event does not happen within 1 second, then that means that the user right-clicked, or Ctrl+Clicked (to open in a new tab), and we don't want to clear the main menu. https://github.com/fonsp/Pluto.jl/issues/2301
+            const handler = (e) => {
+                set_block_screen_with_this_text(value)
+            }
+            window.addEventListener("beforeunload", handler)
+            setTimeout(() => window.removeEventListener("beforeunload", handler), 1000)
+        } else {
             set_block_screen_with_this_text(value)
         }
-        window.addEventListener("beforeunload", handler)
-        setTimeout(() => window.removeEventListener("beforeunload", handler), 1000)
     }
 
     return block_screen_with_this_text != null

From eca8648f783322020d496aaca6dc12709614824f Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Mon, 24 Oct 2022 22:28:04 +0200
Subject: [PATCH 471/821] Don't run static_resolve_topology() to detect md
 cells (#2338)

`ReactiveNode(::String)` is enough since ExpressionExplorer already
handles the maybe_macroexpand case for `@md_str` & `@html_str`.
---
 src/evaluation/Run.jl | 4 +---
 test/Analysis.jl      | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index ee6ac305a6..06cc760fe6 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -374,13 +374,11 @@ function update_save_run!(
 			is_offline_renderer=true,
 		)
 
-		new = notebook.topology = static_resolve_topology(new)
-
 		to_run_offline = filter(c -> !c.running && is_just_text(new, c) && is_just_text(old, c), cells)
 		for cell in to_run_offline
 			run_single!(offline_workspace, cell, new.nodes[cell], new.codes[cell])
 		end
-		
+
 		cd(original_pwd)
 		setdiff(cells, to_run_offline)
 	end
diff --git a/test/Analysis.jl b/test/Analysis.jl
index 1c1efa9d68..f9182ac30c 100644
--- a/test/Analysis.jl
+++ b/test/Analysis.jl
@@ -44,7 +44,7 @@ import Pluto: Notebook, Cell, updated_topology, static_resolve_topology, is_just
         ])
 
         old = notebook.topology
-        new = notebook.topology = updated_topology(old, notebook, notebook.cells) |> static_resolve_topology
+        new = notebook.topology = updated_topology(old, notebook, notebook.cells)
 
         @testset "Only-text detection" begin
             @test is_just_text(new, notebook.cells[1])
@@ -136,4 +136,4 @@ import Pluto: Notebook, Cell, updated_topology, static_resolve_topology, is_just
         
         # @test topo_3 === static_resolve_topology(topo_3)
     end
-end
\ No newline at end of file
+end

From c93b4d267f2b125088b5a618bce29e32d0153cb9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Nov 2022 15:04:48 +0100
Subject: [PATCH 472/821] Create IntegrationTest.yml

---
 .github/workflows/IntegrationTest.yml | 69 +++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 .github/workflows/IntegrationTest.yml

diff --git a/.github/workflows/IntegrationTest.yml b/.github/workflows/IntegrationTest.yml
new file mode 100644
index 0000000000..7c515247a1
--- /dev/null
+++ b/.github/workflows/IntegrationTest.yml
@@ -0,0 +1,69 @@
+name: Test dependent packages
+
+# based on https://github.com/SciML/SciMLBase.jl/blob/master/.github/workflows/Downstream.yml, thanks!
+
+# this is the same as Test.yml
+on:
+    workflow_dispatch:
+    push:
+        paths-ignore:
+            - 'frontend/**'
+            - 'frontend-bundler/**'
+            - 'frontend-dist/**'
+            - 'test/frontend/**'
+            - '**.md'
+        branches:
+            - main
+    pull_request:
+        paths-ignore:
+            - 'frontend/**'
+            - 'frontend-bundler/**'
+            - 'frontend-dist/**'
+            - 'test/frontend/**'
+            - '**.md'
+        branches-ignore:
+            - release
+
+
+jobs:
+    test:
+        name: ${{ matrix.package.repo }}
+        runs-on: ${{ matrix.os }}
+        strategy:
+            fail-fast: false
+            matrix:
+                julia-version: [1]
+                os: [ubuntu-latest]
+                package:
+                    - { user: JuliaPluto, repo: PlutoSliderServer.jl }
+
+        steps:
+            - uses: actions/checkout@v2
+            - uses: julia-actions/setup-julia@v1
+              with:
+                  version: ${{ matrix.julia-version }}
+                  arch: x64
+            - uses: julia-actions/julia-buildpkg@v1
+            - name: Clone Downstream
+              uses: actions/checkout@v2
+              with:
+                  repository: ${{ matrix.package.user }}/${{ matrix.package.repo }}
+                  path: downstream
+            - name: Load this and run the downstream tests
+              shell: julia --project=downstream {0}
+              run: |
+                  using Pkg
+                  try
+                    # force it to use this PR's version of the package
+                    Pkg.develop(PackageSpec(path="."))  # resolver may fail with main deps
+                    Pkg.update()
+                    Pkg.test()  # resolver may fail with test time deps 
+                  catch err
+                    err isa Pkg.Resolve.ResolverError || rethrow()
+                    # If we can't resolve that means this is incompatible by SemVer and this is fine
+                    # It means we marked this as a breaking change, so we don't need to worry about
+                    # Mistakenly introducing a breaking change, as we have intentionally made one
+
+                    @info "Not compatible with this release. No problem." exception=err
+                    exit(0)  # Exit immediately, as a success
+                  end

From a44448ce99b7ca31862a486da40f0491bc897b2d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Nov 2022 15:13:24 +0100
Subject: [PATCH 473/821] typo

---
 frontend/components/Cell.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index c43b2b4f54..5cb8ae4d6e 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -345,7 +345,7 @@ export const Cell = ({
                               source_element: e.target,
                               body: html`This cell is currently stored in the notebook file as a Julia <em>comment</em>, instead of <em>code</em>.<br />
                                   This way, it will not run when the notebook runs as a script outside of Pluto.<br />
-                                  Use the context menu to change enable it again`,
+                                  Use the context menu to enable it again`,
                           })
                       }}
                   ></div>`

From 8323f4a3eff4149473ca4094a71914404e370fe8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Nov 2022 15:55:54 +0100
Subject: [PATCH 474/821] update_nbpkg: fix UndefVarError when backup disabled

---
 src/packages/Packages.jl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index b284673507..09799745f0 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -439,8 +439,8 @@ end
 
 
 function update_nbpkg(session, notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.UPLEVEL_MAJOR, backup::Bool=true, save::Bool=true)
-    if backup && save
-        bp = writebackup(notebook)
+    bp = if backup && save
+        writebackup(notebook)
     end
 
     try
@@ -468,7 +468,7 @@ function update_nbpkg(session, notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.U
 				@debug "PlutoPkg: Notebook restart REQUIRED" notebook.path notebook.nbpkg_restart_required_msg
 			end
 		else
-            isfile(bp) && rm(bp)
+            !isnothing(bp) && isfile(bp) && rm(bp)
         end
 	finally
 		notebook.nbpkg_busy_packages = String[]

From 46d74c8398e716b14b3b690b6cd834f15698409b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 1 Nov 2022 16:09:34 +0100
Subject: [PATCH 475/821] Ignore Tab key in disable_ui mode

---
 frontend/components/CellInput.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index f60cee2474..84dd760381 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -425,6 +425,9 @@ export const CellInput = ({
 
         let select_autocomplete_command = autocomplete.completionKeymap.find((keybinding) => keybinding.key === "Enter")
         let keyMapTab = (/** @type {EditorView} */ cm) => {
+            if (cm.state.readOnly) {
+                return false
+            }
             // This will return true if the autocomplete select popup is open
             if (select_autocomplete_command?.run(cm)) {
                 return true

From 0c451eef51a22daf8b5aa1068750fc288cd9fa11 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 09:48:28 +0100
Subject: [PATCH 476/821] CompatHelper: bump compat for RelocatableFolders to
 1, (keep existing compat) (#2259)

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 5039a19577..2b3444eb24 100644
--- a/Project.toml
+++ b/Project.toml
@@ -38,7 +38,7 @@ MIMEs = "0.1"
 MsgPack = "1.1"
 PrecompileSignatures = "3"
 RegistryInstances = "0.1"
-RelocatableFolders = "0.1, 0.2, 0.3"
+RelocatableFolders = "0.1, 0.2, 0.3, 1"
 Tables = "1"
 URIs = "1.3"
 julia = "^1.6"

From a7be1d03e6df0b86d5159ffabf51f2519a8e5dfc Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 4 Nov 2022 11:56:27 +0100
Subject: [PATCH 477/821] small frontend tweaks

---
 frontend/editor.css |  2 +-
 frontend/editor.js  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index b99412aca6..7cfe776ce5 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2381,7 +2381,7 @@ pluto-logs-container pluto-progress-bar {
     background: linear-gradient(90deg, var(--c), var(--c));
     background-repeat: no-repeat;
     width: 100%;
-    transition: background-size cubic-bezier(0.14, 0.71, 0, 0.99) 2s, opacity linear 0.2s;
+    transition: background-size cubic-bezier(0.14, 0.71, 0, 0.99) 0.5s, opacity linear 0.2s;
     display: grid;
     align-items: center;
 }
diff --git a/frontend/editor.js b/frontend/editor.js
index a923ca7825..2e90f5c0dd 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -58,7 +58,6 @@ const launch_params = {
     //@ts-ignore
     recording_audio_url: url_params.get("recording_audio_url") ?? window.pluto_recording_audio_url,
 }
-console.log("Launch parameters: ", launch_params)
 
 const truthy = (x) => x === "" || x === "true"
 const falsey = (x) => x === "false"
@@ -111,7 +110,8 @@ const without_path_entries = (state) => ({ ...state, path: default_path, shortpa
  * }} props
  */
 const EditorLoader = ({ launch_params }) => {
-    const static_preview = launch_params.statefile != null
+    const { statefile, statefile_integrity } = launch_params
+    const static_preview = statefile != null
 
     const [statefile_download_progress, set_statefile_download_progress] = useState(null)
 
@@ -121,14 +121,15 @@ const EditorLoader = ({ launch_params }) => {
     useEffect(() => {
         if (!ready_for_editor && static_preview) {
             ;(async () => {
-                const r = await fetch(new Request(launch_params.statefile, { integrity: launch_params.statefile_integrity }))
+                const r = await fetch(new Request(statefile, { integrity: statefile_integrity ?? undefined }))
                 const data = await read_Uint8Array_with_progress(r, set_statefile_download_progress)
                 const state = without_path_entries(unpack(data))
+                console.log({ state })
                 initial_notebook_state_ref.current = state
                 set_ready_for_editor(true)
             })()
         }
-    }, [ready_for_editor, static_preview, launch_params.statefile])
+    }, [ready_for_editor, static_preview, statefile])
 
     useEffect(() => {
         set_disable_ui_css(launch_params.disable_ui)
@@ -170,6 +171,7 @@ class PlutoEditorComponent extends HTMLElement {
 
     connectedCallback() {
         const new_launch_params = Object.fromEntries(Object.entries(launch_params).map(([k, v]) => [k, from_attribute(this, k) ?? v]))
+        console.log("Launch parameters: ", new_launch_params)
 
         render(html`<${EditorLoader} launch_params=${new_launch_params} />`, this)
     }

From 20b3287b50ea5fb9477b1781bbc279ac149c34a9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 4 Nov 2022 11:57:02 +0100
Subject: [PATCH 478/821] Catch pwd() failure and recover

fix #2352
---
 src/Configuration.jl | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index 920782d25d..c10ac0d65d 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -14,17 +14,24 @@ using Configurations # https://github.com/Roger-luo/Configurations.jl
 
 import ..Pluto: tamepath
 
+safepwd() = try
+    pwd()
+catch e
+    @warn "pwd() failure" exception=(e, catch_backtrace())
+    homedir()
+end
+
 # Using a ref to avoid fixing the pwd() output during the compilation phase. We don't want this value to be baked into the sysimage, because it depends on the `pwd()`. We do want to cache it, because the pwd might change while Pluto is running.
 const pwd_ref = Ref{Union{Nothing,String}}()
 function notebook_path_suggestion()
-    pwd_val = something(pwd_ref[], pwd())
+    pwd_val = something(pwd_ref[], safepwd())
     preferred_dir = startswith(Sys.BINDIR, pwd_val) ? homedir() : pwd_val
     # so that it ends with / or \
     string(joinpath(preferred_dir, ""))
 end
 
 function __init__()
-    pwd_ref[] = pwd()
+    pwd_ref[] = safepwd()
 end
 
 const ROOT_URL_DEFAULT = nothing

From a498b4c98b627ebf0d80f307504da63592eb7134 Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Mon, 7 Nov 2022 08:56:45 +0000
Subject: [PATCH 479/821] Destructuring is cool! Fixes #2276

---
 frontend/components/CellInput.js                      |  3 ++-
 .../components/CellInput/scopestate_statefield.js     | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 84dd760381..d2e3d453f2 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -62,6 +62,7 @@ import { cl } from "../common/ClassTable.js"
 import { HighlightLineFacet, highlightLinePlugin } from "./CellInput/highlight_line.js"
 import { commentKeymap } from "./CellInput/comment_mixed_parsers.js"
 import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
+import { debug_syntax_plugin } from "./CellInput/debug_syntax_plugin.js"
 
 export const ENABLE_CM_MIXED_PARSER = window.localStorage.getItem("ENABLE_CM_MIXED_PARSER") === "true"
 
@@ -700,7 +701,7 @@ export const CellInput = ({
 
                     // Enable this plugin if you want to see the lezer tree,
                     // and possible lezer errors and maybe more debug info in the console:
-                    // debug_syntax_plugin,
+                    debug_syntax_plugin,
                     // Handle errors hopefully?
                     EditorView.exceptionSink.of((exception) => {
                         set_error(exception)
diff --git a/frontend/components/CellInput/scopestate_statefield.js b/frontend/components/CellInput/scopestate_statefield.js
index dc4d0dfcbc..bc560a2c19 100644
--- a/frontend/components/CellInput/scopestate_statefield.js
+++ b/frontend/components/CellInput/scopestate_statefield.js
@@ -153,6 +153,10 @@ let explorer_function_definition_argument = (cursor, doc, scopestate, verbose =
         if (type) scopestate = explore_variable_usage(type.cursor(), doc, scopestate, verbose)
         return scopestate
     } else {
+        // Fall back to "just explore pattern"...
+        // There is more overlap between function arguments and patterns than I use now, I think
+        scopestate = explore_pattern(cursor, doc, scopestate)
+
         verbose && console.warn("UNKNOWN FUNCTION DEFINITION ARGUMENT:", cursor.toString())
         return scopestate
     }
@@ -187,6 +191,13 @@ let explore_pattern = (node, doc, scopestate, valid_from = null, verbose = false
             scopestate = explore_pattern(name, doc, scopestate, value.from, verbose)
             scopestate = explore_variable_usage(value.cursor(), doc, scopestate, verbose)
             return scopestate
+        } else if ((match = match_assignee(node, true)`(; ${t.many("named_tuples")})`)) {
+            // `(; x, y) = z` => ["x", "y"]
+            let { named_tuples } = match
+            for (let name of named_tuples) {
+                scopestate = explore_pattern(name.node.cursor(), doc, scopestate, valid_from, verbose)
+            }
+            return scopestate
         } else if (
             (match = match_assignee(node)`${t.as("first")}, ${t.many("rest")}`) ??
             (match = match_assignee(node)`(${t.as("first")}, ${t.many("rest")})`)

From d01bcc1a040b298dbeb359c65d5869b63e847d04 Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Mon, 7 Nov 2022 08:58:51 +0000
Subject: [PATCH 480/821] Ha need to get used to github again my bad

---
 frontend/components/CellInput.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index d2e3d453f2..84dd760381 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -62,7 +62,6 @@ import { cl } from "../common/ClassTable.js"
 import { HighlightLineFacet, highlightLinePlugin } from "./CellInput/highlight_line.js"
 import { commentKeymap } from "./CellInput/comment_mixed_parsers.js"
 import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
-import { debug_syntax_plugin } from "./CellInput/debug_syntax_plugin.js"
 
 export const ENABLE_CM_MIXED_PARSER = window.localStorage.getItem("ENABLE_CM_MIXED_PARSER") === "true"
 
@@ -701,7 +700,7 @@ export const CellInput = ({
 
                     // Enable this plugin if you want to see the lezer tree,
                     // and possible lezer errors and maybe more debug info in the console:
-                    debug_syntax_plugin,
+                    // debug_syntax_plugin,
                     // Handle errors hopefully?
                     EditorView.exceptionSink.of((exception) => {
                         set_error(exception)

From 2aba2bf1e0222b5b8d428626a7ea514ba9fd458e Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Mon, 7 Nov 2022 09:16:08 +0000
Subject: [PATCH 481/821] Fix all the ifs and else and elseifs, fixes #2120

---
 .../CellInput/block_matcher_plugin.js         | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/frontend/components/CellInput/block_matcher_plugin.js b/frontend/components/CellInput/block_matcher_plugin.js
index a9907eecfe..09f72c7e45 100644
--- a/frontend/components/CellInput/block_matcher_plugin.js
+++ b/frontend/components/CellInput/block_matcher_plugin.js
@@ -15,7 +15,17 @@ import { Decoration } from "../../imports/CodemirrorPlutoSetup.js"
 
 function match_block(node) {
     if (node.name === "end") {
-        node = node.parent.firstChild
+        if (node.parent.name === "IfStatement") {
+            // Try moving to the "if" part because
+            // the rest of the code is looking for that
+            node = node.parent?.firstChild?.firstChild
+        } else {
+            node = node.parent.firstChild
+        }
+    }
+
+    if (node == null) {
+        return []
     }
 
     // if (node.name === "StructDefinition") node = node.firstChild
@@ -165,7 +175,9 @@ function match_block(node) {
     }
 
     if (node.name === "if" || node.name === "else" || node.name === "elseif") {
+        if (node.name === "if") node = node.parent
         if (node.name === "else") node = node.parent
+        if (node.name === "elseif") node = node.parent.parent
 
         let try_node = node.parent.firstChild
         let possibly_end = node.parent.lastChild
@@ -174,13 +186,14 @@ function match_block(node) {
 
         let decorations = []
         decorations.push({ from: try_node.from, to: try_node.to })
+        for (let elseif_clause_node of node.parent.getChildren("ElseifClause")) {
+            let elseif_node = elseif_clause_node.firstChild
+            decorations.push({ from: elseif_node.from, to: elseif_node.to })
+        }
         for (let else_clause_node of node.parent.getChildren("ElseClause")) {
             let else_node = else_clause_node.firstChild
             decorations.push({ from: else_node.from, to: else_node.to })
         }
-        for (let elseif_node of node.parent.getChildren("elseif")) {
-            decorations.push({ from: elseif_node.from, to: elseif_node.to })
-        }
         decorations.push({ from: possibly_end.from, to: possibly_end.to })
 
         return decorations

From 4345e127db7be70aca7d8fd59b34de61e8cfa1e5 Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Mon, 7 Nov 2022 16:49:48 +0000
Subject: [PATCH 482/821] Upgrade Lezer to 1.0 and Codemirror to 6.0, fixes
 #2295

---
 frontend/imports/CodemirrorPlutoSetup.d.ts | 352 +++++++++++++++------
 frontend/imports/CodemirrorPlutoSetup.js   |   4 +-
 2 files changed, 255 insertions(+), 101 deletions(-)

diff --git a/frontend/imports/CodemirrorPlutoSetup.d.ts b/frontend/imports/CodemirrorPlutoSetup.d.ts
index bbf0a00b40..fd3c2bdca8 100644
--- a/frontend/imports/CodemirrorPlutoSetup.d.ts
+++ b/frontend/imports/CodemirrorPlutoSetup.d.ts
@@ -263,6 +263,7 @@ stores the document length, and can only be applied to documents
 with exactly that length.
 */
 declare class ChangeSet extends ChangeDesc {
+    private constructor();
     /**
     Apply the changes to a document, returning the modified
     document.
@@ -348,6 +349,7 @@ declare class SelectionRange {
     */
     readonly to: number;
     private flags;
+    private constructor();
     /**
     The anchor of the range—the side that doesn't move when you
     extend it.
@@ -418,6 +420,7 @@ declare class EditorSelection {
     usually the range that was added last).
     */
     readonly mainIndex: number;
+    private constructor();
     /**
     Map a selection through a change. Used to adjust the selection
     position for changes.
@@ -502,13 +505,14 @@ declare type FacetConfig<Input, Output> = {
     */
     static?: boolean;
     /**
-    If given, these extension(s) will be added to any state where
-    this facet is provided. (Note that, while a facet's default
-    value can be read from a state even if the facet wasn't present
-    in the state at all, these extensions won't be added in that
+    If given, these extension(s) (or the result of calling the given
+    function with the facet) will be added to any state where this
+    facet is provided. (Note that, while a facet's default value can
+    be read from a state even if the facet wasn't present in the
+    state at all, these extensions won't be added in that
     situation.)
     */
-    enables?: Extension;
+    enables?: Extension | ((self: Facet<Input, Output>) => Extension);
 };
 /**
 A facet is a labeled value that is associated with an editor
@@ -849,6 +853,7 @@ declare class Transaction {
     transaction is dispatched.
     */
     readonly scrollIntoView: boolean;
+    private constructor();
     /**
     The new document produced by the transaction. Contrary to
     [`.state`](https://codemirror.net/6/docs/ref/#state.Transaction.state)`.doc`, accessing this won't
@@ -1006,6 +1011,7 @@ declare class EditorState {
     The current selection.
     */
     readonly selection: EditorSelection;
+    private constructor();
     /**
     Retrieve the value of a [state field](https://codemirror.net/6/docs/ref/#state.StateField). Throws
     an error when the state doesn't have that field, unless you pass
@@ -1167,8 +1173,13 @@ declare class EditorState {
     Look up a translation for the given phrase (via the
     [`phrases`](https://codemirror.net/6/docs/ref/#state.EditorState^phrases) facet), or return the
     original string if no translation is found.
+    
+    If additional arguments are passed, they will be inserted in
+    place of markers like `$1` (for the first value) and `$2`, etc.
+    A single `$` is equivalent to `$1`, and `$$` will produce a
+    literal dollar sign.
     */
-    phrase(phrase: string): string;
+    phrase(phrase: string, ...insert: any[]): string;
     /**
     A facet used to register [language
     data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) providers.
@@ -1335,6 +1346,7 @@ declare class Range<T extends RangeValue> {
     The value associated with this range.
     */
     readonly value: T;
+    private constructor();
 }
 /**
 Collection of methods used when comparing range sets.
@@ -1435,6 +1447,7 @@ way that makes them efficient to [map](https://codemirror.net/6/docs/ref/#state.
 structure.
 */
 declare class RangeSet<T extends RangeValue> {
+    private constructor();
     /**
     The number of ranges in the set.
     */
@@ -1688,6 +1701,7 @@ interface SyntaxNodeRef {
     readonly name: string;
     readonly tree: Tree | null;
     readonly node: SyntaxNode;
+    matchContext(context: readonly string[]): boolean;
 }
 interface SyntaxNode extends SyntaxNodeRef {
     parent: SyntaxNode | null;
@@ -1766,7 +1780,6 @@ declare class InputStream {
     pos: number;
     private rangeIndex;
     private range;
-    resolveOffset(offset: number, assoc: -1 | 1): number;
     peek(offset: number): any;
     acceptToken(token: number, endOffset?: number): void;
     private getChunk;
@@ -1774,14 +1787,12 @@ declare class InputStream {
     advance(n?: number): number;
     private setDone;
 }
-interface Tokenizer {
-}
 interface ExternalOptions {
     contextual?: boolean;
     fallback?: boolean;
     extend?: boolean;
 }
-declare class ExternalTokenizer implements Tokenizer {
+declare class ExternalTokenizer {
     constructor(token: (input: InputStream, stack: Stack) => void, options?: ExternalOptions);
 }
 
@@ -1803,6 +1814,10 @@ interface ParserConfig {
         from: ExternalTokenizer;
         to: ExternalTokenizer;
     }[];
+    specializers?: {
+        from: (value: string, stack: Stack) => number;
+        to: (value: string, stack: Stack) => number;
+    }[];
     contextTracker?: ContextTracker<any>;
     strict?: boolean;
     wrap?: ParseWrapper;
@@ -1818,6 +1833,7 @@ declare class LRParser extends Parser {
     hasWrappers(): boolean;
     getName(term: number): string;
     get topNode(): NodeType;
+    static deserialize(spec: any): LRParser;
 }
 
 declare class StyleModule {
@@ -2377,10 +2393,16 @@ declare class BidiSpan {
     get dir(): Direction;
 }
 
-interface EditorConfig {
+/**
+The type of object given to the [`EditorView`](https://codemirror.net/6/docs/ref/#view.EditorView)
+constructor.
+*/
+interface EditorViewConfig extends EditorStateConfig {
     /**
-    The view's initial state. Defaults to an extension-less state
-    with an empty document.
+    The view's initial state. If not given, a new state is created
+    by passing this configuration object to
+    [`EditorState.create`](https://codemirror.net/6/docs/ref/#state.EditorState^create), using its
+    `doc`, `selection`, and `extensions` field (if provided).
     */
     state?: EditorState;
     /**
@@ -2459,10 +2481,11 @@ declare class EditorView {
     */
     get compositionStarted(): boolean;
     private _dispatch;
+    private _root;
     /**
     The document or shadow root that the view lives in.
     */
-    readonly root: DocumentOrShadowRoot;
+    get root(): DocumentOrShadowRoot;
     /**
     The DOM element that wraps the entire editor view.
     */
@@ -2494,11 +2517,7 @@ declare class EditorView {
     option, or put `view.dom` into your document after creating a
     view, so that the user can see the editor.
     */
-    constructor(
-    /**
-    Initialization options.
-    */
-    config?: EditorConfig);
+    constructor(config?: EditorViewConfig);
     /**
     All regular editor state updates should go through this. It
     takes a transaction or transaction spec and updates the view to
@@ -2551,7 +2570,7 @@ declare class EditorView {
     know you registered a given plugin, it is recommended to check
     the return value of this method.
     */
-    plugin<T>(plugin: ViewPlugin<T>): T | null;
+    plugin<T extends PluginValue>(plugin: ViewPlugin<T>): T | null;
     /**
     The top position of the document, in screen coordinates. This
     may be negative when the editor is scrolled down. Points
@@ -2568,13 +2587,14 @@ declare class EditorView {
     /**
     Find the text line or block widget at the given vertical
     position (which is interpreted as relative to the [top of the
-    document](https://codemirror.net/6/docs/ref/#view.EditorView.documentTop)
+    document](https://codemirror.net/6/docs/ref/#view.EditorView.documentTop)).
     */
     elementAtHeight(height: number): BlockInfo;
     /**
     Find the line block (see
     [`lineBlockAt`](https://codemirror.net/6/docs/ref/#view.EditorView.lineBlockAt) at the given
-    height.
+    height, again interpreted relative to the [top of the
+    document](https://codemirror.net/6/docs/ref/#view.EditorView.documentTop).
     */
     lineBlockAtHeight(height: number): BlockInfo;
     /**
@@ -2737,6 +2757,11 @@ declare class EditorView {
     */
     focus(): void;
     /**
+    Update the [root](https://codemirror.net/6/docs/ref/##view.EditorViewConfig.root) in which the editor lives. This is only
+    necessary when moving the editor's existing DOM to a new window or shadow root.
+    */
+    setRoot(root: Document | ShadowRoot): void;
+    /**
     Clean up this editor view, removing its element from the
     document, unregistering event handlers, and notifying
     plugins. The view instance can no longer be used after
@@ -2863,6 +2888,11 @@ declare class EditorView {
     functions are called _after_ the new viewport has been computed,
     and thus **must not** introduce block widgets or replacing
     decorations that cover line breaks.
+    
+    If you want decorated ranges to behave like atomic units for
+    cursor motion and deletion purposes, also provide the range set
+    containing the decorations to
+    [`EditorView.atomicRanges`](https://codemirror.net/6/docs/ref/#view.EditorView^atomicRanges).
     */
     static decorations: Facet<DecorationSet | ((view: EditorView) => DecorationSet), readonly (DecorationSet | ((view: EditorView) => DecorationSet))[]>;
     /**
@@ -2949,6 +2979,11 @@ declare class EditorView {
     search match).
     */
     static announce: StateEffectType<string>;
+    /**
+    Retrieve an editor view instance from the view's DOM
+    representation.
+    */
+    static findFromDOM(dom: HTMLElement): EditorView | null;
 }
 /**
 Helper type that maps event names to event object types, or the
@@ -3018,7 +3053,7 @@ interface KeyBinding {
     command function returns `false`, further bindings will be tried
     for the key.
     */
-    run: Command;
+    run?: Command;
     /**
     When given, this defines a second binding, using the (possibly
     platform-specific) key name prefixed with `Shift-` to activate
@@ -3026,6 +3061,11 @@ interface KeyBinding {
     */
     shift?: Command;
     /**
+    When this property is present, the function is called for every
+    key that is not a multi-stroke prefix.
+    */
+    any?: (view: EditorView, event: KeyboardEvent) => boolean;
+    /**
     By default, key bindings apply when focus is on the editor
     content (the `"editor"` scope). Some extensions, mostly those
     that define their own panels, might want to allow you to
@@ -3278,6 +3318,10 @@ declare class Language {
         [name: string]: any;
     }>;
     /**
+    A language name.
+    */
+    readonly name: string;
+    /**
     The extension value to install this as the document language.
     */
     readonly extension: Extension;
@@ -3300,7 +3344,11 @@ declare class Language {
     */
     data: Facet<{
         [name: string]: any;
-    }>, parser: Parser, extraExtensions?: Extension[]);
+    }>, parser: Parser, extraExtensions?: Extension[], 
+    /**
+    A language name.
+    */
+    name?: string);
     /**
     Query whether this language is active at the given position.
     */
@@ -3332,6 +3380,10 @@ declare class LRLanguage extends Language {
     Define a language from a parser.
     */
     static define(spec: {
+        /**
+        The [name](https://codemirror.net/6/docs/ref/#Language.name) of the language.
+        */
+        name?: string;
         /**
         The parser to use. Should already have added editor-relevant
         node props (and optionally things like dialect and top rule)
@@ -3348,9 +3400,9 @@ declare class LRLanguage extends Language {
     }): LRLanguage;
     /**
     Create a new instance of this language with a reconfigured
-    version of its parser.
+    version of its parser and optionally a new name.
     */
-    configure(options: ParserConfig): LRLanguage;
+    configure(options: ParserConfig, name?: string): LRLanguage;
     get allowsNesting(): boolean;
 }
 /**
@@ -3549,6 +3601,11 @@ interface FoldGutterConfig {
     Supply event handlers for DOM events on this gutter.
     */
     domEventHandlers?: Handlers;
+    /**
+    When given, if this returns true for a given view update,
+    recompute the fold markers.
+    */
+    foldingChanged?: (update: ViewUpdate) => boolean;
 }
 /**
 Create an extension that registers a fold gutter, which shows a
@@ -3562,6 +3619,10 @@ A highlight style associates CSS styles with higlighting
 [tags](https://lezer.codemirror.net/docs/ref#highlight.Tag).
 */
 declare class HighlightStyle implements Highlighter {
+    /**
+    The tag styles used to create this highlight style.
+    */
+    readonly specs: readonly TagStyle[];
     /**
     A style module holding the CSS rules for this highlight style.
     When using
@@ -3738,7 +3799,7 @@ declare function history(config?: HistoryConfig): Extension;
 Default key bindings for the undo history.
 
 - Mod-z: [`undo`](https://codemirror.net/6/docs/ref/#commands.undo).
-- Mod-y (Mod-Shift-z on macOS): [`redo`](https://codemirror.net/6/docs/ref/#commands.redo).
+- Mod-y (Mod-Shift-z on macOS) + Ctrl-Shift-z on Linux: [`redo`](https://codemirror.net/6/docs/ref/#commands.redo).
 - Mod-u: [`undoSelection`](https://codemirror.net/6/docs/ref/#commands.undoSelection).
 - Alt-u (Mod-Shift-u on macOS): [`redoSelection`](https://codemirror.net/6/docs/ref/#commands.redoSelection).
 */
@@ -3784,6 +3845,15 @@ interface CompletionConfig {
     */
     activateOnTyping?: boolean;
     /**
+    By default, when completion opens, the first option is selected
+    and can be confirmed with
+    [`acceptCompletion`](https://codemirror.net/6/docs/ref/#autocomplete.acceptCompletion). When this
+    is set to false, the completion widget starts with no completion
+    selected, and the user has to explicitly move to a completion
+    before you can confirm one.
+    */
+    selectOnOpen?: boolean;
+    /**
     Override the completion sources used. By default, they will be
     taken from the `"autocomplete"` [language
     data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) (which should hold
@@ -3831,12 +3901,26 @@ interface CompletionConfig {
     completion, and should produce a DOM node to show. `position`
     determines where in the DOM the result appears, relative to
     other added widgets and the standard content. The default icons
-    have position 20, the label position 50, and the detail position 70.
+    have position 20, the label position 50, and the detail position
+    80.
     */
     addToOptions?: {
         render: (completion: Completion, state: EditorState) => Node | null;
         position: number;
     }[];
+    /**
+    The comparison function to use when sorting completions with the same
+    match score. Defaults to using
+    [`localeCompare`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/localeCompare).
+    */
+    compareCompletions?: (a: Completion, b: Completion) => number;
+    /**
+    By default, commands relating to an open completion only take
+    effect 75 milliseconds after the completion opened, so that key
+    presses made before the user is aware of the tooltip don't go to
+    the tooltip. This option can be used to configure that delay.
+    */
+    interactionDelay?: number;
 }
 
 /**
@@ -4044,6 +4128,12 @@ This annotation is added to transactions that are produced by
 picking a completion.
 */
 declare const pickedCompletion: AnnotationType<Completion>;
+/**
+Helper function that returns a transaction spec which inserts a
+completion's text in the main selection range, and any other
+selection range that has the same text in front of it.
+*/
+declare function insertCompletionText(state: EditorState, text: string, from: number, to: number): TransactionSpec;
 
 /**
 Convert a snippet template to a function that can
@@ -4070,6 +4160,11 @@ cursor out of the current field deactivates the fields.
 The order of fields defaults to textual order, but you can add
 numbers to placeholders (`${1}` or `${1:defaultText}`) to provide
 a custom order.
+
+To include a literal `${` or `#{` in your template, put a
+backslash after the dollar or hash and before the brace (`$\\{`).
+This will be removed and the sequence will not be interpreted as a
+placeholder.
 */
 declare function snippet(template: string): (editor: {
     state: EditorState;
@@ -4145,6 +4240,11 @@ interface CloseBracketConfig {
     whitespace. Defaults to `")]}:;>"`.
     */
     before?: string;
+    /**
+    When determining whether a given node may be a string, recognize
+    these prefixes before the opening quote.
+    */
+    stringPrefixes?: string[];
 }
 /**
 Extension to enable bracket-closing behavior. When a closeable
@@ -4219,71 +4319,73 @@ the currently selected completion.
 */
 declare function setSelectedCompletion(index: number): StateEffect<unknown>;
 
-type index_CloseBracketConfig = CloseBracketConfig;
-type index_Completion = Completion;
-type index_CompletionContext = CompletionContext;
-declare const index_CompletionContext: typeof CompletionContext;
-type index_CompletionResult = CompletionResult;
-type index_CompletionSource = CompletionSource;
-declare const index_acceptCompletion: typeof acceptCompletion;
-declare const index_autocompletion: typeof autocompletion;
-declare const index_clearSnippet: typeof clearSnippet;
-declare const index_closeBrackets: typeof closeBrackets;
-declare const index_closeBracketsKeymap: typeof closeBracketsKeymap;
-declare const index_closeCompletion: typeof closeCompletion;
-declare const index_completeAnyWord: typeof completeAnyWord;
-declare const index_completeFromList: typeof completeFromList;
-declare const index_completionKeymap: typeof completionKeymap;
-declare const index_completionStatus: typeof completionStatus;
-declare const index_currentCompletions: typeof currentCompletions;
-declare const index_deleteBracketPair: typeof deleteBracketPair;
-declare const index_ifIn: typeof ifIn;
-declare const index_ifNotIn: typeof ifNotIn;
-declare const index_insertBracket: typeof insertBracket;
-declare const index_moveCompletionSelection: typeof moveCompletionSelection;
-declare const index_nextSnippetField: typeof nextSnippetField;
-declare const index_pickedCompletion: typeof pickedCompletion;
-declare const index_prevSnippetField: typeof prevSnippetField;
-declare const index_selectedCompletion: typeof selectedCompletion;
-declare const index_selectedCompletionIndex: typeof selectedCompletionIndex;
-declare const index_setSelectedCompletion: typeof setSelectedCompletion;
-declare const index_snippet: typeof snippet;
-declare const index_snippetCompletion: typeof snippetCompletion;
-declare const index_snippetKeymap: typeof snippetKeymap;
-declare const index_startCompletion: typeof startCompletion;
-declare namespace index {
+type index_d_CloseBracketConfig = CloseBracketConfig;
+type index_d_Completion = Completion;
+type index_d_CompletionContext = CompletionContext;
+declare const index_d_CompletionContext: typeof CompletionContext;
+type index_d_CompletionResult = CompletionResult;
+type index_d_CompletionSource = CompletionSource;
+declare const index_d_acceptCompletion: typeof acceptCompletion;
+declare const index_d_autocompletion: typeof autocompletion;
+declare const index_d_clearSnippet: typeof clearSnippet;
+declare const index_d_closeBrackets: typeof closeBrackets;
+declare const index_d_closeBracketsKeymap: typeof closeBracketsKeymap;
+declare const index_d_closeCompletion: typeof closeCompletion;
+declare const index_d_completeAnyWord: typeof completeAnyWord;
+declare const index_d_completeFromList: typeof completeFromList;
+declare const index_d_completionKeymap: typeof completionKeymap;
+declare const index_d_completionStatus: typeof completionStatus;
+declare const index_d_currentCompletions: typeof currentCompletions;
+declare const index_d_deleteBracketPair: typeof deleteBracketPair;
+declare const index_d_ifIn: typeof ifIn;
+declare const index_d_ifNotIn: typeof ifNotIn;
+declare const index_d_insertBracket: typeof insertBracket;
+declare const index_d_insertCompletionText: typeof insertCompletionText;
+declare const index_d_moveCompletionSelection: typeof moveCompletionSelection;
+declare const index_d_nextSnippetField: typeof nextSnippetField;
+declare const index_d_pickedCompletion: typeof pickedCompletion;
+declare const index_d_prevSnippetField: typeof prevSnippetField;
+declare const index_d_selectedCompletion: typeof selectedCompletion;
+declare const index_d_selectedCompletionIndex: typeof selectedCompletionIndex;
+declare const index_d_setSelectedCompletion: typeof setSelectedCompletion;
+declare const index_d_snippet: typeof snippet;
+declare const index_d_snippetCompletion: typeof snippetCompletion;
+declare const index_d_snippetKeymap: typeof snippetKeymap;
+declare const index_d_startCompletion: typeof startCompletion;
+declare namespace index_d {
   export {
-    index_CloseBracketConfig as CloseBracketConfig,
-    index_Completion as Completion,
-    index_CompletionContext as CompletionContext,
-    index_CompletionResult as CompletionResult,
-    index_CompletionSource as CompletionSource,
-    index_acceptCompletion as acceptCompletion,
-    index_autocompletion as autocompletion,
-    index_clearSnippet as clearSnippet,
-    index_closeBrackets as closeBrackets,
-    index_closeBracketsKeymap as closeBracketsKeymap,
-    index_closeCompletion as closeCompletion,
-    index_completeAnyWord as completeAnyWord,
-    index_completeFromList as completeFromList,
-    index_completionKeymap as completionKeymap,
-    index_completionStatus as completionStatus,
-    index_currentCompletions as currentCompletions,
-    index_deleteBracketPair as deleteBracketPair,
-    index_ifIn as ifIn,
-    index_ifNotIn as ifNotIn,
-    index_insertBracket as insertBracket,
-    index_moveCompletionSelection as moveCompletionSelection,
-    index_nextSnippetField as nextSnippetField,
-    index_pickedCompletion as pickedCompletion,
-    index_prevSnippetField as prevSnippetField,
-    index_selectedCompletion as selectedCompletion,
-    index_selectedCompletionIndex as selectedCompletionIndex,
-    index_setSelectedCompletion as setSelectedCompletion,
-    index_snippet as snippet,
-    index_snippetCompletion as snippetCompletion,
-    index_snippetKeymap as snippetKeymap,
-    index_startCompletion as startCompletion,
+    index_d_CloseBracketConfig as CloseBracketConfig,
+    index_d_Completion as Completion,
+    index_d_CompletionContext as CompletionContext,
+    index_d_CompletionResult as CompletionResult,
+    index_d_CompletionSource as CompletionSource,
+    index_d_acceptCompletion as acceptCompletion,
+    index_d_autocompletion as autocompletion,
+    index_d_clearSnippet as clearSnippet,
+    index_d_closeBrackets as closeBrackets,
+    index_d_closeBracketsKeymap as closeBracketsKeymap,
+    index_d_closeCompletion as closeCompletion,
+    index_d_completeAnyWord as completeAnyWord,
+    index_d_completeFromList as completeFromList,
+    index_d_completionKeymap as completionKeymap,
+    index_d_completionStatus as completionStatus,
+    index_d_currentCompletions as currentCompletions,
+    index_d_deleteBracketPair as deleteBracketPair,
+    index_d_ifIn as ifIn,
+    index_d_ifNotIn as ifNotIn,
+    index_d_insertBracket as insertBracket,
+    index_d_insertCompletionText as insertCompletionText,
+    index_d_moveCompletionSelection as moveCompletionSelection,
+    index_d_nextSnippetField as nextSnippetField,
+    index_d_pickedCompletion as pickedCompletion,
+    index_d_prevSnippetField as prevSnippetField,
+    index_d_selectedCompletion as selectedCompletion,
+    index_d_selectedCompletionIndex as selectedCompletionIndex,
+    index_d_setSelectedCompletion as setSelectedCompletion,
+    index_d_snippet as snippet,
+    index_d_snippetCompletion as snippetCompletion,
+    index_d_snippetKeymap as snippetKeymap,
+    index_d_startCompletion as startCompletion,
   };
 }
 
@@ -4316,6 +4418,11 @@ itself will be highlighted with `"cm-selectionMatch-main"`.
 */
 declare function highlightSelectionMatches(options?: HighlightOptions): Extension;
 /**
+Select next occurrence of the current selection. Expand selection
+to the surrounding word when the selection is empty.
+*/
+declare const selectNextOccurrence: StateCommand;
+/**
 Default search-related key bindings.
 
  - Mod-f: [`openSearchPanel`](https://codemirror.net/6/docs/ref/#search.openSearchPanel)
@@ -4461,12 +4568,14 @@ declare function markdown(config?: {
     */
     defaultCodeLanguage?: Language | LanguageSupport;
     /**
-    A collection of language descriptions to search through for a
-    matching language (with
-    [`LanguageDescription.matchLanguageName`](https://codemirror.net/6/docs/ref/#language.LanguageDescription^matchLanguageName))
-    when a fenced code block has an info string.
+    A source of language support for highlighting fenced code
+    blocks. When it is an array, the parser will use
+    [`LanguageDescription.matchLanguageName`](https://codemirror.net/6/docs/ref/#language.LanguageDescription^matchLanguageName)
+    with the fenced code info to find a matching language. When it
+    is a function, will be called with the info string and may
+    return a language or `LanguageDescription` object.
     */
-    codeLanguages?: readonly LanguageDescription[];
+    codeLanguages?: readonly LanguageDescription[] | ((info: string) => Language | LanguageDescription | null);
     /**
     Set this to false to disable installation of the Markdown
     [keymap](https://codemirror.net/6/docs/ref/#lang-markdown.markdownKeymap).
@@ -4485,6 +4594,23 @@ declare function markdown(config?: {
     base?: Language;
 }): LanguageSupport;
 
+/**
+Type used to specify tags to complete.
+*/
+interface TagSpec {
+    /**
+    Define tag-specific attributes. Property names are attribute
+    names, and property values can be null to indicate free-form
+    attributes, or a list of strings for suggested attribute values.
+    */
+    attrs?: Record<string, null | readonly string[]>;
+    /**
+    Can be used to specify a list of child tags that are valid
+    inside this tag. The default is to allow any tag.
+    */
+    children?: readonly string[];
+}
+
 /**
 A language provider based on the [Lezer HTML
 parser](https://github.com/lezer-parser/html), extended with the
@@ -4510,6 +4636,14 @@ declare function html(config?: {
     is included in the support extensions. Defaults to true.
     */
     autoCloseTags?: boolean;
+    /**
+    Add additional tags that can be completed.
+    */
+    extraTags?: Record<string, TagSpec>;
+    /**
+    Add additional completable attributes to all tags.
+    */
+    extraGlobalAttributes?: Record<string, null | readonly string[]>;
 }): LanguageSupport;
 
 /**
@@ -4569,6 +4703,11 @@ declare type SQLDialectSpec = {
     */
     spaceAfterDashes?: boolean;
     /**
+    When enabled, things quoted with "$$" are treated as
+    strings, rather than identifiers.
+    */
+    doubleDollarQuotedStrings?: boolean;
+    /**
     When enabled, things quoted with double quotes are treated as
     strings, rather than identifiers.
     */
@@ -4592,6 +4731,12 @@ declare type SQLDialectSpec = {
     to `"\""`.
     */
     identifierQuotes?: string;
+    /**
+    Controls whether bit values can be defined as 0b1010. Defaults
+    to false.
+    */
+    unquotedBitLiterals?: boolean;
+    treatBitsAsBytes?: boolean;
 };
 /**
 Represents an SQL dialect.
@@ -4601,6 +4746,7 @@ declare class SQLDialect {
     The language for this dialect.
     */
     readonly language: LRLanguage;
+    private constructor();
     /**
     Returns the language for this dialect as an extension.
     */
@@ -4620,8 +4766,9 @@ interface SQLConfig {
     */
     dialect?: SQLDialect;
     /**
-    An object that maps table names to options (columns) that can
-    be completed for that table. Use lower-case names here.
+    An object that maps table names, optionally prefixed with a
+    schema name (`"schema.table"`) to options (columns) that can be
+    completed for that table. Use lower-case names here.
     */
     schema?: {
         [table: string]: readonly (string | Completion)[];
@@ -4639,6 +4786,11 @@ interface SQLConfig {
     */
     defaultTable?: string;
     /**
+    When given, tables prefixed with this schema name can be
+    completed directly at the top level.
+    */
+    defaultSchema?: string;
+    /**
     When set to true, keyword completions will be upper-case.
     */
     upperCaseKeywords?: boolean;
@@ -4690,4 +4842,4 @@ Create an instance of the collaborative editing plugin.
 */
 declare function collab(config?: CollabConfig): Extension;
 
-export { Annotation, Compartment, Decoration, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, Text, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, completionKeymap, css, cssLanguage, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, keymap, lineNumbers, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, rectangularSelection, searchKeymap, sql, syntaxHighlighting, syntaxTree, syntaxTreeAvailable, tags };
+export { Annotation, Compartment, Decoration, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, Text, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index_d as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, completionKeymap, css, cssLanguage, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, keymap, lineNumbers, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, rectangularSelection, searchKeymap, selectNextOccurrence, sql, syntaxHighlighting, syntaxTree, syntaxTreeAvailable, tags };
diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index cb48aa8802..c3d17fa6ed 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -58,8 +58,9 @@ import {
     Text,
     css,
     cssLanguage,
+    selectNextOccurrence,
     //@ts-ignore
-} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.28.0/dist/index.es.min.js"
+} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.28.1/dist/index.es.min.js"
 
 export {
     EditorState,
@@ -120,4 +121,5 @@ export {
     Text,
     css,
     cssLanguage,
+    selectNextOccurrence,
 }

From c52a87fd29d46e9e3c7a95f58cc2b585b0fe8dcf Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Mon, 7 Nov 2022 16:50:14 +0000
Subject: [PATCH 483/821] Cmd+D, fixes #1523

---
 frontend/components/CellInput.js              |  3 +
 .../components/CellInput/mod_d_command.js     | 60 +++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 frontend/components/CellInput/mod_d_command.js

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 84dd760381..48678f0c1b 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -62,6 +62,7 @@ import { cl } from "../common/ClassTable.js"
 import { HighlightLineFacet, highlightLinePlugin } from "./CellInput/highlight_line.js"
 import { commentKeymap } from "./CellInput/comment_mixed_parsers.js"
 import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
+import { mod_d_command } from "./CellInput/mod_d_command.js"
 
 export const ENABLE_CM_MIXED_PARSER = window.localStorage.getItem("ENABLE_CM_MIXED_PARSER") === "true"
 
@@ -550,6 +551,8 @@ export const CellInput = ({
             { key: "Ctrl-Delete", run: keyMapDelete },
             { key: "Backspace", run: keyMapBackspace },
             { key: "Ctrl-Backspace", run: keyMapBackspace },
+
+            mod_d_command,
         ]
 
         let DOCS_UPDATER_VERBOSE = false
diff --git a/frontend/components/CellInput/mod_d_command.js b/frontend/components/CellInput/mod_d_command.js
new file mode 100644
index 0000000000..3d6e8dc296
--- /dev/null
+++ b/frontend/components/CellInput/mod_d_command.js
@@ -0,0 +1,60 @@
+import { EditorView, EditorSelection, selectNextOccurrence, syntaxTree } from "../../imports/CodemirrorPlutoSetup.js"
+
+export let mod_d_command = {
+    key: "Mod-d",
+    /** @param {EditorView} view */
+    run: ({ state, dispatch }) => {
+        if (state.selection.main.empty) {
+            let nodes_that_i_like = ["Identifier", "FieldName"]
+
+            // Expand to closest Identifier
+            let cursor_left = syntaxTree(state).cursorAt(state.selection.main.from, -1)
+            let cursor_right = syntaxTree(state).cursorAt(state.selection.main.from, 1)
+
+            for (let node_i_like of nodes_that_i_like) {
+                let matching_node = cursor_left.name === node_i_like ? cursor_left : cursor_right.name === node_i_like ? cursor_right : null
+                if (matching_node) {
+                    dispatch({
+                        selection: { anchor: matching_node.from, head: matching_node.to },
+                    })
+                    return true
+                }
+            }
+
+            // If there is no cool syntax thing (say we are in a string), then just select the word.
+            let line = state.doc.lineAt(state.selection.main.from)
+            let position_relative_to_line = state.selection.main.from - line.from
+            let before_cursor = line.text.slice(0, position_relative_to_line)
+            let after_cursor = line.text.slice(position_relative_to_line)
+
+            let word_before_cursor = before_cursor.match(/(\w+)$/)?.[0] ?? ""
+            let word_after_cursor = after_cursor.match(/^(\w+)/)?.[0] ?? ""
+
+            dispatch({
+                selection: { anchor: state.selection.main.from - word_before_cursor.length, head: state.selection.main.from + word_after_cursor.length },
+            })
+        } else {
+            selectNextOccurrence({ state, dispatch })
+        }
+    },
+    /** @param {EditorView} view */
+    shift: ({ state, dispatch }) => {
+        if (state.selection.ranges.length === 1) return false
+
+        // So funny thing, the index "before" (might wrap around) the mainIndex is the one you just selected
+        // @ts-ignore
+        let just_selected = state.selection.ranges.at(state.selection.mainIndex - 1)
+
+        let new_ranges = state.selection.ranges.filter((x) => x !== just_selected)
+        let new_main_index = new_ranges.indexOf(state.selection.main)
+
+        let previous_selected = new_ranges.at(state.selection.mainIndex - 1)
+
+        dispatch({
+            selection: EditorSelection.create(new_ranges, new_main_index),
+            effects: previous_selected == null ? [] : EditorView.scrollIntoView(previous_selected.from),
+        })
+        return true
+    },
+    preventDefault: true,
+}

From 0ce6e2f1d5fb2fc439bad7b20f7e8137005feffa Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Mon, 7 Nov 2022 16:56:13 +0000
Subject: [PATCH 484/821] "This is exactly why you should open PRs first"

---
 frontend/components/CellInput/mod_d_command.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/components/CellInput/mod_d_command.js b/frontend/components/CellInput/mod_d_command.js
index 3d6e8dc296..13fe7fdc3a 100644
--- a/frontend/components/CellInput/mod_d_command.js
+++ b/frontend/components/CellInput/mod_d_command.js
@@ -1,5 +1,9 @@
 import { EditorView, EditorSelection, selectNextOccurrence, syntaxTree } from "../../imports/CodemirrorPlutoSetup.js"
 
+let array_at = (array, pos) => {
+    return array.slice(pos, pos + 1)[0]
+}
+
 export let mod_d_command = {
     key: "Mod-d",
     /** @param {EditorView} view */
@@ -48,7 +52,7 @@ export let mod_d_command = {
         let new_ranges = state.selection.ranges.filter((x) => x !== just_selected)
         let new_main_index = new_ranges.indexOf(state.selection.main)
 
-        let previous_selected = new_ranges.at(state.selection.mainIndex - 1)
+        let previous_selected = array_at(new_ranges, state.selection.mainIndex - 1)
 
         dispatch({
             selection: EditorSelection.create(new_ranges, new_main_index),

From 729c23acda0a4321b021b7f85ee50b4ec1cce223 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Wed, 9 Nov 2022 01:57:09 +0100
Subject: [PATCH 485/821] Show keywords in live docs (#2361)

---
 .../CellInput/LiveDocsFromCursor.js           | 16 ++++-
 src/runner/PlutoRunner.jl                     | 69 ++++++++++---------
 test/Dynamic.jl                               | 11 ++-
 3 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/frontend/components/CellInput/LiveDocsFromCursor.js b/frontend/components/CellInput/LiveDocsFromCursor.js
index 17f8dd5738..f8ddce3345 100644
--- a/frontend/components/CellInput/LiveDocsFromCursor.js
+++ b/frontend/components/CellInput/LiveDocsFromCursor.js
@@ -27,7 +27,21 @@ let VALID_DOCS_TYPES = [
     "Definition",
     "ParameterizedIdentifier",
 ]
-let keywords_that_have_docs_and_are_cool = ["import", "export", "try", "catch", "finally", "quote", "do", "struct", "mutable"]
+let keywords_that_have_docs_and_are_cool = [
+    "import",
+    "export",
+    "try",
+    "catch",
+    "finally",
+    "quote",
+    "do",
+    "struct",
+    "mutable",
+    "module",
+    "baremodule",
+    "if",
+    "let",
+]
 
 let is_docs_searchable = (/** @type {import("../../imports/CodemirrorPlutoSetup.js").TreeCursor} */ cursor) => {
     if (keywords_that_have_docs_and_are_cool.includes(cursor.name)) {
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 30e957a112..2d3dfbbc57 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1794,39 +1794,46 @@ end
 "You say doc_fetcher, I say You say doc_fetcher, I say You say doc_fetcher, I say You say doc_fetcher, I say ...!!!!"
 function doc_fetcher(query, workspace::Module)
     try
-        parsed_query = Meta.parse(query)
-        value = binding_from(parsed_query, workspace)
-        doc_md = Docs.doc(value)
-
-        if !showable(MIME("text/html"), doc_md)
-            # PyPlot returns `Text{String}` objects from their docs...
-            # which is a bit silly, but turns out it actuall is markdown if you look hard enough.
-            doc_md = Markdown.parse(repr(doc_md))
-        end
+        parsed_query = Meta.parse(query; raise=false, depwarn=false)
+
+        doc_md = if Meta.isexpr(parsed_query, [:incomplete, :error]) && haskey(Docs.keywords, Symbol(query))
+            Docs.parsedoc(Docs.keywords[Symbol(query)])
+        else
+            binding = binding_from(parsed_query, workspace)
+            doc_md = Docs.doc(binding)
 
-        # Add suggestions results if no docstring was found
-        if parsed_query isa Symbol &&
-            !Docs.defined(value) &&
-            doc_md isa Markdown.MD &&
-            haskey(doc_md.meta, :results) &&
-            isempty(doc_md.meta[:results])
-
-            suggestions = REPL.accessible(workspace)
-            suggestions_scores = map(s -> REPL.fuzzyscore(query, s), suggestions)
-            removed_indices = [i for (i, s) in enumerate(suggestions_scores) if s < 0]
-            deleteat!(suggestions_scores, removed_indices)
-            deleteat!(suggestions, removed_indices)
-
-            perm = sortperm(suggestions_scores; lt=Base.:>)
-            permute!(suggestions, perm)
-            links = map(s -> Suggestion(s, query), @view(suggestions[begin:min(end,DOC_SUGGESTION_LIMIT)]))
-
-            if length(links) > 0
-                push!(doc_md.content,
-                      Markdown.HorizontalRule(),
-                      Markdown.Paragraph(["Similar result$(length(links) > 1 ? "s" : ""):"]),
-                      Markdown.List(links))
+            if !showable(MIME("text/html"), doc_md)
+                # PyPlot returns `Text{String}` objects from their docs...
+                # which is a bit silly, but turns out it actuall is markdown if you look hard enough.
+                doc_md = Markdown.parse(repr(doc_md))
             end
+
+            # Add suggestions results if no docstring was found
+            if parsed_query isa Symbol &&
+                !Docs.defined(binding) &&
+                doc_md isa Markdown.MD &&
+                haskey(doc_md.meta, :results) &&
+                isempty(doc_md.meta[:results])
+
+                suggestions = REPL.accessible(workspace)
+                suggestions_scores = map(s -> REPL.fuzzyscore(query, s), suggestions)
+                removed_indices = [i for (i, s) in enumerate(suggestions_scores) if s < 0]
+                deleteat!(suggestions_scores, removed_indices)
+                deleteat!(suggestions, removed_indices)
+
+                perm = sortperm(suggestions_scores; lt=Base.:>)
+                permute!(suggestions, perm)
+                links = map(s -> Suggestion(s, query), @view(suggestions[begin:min(end,DOC_SUGGESTION_LIMIT)]))
+
+                if length(links) > 0
+                    push!(doc_md.content,
+                          Markdown.HorizontalRule(),
+                          Markdown.Paragraph(["Similar result$(length(links) > 1 ? "s" : ""):"]),
+                          Markdown.List(links))
+                end
+            end
+
+            doc_md
         end
 
         (repr(MIME("text/html"), doc_md), :👍)
diff --git a/test/Dynamic.jl b/test/Dynamic.jl
index fcdcadc984..7ea16bb8c9 100644
--- a/test/Dynamic.jl
+++ b/test/Dynamic.jl
@@ -150,8 +150,15 @@ end
     @testset "Docs" begin
         @test occursin("square root", Pluto.PlutoRunner.doc_fetcher("sqrt", Main)[1])
         @test occursin("square root", Pluto.PlutoRunner.doc_fetcher("Base.sqrt", Main)[1])
+        @test occursin("Functions are defined", Pluto.PlutoRunner.doc_fetcher("function", Main)[1])
+        @test occursin("Within a module", Pluto.PlutoRunner.doc_fetcher("module", Main)[1])
         @test occursin("No documentation found", Pluto.PlutoRunner.doc_fetcher("Base.findmeta", Main)[1])
-        
+        let
+            doc_output = Pluto.PlutoRunner.doc_fetcher("sor", Main)[1]
+            @test occursin("Similar results:", doc_output)
+            @test occursin("<b>s</b><b>o</b><b>r</b>tperm", doc_output)
+        end
+
         # Issue #1128
         # Ref https://docs.julialang.org/en/v1/manual/documentation/#Dynamic-documentation
         m = Module()
@@ -167,7 +174,7 @@ end
             global y
             end
         ))
-        
+
         @test occursin("Normal docstring", Pluto.PlutoRunner.doc_fetcher("MyType", m.DocTest)[1])
         @test occursin("Normal docstring", Pluto.PlutoRunner.doc_fetcher("DocTest.MyType", m)[1])
         @test occursin("Documentation for MyType with value", Pluto.PlutoRunner.doc_fetcher("x", m.DocTest)[1])

From a7582ed3ea85c725bedc7b42dd3d9d1bed698c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Wed, 9 Nov 2022 03:02:47 +0200
Subject: [PATCH 486/821] Draft: Guard exceptions caused by
 `last(Tables.rows(table))` (#2341)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 src/runner/PlutoRunner.jl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 2d3dfbbc57..329ae0e235 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1522,8 +1522,11 @@ const integrations = Integration[
 
                 if truncate_rows
                     push!(row_data, "more")
-                    if applicable(lastindex, rows)
-                        push!(row_data, (length(rows), row_data_for(last(rows))))
+
+                    # In some environments this fails. Not sure why.
+                    last_row = applicable(lastindex, rows) ? try last(rows) catch e nothing end : nothing
+                    if !isnothing(last_row)
+                        push!(row_data, (length(rows), row_data_for(last_row)))
                     end
                 end
                 

From 309d29be62ba5050629522778a11edcb7dd7dc10 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 9 Nov 2022 11:03:18 +0100
Subject: [PATCH 487/821] =?UTF-8?q?=F0=9F=8C=B3=20Fix=20#1385?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/runner/PlutoRunner.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 329ae0e235..f4298c3735 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1546,7 +1546,7 @@ const integrations = Integration[
             end
 
 
-            pluto_showable(::MIME"application/vnd.pluto.table+object", x::Any) = try Tables.rowaccess(x)::Bool catch; false end
+            pluto_showable(::MIME"application/vnd.pluto.table+object", x::Any) = try Tables.rowaccess(x)::Bool && !isempty(x) catch; false end
             pluto_showable(::MIME"application/vnd.pluto.table+object", t::Type) = false
             pluto_showable(::MIME"application/vnd.pluto.table+object", t::AbstractVector{<:NamedTuple}) = false
             pluto_showable(::MIME"application/vnd.pluto.table+object", t::AbstractVector{<:Dict{Symbol,<:Any}}) = false

From b79c9dce861c8d3835a466b8d3ab2d11300ba328 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 9 Nov 2022 11:03:40 +0100
Subject: [PATCH 488/821] =?UTF-8?q?=F0=9F=A6=86=20CSS=20z-index=20tweaks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/editor.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 7cfe776ce5..418e8f5237 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -459,7 +459,7 @@ header#pluto-nav {
     top: 0px; */
     width: 100%;
     min-height: 60px;
-    z-index: 50;
+    z-index: 60;
     background-color: var(--header-bg-color);
     transform: translateY(0px);
     transition: background-color 0.5s ease-in-out, transform 0.25s cubic-bezier(0.18, 0.89, 0.49, 1.13);
@@ -1775,7 +1775,7 @@ pkg-status-mark.disable_pkg > button > span::after {
 pluto-popup {
     display: block;
     position: absolute;
-    z-index: 50;
+    z-index: 70;
     /* left: 1.5em; */
     /* top: calc((1.5em - 200px) * 0.5); */
     width: min(90vw, 251px);
@@ -2545,7 +2545,7 @@ a.stdout-info {
     position: absolute;
     right: 2px;
     top: 2px;
-    z-index: 50;
+    z-index: unset;
     pointer-events: initial;
 }
 

From 4bc2c14ea1a2e9ee8d4014f1d515dabb7103a8a6 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 9 Nov 2022 13:57:09 +0100
Subject: [PATCH 489/821] fix tests

---
 test/RichOutput.jl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/RichOutput.jl b/test/RichOutput.jl
index 6675aa4008..1132472112 100644
--- a/test/RichOutput.jl
+++ b/test/RichOutput.jl
@@ -260,8 +260,8 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
 
         update_run!(🍭, notebook, notebook.cells)
 
-        @test notebook.cells[2].output.mime isa MIME"application/vnd.pluto.table+object"
-        @test notebook.cells[3].output.mime isa MIME"application/vnd.pluto.table+object"
+        # @test notebook.cells[2].output.mime isa MIME"application/vnd.pluto.table+object"
+        # @test notebook.cells[3].output.mime isa MIME"application/vnd.pluto.table+object"
         @test notebook.cells[4].output.mime isa MIME"application/vnd.pluto.table+object"
         @test notebook.cells[5].output.mime isa MIME"application/vnd.pluto.table+object"
         @test notebook.cells[6].output.mime isa MIME"application/vnd.pluto.table+object"
@@ -274,8 +274,8 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
         @test notebook.cells[15].output.mime isa MIME"application/vnd.pluto.tree+object"
         @test notebook.cells[16].output.mime isa MIME"application/vnd.pluto.tree+object"
         @test notebook.cells[17].output.mime isa MIME"application/vnd.pluto.tree+object"
-        @test notebook.cells[2].output.body isa Dict
-        @test notebook.cells[3].output.body isa Dict
+        # @test notebook.cells[2].output.body isa Dict
+        # @test notebook.cells[3].output.body isa Dict
         @test notebook.cells[4].output.body isa Dict
         @test notebook.cells[5].output.body isa Dict
         @test notebook.cells[6].output.body isa Dict

From 9d8a0b09d9933defa1552b331b9f0ab70db4daa4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 9 Nov 2022 15:36:45 +0100
Subject: [PATCH 490/821] remove console log

---
 frontend/components/CellInput/scopestate_statefield.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/CellInput/scopestate_statefield.js b/frontend/components/CellInput/scopestate_statefield.js
index bc560a2c19..b0259baee5 100644
--- a/frontend/components/CellInput/scopestate_statefield.js
+++ b/frontend/components/CellInput/scopestate_statefield.js
@@ -191,7 +191,7 @@ let explore_pattern = (node, doc, scopestate, valid_from = null, verbose = false
             scopestate = explore_pattern(name, doc, scopestate, value.from, verbose)
             scopestate = explore_variable_usage(value.cursor(), doc, scopestate, verbose)
             return scopestate
-        } else if ((match = match_assignee(node, true)`(; ${t.many("named_tuples")})`)) {
+        } else if ((match = match_assignee(node)`(; ${t.many("named_tuples")})`)) {
             // `(; x, y) = z` => ["x", "y"]
             let { named_tuples } = match
             for (let name of named_tuples) {

From 2b96394ef7f66a15d1ba80201890d93d8aa23ff4 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Wed, 9 Nov 2022 15:41:31 +0100
Subject: [PATCH 491/821] Logging: Scope loggers to cell (#2249)

Co-authored-by: Christopher Rowley <1844215+cjdoris@users.noreply.github.com>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/Logs.js        |  40 +++++--
 src/analysis/Topology.jl           |   4 +-
 src/evaluation/Run.jl              |  12 +--
 src/evaluation/WorkspaceManager.jl |   9 +-
 src/runner/PlutoRunner.jl          | 161 ++++++++++++++++++++---------
 test/Logging.jl                    |  43 ++++++++
 test/compiletimes.jl               |   3 +-
 7 files changed, 200 insertions(+), 72 deletions(-)

diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
index a7922fbddb..950b909680 100644
--- a/frontend/components/Logs.js
+++ b/frontend/components/Logs.js
@@ -7,26 +7,50 @@ import AnsiUp from "../imports/AnsiUp.js"
 
 const LOGS_VISIBLE_START = 60
 const LOGS_VISIBLE_END = 20
+
 const PROGRESS_LOG_LEVEL = "LogLevel(-1)"
+const STDOUT_LOG_LEVEL = "LogLevel(-555)"
+// const RESIZE_THROTTLE = 60
 
 const is_progress_log = (log) => {
     return log.level == PROGRESS_LOG_LEVEL && log.kwargs.find((kwarg) => kwarg[0] === "progress") !== undefined
 }
 
+const is_stdout_log = (log) => {
+    return log.level == STDOUT_LOG_LEVEL
+}
+
 export const Logs = ({ logs, line_heights, set_cm_highlighted_line }) => {
     const progress_logs = logs.filter(is_progress_log)
     const latest_progress_logs = progress_logs.reduce((progress_logs, log) => ({ ...progress_logs, [log.id]: log }), {})
-    const [_, grouped_progress_and_logs] = logs.reduce(
-        ([seen, final_logs], log) => {
+    const stdout_log = logs.reduce((stdout_log, log) => {
+        if (!is_stdout_log(log)) {
+            return stdout_log
+        }
+        if (stdout_log === null) {
+            return log
+        }
+        return {
+            ...stdout_log,
+            msg: [stdout_log.msg[0] + log.msg[0]], // Append to the previous stdout
+        }
+    }, null)
+    const [_, __, grouped_progress_and_logs] = logs.reduce(
+        ([seen_progress, seen_stdout, final_logs], log) => {
             const ipl = is_progress_log(log)
-            if (ipl && !(log.id in seen)) {
-                return [{ ...seen, [log.id]: true }, [...final_logs, latest_progress_logs[log.id]]]
+            if (ipl && !seen_progress.has(log.id)) {
+                seen_progress.add(log.id)
+                return [seen_progress, seen_stdout, [...final_logs, latest_progress_logs[log.id]]]
             } else if (!ipl) {
-                return [seen, [...final_logs, log]]
+                if (is_stdout_log(log) && !seen_stdout) {
+                    return [seen_progress, true, [...final_logs, stdout_log]]
+                } else if (!is_stdout_log(log)) {
+                    return [seen_progress, seen_stdout, [...final_logs, log]]
+                }
             }
-            return [seen, final_logs]
+            return [seen_progress, seen_stdout, final_logs]
         },
-        [{}, []]
+        [new Set(), false, []]
     )
 
     const is_hidden_input = line_heights[0] === 0
@@ -77,7 +101,7 @@ const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${"adsf"} mi
 
 const Dot = ({ set_cm_highlighted_line, msg, kwargs, y, level }) => {
     const is_progress = is_progress_log({ level, kwargs })
-    const is_stdout = level === "LogLevel(-555)"
+    const is_stdout = level === STDOUT_LOG_LEVEL
     let progress = null
     if (is_progress) {
         progress = kwargs.find((p) => p[0] === "progress")[1][0]
diff --git a/src/analysis/Topology.jl b/src/analysis/Topology.jl
index fe4b32a127..eb441f098b 100644
--- a/src/analysis/Topology.jl
+++ b/src/analysis/Topology.jl
@@ -49,8 +49,8 @@ function set_unresolved(topology::NotebookTopology, unresolved_cells::Vector{Cel
         for cell in unresolved_cells
     )
     NotebookTopology(
-        nodes=topology.nodes, 
-        codes=merge(topology.codes, codes), 
+        nodes=topology.nodes,
+        codes=merge(topology.codes, codes),
         unresolved_cells=union(topology.unresolved_cells, unresolved_cells),
         cell_order=topology.cell_order,
         disabled_cells=topology.disabled_cells,
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 06cc760fe6..45304b68b2 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -157,12 +157,12 @@ function run_reactive_core!(
     local any_interrupted = false
     for (i, cell) in enumerate(to_run)
 
-		cell.queued = false
-		cell.running = true
-		# Important to not use empty! here because AppendonlyMarker requires a new array identity.
-		# Eventually we could even make AppendonlyArray to enforce this but idk if it's worth it. yadiyadi.
-		cell.logs = []
-		send_notebook_changes_throttled()
+        cell.queued = false
+        cell.running = true
+        # Important to not use empty! here because AppendonlyMarker requires a new array identity.
+        # Eventually we could even make AppendonlyArray to enforce this but idk if it's worth it. yadiyadi.
+        cell.logs = []
+        send_notebook_changes_throttled()
 
         if any_interrupted || notebook.wants_to_interrupt || !will_run_code(notebook)
             relay_reactivity_error!(cell, InterruptException())
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 314dc99a01..a42719085f 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -77,9 +77,8 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
         $(Distributed).RemoteChannel(() -> eval(quote
             channel = Channel{Any}(10)
             Main.PlutoRunner.setup_plutologger(
-                $($(notebook.notebook_id)),
-                channel;
-                make_global=$($(use_distributed))
+                $($(notebook.notebook_id)), 
+                channel,
             )
             channel
         end), $pid)
@@ -497,13 +496,13 @@ function collect_soft_definitions(session_notebook::SN, modules::Set{Expr})
     end)
 end
 
-function macroexpand_in_workspace(session_notebook::Union{SN,Workspace}, macrocall, cell_id, module_name=nothing)::Tuple{Bool,Any}
+function macroexpand_in_workspace(session_notebook::SN, macrocall, cell_id, module_name = nothing; capture_stdout::Bool=true)::Tuple{Bool, Any}
     workspace = get_workspace(session_notebook)
     module_name = module_name === nothing ? workspace.module_name : module_name
 
     Distributed.remotecall_eval(Main, workspace.pid, quote
         try
-            (true, PlutoRunner.try_macroexpand($module_name, $(workspace.notebook_id), $cell_id, $(QuoteNode(macrocall))))
+            (true, PlutoRunner.try_macroexpand($(module_name), $(workspace.notebook_id), $(cell_id), $(macrocall |> QuoteNode); capture_stdout=$(capture_stdout)))
         catch error
             # We have to be careful here, for example a thrown `MethodError()` will contain the called method and arguments.
             # which normally would be very useful for debugging, but we can't serialize it!
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index f4298c3735..d7592d5978 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -44,6 +44,7 @@ struct CachedMacroExpansion
     expansion_duration::UInt64
     has_pluto_hook_features::Bool
     did_mention_expansion_time::Bool
+    expansion_logs::Vector{Any}
 end
 const cell_expanded_exprs = Dict{UUID,CachedMacroExpansion}()
 
@@ -265,10 +266,10 @@ module CantReturnInPluto
     replace_returns_with_error_in_interpolation(ex) = ex
 end
 
-function try_macroexpand(mod::Module, notebook_id::UUID, cell_id::UUID, expr)
+function try_macroexpand(mod::Module, notebook_id::UUID, cell_id::UUID, expr; capture_stdout::Bool=true)
     # Remove the precvious cached expansion, so when we error somewhere before we update,
     # the old one won't linger around and get run accidentally.
-    delete!(cell_expanded_exprs, cell_id)
+    pop!(cell_expanded_exprs, cell_id, nothing)
 
     # Remove toplevel block, as that screws with the computer and everything
     expr_not_toplevel = if expr.head == :toplevel || expr.head == :block
@@ -278,9 +279,23 @@ function try_macroexpand(mod::Module, notebook_id::UUID, cell_id::UUID, expr)
         Expr(:block, expr)
     end
 
-    elapsed_ns = time_ns()
-    expanded_expr = macroexpand(mod, expr_not_toplevel)::Expr
-    elapsed_ns = time_ns() - elapsed_ns
+    logger = get!(() -> PlutoCellLogger(notebook_id, cell_id), pluto_cell_loggers, cell_id)
+    if logger.workspace_count < moduleworkspace_count[]
+        logger = pluto_cell_loggers[cell_id] = PlutoCellLogger(notebook_id, cell_id)
+    end
+
+    capture_logger = CaptureLogger(nothing, logger, Dict[])
+
+    expanded_expr, elapsed_ns = Logging.with_logger(capture_logger) do
+        with_io_to_logs(; enabled=capture_stdout, loglevel=stdout_log_level) do
+            elapsed_ns = time_ns()
+            expanded_expr = macroexpand(mod, expr_not_toplevel)::Expr
+            elapsed_ns = time_ns() - elapsed_ns
+            expanded_expr, elapsed_ns
+        end
+    end
+
+    logs = capture_logger.logs
 
     # Removes baked in references to the module this was macroexpanded in.
     # Fix for https://github.com/fonsp/Pluto.jl/issues/1112
@@ -300,7 +315,8 @@ function try_macroexpand(mod::Module, notebook_id::UUID, cell_id::UUID, expr)
         expr_to_save,
         elapsed_ns,
         has_pluto_hook_features,
-        did_mention_expansion_time
+        did_mention_expansion_time,
+        logs,
     )
 
     return (sanitize_expr(expr_to_save), expr_hash(expr_to_save))
@@ -504,8 +520,11 @@ function run_expression(
 
     old_currently_running_cell_id = currently_running_cell_id[]
     currently_running_cell_id[] = cell_id
-    logger = pluto_loggers[notebook_id]
-    logger.currently_running_cell_id[] = cell_id
+
+    logger = get!(() -> PlutoCellLogger(notebook_id, cell_id), pluto_cell_loggers, cell_id)
+    if logger.workspace_count < moduleworkspace_count[]
+        logger = pluto_cell_loggers[cell_id] = PlutoCellLogger(notebook_id, cell_id)
+    end
 
     # reset published objects
     cell_published_objects[cell_id] = Dict{String,Any}()
@@ -525,7 +544,7 @@ function run_expression(
     # .... But ideally we wouldn't re-macroexpand and store the error the first time (TODO-ish)
     if !haskey(cell_expanded_exprs, cell_id) || cell_expanded_exprs[cell_id].original_expr_hash != expr_hash(expr)
         try
-            try_macroexpand(m, notebook_id, cell_id, expr)
+            try_macroexpand(m, notebook_id, cell_id, expr; capture_stdout)
         catch e
             result = CapturedException(e, stacktrace(catch_backtrace()))
             cell_results[cell_id], cell_runtimes[cell_id] = (result, nothing)
@@ -538,6 +557,13 @@ function run_expression(
     original_expr = expr
     expr = expanded_cache.expanded_expr
 
+    # Re-play logs from expansion cache
+    for log in expanded_cache.expansion_logs
+        (level, msg, _module, group, id, file, line, kwargs) = log
+        Logging.handle_message(logger, level, msg, _module, group, id, file, line; kwargs...)
+    end
+    empty!(expanded_cache.expansion_logs)
+
     # We add the time it took to macroexpand to the time for the first call,
     # but we make sure we don't mention it on subsequent calls
     expansion_runtime = if expanded_cache.did_mention_expansion_time === false
@@ -547,7 +573,8 @@ function run_expression(
             expanded_cache.expanded_expr,
             expanded_cache.expansion_duration,
             expanded_cache.has_pluto_hook_features,
-            did_mention_expansion_time
+            did_mention_expansion_time,
+            expanded_cache.expansion_logs,
         )
         expanded_cache.expansion_duration
     else
@@ -859,8 +886,6 @@ function formatted_result_of(
 )::FormattedCellResult
     load_integrations_if_needed()
     currently_running_cell_id[] = cell_id
-    logger = pluto_loggers[notebook_id]
-    logger.currently_running_cell_id[] = cell_id
 
     extra_items = if showmore === nothing
         tree_display_extra_items[cell_id] = Dict{ObjectDimPair,Int64}()
@@ -879,15 +904,15 @@ function formatted_result_of(
     else
         ("", MIME"text/plain"())
     end
-    
+
     published_objects = get(cell_published_objects, cell_id, Dict{String,Any}())
-    
+
     for k in known_published_objects
         if haskey(published_objects, k)
             published_objects[k] = nothing
         end
     end
-    
+
     return (;
         output_formatted,
         errored,
@@ -2213,19 +2238,45 @@ const original_stderr = stderr
 
 const old_logger = Ref{Union{Logging.AbstractLogger,Nothing}}(nothing)
 
-struct PlutoLogger <: Logging.AbstractLogger
+struct PlutoCellLogger <: Logging.AbstractLogger
     stream # some packages expect this field to exist...
     log_channel::Channel{Any}
-    currently_running_cell_id::Ref{UUID}
+    cell_id::UUID
+    workspace_count::Int # Used to invalidate previous logs
+end
+function PlutoCellLogger(notebook_id, cell_id)
+    notebook_log_channel = pluto_log_channels[notebook_id]
+    PlutoCellLogger(nothing, notebook_log_channel, cell_id, moduleworkspace_count[])
+end
+
+struct CaptureLogger <: Logging.AbstractLogger
+    stream
+    logger::PlutoCellLogger
+    logs::Vector{Any}
+end
+
+Logging.shouldlog(cl::CaptureLogger, args...) = Logging.shouldlog(cl.logger, args...)
+Logging.min_enabled_level(::CaptureLogger) = min(Logging.Debug, stdout_log_level)
+Logging.catch_exceptions(::CaptureLogger) = Logging.catch_exceptions(cl.logger)
+function Logging.handle_message(pl::CaptureLogger, level, msg, _module, group, id, file, line; kwargs...)
+    push!(pl.logs, (level, msg, _module, group, id, file, line, kwargs))
 end
 
-const pluto_loggers = Dict{UUID,PlutoLogger}()
 
-function Logging.shouldlog(::PlutoLogger, level, _module, _...)
+const pluto_cell_loggers = Dict{UUID,PlutoCellLogger}() # One logger per cell
+const pluto_log_channels = Dict{UUID,Channel{Any}}() # One channel per notebook
+
+function Logging.shouldlog(logger::PlutoCellLogger, level, _module, _...)
     # Accept logs
+    # - Only if the logger is the latest for this cell using the increasing workspace_count tied to each logger
     # - From the user's workspace module
     # - Info level and above for other modules
     # - LogLevel(-1) because that's what ProgressLogging.jl uses for its messages
+    current_logger = pluto_cell_loggers[logger.cell_id]
+    if current_logger.workspace_count > logger.workspace_count
+        return false
+    end
+
     level = convert(Logging.LogLevel, level)
     (_module isa Module && is_pluto_workspace(_module)) ||
         level >= Logging.Info ||
@@ -2233,35 +2284,34 @@ function Logging.shouldlog(::PlutoLogger, level, _module, _...)
         level == stdout_log_level
 end
 
-Logging.min_enabled_level(::PlutoLogger) = min(Logging.Debug, stdout_log_level)
-Logging.catch_exceptions(::PlutoLogger) = false
-function Logging.handle_message(pl::PlutoLogger, level, msg, _module, group, id, file, line; kwargs...)
+Logging.min_enabled_level(::PlutoCellLogger) = min(Logging.Debug, stdout_log_level)
+Logging.catch_exceptions(::PlutoCellLogger) = false
+function Logging.handle_message(pl::PlutoCellLogger, level, msg, _module, group, id, file, line; kwargs...)
     # println("receiving msg from ", _module, " ", group, " ", id, " ", msg, " ", level, " ", line, " ", file)
     # println("with types: ", "_module: ", typeof(_module), ", ", "msg: ", typeof(msg), ", ", "group: ", typeof(group), ", ", "id: ", typeof(id), ", ", "file: ", typeof(file), ", ", "line: ", typeof(line), ", ", "kwargs: ", typeof(kwargs)) # thanks Copilot
 
     try
-        
+
         yield()
-        
+
         put!(pl.log_channel, Dict{String,Any}(
             "level" => string(level),
             "msg" => format_output_default(msg isa AbstractString ? Text(msg) : msg),
             "group" => string(group),
             "id" => string(id),
             "file" => string(file),
-            "cell_id" => pl.currently_running_cell_id[],
+            "cell_id" => pl.cell_id,
             "line" => line isa Union{Int32,Int64} ? line : nothing,
             "kwargs" => Tuple{String,Any}[(string(k), format_log_value(v)) for (k, v) in kwargs],
-            )
-        )
-        
+        ))
+
         yield()
-        
-        # Also print to console (disabled)
-        # Logging.handle_message(old_logger[], level, msg, _module, group, id, file, line; kwargs...)
+
     catch e
         println(original_stderr, "Failed to relay log from PlutoRunner")
         showerror(original_stderr, e, stacktrace(catch_backtrace()))
+
+        nothing
     end
 end
 
@@ -2274,7 +2324,7 @@ function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogL
         return f()
     end
     # Taken from https://github.com/JuliaDocs/IOCapture.jl/blob/master/src/IOCapture.jl with some modifications to make it log.
-    
+
     # Original implementation from Documenter.jl (MIT license)
     # Save the default output streams.
     default_stdout = stdout
@@ -2292,8 +2342,32 @@ function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogL
     # `String`. We need to use an asynchronous task to continously tranfer bytes from the
     # pipe to `output` in order to avoid the buffer filling up and stalling write() calls in
     # user code.
+    execution_done = Ref(false)
     output = IOBuffer()
-    buffer_redirect_task = @async write(output, pipe)
+    function send_output()
+        output_str = String(take!(output))
+        if !isempty(output_str)
+            Logging.@logmsg loglevel output_str
+        end
+    end
+
+    @async begin
+        pipe_reader = Base.pipe_reader(pipe)
+        try
+            while !eof(pipe_reader)
+                write(output, readavailable(pipe_reader))
+
+                # NOTE: we don't really have to wait for the end of execution to stream output logs
+                #       so maybe we should just enable it?
+                if execution_done[]
+                    send_output()
+                end
+            end
+            send_output()
+        catch err
+            @error "Failed to redirect stdout/stderr to logs"  exception=(err,catch_backtrace())
+        end
+    end
 
     # To make the `display` function work.
     redirect_display = TextDisplay(pe_stdout)
@@ -2311,33 +2385,22 @@ function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogL
             # This happens when the user calls `popdisplay()`, fine.
             # @warn "Pluto's display was already removed?" e
         end
+
+        execution_done[] = true
+
         # Restore the original output streams.
         redirect_stdout(default_stdout)
         redirect_stderr(default_stderr)
         close(pe_stdout)
         close(pe_stderr)
-        wait(buffer_redirect_task)
-    end
-
-
-    output = String(take!(output))
-    if !isempty(output)
-        Logging.@logmsg loglevel output
     end
 
     result
 end
 
 
-function setup_plutologger(notebook_id::UUID, log_channel::Channel{Any}; make_global::Bool=false)
-    logger = pluto_loggers[notebook_id] = 
-        PlutoLogger(nothing, log_channel, Ref{UUID}(uuid4()))
-    
-    if make_global
-        old_logger[] = Logging.global_logger()
-        Logging.global_logger(logger)
-    end
-    logger
+function setup_plutologger(notebook_id::UUID, log_channel::Channel{Any})
+    pluto_log_channels[notebook_id] = log_channel
 end
 
 end
diff --git a/test/Logging.jl b/test/Logging.jl
index 125f048f2f..4324f9d32c 100644
--- a/test/Logging.jl
+++ b/test/Logging.jl
@@ -31,6 +31,24 @@ using Pluto.WorkspaceManager: poll
             @info "even more logging"
         end
         """, # 11
+        
+        "t1 = @async sleep(3)", # 12
+        "!istaskfailed(t1) && !istaskdone(t1)", # 13
+        "t2 = @async run(`sleep 3`)", # 14
+        "!istaskfailed(t2) && !istaskdone(t2)", # 15
+        
+        """
+        macro hello()
+            a = rand()
+            @info a
+            nothing
+        end
+        """, # 16
+        
+        "@hello", # 17
+        
+        "123", # 18
+        
     ]))
     
     
@@ -61,6 +79,31 @@ using Pluto.WorkspaceManager: poll
             @test strip(log["msg"][1]) == "123"
             @test log["msg"][2] == MIME"text/plain"()
         end
+        
+        update_run!(🍭, notebook, notebook.cells[12:15])
+        update_run!(🍭, notebook, notebook.cells[[12,14]])
+        @test notebook.cells[13].output.body == "true"
+        Sys.iswindows() || @test notebook.cells[15].output.body == "true"
+        
+        update_run!(🍭, notebook, notebook.cells[16:18])
+        
+        @test isempty(notebook.cells[16].logs)
+        @test length(notebook.cells[17].logs) == 1
+        @test isempty(notebook.cells[18].logs)
+        
+        update_run!(🍭, notebook, notebook.cells[18])
+        update_run!(🍭, notebook, notebook.cells[17])
+        
+        @test isempty(notebook.cells[16].logs)
+        @test length(notebook.cells[17].logs) == 1
+        @test isempty(notebook.cells[18].logs)
+        
+        update_run!(🍭, notebook, notebook.cells[16])
+        
+        @test isempty(notebook.cells[16].logs)
+        @test length(notebook.cells[17].logs) == 1
+        @test isempty(notebook.cells[18].logs)
+        
     end
 
     @testset "Logging respects maxlog" begin
diff --git a/test/compiletimes.jl b/test/compiletimes.jl
index c1eef7d165..eeddc1d5f3 100644
--- a/test/compiletimes.jl
+++ b/test/compiletimes.jl
@@ -16,8 +16,7 @@ let
     channel = Channel{Any}(10)
     Pluto.PlutoRunner.setup_plutologger(
         test_notebook_id, 
-        channel; 
-        make_global=false
+        channel,
     )
 end
 @timeit TOUT "PlutoRunner.run_expression" @eval Pluto.PlutoRunner.run_expression(Foo, Expr(:toplevel, :(1 + 1)), test_notebook_id, uuid1(), nothing);

From b872d4e1a943cf875a6616f2cc6a1b64f18cec7e Mon Sep 17 00:00:00 2001
From: Alberto Mengali <disberd@gmail.com>
Date: Wed, 9 Nov 2022 15:43:26 +0100
Subject: [PATCH 492/821] Allow forcing SliderServer POST request using
 notebook metadata (#2362)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/common/SliderServerClient.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/common/SliderServerClient.js b/frontend/common/SliderServerClient.js
index d2ad32c7d5..49e64ffb19 100644
--- a/frontend/common/SliderServerClient.js
+++ b/frontend/common/SliderServerClient.js
@@ -66,7 +66,8 @@ export const slider_server_actions = ({ setStatePromise, launch_params, actions,
 
             let unpacked = null
             try {
-                const use_get = url.length + (packed.length * 4) / 3 + 20 < 8000
+                const force_post = get_current_state().metadata["sliderserver_force_post"] ?? false
+                const use_get = !force_post && url.length + (packed.length * 4) / 3 + 20 < 8000
 
                 const response = use_get
                     ? await fetch(url + (await base64url_arraybuffer(packed)), {

From ab418abc9b358679e1ed19a618f826f6153b0b87 Mon Sep 17 00:00:00 2001
From: Alberto Mengali <disberd@gmail.com>
Date: Wed, 9 Nov 2022 16:05:52 +0100
Subject: [PATCH 493/821] Print secret to console if main page requested
 without it (#2322)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Παναγιώτης Γεωργακόπουλος <pankgeorg@gmail.com>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 src/evaluation/Throttled.jl | 22 ++++++++++++++++++++++
 src/webserver/Static.jl     |  9 +++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/evaluation/Throttled.jl b/src/evaluation/Throttled.jl
index 7c99af546e..f0fa10352d 100644
--- a/src/evaluation/Throttled.jl
+++ b/src/evaluation/Throttled.jl
@@ -47,3 +47,25 @@ function throttled(f::Function, timeout::Real)
 
     return throttled_f, flush
 end
+
+
+"""
+    simple_leading_throttle(f, delay::Real)
+
+Return a function that when invoked, will only be triggered at most once
+during `timeout` seconds.
+The throttled function will run as much as it can, without ever
+going more than once per `wait` duration.
+
+Compared to [`throttled`](@ref), this simple function only implements [leading](https://css-tricks.com/debouncing-throttling-explained-examples/) throttling and accepts function with arbitrary number of positional and keyword arguments.
+"""
+function simple_leading_throttle(f, delay::Real)
+    last_time = 0.0
+    return function(args...;kwargs...)
+        now = time()
+        if now - last_time > delay
+            last_time = now
+            f(args...;kwargs...)
+        end
+    end
+end
\ No newline at end of file
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index f2ddf9950e..b3b0fd8112 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -142,6 +142,14 @@ function scoped_router(base_url, base_router)
     return router
 end
 
+# Function to print the url with secret on the Julia CLI when a request comes to the server without the secret. Executes at most once every 5 seconds
+print_secret_throttled = simple_leading_throttle(5) do session::ServerSession, request::HTTP.Request
+    host = HTTP.header(request, "Host")
+    target = request.target
+    url = Text(string(HTTP.URI(HTTP.URI("http://$host/"); query=Dict("secret" => session.secret))))
+    @info("No longer authenticated? Visit this URL to continue:", url)
+end
+
 function http_router_for(session::ServerSession)
     router = HTTP.Router(default_404)
     security = session.options.security
@@ -170,6 +178,7 @@ function http_router_for(session::ServerSession)
                 end
                 response
             else
+                print_secret_throttled(session, request)
                 error_response(403, "Not yet authenticated", "<b>Open the link that was printed in the terminal where you launched Pluto.</b> It includes a <em>secret</em>, which is needed to access this server.<br><br>If you are running the server yourself and want to change this configuration, have a look at the keyword arguments to <em>Pluto.run</em>. <br><br>Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a> if you did not expect it!")
             end
         end

From f8855d9e301602b427f826a00d23c535dd5609a1 Mon Sep 17 00:00:00 2001
From: Alberto Mengali <disberd@gmail.com>
Date: Thu, 10 Nov 2022 09:44:49 +0100
Subject: [PATCH 494/821] Allow copying vars from Memoize.jl to new workspace
 (#2328)

Co-authored-by: Paul Berg <9824244+Pangoraw@users.noreply.github.com>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 src/runner/PlutoRunner.jl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index d7592d5978..3402eca934 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -659,6 +659,8 @@ end
 # DELETING GLOBALS
 ###
 
+# This function checks whether the symbol provided to it represents a name of a memoized_cache variable from Memoize.jl, see https://github.com/fonsp/Pluto.jl/issues/2305 for more details
+is_memoized_cache(s::Symbol) = startswith(string(s), "##") && endswith(string(s), "_memoized_cache")
 
 function do_reimports(workspace_name, module_imports_to_move::Set{Expr})
     for expr in module_imports_to_move
@@ -725,7 +727,7 @@ function move_vars(
             end
         else
             # var will not be redefined in the new workspace, move it over
-            if !(symbol == :eval || symbol == :include || string(symbol)[1] == '#' || startswith(string(symbol), "workspace#"))
+            if !(symbol == :eval || symbol == :include || (string(symbol)[1] == '#' && !is_memoized_cache(symbol)) || startswith(string(symbol), "workspace#"))
                 try
                     getfield(old_workspace, symbol)
 

From a564d91d19d8d0b828c5b52c5a5ddf4eac4160d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Thu, 10 Nov 2022 14:37:53 +0200
Subject: [PATCH 495/821] Allow environment to control custom connects to
 backend (#2214)

---
 frontend/common/Environment.js                | 13 ++++++
 frontend/components/Editor.js                 | 36 +++------------
 .../components/Editor/LaunchBackendButton.js  | 45 +++++++++++++++++++
 frontend/components/welcome/Welcome.js        |  3 +-
 frontend/editor.html                          |  1 -
 frontend/editor.js                            | 30 ++++++++++---
 src/evaluation/Run.jl                         | 13 ++++--
 src/notebook/Events.jl                        | 13 ++++--
 src/notebook/Export.jl                        |  2 +-
 9 files changed, 112 insertions(+), 44 deletions(-)
 create mode 100644 frontend/components/Editor/LaunchBackendButton.js

diff --git a/frontend/common/Environment.js b/frontend/common/Environment.js
index c398a4ef9e..81447c40d0 100644
--- a/frontend/common/Environment.js
+++ b/frontend/common/Environment.js
@@ -15,4 +15,17 @@ function environment({
     }
 }
 
+export const get_environment = async (client) => {
+    let environment // Draal this is for you
+    // @ts-ignore
+    if (!window.pluto_injected_environment) {
+        const { default: env } = await import(client.session_options.server.injected_javascript_data_url)
+        environment = env
+    } else {
+        // @ts-ignore
+        environment = window.pluto_injected_environment.environment
+    }
+    return environment
+}
+
 export default environment
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index f144b01577..d4f809cda6 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -23,9 +23,8 @@ import { Popup } from "./Popup.js"
 import { slice_utf8, length_utf8 } from "../common/UnicodeTools.js"
 import { has_ctrl_or_cmd_pressed, ctrl_or_cmd_name, is_mac_keyboard, in_textarea_or_input } from "../common/KeyboardShortcuts.js"
 import { PlutoActionsContext, PlutoBondsContext, PlutoJSInitializingContext, SetWithEmptyCallback } from "../common/PlutoContext.js"
-import { start_binder, BackendLaunchPhase, count_stat } from "../common/Binder.js"
+import { BackendLaunchPhase, count_stat } from "../common/Binder.js"
 import { setup_mathjax } from "../common/SetupMathJax.js"
-import { BinderButton, RunLocalButton } from "./EditOrRunButton.js"
 import { slider_server_actions, nothing_actions } from "../common/SliderServerClient.js"
 import { ProgressBar } from "./ProgressBar.js"
 import { NonCellOutput } from "./NonCellOutput.js"
@@ -33,8 +32,9 @@ import { IsolatedCell } from "./Cell.js"
 import { RawHTMLContainer } from "./CellOutput.js"
 import { RecordingPlaybackUI, RecordingUI } from "./RecordingUI.js"
 import { HijackExternalLinksToOpenInNewTab } from "./HackySideStuff/HijackExternalLinksToOpenInNewTab.js"
-import { start_local } from "../common/RunLocal.js"
 import { FrontMatterInput } from "./FrontmatterInput.js"
+import { EditorLaunchBackendButton } from "./Editor/LaunchBackendButton.js"
+import { get_environment } from "../common/Environment.js"
 
 // This is imported asynchronously - uncomment for development
 // import environment from "../common/Environment.js"
@@ -72,7 +72,7 @@ const ProcessStatus = {
 }
 
 /**
- * Map of status => Bool. In order of decreasing prioirty.
+ * Map of status => Bool. In order of decreasing priority.
  */
 const statusmap = (/** @type {EditorState} */ state, /** @type {LaunchParameters} */ launch_params) => ({
     disconnected: !(state.connected || state.initializing || state.static_preview),
@@ -773,7 +773,7 @@ patch: ${JSON.stringify(
             // nasty
             Object.assign(this.client, client)
             try {
-                const { default: environment } = await import(this.client.session_options.server.injected_javascript_data_url)
+                const environment = await get_environment(client)
                 const { custom_editor_header_component, custom_non_cell_output } = environment({ client, editor: this, imports: { preact } })
                 this.setState({
                     extended_components: {
@@ -1471,31 +1471,7 @@ patch: ${JSON.stringify(
                                 })
                             )}
                     />
-                    
-                    ${
-                        status.offer_local
-                            ? html`<${RunLocalButton}
-                                  start_local=${() =>
-                                      start_local({
-                                          setStatePromise: this.setStatePromise,
-                                          connect: this.connect,
-                                          launch_params: launch_params,
-                                      })}
-                              />`
-                            : status.offer_binder
-                            ? html`<${BinderButton}
-                                  offer_binder=${status.offer_binder}
-                                  start_binder=${() =>
-                                      start_binder({
-                                          setStatePromise: this.setStatePromise,
-                                          connect: this.connect,
-                                          launch_params: launch_params,
-                                      })}
-                                  notebookfile=${launch_params.notebookfile == null ? null : new URL(launch_params.notebookfile, window.location.href).href}
-                                  notebook=${notebook}
-                              />`
-                            : null
-                    }
+                    <${EditorLaunchBackendButton} editor=${this} launch_params=${launch_params} status=${status} />
                     <${FrontMatterInput} 
                         remote_frontmatter=${notebook.metadata?.frontmatter} 
                         set_remote_frontmatter=${(newval) =>
diff --git a/frontend/components/Editor/LaunchBackendButton.js b/frontend/components/Editor/LaunchBackendButton.js
new file mode 100644
index 0000000000..7d3023a02a
--- /dev/null
+++ b/frontend/components/Editor/LaunchBackendButton.js
@@ -0,0 +1,45 @@
+import { html, useMemo, useEffect } from "../../imports/Preact.js"
+import * as preact from "../../imports/Preact.js"
+import { RunLocalButton, BinderButton } from "../EditOrRunButton.js"
+import { start_local } from "../../common/RunLocal.js"
+import { BackendLaunchPhase, start_binder } from "../../common/Binder.js"
+import immer, { applyPatches, produceWithPatches } from "../../imports/immer.js"
+
+export const EditorLaunchBackendButton = ({ editor, launch_params, status }) => {
+    try {
+        const EnvRun = useMemo(
+            // @ts-ignore
+            () => window?.pluto_injected_environment?.environment?.({ client: editor.client, editor, imports: { immer, preact } })?.custom_run_or_edit,
+            [editor.client, editor]
+        )
+        // @ts-ignore
+        if (window?.pluto_injected_environment?.provides_backend) {
+            // @ts-ignore
+            return html`<${EnvRun} editor=${editor} backend_phases=${BackendLaunchPhase} launch_params=${launch_params} />`
+            // Don't allow a misconfigured environment to stop offering other backends
+        }
+    } catch (e) {}
+    if (status.offer_local)
+        return html`<${RunLocalButton}
+            start_local=${() =>
+                start_local({
+                    setStatePromise: editor.setStatePromise,
+                    connect: editor.connect,
+                    launch_params: launch_params,
+                })}
+        />`
+
+    if (status.offer_binder)
+        return html`<${BinderButton}
+            offer_binder=${status.offer_binder}
+            start_binder=${() =>
+                start_binder({
+                    setStatePromise: editor.setStatePromise,
+                    connect: editor.connect,
+                    launch_params: launch_params,
+                })}
+            notebookfile=${launch_params.notebookfile == null ? null : new URL(launch_params.notebookfile, window.location.href).href}
+        />`
+
+    return null
+}
diff --git a/frontend/components/welcome/Welcome.js b/frontend/components/welcome/Welcome.js
index de8a3b3c5a..6b74400aff 100644
--- a/frontend/components/welcome/Welcome.js
+++ b/frontend/components/welcome/Welcome.js
@@ -7,6 +7,7 @@ import { new_update_message } from "../../common/NewUpdateMessage.js"
 import { Open } from "./Open.js"
 import { Recent } from "./Recent.js"
 import { Featured } from "./Featured.js"
+import { get_environment } from "../../common/Environment.js"
 
 // This is imported asynchronously - uncomment for development
 // import environment from "../../common/Environment.js"
@@ -56,7 +57,7 @@ export const Welcome = () => {
             set_connected(true)
 
             try {
-                const { default: environment } = await import(client.session_options.server.injected_javascript_data_url)
+                const environment = await get_environment(client)
                 const { custom_recent, custom_filepicker, show_samples = true } = environment({ client, editor: this, imports: { preact } })
                 set_extended_components((old) => ({
                     ...old,
diff --git a/frontend/editor.html b/frontend/editor.html
index 7d3b795313..ddfc9e7915 100644
--- a/frontend/editor.html
+++ b/frontend/editor.html
@@ -40,7 +40,6 @@
     <link rel="stylesheet" href="./highlightjs.css" type="text/css">
 
     <meta name="pluto-insertion-spot-parameters">
-
     <script src="./editor.js" type="module" defer></script>
     <script src="./warn_old_browsers.js"></script>
 
diff --git a/frontend/editor.js b/frontend/editor.js
index 2e90f5c0dd..f13806e96b 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -103,6 +103,26 @@ export const empty_notebook_state = ({ notebook_id }) => ({
  */
 const without_path_entries = (state) => ({ ...state, path: default_path, shortpath: "" })
 
+/**
+ * Fetches the statefile (usually a async resource) in launch_params.statefile
+ * and makes it available for consuming by `pluto-editor`
+ * To add custom logic instead, see use Environment.js
+ *
+ * @param {import("./components/Editor.js").LaunchParameters} launch_params
+ * @param {{current: import("./components/Editor.js").EditorState}} initial_notebook_state_ref
+ * @param {Function} set_ready_for_editor
+ * @param {Function} set_statefile_download_progress
+ */
+
+const get_statefile =
+    // @ts-ignore
+    window?.pluto_injected_environment?.custom_get_statefile?.(read_Uint8Array_with_progress, without_path_entries, unpack) ??
+    (async (launch_params, set_statefile_download_progress) => {
+        const r = await fetch(new Request(launch_params.statefile, { integrity: launch_params.statefile_integrity ?? undefined }))
+        const data = await read_Uint8Array_with_progress(r, set_statefile_download_progress)
+        const state = without_path_entries(unpack(data))
+        return state
+    })
 /**
  *
  * @param {{
@@ -120,14 +140,11 @@ const EditorLoader = ({ launch_params }) => {
 
     useEffect(() => {
         if (!ready_for_editor && static_preview) {
-            ;(async () => {
-                const r = await fetch(new Request(statefile, { integrity: statefile_integrity ?? undefined }))
-                const data = await read_Uint8Array_with_progress(r, set_statefile_download_progress)
-                const state = without_path_entries(unpack(data))
+            get_statefile(launch_params, set_statefile_download_progress).then((state) => {
                 console.log({ state })
                 initial_notebook_state_ref.current = state
                 set_ready_for_editor(true)
-            })()
+            })
         }
     }, [ready_for_editor, static_preview, statefile])
 
@@ -162,6 +179,8 @@ const EditorLoader = ({ launch_params }) => {
 <pluto-editor notebook_id="fcc1b498-a141-11ec-342a-593db1016648"></pluto-editor>
 
 <pluto-editor notebook_id="21ebc942-a1ed-11ec-2505-7b242b18daf3"></pluto-editor>
+
+TODO: Make this self-contained (currently depends on various stuff being on window.*, e.g. observablehq library, lodash etc)
 */
 
 class PlutoEditorComponent extends HTMLElement {
@@ -170,6 +189,7 @@ class PlutoEditorComponent extends HTMLElement {
     }
 
     connectedCallback() {
+        /** Web components only support text attributes. We deserialize into js here */
         const new_launch_params = Object.fromEntries(Object.entries(launch_params).map(([k, v]) => [k, from_attribute(this, k) ?? v]))
         console.log("Launch parameters: ", new_launch_params)
 
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 45304b68b2..5f1c8e257c 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -18,7 +18,7 @@ function run_reactive!(
     user_requested_run::Bool = true,
     bond_value_pairs=zip(Symbol[],Any[]),
 )::TopologicalOrder
-    withtoken(notebook.executetoken) do
+    topological_order = withtoken(notebook.executetoken) do
         run_reactive_core!(
             session,
             notebook,
@@ -31,6 +31,8 @@ function run_reactive!(
             bond_value_pairs,
         )
     end
+    try_event_call(session, NotebookExecutionDoneEvent(notebook, user_requested_run))
+	return topological_order
 end
 
 """
@@ -406,7 +408,7 @@ function update_save_run!(
 	end
 
 	maybe_async(run_async) do
-        withtoken(notebook.executetoken) do
+        topological_order = withtoken(notebook.executetoken) do
             sync_nbpkg(session, notebook, old, new; save=(save && !session.options.server.disable_writing_notebook_files), take_token=false)
             if !(isempty(to_run_online) && session.options.evaluation.lazy_workspace_creation) && will_run_code(notebook)
                 # not async because that would be double async
@@ -414,7 +416,12 @@ function update_save_run!(
                 # run_reactive_async!(session, notebook, old, new, to_run_online; deletion_hook=deletion_hook, run_async=false, kwargs...)
             end
         end
-	end
+        try_event_call(
+            session,
+            NotebookExecutionDoneEvent(notebook, get(kwargs, :user_requested_run, true))
+        )
+		topological_order
+    end
 end
 
 update_save_run!(session::ServerSession, notebook::Notebook, cell::Cell; kwargs...) = update_save_run!(session, notebook, [cell]; kwargs...)
diff --git a/src/notebook/Events.jl b/src/notebook/Events.jl
index f4ca537373..748fbcaa0e 100644
--- a/src/notebook/Events.jl
+++ b/src/notebook/Events.jl
@@ -40,7 +40,8 @@ function try_event_call(session, event::PlutoEvent)
     return try
         session.options.server.on_event(event)
     catch e
-        @warn "Couldn't run event listener" event exception=(e, catch_backtrace())
+        # Do not print all the event; it's too big!
+        @warn "Couldn't run event listener" event_type=typeof(event) exception=(e, catch_backtrace())
         nothing
     end
 end
@@ -83,15 +84,21 @@ FileEditEvent(notebook::Notebook) = begin
     FileEditEvent(notebook, file_contents, notebook.path)
 end
 
-# Triggered when we open a new notebook
+# Triggered when we create a new notebook
 struct NewNotebookEvent <: PlutoEvent
 end
 
-# Triggered when a user opens a notebook
+# Triggered when we open any notebook
 struct OpenNotebookEvent <: PlutoEvent
     notebook::Notebook
 end
 
+# Triggered when Pluto completes an evaluation loop
+struct NotebookExecutionDoneEvent <: PlutoEvent
+    notebook::Notebook
+    user_requested_run::Bool
+end
+
 # This will be fired ONLY if URL params don't match anything else.
 # Useful if you want to create a file in a custom way,
 # before opening the notebook
diff --git a/src/notebook/Export.jl b/src/notebook/Export.jl
index 3c0f56aac6..434d4da49f 100644
--- a/src/notebook/Export.jl
+++ b/src/notebook/Export.jl
@@ -64,7 +64,7 @@ function generate_html(;
         preamble_html_js::AbstractString="undefined",
         notebook_id_js::AbstractString="undefined", 
         isolated_cell_ids_js::AbstractString="undefined",
-        
+
         header_html::AbstractString="",
     )::String
 

From bb0d01279506c7e4751a558be1f8449b4193581e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 10 Nov 2022 13:44:19 +0100
Subject: [PATCH 496/821] =?UTF-8?q?=F0=9F=90=8C=20Fix=20binder=20button=20?=
 =?UTF-8?q?after=20#2214?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Editor/LaunchBackendButton.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/components/Editor/LaunchBackendButton.js b/frontend/components/Editor/LaunchBackendButton.js
index 7d3023a02a..038870b695 100644
--- a/frontend/components/Editor/LaunchBackendButton.js
+++ b/frontend/components/Editor/LaunchBackendButton.js
@@ -39,6 +39,7 @@ export const EditorLaunchBackendButton = ({ editor, launch_params, status }) =>
                     launch_params: launch_params,
                 })}
             notebookfile=${launch_params.notebookfile == null ? null : new URL(launch_params.notebookfile, window.location.href).href}
+            notebook=${editor.state.notebook}
         />`
 
     return null

From 63d4ec4982033e173f20d157ac067db889fb78db Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 10 Nov 2022 15:25:09 +0100
Subject: [PATCH 497/821] =?UTF-8?q?=F0=9F=AA=B2=20Fix=20#2346?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Cell.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 5cb8ae4d6e..f8104971ba 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -115,8 +115,9 @@ export const Cell = ({
 }) => {
     const { show_logs, disabled: running_disabled, skip_as_script } = metadata
     let pluto_actions = useContext(PlutoActionsContext)
-    const on_update_doc_query = pluto_actions.set_doc_query
-    const on_focus_neighbor = pluto_actions.focus_on_neighbor
+    // useCallback because pluto_actions.set_doc_query can change value when you go from viewing a static document to connecting (to binder)
+    const on_update_doc_query = useCallback((...args) => pluto_actions.set_doc_query(...args), [pluto_actions])
+    const on_focus_neighbor = useCallback((...args) => pluto_actions.focus_on_neighbor(...args), [pluto_actions])
     const on_change = useCallback((val) => pluto_actions.set_local_cell(cell_id, val), [cell_id, pluto_actions])
     const variables = useMemo(() => Object.keys(cell_dependencies?.downstream_cells_map ?? {}), [cell_dependencies])
 

From 7563c741623b56a020afc4a2cb655a16aac0a891 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 10 Nov 2022 15:25:22 +0100
Subject: [PATCH 498/821] css tweak

---
 frontend/welcome.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/welcome.css b/frontend/welcome.css
index 8b588eeef6..891ab44c37 100644
--- a/frontend/welcome.css
+++ b/frontend/welcome.css
@@ -113,8 +113,10 @@ section {
 
 section > div {
     margin: 1rem 1rem;
-    max-width: 614px; /* margin: auto; */
+    max-width: 614px;
+    /* margin: auto; */
     flex: 1 1 auto;
+    min-width: 0;
 }
 
 .pluto-logo {

From 2aa7f1dab9cf3acb7e4c7fe784758bbaa06cf1da Mon Sep 17 00:00:00 2001
From: kcin96 <26337751+kcin96@users.noreply.github.com>
Date: Mon, 14 Nov 2022 08:17:24 +0000
Subject: [PATCH 499/821] Add case for handling splat assignments. (#2365)

* Add case for handling splat assignments.

* Add tests for splat variables and assignments

* Add tuple destructuring as function argument

Co-authored-by: Nicholas Ting Yik Ming <nicholasting@Nicholass-MacBook-Pro.local>
Co-authored-by: Paul Berg <paul@plutojl.org>
---
 src/analysis/ExpressionExplorer.jl |  4 ++++
 test/ExpressionExplorer.jl         | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 972a62bdac..500dbb8aef 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -148,6 +148,10 @@ function get_assignees(ex::Expr)::FunctionName
         get_assignees(ex.args[1])
     elseif ex.head == :ref || ex.head == :(.)
         Symbol[]
+    elseif ex.head == :...
+        # Handles splat assignments. e.g. _, y... = 1:5
+        args = ex.args
+        union!(Symbol[], get_assignees.(args)...)
     else
         @warn "unknown use of `=`. Assignee is unrecognised." ex
         Symbol[]
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index 55acb8aa33..627f404014 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -154,7 +154,7 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(:(a[b,c,:] = d), [:a, :b, :c, :d, :(:)], [], [], [])
         @test testee(:(a.b = c), [:a, :c], [], [], [])
         @test testee(:(f(a, b=c, d=e; f=g)), [:a, :c, :e, :g], [], [:f], [])
-        
+
         @test testee(:(a += 1), [:a], [:a], [:+], [])
         @test testee(:(a >>>= 1), [:a], [:a], [:>>>], [])
         @test testee(:(a ⊻= 1), [:a], [:a], [:⊻], [])
@@ -200,6 +200,9 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(quote
             (a[i], b.r) = (c.d, 2)
         end, [:a, :b, :i, :c], [], [], [])
+        @test testee(quote
+            a, b... = 0:5
+        end, [],[:a, :b], [[:(:)]], [])
         @test testee(quote (; a, b) = x end, [:x], [:a, :b], [], [])
         @test testee(quote a = (b, c) end, [:b, :c], [:a], [], [])
 
@@ -310,6 +313,12 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(:(f(x, y=a + 1) = x * y * z), [], [], [], [
             :f => ([:z, :a], [], [:*, :+], [])
         ])
+        @test testee(:(f(x, y...) = y),[],[],[],[
+            :f => ([], [], [], [])
+        ])
+        @test testee(:(f((x, y...), z) = y),[],[],[],[
+            :f => ([], [], [], [])
+        ])
         @test testee(:(begin f() = 1; f end), [], [], [], [
             :f => ([], [], [], [])
         ])
@@ -372,6 +381,8 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(:(funcs[i](b)), [:funcs, :i, :b], [], [], [])
         @test testee(:(f(a)(b)), [:a, :b], [], [:f], [])
         @test testee(:(f(a).b()), [:a], [], [:f], [])
+        @test testee(:(f(a...)),[:a],[],[:f],[])
+        @test testee(:(f(a, b...)),[:a, :b],[],[:f],[])
 
         @test testee(:(a.b(c)), [:a, :c], [], [[:a,:b]], [])
         @test testee(:(a.b.c(d)), [:a, :d], [], [[:a,:b,:c]], [])

From 6ccefb8e4eb431449f4c99daeaab4f4df3004fad Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 14 Nov 2022 18:05:23 +0100
Subject: [PATCH 500/821] =?UTF-8?q?=F0=9F=A7=B9=20cleanup=20frontend=20tes?=
 =?UTF-8?q?ts=20(#2369)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/frontend/__tests__/autocomplete_test.js  |  33 +-
 .../{bond_rerun_test.js => bonds.js}          |  27 +-
 .../__tests__/import_notebook_test.js         |  32 +-
 test/frontend/__tests__/javascript_api.js     | 314 ++++++++----------
 test/frontend/__tests__/new_notebook_test.js  |  25 +-
 test/frontend/__tests__/paste_test.disabled   |   5 +-
 test/frontend/__tests__/slide_controls.js     |  35 +-
 test/frontend/helpers/common.js               |  10 +-
 test/frontend/helpers/pluto.js                |  62 +++-
 9 files changed, 259 insertions(+), 284 deletions(-)
 rename test/frontend/__tests__/{bond_rerun_test.js => bonds.js} (77%)

diff --git a/test/frontend/__tests__/autocomplete_test.js b/test/frontend/__tests__/autocomplete_test.js
index c765f6db60..b44a5b4a0f 100644
--- a/test/frontend/__tests__/autocomplete_test.js
+++ b/test/frontend/__tests__/autocomplete_test.js
@@ -1,6 +1,16 @@
 import puppeteer from "puppeteer"
-import { lastElement, saveScreenshot, getTestScreenshotPath, setupPage } from "../helpers/common"
-import { getCellIds, importNotebook, waitForCellOutput, getPlutoUrl, prewarmPluto, writeSingleLineInPlutoInput, waitForNoUpdateOngoing } from "../helpers/pluto"
+import { lastElement, saveScreenshot, getTestScreenshotPath, createPage } from "../helpers/common"
+import {
+    getCellIds,
+    importNotebook,
+    waitForCellOutput,
+    getPlutoUrl,
+    prewarmPluto,
+    writeSingleLineInPlutoInput,
+    waitForNoUpdateOngoing,
+    shutdownCurrentNotebook,
+    setupPlutoBrowser,
+} from "../helpers/pluto"
 
 describe("PlutoAutocomplete", () => {
     /**
@@ -13,26 +23,15 @@ describe("PlutoAutocomplete", () => {
     /** @type {puppeteer.Page} */
     let page = null
     beforeAll(async () => {
-        browser = await puppeteer.launch({
-            headless: process.env.HEADLESS !== "false",
-            args: ["--no-sandbox", "--disable-setuid-sandbox"],
-            devtools: false,
-        })
-
-        let page = await browser.newPage()
-        setupPage(page)
-        await prewarmPluto(browser, page)
-        await page.close()
+        browser = await setupPlutoBrowser()
     })
     beforeEach(async () => {
-        page = await browser.newPage()
-        setupPage(page)
+        page = await createPage(browser)
         await page.goto(getPlutoUrl(), { waitUntil: "networkidle0" })
     })
     afterEach(async () => {
-        await saveScreenshot(page, getTestScreenshotPath())
-        // @ts-ignore
-        await page.evaluate(() => window.shutdownNotebook?.())
+        await saveScreenshot(page)
+        await shutdownCurrentNotebook(page)
         await page.close()
         page = null
     })
diff --git a/test/frontend/__tests__/bond_rerun_test.js b/test/frontend/__tests__/bonds.js
similarity index 77%
rename from test/frontend/__tests__/bond_rerun_test.js
rename to test/frontend/__tests__/bonds.js
index a6aa215b87..717e88b924 100644
--- a/test/frontend/__tests__/bond_rerun_test.js
+++ b/test/frontend/__tests__/bonds.js
@@ -1,6 +1,6 @@
 import puppeteer from "puppeteer"
-import { saveScreenshot, getTestScreenshotPath, setupPage, paste } from "../helpers/common"
-import { createNewNotebook, getPlutoUrl, prewarmPluto, waitForNoUpdateOngoing } from "../helpers/pluto"
+import { saveScreenshot, createPage, paste } from "../helpers/common"
+import { createNewNotebook, getPlutoUrl, prewarmPluto, setupPlutoBrowser, shutdownCurrentNotebook, waitForNoUpdateOngoing } from "../helpers/pluto"
 
 // https://github.com/fonsp/Pluto.jl/issues/928
 describe("Bonds should run once when refreshing page", () => {
@@ -14,28 +14,15 @@ describe("Bonds should run once when refreshing page", () => {
     /** @type {puppeteer.Page} */
     let page = null
     beforeAll(async () => {
-        browser = await puppeteer.launch({
-            headless: process.env.HEADLESS !== "false",
-            args: ["--no-sandbox", "--disable-setuid-sandbox"],
-            devtools: false,
-        })
-
-        let page = await browser.newPage()
-        setupPage(page)
-        await prewarmPluto(browser, page)
-        await page.close()
+        browser = await setupPlutoBrowser()
     })
     beforeEach(async () => {
-        page = await browser.newPage()
-        setupPage(page)
+        page = await createPage(browser)
         await page.goto(getPlutoUrl(), { waitUntil: "networkidle0" })
-        await createNewNotebook(page)
-        await page.waitForSelector("pluto-input", { visible: true })
     })
     afterEach(async () => {
-        await saveScreenshot(page, getTestScreenshotPath())
-        // @ts-ignore
-        await page.evaluate(() => window.shutdownNotebook?.())
+        await saveScreenshot(page)
+        await shutdownCurrentNotebook(page)
         await page.close()
         page = null
     })
@@ -45,6 +32,8 @@ describe("Bonds should run once when refreshing page", () => {
     })
 
     it("should not rerun bond values when refreshing page", async () => {
+        await createNewNotebook(page)
+
         await paste(
             page,
             `
diff --git a/test/frontend/__tests__/import_notebook_test.js b/test/frontend/__tests__/import_notebook_test.js
index c293bd91fa..591a7bb697 100644
--- a/test/frontend/__tests__/import_notebook_test.js
+++ b/test/frontend/__tests__/import_notebook_test.js
@@ -1,6 +1,15 @@
 import puppeteer from "puppeteer"
-import { lastElement, saveScreenshot, getTestScreenshotPath, setupPage } from "../helpers/common"
-import { getCellIds, waitForCellOutput, importNotebook, getPlutoUrl, prewarmPluto, writeSingleLineInPlutoInput } from "../helpers/pluto"
+import { lastElement, saveScreenshot, createPage } from "../helpers/common"
+import {
+    getCellIds,
+    waitForCellOutput,
+    importNotebook,
+    getPlutoUrl,
+    prewarmPluto,
+    writeSingleLineInPlutoInput,
+    shutdownCurrentNotebook,
+    setupPlutoBrowser,
+} from "../helpers/pluto"
 
 describe("PlutoImportNotebook", () => {
     /**
@@ -13,26 +22,15 @@ describe("PlutoImportNotebook", () => {
     /** @type {puppeteer.Page} */
     let page = null
     beforeAll(async () => {
-        browser = await puppeteer.launch({
-            headless: process.env.HEADLESS !== "false",
-            args: ["--no-sandbox", "--disable-setuid-sandbox"],
-            devtools: false,
-        })
-
-        let page = await browser.newPage()
-        setupPage(page)
-        await prewarmPluto(browser, page)
-        await page.close()
+        browser = await setupPlutoBrowser()
     })
     beforeEach(async () => {
-        page = await browser.newPage()
-        setupPage(page)
+        page = await createPage(browser)
         await page.goto(getPlutoUrl(), { waitUntil: "networkidle0" })
     })
     afterEach(async () => {
-        await saveScreenshot(page, getTestScreenshotPath())
-        // @ts-ignore
-        await page.evaluate(() => window.shutdownNotebook?.())
+        await saveScreenshot(page)
+        await shutdownCurrentNotebook(page)
         await page.close()
         page = null
     })
diff --git a/test/frontend/__tests__/javascript_api.js b/test/frontend/__tests__/javascript_api.js
index c60a6fae9c..a555ec0d19 100644
--- a/test/frontend/__tests__/javascript_api.js
+++ b/test/frontend/__tests__/javascript_api.js
@@ -1,148 +1,117 @@
-import puppeteer from "puppeteer";
+import puppeteer from "puppeteer"
+import { waitForContent, lastElement, saveScreenshot, getTestScreenshotPath, waitForContentToBecome, createPage, paste, countCells } from "../helpers/common"
 import {
-  waitForContent,
-  lastElement,
-  saveScreenshot,
-  getTestScreenshotPath,
-  waitForContentToBecome,
-  setupPage,
-  paste,
-  countCells,
-} from "../helpers/common";
-import {
-  createNewNotebook,
-  getCellIds,
-  waitForCellOutput,
-  waitForNoUpdateOngoing,
-  getPlutoUrl,
-  prewarmPluto,
-  waitForCellOutputToChange,
-  keyboardPressInPlutoInput,
-  writeSingleLineInPlutoInput,
-  manuallyEnterCells,
-} from "../helpers/pluto";
+    createNewNotebook,
+    getCellIds,
+    waitForCellOutput,
+    waitForNoUpdateOngoing,
+    getPlutoUrl,
+    prewarmPluto,
+    waitForCellOutputToChange,
+    keyboardPressInPlutoInput,
+    writeSingleLineInPlutoInput,
+    manuallyEnterCells,
+    shutdownCurrentNotebook,
+    setupPlutoBrowser,
+} from "../helpers/pluto"
 
 describe("JavaScript API", () => {
-  /**
-   * Launch a shared browser instance for all tests.
-   * I don't use jest-puppeteer because it takes away a lot of control and works buggy for me,
-   * so I need to manually create the shared browser.
-   * @type {puppeteer.Browser}
-   */
-  let browser = null;
-  /** @type {puppeteer.Page} */
-  let page = null;
-  beforeAll(async () => {
-    browser = await puppeteer.launch({
-      headless: process.env.HEADLESS !== "false",
-      args: ["--no-sandbox", "--disable-setuid-sandbox"],
-      devtools: false,
-    });
-
-    let page = await browser.newPage();
-    setupPage(page);
-    await prewarmPluto(browser, page);
-    await page.close();
-  });
-  beforeEach(async () => {
-    page = await browser.newPage();
-    setupPage(page);
-    await page.goto(getPlutoUrl(), { waitUntil: "networkidle0" });
-    await createNewNotebook(page);
-    await page.waitForSelector("pluto-input", { visible: true });
-  });
-  afterEach(async () => {
-    await saveScreenshot(page, getTestScreenshotPath());
-    // @ts-ignore
-    await page.evaluate(() => window.shutdownNotebook?.());
-    await page.close();
-    page = null;
-  });
-  afterAll(async () => {
-    await browser.close();
-    browser = null;
-  });
+    /**
+     * Launch a shared browser instance for all tests.
+     * I don't use jest-puppeteer because it takes away a lot of control and works buggy for me,
+     * so I need to manually create the shared browser.
+     * @type {puppeteer.Browser}
+     */
+    let browser = null
+    /** @type {puppeteer.Page} */
+    let page = null
+    beforeAll(async () => {
+        browser = await setupPlutoBrowser()
+    })
+    beforeEach(async () => {
+        page = await createPage(browser)
+        await page.goto(getPlutoUrl(), { waitUntil: "networkidle0" })
+        await createNewNotebook(page)
+    })
+    afterEach(async () => {
+        await saveScreenshot(page)
+        await shutdownCurrentNotebook(page)
+        await page.close()
+        page = null
+    })
+    afterAll(async () => {
+        await browser.close()
+        browser = null
+    })
 
-  it("⭐️ If you return an HTML node, it will be displayed.", async () => {
-    const expected = "Success";
-    await paste(
-      page,
-      `# ╔═╡ 90cfa9a0-114d-49bf-8dea-e97d58fa2442
+    it("⭐️ If you return an HTML node, it will be displayed.", async () => {
+        const expected = "Success"
+        await paste(
+            page,
+            `# ╔═╡ 90cfa9a0-114d-49bf-8dea-e97d58fa2442
       html"""<script>
     const div = document.createElement("div")
     div.innerHTML = "${expected}"
     return div;
 </script>"""
         `
-    );
-    await page.waitForSelector(`.runallchanged`, {
-      visible: true,
-      polling: 200,
-      timeout: 0,
-    });
-    await page.click(`.runallchanged`);
-    await waitForNoUpdateOngoing(page, { polling: 100 });
-    const initialLastCellContent = await waitForContentToBecome(
-      page,
-      `pluto-cell:last-child pluto-output`,
-      expected
-    );
-    expect(initialLastCellContent).toBe(expected);
-  });
+        )
+        await page.waitForSelector(`.runallchanged`, {
+            visible: true,
+            polling: 200,
+            timeout: 0,
+        })
+        await page.click(`.runallchanged`)
+        await waitForNoUpdateOngoing(page, { polling: 100 })
+        const initialLastCellContent = await waitForContentToBecome(page, `pluto-cell:last-child pluto-output`, expected)
+        expect(initialLastCellContent).toBe(expected)
+    })
 
-  it("⭐️ The observablehq/stdlib library is pre-imported, you can use DOM, html, Promises, etc.", async () => {
-    const expected = "Success";
-    await paste(
-      page,
-      `# ╔═╡ 90cfa9a0-114d-49bf-8dea-e97d58fa2442
+    it("⭐️ The observablehq/stdlib library is pre-imported, you can use DOM, html, Promises, etc.", async () => {
+        const expected = "Success"
+        await paste(
+            page,
+            `# ╔═╡ 90cfa9a0-114d-49bf-8dea-e97d58fa2442
       html"""<script>
     return html\`<span>${expected}\</span>\`;
 </script>"""
         `
-    );
-    await page.waitForSelector(`.runallchanged`, {
-      visible: true,
-      polling: 200,
-      timeout: 0,
-    });
-    await page.click(`.runallchanged`);
-    await waitForNoUpdateOngoing(page, { polling: 100 });
-    let initialLastCellContent = await waitForContentToBecome(
-      page,
-      `pluto-cell:last-child pluto-output`,
-      expected
-    );
-    expect(initialLastCellContent).toBe(expected);
+        )
+        await page.waitForSelector(`.runallchanged`, {
+            visible: true,
+            polling: 200,
+            timeout: 0,
+        })
+        await page.click(`.runallchanged`)
+        await waitForNoUpdateOngoing(page, { polling: 100 })
+        let initialLastCellContent = await waitForContentToBecome(page, `pluto-cell:last-child pluto-output`, expected)
+        expect(initialLastCellContent).toBe(expected)
 
-    await paste(
-      page,
-      `# ╔═╡ 90cfa9a0-114d-49bf-8dea-e97d58fa2442
+        await paste(
+            page,
+            `# ╔═╡ 90cfa9a0-114d-49bf-8dea-e97d58fa2442
       html"""<script>
             const span = DOM.element("span");
             span.innerHTML = "${expected}"
             return span
 </script>"""
         `
-    );
-    await page.waitForSelector(`.runallchanged`, {
-      visible: true,
-      polling: 200,
-      timeout: 0,
-    });
-    await page.click(`.runallchanged`);
-    await waitForNoUpdateOngoing(page, { polling: 100 });
-    initialLastCellContent = await waitForContentToBecome(
-      page,
-      `pluto-cell:last-child pluto-output`,
-      expected
-    );
-    expect(initialLastCellContent).toBe(expected);
-  });
+        )
+        await page.waitForSelector(`.runallchanged`, {
+            visible: true,
+            polling: 200,
+            timeout: 0,
+        })
+        await page.click(`.runallchanged`)
+        await waitForNoUpdateOngoing(page, { polling: 100 })
+        initialLastCellContent = await waitForContentToBecome(page, `pluto-cell:last-child pluto-output`, expected)
+        expect(initialLastCellContent).toBe(expected)
+    })
 
-  it("⭐️ When a cell re-runs reactively, this will be set to the previous output", async () => {
-    await paste(
-      page,
-      `   
+    it("⭐️ When a cell re-runs reactively, this will be set to the previous output", async () => {
+        await paste(
+            page,
+            `   
                 # ╔═╡ 90cfa9a0-114d-49bf-8dea-e97d58fa2442
                 @bind v html"""<span id="emit-from-here">emitter</span>"""
                 
@@ -160,69 +129,52 @@ describe("JavaScript API", () => {
                 # ╔═╡ cdb22342-4b79-4efe-bc2e-9edc61a0fef9
                 v
         `
-    );
-    await page.waitForSelector(`.runallchanged`, {
-      visible: true,
-      polling: 200,
-      timeout: 0,
-    });
-    await page.click(`.runallchanged`);
-    await waitForNoUpdateOngoing(page, { polling: 100 });
-    await waitForContentToBecome(
-      page,
-      `pluto-cell:nth-child(2) pluto-output`,
-      "emitter"
-    );
-    page.waitForTimeout(2000);
+        )
+        await page.waitForSelector(`.runallchanged`, {
+            visible: true,
+            polling: 200,
+            timeout: 0,
+        })
+        await page.click(`.runallchanged`)
+        await waitForNoUpdateOngoing(page, { polling: 100 })
+        await waitForContentToBecome(page, `pluto-cell:nth-child(2) pluto-output`, "emitter")
+        page.waitForTimeout(2000)
 
-    // Send a custom event to increment value
-    // Due to various optimizations this will take its time
-    const incrementT = async () =>
-      await page.evaluate(() => {
-        const span = document.querySelector(`#emit-from-here`);
-        span.value = (span.value || 0) + 1;
-        span.dispatchEvent(new CustomEvent("input"));
-        return span.value;
-      });
-    // Wait until you see the value.
-    // Only then you know reactivity reacted (and did not defer!)
-    const waitV = async (t) =>
-      await waitForContentToBecome(
-        page,
-        `pluto-cell:last-child pluto-output`,
-        `${t}`
-      );
+        // Send a custom event to increment value
+        // Due to various optimizations this will take its time
+        const incrementT = async () =>
+            await page.evaluate(() => {
+                const span = document.querySelector(`#emit-from-here`)
+                span.value = (span.value || 0) + 1
+                span.dispatchEvent(new CustomEvent("input"))
+                return span.value
+            })
+        // Wait until you see the value.
+        // Only then you know reactivity reacted (and did not defer!)
+        const waitV = async (t) => await waitForContentToBecome(page, `pluto-cell:last-child pluto-output`, `${t}`)
 
-    let t = await incrementT();
-    await waitV(t);
+        let t = await incrementT()
+        await waitV(t)
 
-    t = await incrementT();
-    await waitV(t);
+        t = await incrementT()
+        await waitV(t)
 
-    t = await incrementT();
-    await waitV(t);
+        t = await incrementT()
+        await waitV(t)
 
-    await waitForNoUpdateOngoing(page, { polling: 100 });
-    await waitForContentToBecome(
-      page,
-      `pluto-cell:nth-child(2) pluto-output`,
-      "emitter"
-    );
+        await waitForNoUpdateOngoing(page, { polling: 100 })
+        await waitForContentToBecome(page, `pluto-cell:nth-child(2) pluto-output`, "emitter")
 
-    const result = await page.evaluate(() => {
-      // The script tag won't be in the DOM. The return'ed span will
-      const results = document.querySelector("#test-id-2")._results;
-      return (
-        results[0] == null &&
-        results[2] === results[1] &&
-        results[1] === results[3]
-      );
-    });
-    expect(result).toBe(true); // else will timout
-  });
+        const result = await page.evaluate(() => {
+            // The script tag won't be in the DOM. The return'ed span will
+            const results = document.querySelector("#test-id-2")._results
+            return results[0] == null && results[2] === results[1] && results[1] === results[3]
+        })
+        expect(result).toBe(true) // else will timout
+    })
 
-  // TODO
-  // it("⭐️The variable invalidation is a Promise that will get resolved when the cell output is changed or removed.", async () => {
-  //     expect("this").toBe("implemented")
-  // })
-});
+    // TODO
+    // it("⭐️The variable invalidation is a Promise that will get resolved when the cell output is changed or removed.", async () => {
+    //     expect("this").toBe("implemented")
+    // })
+})
diff --git a/test/frontend/__tests__/new_notebook_test.js b/test/frontend/__tests__/new_notebook_test.js
index 67c6556a61..4938d16df3 100644
--- a/test/frontend/__tests__/new_notebook_test.js
+++ b/test/frontend/__tests__/new_notebook_test.js
@@ -1,15 +1,16 @@
 import puppeteer from "puppeteer"
-import { waitForContent, lastElement, saveScreenshot, getTestScreenshotPath, waitForContentToBecome, setupPage } from "../helpers/common"
+import { waitForContent, lastElement, saveScreenshot, waitForContentToBecome, createPage } from "../helpers/common"
 import {
     createNewNotebook,
     getCellIds,
-    waitForCellOutput,
     waitForNoUpdateOngoing,
     getPlutoUrl,
     prewarmPluto,
     waitForCellOutputToChange,
     keyboardPressInPlutoInput,
     writeSingleLineInPlutoInput,
+    shutdownCurrentNotebook,
+    setupPlutoBrowser,
 } from "../helpers/pluto"
 
 const manuallyEnterCells = async (page, cells) => {
@@ -37,28 +38,16 @@ describe("PlutoNewNotebook", () => {
     /** @type {puppeteer.Page} */
     let page = null
     beforeAll(async () => {
-        browser = await puppeteer.launch({
-            headless: process.env.HEADLESS !== "false",
-            args: ["--no-sandbox", "--disable-setuid-sandbox"],
-            devtools: false,
-        })
-
-        let page = await browser.newPage()
-        setupPage(page)
-        await prewarmPluto(browser, page)
-        await page.close()
+        browser = await setupPlutoBrowser()
     })
     beforeEach(async () => {
-        page = await browser.newPage()
-        setupPage(page)
+        page = await createPage(browser)
         await page.goto(getPlutoUrl(), { waitUntil: "networkidle0" })
         await createNewNotebook(page)
-        await page.waitForSelector("pluto-input", { visible: true })
     })
     afterEach(async () => {
-        await saveScreenshot(page, getTestScreenshotPath())
-        // @ts-ignore
-        await page.evaluate(() => window.shutdownNotebook?.())
+        await saveScreenshot(page)
+        await shutdownCurrentNotebook(page)
         await page.close()
         page = null
     })
diff --git a/test/frontend/__tests__/paste_test.disabled b/test/frontend/__tests__/paste_test.disabled
index a61e600e36..c2461bbe3a 100644
--- a/test/frontend/__tests__/paste_test.disabled
+++ b/test/frontend/__tests__/paste_test.disabled
@@ -21,6 +21,7 @@ import {
     keyboardPressInPlutoInput,
     writeSingleLineInPlutoInput,
     manuallyEnterCells,
+    shutdownCurrentNotebook,
 } from "../helpers/pluto"
 
 describe("Paste Functionality", () => {
@@ -36,8 +37,8 @@ describe("Paste Functionality", () => {
     })
 
     afterEach(async () => {
-        await saveScreenshot(page, getTestScreenshotPath())
-        await page.evaluate(() => window.shutdownNotebook())
+        await saveScreenshot(page)
+        await shutdownCurrentNotebook(page)
     })
 
     it("should *not* create new cell when you paste code into cell", async () => {
diff --git a/test/frontend/__tests__/slide_controls.js b/test/frontend/__tests__/slide_controls.js
index 0d7d7530bb..97ee66fe1c 100644
--- a/test/frontend/__tests__/slide_controls.js
+++ b/test/frontend/__tests__/slide_controls.js
@@ -1,33 +1,36 @@
 import puppeteer from "puppeteer"
-import { setupPage, waitForContent } from "../helpers/common"
-import { createNewNotebook, getPlutoUrl, manuallyEnterCells, prewarmPluto, waitForNoUpdateOngoing } from "../helpers/pluto"
+import { saveScreenshot, createPage, waitForContent } from "../helpers/common"
+import {
+    createNewNotebook,
+    getPlutoUrl,
+    manuallyEnterCells,
+    prewarmPluto,
+    setupPlutoBrowser,
+    shutdownCurrentNotebook,
+    waitForNoUpdateOngoing,
+} from "../helpers/pluto"
 
 describe("slideControls", () => {
     let browser = null
     let page = null
 
     beforeAll(async () => {
-        browser = await puppeteer.launch({
-            headless: process.env.HEADLESS !== "false",
-            args: ["--no-sandbox", "--disable-setuid-sandbox"],
-            devtools: false,
-        })
-
-        let page = await browser.newPage()
-        setupPage(page)
-        await prewarmPluto(browser, page)
-        await page.close()
+        browser = await setupPlutoBrowser()
     })
     beforeEach(async () => {
-        page = await browser.newPage()
-        setupPage(page)
+        page = await createPage(browser)
         await page.goto(getPlutoUrl(), { waitUntil: "networkidle0" })
         await createNewNotebook(page)
-        await page.waitForSelector("pluto-input", { visible: true })
     })
-    afterAll(async () => {
+    afterEach(async () => {
+        await saveScreenshot(page)
+        await shutdownCurrentNotebook(page)
         await page.close()
+        page = null
+    })
+    afterAll(async () => {
         await browser.close()
+        browser = null
     })
 
     it("should create titles", async () => {
diff --git a/test/frontend/helpers/common.js b/test/frontend/helpers/common.js
index 5a0f3ce946..49f894c06f 100644
--- a/test/frontend/helpers/common.js
+++ b/test/frontend/helpers/common.js
@@ -186,7 +186,9 @@ console.log(`Offline mode enabled: ${should_be_offline}`)
 const blocked_domains = ["cdn.jsdelivr.net", "unpkg.com", "cdn.skypack.dev", "esm.sh", "firebase.google.com"]
 const hide_warning = url => url.includes("mathjax")
 
-export const setupPage = (page) => {
+export const createPage = async (browser) => {
+  const page = await browser.newPage()
+  
   failOnError(page);
   dismissBeforeUnloadDialogs(page);
   dismissVersionDialogs(page);
@@ -203,6 +205,8 @@ export const setupPage = (page) => {
       }
     });
   }
+  
+  return page
 };
 
 let testname = () => expect.getState().currentTestName.replace(/ /g, "_");
@@ -211,7 +215,7 @@ export const lastElement = (arr) => arr[arr.length - 1];
 
 const getFixturesDir = () => path.join(__dirname, "..", "fixtures");
 
-const getArtifactsDir = () => path.join(__dirname, "..", "artifacts");
+export const getArtifactsDir = () => path.join(__dirname, "..", "artifacts");
 
 export const getFixtureNotebookPath = (name) =>
   path.join(getFixturesDir(), name);
@@ -229,7 +233,7 @@ export const getTestScreenshotPath = () => {
   );
 };
 
-export const saveScreenshot = async (page, screenshot_path) => {
+export const saveScreenshot = async (page, screenshot_path=getTestScreenshotPath()) => {
   let dirname = path.dirname(screenshot_path);
   await mkdirp(dirname); // Because some of our tests contain /'s 🤷‍♀️
   await page.screenshot({ path: screenshot_path });
diff --git a/test/frontend/helpers/pluto.js b/test/frontend/helpers/pluto.js
index 589d5d9034..eb837848ab 100644
--- a/test/frontend/helpers/pluto.js
+++ b/test/frontend/helpers/pluto.js
@@ -1,6 +1,7 @@
-import fs from "fs"
+import puppeteer from "puppeteer"
+import fs, { existsSync, writeFile, writeFileSync } from "fs"
 import { platform } from "process"
-import { Page } from "puppeteer"
+import { Browser, Page } from "puppeteer"
 import {
     clickAndWaitForNavigation,
     getFixtureNotebookPath,
@@ -9,17 +10,30 @@ import {
     waitForContentToChange,
     getTextContent,
     lastElement,
+    createPage,
+    getArtifactsDir,
 } from "./common"
+import path from "path"
 
 // if (!process.env.PLUTO_PORT) {
 //     throw new Error("You didn't set the PLUTO_PORT environment variable")
 // }
 export const getPlutoUrl = () => `http://localhost:${process.env.PLUTO_PORT}`
 
+// we use a file to keep track of whether we already prewarmed pluto or not
+const pluto_is_warm_path = path.join(getArtifactsDir(), `pluto_is_warm.txt`)
+
 /**
- * @param {Page} page
+ * @param {Browser} browser
  */
-export const prewarmPluto = async (browser, page) => {
+export const prewarmPluto = async (browser) => {
+    if (existsSync(pluto_is_warm_path)) {
+        return
+    }
+    writeFileSync(pluto_is_warm_path, "yes")
+
+    let page = await createPage(browser)
+
     await browser.defaultBrowserContext().overridePermissions(getPlutoUrl(), ["clipboard-read", "clipboard-write"])
     await page.goto(getPlutoUrl(), { waitUntil: "networkidle0" })
     await createNewNotebook(page)
@@ -31,10 +45,31 @@ export const prewarmPluto = async (browser, page) => {
     await page.waitForSelector(runSelector, { visible: true })
     await page.click(runSelector)
     await waitForContent(page, "pluto-output")
-    await page.evaluate(() => {
-        // @ts-ignore
-        shutdownNotebook()
+    await shutdownCurrentNotebook(page)
+
+    await page.close()
+}
+
+/**
+ * @param {Page} page
+ */
+export const shutdownCurrentNotebook = async (page) => {
+    await page.evaluate(
+        //@ts-ignore
+        () => window.shutdownNotebook?.()
+    )
+}
+
+export const setupPlutoBrowser = async () => {
+    const browser = await puppeteer.launch({
+        headless: process.env.HEADLESS !== "false",
+        args: ["--no-sandbox", "--disable-setuid-sandbox"],
+        devtools: false,
     })
+
+    await prewarmPluto(browser)
+
+    return browser
 }
 
 /**
@@ -45,6 +80,7 @@ export const createNewNotebook = async (page) => {
     await page.waitForSelector(newNotebookSelector)
     await clickAndWaitForNavigation(page, newNotebookSelector)
     await waitForPlutoToCalmDown(page)
+    await page.waitForSelector("pluto-input", { visible: true })
 }
 
 /**
@@ -75,9 +111,8 @@ export const getCellIds = (page) => page.evaluate(() => Array.from(document.quer
  */
 export const waitForPlutoToCalmDown = async (page) => {
     await page.waitForTimeout(1000)
-    await page.waitForFunction(
-        () => document?.querySelector("body")?._update_is_ongoing === false && document?.querySelector(`pluto-cell.running, pluto-cell.queued`) === null
-    )
+    //@ts-ignore
+    await page.waitForFunction(() => document?.body?._update_is_ongoing === false && document?.querySelector(`pluto-cell.running, pluto-cell.queued`) === null)
 }
 
 /**
@@ -101,7 +136,12 @@ export const waitForCellOutputToChange = (page, cellId, currentOutput) => {
 
 export const waitForNoUpdateOngoing = async (page, options = {}) => {
     await page.waitForTimeout(1000)
-    return await page.waitForFunction(() => document.querySelector("body")?._update_is_ongoing === false, options)
+    return await page.waitForFunction(
+        () =>
+            //@ts-ignore
+            document.body?._update_is_ongoing === false,
+        options
+    )
 }
 
 /**

From c741b243590ee9a07d6836e2fb2af2d71d0750a6 Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Tue, 15 Nov 2022 12:38:06 +0100
Subject: [PATCH 501/821] The formalities for upgrading codemirror, fixes #2360

---
 frontend/imports/CodemirrorPlutoSetup.d.ts | 12 ++++++++++++
 frontend/imports/CodemirrorPlutoSetup.js   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/frontend/imports/CodemirrorPlutoSetup.d.ts b/frontend/imports/CodemirrorPlutoSetup.d.ts
index fd3c2bdca8..4b130571c2 100644
--- a/frontend/imports/CodemirrorPlutoSetup.d.ts
+++ b/frontend/imports/CodemirrorPlutoSetup.d.ts
@@ -1192,6 +1192,18 @@ declare class EditorState {
     /**
     Find the values for a given language data field, provided by the
     the [`languageData`](https://codemirror.net/6/docs/ref/#state.EditorState^languageData) facet.
+    
+    Examples of language data fields are...
+    
+    - [`"commentTokens"`](https://codemirror.net/6/docs/ref/#commands.CommentTokens) for specifying
+      comment syntax.
+    - [`"autocomplete"`](https://codemirror.net/6/docs/ref/#autocomplete.autocompletion^config.override)
+      for providing language-specific completion sources.
+    - [`"wordChars"`](https://codemirror.net/6/docs/ref/#state.EditorState.charCategorizer) for adding
+      characters that should be considered part of words in this
+      language.
+    - [`"closeBrackets"`](https://codemirror.net/6/docs/ref/#autocomplete.CloseBracketConfig) controls
+      bracket closing behavior.
     */
     languageDataAt<T>(name: string, pos: number, side?: -1 | 0 | 1): readonly T[];
     /**
diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index c3d17fa6ed..59c5854723 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -60,7 +60,7 @@ import {
     cssLanguage,
     selectNextOccurrence,
     //@ts-ignore
-} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.28.1/dist/index.es.min.js"
+} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.28.2/dist/index.es.min.js"
 
 export {
     EditorState,

From a3875074877ed2fa963c24d68af705df058e777d Mon Sep 17 00:00:00 2001
From: Sarang S <85063520+eigengravy@users.noreply.github.com>
Date: Tue, 15 Nov 2022 17:46:32 +0530
Subject: [PATCH 502/821] Rewrite FilePicker from a class component to a
 function component (#2367)

---
 frontend/components/FilePicker.js | 219 ++++++++++++++++--------------
 1 file changed, 114 insertions(+), 105 deletions(-)

diff --git a/frontend/components/FilePicker.js b/frontend/components/FilePicker.js
index 95675a627d..c2149dd823 100644
--- a/frontend/components/FilePicker.js
+++ b/frontend/components/FilePicker.js
@@ -1,4 +1,4 @@
-import { html, Component } from "../imports/Preact.js"
+import { html, Component, useState, useRef, useEffect, useLayoutEffect } from "../imports/Preact.js"
 
 import { utf8index_to_ut16index } from "../common/UnicodeTools.js"
 import { map_cmd_to_ctrl_on_mac } from "../common/KeyboardShortcuts.js"
@@ -7,7 +7,7 @@ import {
     EditorState,
     EditorSelection,
     EditorView,
-    placeholder,
+    placeholder as Placeholder,
     keymap,
     history,
     autocomplete,
@@ -56,8 +56,7 @@ if (is_desktop) {
 }
 
 /**
- * @typedef FilePickerProps
- * @type {{
+ * @param {{
  *  value: String,
  *  suggest_new_file: {base: String},
  *  button_label: String,
@@ -65,69 +64,69 @@ if (is_desktop) {
  *  on_submit: (new_path: String) => Promise<void>,
  *  on_desktop_submit?: (loc?: string) => Promise<void>,
  *  client: import("../common/PlutoConnection.js").PlutoConnection,
- * }}
- * @augments Component<FilePickerProps,{}>
+ * }} props
  */
-export class FilePicker extends Component {
-    constructor(/** @type {FilePickerProps} */ props) {
-        super(props)
-        this.state = {
-            is_button_disabled: true,
-            url_value: "",
-        }
-        this.forced_value = ""
-        /** @type {EditorView?} */
-        this.cm = null
+export const FilePicker = ({ value, suggest_new_file, button_label, placeholder, on_submit, on_desktop_submit, client }) => {
+    const [is_button_disabled, set_is_button_disabled] = useState(true)
+    const [url_value, set_url_value] = useState("")
+    const forced_value = useRef("")
+    /** @type {import("../imports/Preact.js").Ref<HTMLElement>} */
+    const base = useRef(/** @type {any} */ (null))
+    const cm = useRef(/** @type {EditorView?} */ (null))
 
-        this.suggest_not_tmp = () => {
-            if (!this.cm) return
-            const suggest = this.props.suggest_new_file
-            if (suggest != null && this.cm.state.doc.length === 0) {
-                // this.cm.focus()
-                set_cm_value(this.cm, suggest.base, false)
-                this.request_path_completions()
-            }
-            window.dispatchEvent(new CustomEvent("collapse_cell_selection", {}))
+    const suggest_not_tmp = () => {
+        const current_cm = cm.current
+        if (current_cm == null) return
+        if (suggest_new_file != null && current_cm.state.doc.length === 0) {
+            // current_cm.focus()
+            set_cm_value(current_cm, suggest_new_file.base, false)
+            request_path_completions()
         }
+        window.dispatchEvent(new CustomEvent("collapse_cell_selection", {}))
+    }
 
-        let run = async (fn) => await fn()
-        this.on_submit = () => {
-            if (!this.cm) return true
-            const cm = this.cm
+    let run = async (fn) => await fn()
 
-            // ingore if running in desktop environment
-            if (!is_desktop) {
-                const my_val = cm.state.doc.toString()
-                if (my_val === this.forced_value) {
-                    this.suggest_not_tmp()
-                    return true
-                }
+    const onSubmit = () => {
+        const current_cm = cm.current
+        if (current_cm == null) return
+        if (!is_desktop) {
+            const my_val = current_cm.state.doc.toString()
+            if (my_val === forced_value.current) {
+                suggest_not_tmp()
+                return true
             }
-            run(async () => {
-                try {
-                    if (is_desktop && this.props.on_desktop_submit) {
-                        await this.props.on_desktop_submit((await guess_notebook_location(this.state.url_value)).path_or_url)
-                    } else await this.props.on_submit(cm.state.doc.toString())
-                    cm.dom.blur()
-                } catch (error) {
-                    set_cm_value(cm, this.props.value, true)
-                    cm.dom.blur()
-                }
-            })
-            return true
         }
+        run(async () => {
+            try {
+                if (is_desktop && on_desktop_submit) {
+                    await on_desktop_submit((await guess_notebook_location(url_value)).path_or_url)
+                } else await on_submit(current_cm.state.doc.toString())
+                current_cm.dom.blur()
+            } catch (error) {
+                set_cm_value(current_cm, value, true)
+                current_cm.dom.blur()
+            }
+        })
+        return true
     }
-    componentDidUpdate() {
-        if (this.forced_value != this.props.value) {
-            if (!this.cm) return
-            const cm = this.cm
-            set_cm_value(cm, this.props.value, true)
-            this.forced_value = this.props.value
-        }
+
+    const request_path_completions = () => {
+        const current_cm = cm.current
+        if (current_cm == null) return
+        let selection = current_cm.state.selection.main
+        if (selection.from !== selection.to) return
+        if (current_cm.state.doc.length !== selection.to) return
+        return assert_not_null(start_autocomplete_command).run(current_cm)
     }
-    componentDidMount() {
+
+    useLayoutEffect(() => {
         const usesDarkTheme = window.matchMedia("(prefers-color-scheme: dark)").matches
-        this.cm = new EditorView({
+        const keyMapSubmit = () => {
+            onSubmit()
+            return true
+        }
+        cm.current = new EditorView({
             state: EditorState.create({
                 doc: "",
                 extensions: [
@@ -135,10 +134,10 @@ export class FilePicker extends Component {
                     EditorView.domEventHandlers({
                         focus: (event, cm) => {
                             setTimeout(() => {
-                                if (this.props.suggest_new_file) {
-                                    this.suggest_not_tmp()
+                                if (suggest_new_file) {
+                                    suggest_not_tmp()
                                 } else if (cm.state.doc.length === 0) {
-                                    this.request_path_completions()
+                                    request_path_completions()
                                 }
                             }, 0)
                             return true
@@ -146,14 +145,14 @@ export class FilePicker extends Component {
                         blur: (event, cm) => {
                             setTimeout(() => {
                                 if (!cm.hasFocus) {
-                                    set_cm_value(cm, this.props.value, true)
+                                    set_cm_value(cm, value, true)
                                 }
                             }, 200)
                         },
                     }),
                     EditorView.updateListener.of((update) => {
                         if (update.docChanged) {
-                            this.setState({ is_button_disabled: update.state.doc.length === 0 })
+                            set_is_button_disabled(update.state.doc.length === 0)
                         }
                     }),
                     EditorView.theme(
@@ -175,8 +174,8 @@ export class FilePicker extends Component {
                         activateOnTyping: true,
                         override: [
                             pathhints({
-                                suggest_new_file: this.props.suggest_new_file,
-                                client: this.props.client,
+                                suggest_new_file: suggest_new_file,
+                                client: client,
                             }),
                         ],
                         defaultKeymap: false, // We add these manually later, so we can override them if necessary
@@ -193,7 +192,7 @@ export class FilePicker extends Component {
                                     selection: EditorSelection.cursor(update.state.doc.length),
                                 })
 
-                                this.request_path_completions()
+                                request_path_completions()
                             }
                         })
                     }),
@@ -205,17 +204,28 @@ export class FilePicker extends Component {
                                 return assert_not_null(accept_autocomplete_command).run(cm)
                             },
                         },
-                        { key: "Enter", run: this.on_submit },
-                        { key: "Ctrl-Enter", mac: "Cmd-Enter", run: this.on_submit },
-                        { key: "Ctrl-Shift-Enter", mac: "Cmd-Shift-Enter", run: this.on_submit },
+                        {
+                            key: "Enter",
+                            run: keyMapSubmit,
+                        },
+                        {
+                            key: "Ctrl-Enter",
+                            mac: "Cmd-Enter",
+                            run: keyMapSubmit,
+                        },
+                        {
+                            key: "Ctrl-Shift-Enter",
+                            mac: "Cmd-Shift-Enter",
+                            run: keyMapSubmit,
+                        },
                         {
                             key: "Escape",
                             run: (cm) => {
                                 assert_not_null(close_autocomplete_command).run(cm)
                                 cm.dispatch({
-                                    changes: { from: 0, to: cm.state.doc.length, insert: this.props.value },
-                                    selection: EditorSelection.cursor(this.props.value.length),
-                                    effects: EditorView.scrollIntoView(this.props.value.length),
+                                    changes: { from: 0, to: cm.state.doc.length, insert: value },
+                                    selection: EditorSelection.cursor(value.length),
+                                    effects: EditorView.scrollIntoView(value.length),
                                 })
                                 // @ts-ignore
                                 document.activeElement.blur()
@@ -229,57 +239,56 @@ export class FilePicker extends Component {
                                 // If there is autocomplete open, accept that
                                 if (assert_not_null(accept_autocomplete_command).run(cm)) {
                                     // and request the next ones
-                                    this.request_path_completions()
+                                    request_path_completions()
                                     return true
                                 }
                                 // Else, activate it (possibly)
-                                return this.request_path_completions()
+                                return request_path_completions()
                             },
                         },
                     ]),
                     keymap.of(completionKeymap),
 
-                    placeholder(this.props.placeholder),
+                    Placeholder(placeholder),
                 ],
             }),
         })
-        if (!is_desktop) this.base.insertBefore(this.cm.dom, this.base.firstElementChild)
+        const current_cm = cm.current
 
+        if (!is_desktop) base.current.insertBefore(current_cm.dom, base.current.firstElementChild)
         // window.addEventListener("resize", () => {
-        //     if (!this.cm.hasFocus()) {
-        //         deselect(this.cm)
+        //     if (!cm.current.hasFocus()) {
+        //         deselect(cm.current)
         //     }
         // })
-    }
-    render() {
-        return is_desktop
-            ? html`<div class="desktop_picker_group">
-                  <input
-                      value=${this.state.url_value}
-                      placeholder="Enter notebook URL..."
-                      onChange=${(v) => {
-                          this.setState({ url_value: v.target.value })
-                      }}
-                  />
-                  <div onClick=${this.on_submit} class="desktop_picker">
-                      <button>${this.props.button_label}</button>
-                  </div>
-              </div>`
-            : html`
-                  <pluto-filepicker>
-                      <button onClick=${this.on_submit} disabled=${this.state.is_button_disabled}>${this.props.button_label}</button>
-                  </pluto-filepicker>
-              `
-    }
+    }, [])
 
-    request_path_completions() {
-        if (!this.cm) return
-        let selection = this.cm.state.selection.main
-        if (selection.from !== selection.to) return
-        if (this.cm.state.doc.length !== selection.to) return
+    useLayoutEffect(() => {
+        if (forced_value.current != value) {
+            if (cm.current == null) return
+            set_cm_value(cm.current, value, true)
+            forced_value.current = value
+        }
+    })
 
-        return assert_not_null(start_autocomplete_command).run(this.cm)
-    }
+    return is_desktop
+        ? html`<div class="desktop_picker_group" ref=${base}>
+              <input
+                  value=${url_value}
+                  placeholder="Enter notebook URL..."
+                  onChange=${(v) => {
+                      set_url_value(v.target.value)
+                  }}
+              />
+              <div onClick=${onSubmit} class="desktop_picker">
+                  <button>${button_label}</button>
+              </div>
+          </div>`
+        : html`
+              <pluto-filepicker ref=${base}>
+                  <button onClick=${onSubmit} disabled=${is_button_disabled}>${button_label}</button>
+              </pluto-filepicker>
+          `
 }
 
 const pathhints =

From 377bff0c7e0b69c63dd1eb57b4a00c453cdd8bef Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 16 Nov 2022 14:01:20 +0100
Subject: [PATCH 503/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 2b3444eb24..ba2684241f 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.14"
+version = "0.19.15"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From eda5a19b585725ddb6fd1e773e77016159895a63 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 16 Nov 2022 14:19:20 +0100
Subject: [PATCH 504/821] Update TypeScriptCheck.yml

---
 .github/workflows/TypeScriptCheck.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/TypeScriptCheck.yml b/.github/workflows/TypeScriptCheck.yml
index c88be06aeb..afcafd5510 100644
--- a/.github/workflows/TypeScriptCheck.yml
+++ b/.github/workflows/TypeScriptCheck.yml
@@ -14,6 +14,7 @@ on:
             - "**.ts"
         branches-ignore:
             - release
+    workflow_dispatch:
 
 jobs:
   test:

From 4af5a5691465bd37a8e6d2dba129914a434f019c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 16 Nov 2022 14:24:48 +0100
Subject: [PATCH 505/821] Fix TS failure

---
 frontend/components/CellInput/scopestate_statefield.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/components/CellInput/scopestate_statefield.js b/frontend/components/CellInput/scopestate_statefield.js
index b0259baee5..0a22b182ce 100644
--- a/frontend/components/CellInput/scopestate_statefield.js
+++ b/frontend/components/CellInput/scopestate_statefield.js
@@ -429,7 +429,7 @@ let scopestate_add_definition = (scopestate, doc, node, valid_from = null) => {
 }
 
 /**
- * @param {TreeCursor} cursor
+ * @param {TreeCursor | SyntaxNode} cursor
  * @param {any} doc
  * @param {ScopeState} scopestate
  * @param {boolean} [verbose]
@@ -447,7 +447,7 @@ export let explore_variable_usage = (
 ) => {
     if ("cursor" in cursor) {
         // console.trace("`explore_variable_usage()` called with a SyntaxNode, not a TreeCursor")
-        cursor = cursor["cursor"]()
+        cursor = cursor.cursor()
     }
 
     let start_node = null

From 4fc670fd0d64851635ca8f7cd80a17170d72af39 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 17 Nov 2022 17:20:38 +0100
Subject: [PATCH 506/821] TS tweaks

---
 frontend/common/PlutoConnection.js            | 24 +++++++++++--------
 frontend/components/Editor.js                 |  2 ++
 .../components/Editor/LaunchBackendButton.js  |  1 +
 frontend/components/TreeView.js               |  2 +-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/frontend/common/PlutoConnection.js b/frontend/common/PlutoConnection.js
index 4d5156d8f3..9a60f8ba41 100644
--- a/frontend/common/PlutoConnection.js
+++ b/frontend/common/PlutoConnection.js
@@ -3,9 +3,6 @@ import { pack, unpack } from "./MsgPack.js"
 import "./Polyfill.js"
 import { with_query_params } from "./URLTools.js"
 
-// https://github.com/denysdovhan/wtfjs/issues/61
-const different_Infinity_because_js_is_yuck = 2147483646
-
 const reconnect_after_close_delay = 500
 const retry_after_connect_failure_delay = 5000
 
@@ -78,11 +75,11 @@ const socket_is_alright_with_grace_period = (socket) =>
         }
     })
 
-const try_close_socket_connection = (socket) => {
+const try_close_socket_connection = (/** @type {WebSocket} */ socket) => {
     socket.onopen = () => {
         try_close_socket_connection(socket)
     }
-    socket.onmessage = socket.onclose = socket.onerror = undefined
+    socket.onmessage = socket.onclose = socket.onerror = null
     try {
         socket.close(1000, "byebye")
     } catch (ex) {}
@@ -94,7 +91,7 @@ const try_close_socket_connection = (socket) => {
  * @param {string} address The WebSocket URL
  * @param {{on_message: Function, on_socket_close:Function}} callbacks
  * @param {number} timeout_s Timeout for creating the websocket connection (seconds)
- * @return {Promise<WebsocketConnection>}
+ * @returns {Promise<WebsocketConnection>}
  */
 const create_ws_connection = (address, { on_message, on_socket_close }, timeout_s = 30) => {
     return new Promise((resolve, reject) => {
@@ -192,8 +189,8 @@ let next_tick_promise = () => {
  * I need to put it here so other code,
  * like running cells, will also wait for the updates to complete.
  * I SHALL MAKE IT MORE COMPLEX! (https://www.youtube.com/watch?v=aO3JgPUJ6iQ&t=195s)
- * @param {Function} send
- * @returns
+ * @param {import("./PlutoConnectionSendFn").SendFn} send
+ * @returns {import("./PlutoConnectionSendFn").SendFn}
  */
 const batched_updates = (send) => {
     let current_combined_updates_promise = null
@@ -228,7 +225,7 @@ const batched_updates = (send) => {
     return batched
 }
 
-export const ws_address_from_base = (base_url) => {
+export const ws_address_from_base = (/** @type {string | URL} */ base_url) => {
     const ws_url = new URL("./", base_url)
     ws_url.protocol = ws_url.protocol.replace("http", "ws")
 
@@ -281,7 +278,8 @@ export const create_pluto_connection = async ({
     connect_metadata = {},
     ws_address = default_ws_address(),
 }) => {
-    var ws_connection = null // will be defined later i promise
+    let ws_connection = /** @type {WebsocketConnection?} */ (null) // will be defined later i promise
+
     /** @type {PlutoConnection} */
     const client = {
         send: null,
@@ -300,6 +298,9 @@ export const create_pluto_connection = async ({
 
     /** @type {import("./PlutoConnectionSendFn").SendFn} */
     const send = async (message_type, body = {}, metadata = {}, no_broadcast = true) => {
+        if (ws_connection == null) {
+            throw new Error("No connection established yet")
+        }
         const request_id = get_unique_short_id()
 
         const message = {
@@ -383,6 +384,9 @@ export const create_pluto_connection = async ({
             console.log("Hello?")
             const u = await send("connect", {}, connect_metadata)
             console.log("Hello!")
+            client.kill = () => {
+                if (ws_connection) ws_connection.socket.close()
+            }
             client.session_options = u.message.options
             client.version_info = u.message.version_info
             client.notebook_exists = u.message.notebook_exists
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index d4f809cda6..b06c9e0e12 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -786,6 +786,8 @@ patch: ${JSON.stringify(
 
             // @ts-ignore
             window.version_info = this.client.version_info // for debugging
+            // @ts-ignore
+            window.kill_socket = this.client.kill // for debugging
 
             if (!client.notebook_exists) {
                 console.error("Notebook does not exist. Not connecting.")
diff --git a/frontend/components/Editor/LaunchBackendButton.js b/frontend/components/Editor/LaunchBackendButton.js
index 038870b695..e835a5e2eb 100644
--- a/frontend/components/Editor/LaunchBackendButton.js
+++ b/frontend/components/Editor/LaunchBackendButton.js
@@ -19,6 +19,7 @@ export const EditorLaunchBackendButton = ({ editor, launch_params, status }) =>
             // Don't allow a misconfigured environment to stop offering other backends
         }
     } catch (e) {}
+    if (status == null) return null
     if (status.offer_local)
         return html`<${RunLocalButton}
             start_local=${() =>
diff --git a/frontend/components/TreeView.js b/frontend/components/TreeView.js
index 9d7c266b55..841aba546d 100644
--- a/frontend/components/TreeView.js
+++ b/frontend/components/TreeView.js
@@ -90,7 +90,7 @@ export const TreeView = ({ mime, body, cell_id, persist_js_state }) => {
     const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${cell_id} mime=${pair[1]} body=${pair[0]} persist_js_state=${persist_js_state} />`
     const more = html`<p-r><${More} on_click_more=${on_click_more} /></p-r>`
 
-    var inner = null
+    let inner = null
     switch (body.type) {
         case "Pair":
             const r = body.key_value

From f7592cd07116a09ab9cc373bbd81330f518056bf Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 21 Nov 2022 07:01:26 +0100
Subject: [PATCH 507/821] Fix cell input scrollbars showing on Chrome Linux
 (#2377)

* Apply patch from holomorphism

Co-Authored-By: holomorphism <3076585+holomorphism@users.noreply.github.com>

* Apply `overflow-x: hidden` to the pluto-input cm instance

* Use overflow-y instead

Co-authored-by: holomorphism <3076585+holomorphism@users.noreply.github.com>
Co-authored-by: Paul <paul@plutojl.org>
---
 frontend/editor.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/editor.css b/frontend/editor.css
index 418e8f5237..1983f64ee2 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2778,6 +2778,10 @@ Based on "Paraíso (Light)" by Jan T. Sott:
     background: var(--autocomplete-menu-bg-color);
 }
 
+pluto-input .cm-editor .cm-scroller {
+    overflow-y: hidden;
+}
+
 pluto-input .cm-editor .cm-content,
 pluto-input .cm-editor .cm-scroller,
 .cm-editor .cm-tooltip-autocomplete .cm-completionLabel {

From 44b6e40023787e3fca1398bf189d2ef82db00f2d Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Mon, 21 Nov 2022 07:01:49 +0100
Subject: [PATCH 508/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index ba2684241f..28f589a740 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.15"
+version = "0.19.16"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From a89f1460619ee6a05107f81e4ed69c72a4278b8f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 21 Nov 2022 16:40:07 +0100
Subject: [PATCH 509/821] Automatic cell disabling: special-case bind macro

---
 src/evaluation/Run.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 5f1c8e257c..c370f91959 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -455,7 +455,7 @@ function cells_to_disable_to_resolve_multiple_defs(old::NotebookTopology, new::N
 						length(node.definitions) == 1 && # for more than one defined variable, we might confuse the user, or disable more things than we want to.
 						disjoint(node.references, node.definitions) && # avoid self-reference like `x = x + 1`
 						isempty(node.funcdefs_without_signatures) &&
-						isempty(node.macrocalls)
+						node.macrocalls ⊆ (Symbol("@bind"),) # allow no macros (except for `@bind`)
 					)
 				end
 				

From a71378ab027cab8f59cfc1427c27b3524d16cc99 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Nov 2022 21:07:37 +0100
Subject: [PATCH 510/821] Some type fixes

Update CodemirrorPlutoSetup.d.ts
---
 frontend/components/CellInput.js              |  2 +-
 .../components/CellInput/mod_d_command.js     |  1 +
 .../CellInput/pluto_autocomplete.js           | 25 +++++++++++--------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 48678f0c1b..d6745023db 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -430,7 +430,7 @@ export const CellInput = ({
                 return false
             }
             // This will return true if the autocomplete select popup is open
-            if (select_autocomplete_command?.run(cm)) {
+            if (select_autocomplete_command?.run?.(cm)) {
                 return true
             }
 
diff --git a/frontend/components/CellInput/mod_d_command.js b/frontend/components/CellInput/mod_d_command.js
index 13fe7fdc3a..1363d572de 100644
--- a/frontend/components/CellInput/mod_d_command.js
+++ b/frontend/components/CellInput/mod_d_command.js
@@ -40,6 +40,7 @@ export let mod_d_command = {
         } else {
             selectNextOccurrence({ state, dispatch })
         }
+        return false
     },
     /** @param {EditorView} view */
     shift: ({ state, dispatch }) => {
diff --git a/frontend/components/CellInput/pluto_autocomplete.js b/frontend/components/CellInput/pluto_autocomplete.js
index 31c5ae4bf6..2fe7577eed 100644
--- a/frontend/components/CellInput/pluto_autocomplete.js
+++ b/frontend/components/CellInput/pluto_autocomplete.js
@@ -93,6 +93,7 @@ let open_docs_if_autocomplete_is_open_command = (cm) => {
         window.dispatchEvent(new CustomEvent("open_live_docs"))
         return true
     }
+    return false
 }
 
 /** @param {EditorView} cm */
@@ -173,7 +174,7 @@ let julia_special_completions_to_cm = (/** @type {PlutoRequestAutocomplete} */ r
             return {
                 label: text,
                 apply: detail && should_apply_unicode_completion ? detail : text,
-                detail,
+                detail: detail ?? undefined,
             }
         }),
         // TODO Do something docs_prefix ish when we also have the apply text
@@ -247,12 +248,13 @@ const julia_code_completions_to_cm = (/** @type {PlutoRequestAutocomplete} */ re
                 return {
                     label: text,
                     apply: text_to_apply,
-                    type: cl({
-                        c_notexported: !is_exported,
-                        [`c_${type_description}`]: type_description != null,
-                        [`completion_${completion_type}`]: completion_type != null,
-                        c_from_notebook: is_from_notebook,
-                    }),
+                    type:
+                        cl({
+                            c_notexported: !is_exported,
+                            [`c_${type_description}`]: type_description != null,
+                            [`completion_${completion_type}`]: completion_type != null,
+                            c_from_notebook: is_from_notebook,
+                        }) ?? undefined,
                     boost: 50 - i / results.length,
                 }
             }),
@@ -264,7 +266,7 @@ const julia_code_completions_to_cm = (/** @type {PlutoRequestAutocomplete} */ re
             ...results
                 .filter(([text]) => is_field_expression && override_text_to_apply_in_field_expression(text) != null)
                 .map(([text, type_description, is_exported], i) => {
-                    let text_to_apply = override_text_to_apply_in_field_expression(text)
+                    let text_to_apply = override_text_to_apply_in_field_expression(text) ?? ""
 
                     return {
                         label: text_to_apply,
@@ -281,6 +283,7 @@ const julia_code_completions_to_cm = (/** @type {PlutoRequestAutocomplete} */ re
     }
 }
 
+/** @returns {import("../../imports/CodemirrorPlutoSetup.js").CompletionSource} */
 const pluto_completion_fetcher = (request_autocomplete) => {
     const unicode_completions = julia_special_completions_to_cm(request_autocomplete)
     const code_completions = julia_code_completions_to_cm(request_autocomplete)
@@ -305,7 +308,7 @@ const complete_anyword = async (ctx) => {
             // See https://github.com/codemirror/codemirror.next/issues/788 about `type: null`
             label,
             apply: label,
-            type: null,
+            type: undefined,
             boost: 0 - i,
         })),
     }
@@ -331,7 +334,7 @@ const local_variables_completion = (ctx) => {
                 // See https://github.com/codemirror/codemirror.next/issues/788 about `type: null`
                 label: name,
                 apply: name,
-                type: null,
+                type: undefined,
                 boost: 99 - i,
             })),
     }
@@ -384,7 +387,7 @@ export let pluto_autocomplete = ({ request_autocomplete, on_update_doc_query })
             ],
             defaultKeymap: false, // We add these manually later, so we can override them if necessary
             maxRenderedOptions: 512, // fons's magic number
-            optionClass: (c) => c.type,
+            optionClass: (c) => c.type ?? "",
         }),
 
         // If there is just one autocomplete result, apply it directly

From 593e485494e2f5113681861bdd08183f09415d88 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 23 Nov 2022 21:25:21 +0100
Subject: [PATCH 511/821] oops

---
 frontend/components/CellInput/pluto_autocomplete.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/components/CellInput/pluto_autocomplete.js b/frontend/components/CellInput/pluto_autocomplete.js
index 2fe7577eed..35f9b7e29b 100644
--- a/frontend/components/CellInput/pluto_autocomplete.js
+++ b/frontend/components/CellInput/pluto_autocomplete.js
@@ -283,7 +283,6 @@ const julia_code_completions_to_cm = (/** @type {PlutoRequestAutocomplete} */ re
     }
 }
 
-/** @returns {import("../../imports/CodemirrorPlutoSetup.js").CompletionSource} */
 const pluto_completion_fetcher = (request_autocomplete) => {
     const unicode_completions = julia_special_completions_to_cm(request_autocomplete)
     const code_completions = julia_code_completions_to_cm(request_autocomplete)

From 5d4a76754b4a890d216bb365fde7972a470e7392 Mon Sep 17 00:00:00 2001
From: Alberto Mengali <disberd@gmail.com>
Date: Wed, 23 Nov 2022 22:09:09 +0100
Subject: [PATCH 512/821] expose a function to return the bond names (#2379)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 src/evaluation/RunBonds.jl         | 10 ++++++++++
 src/evaluation/WorkspaceManager.jl |  8 ++++++++
 src/runner/PlutoRunner.jl          |  4 ++++
 test/Bonds.jl                      |  3 +++
 4 files changed, 25 insertions(+)

diff --git a/src/evaluation/RunBonds.jl b/src/evaluation/RunBonds.jl
index fd70d9c694..ff80d455b4 100644
--- a/src/evaluation/RunBonds.jl
+++ b/src/evaluation/RunBonds.jl
@@ -50,6 +50,16 @@ function set_bond_values_reactive(;
     run_reactive_async!(session, notebook, to_reeval; deletion_hook=custom_deletion_hook, user_requested_run=false, run_async=false, bond_value_pairs, kwargs...)
 end
 
+"""
+Returns the names of all defined bonds
+"""
+function get_bond_names(session::ServerSession, notebook::Notebook)
+    cells_bond_names = map(notebook.cell_order) do cell_id
+        WorkspaceManager.get_bond_names((session,notebook), cell_id)
+    end
+    union!(Set{Symbol}(), cells_bond_names...)
+end
+
 """
 Returns the set of all possible values for the binded variable `n` as returned by the widget implementation using `AbstractPlutoDingetjes.possible_bond_values(element)`. This API is meant to be used by PlutoSliderServer.
 """
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index a42719085f..c57eaf6bb2 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -240,6 +240,14 @@ function bump_workspace_module(session_notebook::SN)
     old_name, new_name
 end
 
+function get_bond_names(session_notebook::SN, cell_id)
+    workspace = get_workspace(session_notebook)
+
+    Distributed.remotecall_eval(Main, workspace.pid, quote
+        PlutoRunner.get_bond_names($cell_id)
+    end)
+end
+
 function possible_bond_values(session_notebook::SN, n::Symbol; get_length::Bool=false)
     workspace = get_workspace(session_notebook)
 
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 3402eca934..38a2f1bc4f 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1905,6 +1905,10 @@ function transform_bond_value(s::Symbol, value_from_js)
     end
 end
 
+function get_bond_names(cell_id)
+    get(cell_registered_bond_names, cell_id, Set{Symbol}())
+end
+
 function possible_bond_values(s::Symbol; get_length::Bool=false)
     element = registered_bond_elements[s]
     possible_values = possible_bond_values_ref[](element)
diff --git a/test/Bonds.jl b/test/Bonds.jl
index 21ab86d598..f438d96b64 100644
--- a/test/Bonds.jl
+++ b/test/Bonds.jl
@@ -358,6 +358,9 @@ import Distributed
         ])
         update_run!(🍭, notebook, notebook.cells)
 
+        # Test the get_bond_names function
+        @test Pluto.get_bond_names(🍭, notebook) == Set([:a, :b, :x, :y])
+
         function set_bond_values!(notebook:: Notebook, bonds:: Dict; is_first_value=false)
             for (name, value) in bonds
                 notebook.bonds[name] = Dict("value" => value)

From ba22ac8869923974ed63ee3d687b59a5e91bbd27 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 24 Nov 2022 14:49:30 +0100
Subject: [PATCH 513/821] Update GHA versions

---
 .github/workflows/Bundle.yml          | 4 ++--
 .github/workflows/FrontendTest.yml    | 4 ++--
 .github/workflows/IntegrationTest.yml | 4 ++--
 .github/workflows/LaunchTest.yml      | 2 +-
 .github/workflows/ReleaseTriggers.yml | 2 +-
 .github/workflows/Test.yml            | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/Bundle.yml b/.github/workflows/Bundle.yml
index ce60739ec3..065b42f739 100644
--- a/.github/workflows/Bundle.yml
+++ b/.github/workflows/Bundle.yml
@@ -13,7 +13,7 @@ jobs:
     trigger:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
               # We use that PAT token instead of GITHUB_TOKEN because we are triggering another github action on the 'release' event.
               # Triggering a workflow from a workflow is only allowed if the relaying event is signed with a PAT.
               # See https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
@@ -31,7 +31,7 @@ jobs:
                   git reset --hard $GITHUB_SHA
 
             # Do the actual bundling
-            - uses: actions/setup-node@v2
+            - uses: actions/setup-node@v3
               with:
                   node-version: 17.x
                   cache: "npm"
diff --git a/.github/workflows/FrontendTest.yml b/.github/workflows/FrontendTest.yml
index a8033b8d03..2de9dca3a8 100644
--- a/.github/workflows/FrontendTest.yml
+++ b/.github/workflows/FrontendTest.yml
@@ -22,7 +22,7 @@ jobs:
 
         steps:
             # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             # Makes thes `julia` command available
             - uses: julia-actions/setup-julia@v1
@@ -79,7 +79,7 @@ jobs:
                   PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: "true"
                   PUPPETEER_EXECUTABLE_PATH: "/usr/bin/google-chrome-stable"
 
-            - uses: actions/upload-artifact@v2
+            - uses: actions/upload-artifact@v3
               if: failure()
               with:
                   name: test-screenshot-artifacts
diff --git a/.github/workflows/IntegrationTest.yml b/.github/workflows/IntegrationTest.yml
index 7c515247a1..69e7d8b5a5 100644
--- a/.github/workflows/IntegrationTest.yml
+++ b/.github/workflows/IntegrationTest.yml
@@ -38,14 +38,14 @@ jobs:
                     - { user: JuliaPluto, repo: PlutoSliderServer.jl }
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
             - uses: julia-actions/setup-julia@v1
               with:
                   version: ${{ matrix.julia-version }}
                   arch: x64
             - uses: julia-actions/julia-buildpkg@v1
             - name: Clone Downstream
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
               with:
                   repository: ${{ matrix.package.user }}/${{ matrix.package.repo }}
                   path: downstream
diff --git a/.github/workflows/LaunchTest.yml b/.github/workflows/LaunchTest.yml
index 814357ef33..7bac5abb94 100644
--- a/.github/workflows/LaunchTest.yml
+++ b/.github/workflows/LaunchTest.yml
@@ -18,7 +18,7 @@ jobs:
 
         steps:
             # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             # Makes thes `julia` command available
             - uses: julia-actions/setup-julia@v1
diff --git a/.github/workflows/ReleaseTriggers.yml b/.github/workflows/ReleaseTriggers.yml
index b149a530bd..cad0e668c3 100644
--- a/.github/workflows/ReleaseTriggers.yml
+++ b/.github/workflows/ReleaseTriggers.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         repository: ['fonsp/pluto-on-binder', 'JuliaPluto/sample-notebook-previews']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: |
           curl \
             -X POST \
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 8b7b207f7e..269eac0b02 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -39,7 +39,7 @@ jobs:
 
         steps:
             # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
 
             # Makes thes `julia` command available
             - uses: julia-actions/setup-julia@v1

From 8944a236ff5ebcb3122adfc0f2797c75e393645a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 24 Nov 2022 15:03:31 +0100
Subject: [PATCH 514/821] Update more GHA versions

---
 .github/workflows/FrontendTest.yml    | 6 +++---
 .github/workflows/TypeScriptCheck.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/FrontendTest.yml b/.github/workflows/FrontendTest.yml
index 2de9dca3a8..e32d7bc0a0 100644
--- a/.github/workflows/FrontendTest.yml
+++ b/.github/workflows/FrontendTest.yml
@@ -27,15 +27,15 @@ jobs:
             # Makes thes `julia` command available
             - uses: julia-actions/setup-julia@v1
               with:
-                  version: "1.6"
+                  version: "1.6" # our lowest supported version
 
             - name: Install Pluto.jl packages
               run: |
                   julia --project=$GITHUB_WORKSPACE -e "using Pkg; Pkg.instantiate()"
 
-            - uses: actions/setup-node@v1
+            - uses: actions/setup-node@v3
               with:
-                  node-version: "12.x"
+                  node-version: "18.x"
 
             - name: Install Chrome dependencies
               run: |
diff --git a/.github/workflows/TypeScriptCheck.yml b/.github/workflows/TypeScriptCheck.yml
index afcafd5510..d4830bc6c8 100644
--- a/.github/workflows/TypeScriptCheck.yml
+++ b/.github/workflows/TypeScriptCheck.yml
@@ -20,9 +20,9 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v3
         with:
           node-version: "18.x"
 

From 1e1437672840b56d307d757de0531e03b3a736c7 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Fri, 25 Nov 2022 16:29:04 +0100
Subject: [PATCH 515/821] Fix printing install progress (#2393)

Mutate notebook.nbpkg_ctx instead of using a new one. This allows use to use the same io.
---
 src/packages/Packages.jl   | 33 ++++++++++++----------
 src/packages/PkgCompat.jl  | 57 +++++++++++++++++++++++++-------------
 src/packages/PkgUtils.jl   |  4 +--
 test/packages/Basic.jl     |  5 ++--
 test/packages/PkgCompat.jl |  6 ++--
 5 files changed, 64 insertions(+), 41 deletions(-)

diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 09799745f0..39052ad5f0 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -149,7 +149,7 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                     PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
                         withinteractive(false) do
                             # We temporarily clear the "semver-compatible" [deps] entries, because Pkg already respects semver, unless it doesn't, in which case we don't want to force it.
-                            notebook.nbpkg_ctx = PkgCompat.clear_auto_compat_entries(notebook.nbpkg_ctx)
+                            PkgCompat.clear_auto_compat_entries!(notebook.nbpkg_ctx)
 
                             try
                                 for tier in [
@@ -165,7 +165,7 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                                             Pkg.PackageSpec(name=p)
                                             for p in to_add
                                         ]; preserve=used_tier)
-                                        
+
                                         break
                                     catch e
                                         if used_tier == Pkg.PRESERVE_NONE
@@ -175,7 +175,7 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                                     end
                                 end
                             finally
-                                notebook.nbpkg_ctx = PkgCompat.write_auto_compat_entries(notebook.nbpkg_ctx)
+                                PkgCompat.write_auto_compat_entries!(notebook.nbpkg_ctx)
                             end
 
                             # Now that Pkg is set up, the notebook process will call `using Package`, which can take some time. We write this message to the io, to notify the user.
@@ -298,7 +298,7 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
 		send_notebook_changes!(ClientRequest(session=session, notebook=notebook))
 
 		# Clear the embedded Project and Manifest and require a restart from the user.
-		reset_nbpkg(notebook, new_topology; keep_project=false, save=save)
+		reset_nbpkg!(notebook, new_topology; keep_project=false, save=save)
 		notebook.nbpkg_restart_required_msg = "Yes, because sync_nbpkg_core failed. \n\n$(error_text)"
         notebook.nbpkg_install_time_ns = nothing
         notebook.nbpkg_ctx_instantiated = false
@@ -322,9 +322,8 @@ end
 Run `Pkg.resolve` on the notebook's package environment. Keep trying more and more invasive strategies to fix problems until the operation succeeds.
 """
 function resolve_with_auto_fixes(notebook::Notebook, iolistener::IOListener)
-    
-    notebook.nbpkg_ctx = PkgCompat.clear_stdlib_compat_entries(notebook.nbpkg_ctx)
-    
+    PkgCompat.clear_stdlib_compat_entries!(notebook.nbpkg_ctx)
+
     PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
         withinteractive(false) do
             try
@@ -338,14 +337,14 @@ function resolve_with_auto_fixes(notebook::Notebook, iolistener::IOListener)
                 catch e
                     @warn "Failed to resolve Pkg environment. Removing Manifest and trying again..." exception=e
                     
-                    reset_nbpkg(notebook; keep_project=true, save=false, backup=false)
+                    reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
                     try
                         Pkg.resolve(notebook.nbpkg_ctx)
                     catch e
                         @warn "Failed to resolve Pkg environment. Removing Project compat entries and Manifest and trying again..." exception=e
                         
-                        reset_nbpkg(notebook; keep_project=true, save=false, backup=false)
-                        notebook.nbpkg_ctx = PkgCompat.clear_compat_entries(notebook.nbpkg_ctx)
+                        reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
+                        PkgCompat.clear_compat_entries!(notebook.nbpkg_ctx)
                         
                         Pkg.resolve(notebook.nbpkg_ctx)
                     end
@@ -362,7 +361,7 @@ If `keep_project` is `true` (default `false`), the `Project.toml` file will be k
 
 This function is useful when we are not able to resolve/activate/instantiate a notebook's environment after loading, which happens when e.g. the environment was created on a different OS or Julia version.
 """
-function reset_nbpkg(notebook::Notebook, topology::Union{NotebookTopology,Nothing}=nothing; keep_project::Bool=false, backup::Bool=true, save::Bool=true)
+function reset_nbpkg!(notebook::Notebook, topology::Union{NotebookTopology,Nothing}=nothing; keep_project::Bool=false, backup::Bool=true, save::Bool=true)
     backup && save && writebackup(notebook)
 
     if notebook.nbpkg_ctx !== nothing
@@ -371,9 +370,13 @@ function reset_nbpkg(notebook::Notebook, topology::Union{NotebookTopology,Nothin
         keep_project || (isfile(p) && rm(p))
         isfile(m) && rm(m)
 
-        notebook.nbpkg_ctx = PkgCompat.load_ctx(PkgCompat.env_dir(notebook.nbpkg_ctx))
+        PkgCompat.load_ctx!(notebook.nbpkg_ctx, PkgCompat.env_dir(notebook.nbpkg_ctx))
     else
-        notebook.nbpkg_ctx = use_plutopkg(something(topology, notebook.topology)) ? PkgCompat.create_empty_ctx() : nothing
+        notebook.nbpkg_ctx = if use_plutopkg(something(topology, notebook.topology))
+            PkgCompat.load_empty_ctx!(notebook.nbpkg_ctx)
+        else
+            nothing
+        end
     end
 
     save && save_notebook(notebook)
@@ -409,14 +412,14 @@ function update_nbpkg_core(notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.UPLEV
 
             PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
                 # We temporarily clear the "semver-compatible" [deps] entries, because it is difficult to update them after the update 🙈. TODO
-                notebook.nbpkg_ctx = PkgCompat.clear_auto_compat_entries(notebook.nbpkg_ctx)
+                PkgCompat.clear_auto_compat_entries!(notebook.nbpkg_ctx)
 
                 try
                     ###
                     Pkg.update(notebook.nbpkg_ctx; level=level)
                     ###
                 finally
-                    notebook.nbpkg_ctx = PkgCompat.write_auto_compat_entries(notebook.nbpkg_ctx)
+                    PkgCompat.write_auto_compat_entries!(notebook.nbpkg_ctx)
                 end
             end
 
diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index fe17ca0536..a79bded294 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -60,23 +60,42 @@ else
 	Pkg.Types.Context
 end
 
+function PkgContext!(ctx::PkgContext; kwargs...)
+    for (k, v) in kwargs
+        setfield!(ctx, k, v)
+    end
+    ctx
+end
+
 # 🐸 "Public API", but using PkgContext
-load_ctx(env_dir)::PkgContext = PkgContext(env=Pkg.Types.EnvCache(joinpath(env_dir, "Project.toml")))
+load_ctx(env_dir)::PkgContext = PkgContext(;env=Pkg.Types.EnvCache(joinpath(env_dir, "Project.toml")))
 
 # 🐸 "Public API", but using PkgContext
-create_empty_ctx()::PkgContext = load_ctx(mktempdir())
+load_ctx!(ctx::PkgContext, env_dir)::PkgContext = PkgContext!(ctx; env=Pkg.Types.EnvCache(joinpath(env_dir, "Project.toml")))
+
+# 🐸 "Public API", but using PkgContext
+load_empty_ctx!(ctx) = @static if :io ∈ fieldnames(PkgContext)
+    PkgContext!(create_empty_ctx(); io=ctx.io)
+else
+    create_empty_ctx()
+end
+
+# 🐸 "Public API", but using PkgContext
+create_empty_ctx()::PkgContext = load_ctx!(PkgContext(), mktempdir())
 
 # ⚠️ Internal API with fallback
-function load_ctx(original::PkgContext)
-	new = load_ctx(env_dir(original))
-	
+function load_ctx!(original::PkgContext)
+	original_project = deepcopy(original.env.original_project)
+	original_manifest = deepcopy(original.env.original_manifest)
+	new = load_ctx!(original, env_dir(original))
+
 	try
-		new.env.original_project = original.env.original_project
-		new.env.original_manifest = original.env.original_manifest
+		new.env.original_project = original_project
+		new.env.original_manifest = original_manifest
 	catch e
 		@warn "Pkg compat: failed to set original_project" exception=(e,catch_backtrace())
 	end
-	
+
 	new
 end
 
@@ -404,7 +423,7 @@ project_key_order(key::String) =
     something(findfirst(x -> x == key, _project_key_order), length(_project_key_order) + 1)
 
 # ✅ Public API
-function _modify_compat(f!::Function, ctx::PkgContext)::PkgContext
+function _modify_compat!(f!::Function, ctx::PkgContext)::PkgContext
 	project_path = project_file(ctx)
 	
 	toml = if isfile(project_path)
@@ -422,7 +441,7 @@ function _modify_compat(f!::Function, ctx::PkgContext)::PkgContext
 		Pkg.TOML.print(io, toml; sorted=true, by=(key -> (project_key_order(key), key)))
 	end)
 	
-	return load_ctx(ctx)
+	return load_ctx!(ctx)
 end
 
 
@@ -432,8 +451,8 @@ Add any missing [`compat`](https://pkgdocs.julialang.org/v1/compatibility/) entr
 
 The automatic compat entry is: `"~" * string(installed_version)`.
 """
-function write_auto_compat_entries(ctx::PkgContext)::PkgContext
-	_modify_compat(ctx) do compat
+function write_auto_compat_entries!(ctx::PkgContext)::PkgContext
+	_modify_compat!(ctx) do compat
 		for p in keys(project(ctx).dependencies)
 			if !haskey(compat, p)
 				m_version = get_manifest_version(ctx, p)
@@ -450,9 +469,9 @@ end
 """
 Remove all [`compat`](https://pkgdocs.julialang.org/v1/compatibility/) entries from the `Project.toml`.
 """
-function clear_compat_entries(ctx::PkgContext)::PkgContext
+function clear_compat_entries!(ctx::PkgContext)::PkgContext
 	if isfile(project_file(ctx))
-		_modify_compat(empty!, ctx)
+		_modify_compat!(empty!, ctx)
 	else
 		ctx
 	end
@@ -461,11 +480,11 @@ end
 
 # ✅ Public API
 """
-Remove any automatically-generated [`compat`](https://pkgdocs.julialang.org/v1/compatibility/) entries from the `Project.toml`. This will undo the effects of [`write_auto_compat_entries`](@ref) but leave other (e.g. manual) compat entries intact. Return the new `PkgContext`.
+Remove any automatically-generated [`compat`](https://pkgdocs.julialang.org/v1/compatibility/) entries from the `Project.toml`. This will undo the effects of [`write_auto_compat_entries!`](@ref) but leave other (e.g. manual) compat entries intact. Return the new `PkgContext`.
 """
-function clear_auto_compat_entries(ctx::PkgContext)::PkgContext
+function clear_auto_compat_entries!(ctx::PkgContext)::PkgContext
 	if isfile(project_file(ctx))
-		_modify_compat(ctx) do compat
+		_modify_compat!(ctx) do compat
 			for p in keys(compat)
 				m_version = get_manifest_version(ctx, p)
 				if m_version !== nothing && !is_stdlib(p)
@@ -484,9 +503,9 @@ end
 """
 Remove any [`compat`](https://pkgdocs.julialang.org/v1/compatibility/) entries from the `Project.toml` for standard libraries. These entries are created when an old version of Julia uses a package that later became a standard library, like https://github.com/JuliaPackaging/Artifacts.jl. Return the new `PkgContext`.
 """
-function clear_stdlib_compat_entries(ctx::PkgContext)::PkgContext
+function clear_stdlib_compat_entries!(ctx::PkgContext)::PkgContext
 	if isfile(project_file(ctx))
-		_modify_compat(ctx) do compat
+		_modify_compat!(ctx) do compat
 			for p in keys(compat)
 				if is_stdlib(p)
 					@info "Removing compat entry for stdlib" p
diff --git a/src/packages/PkgUtils.jl b/src/packages/PkgUtils.jl
index e9916a5fb0..01d50e488b 100644
--- a/src/packages/PkgUtils.jl
+++ b/src/packages/PkgUtils.jl
@@ -84,7 +84,7 @@ reset_notebook_environment(notebook_path::String; keep_project::Bool=false, back
 Remove the embedded `Project.toml` and `Manifest.toml` from a notebook file, modifying the file. If `keep_project` is true, only `Manifest.toml` will be deleted. A backup of the notebook file is created by default.
 """
 function reset_notebook_environment(path::String; kwargs...)
-    Pluto.reset_nbpkg(
+    Pluto.reset_nbpkg!(
         load_notebook_nobackup(path);
         kwargs...
     )
@@ -235,4 +235,4 @@ function testnb()
     t
 end
 
-end
\ No newline at end of file
+end
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index 5df3a3135b..5f4e8232c7 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -56,7 +56,8 @@ import Distributed
         @test haskey(terminals, "PlutoPkgTestD")
         # they were installed in one batch, so their terminal outputs should be the same
         @test terminals["PlutoPkgTestA"] == terminals["PlutoPkgTestD"]
-
+        # " [9e88b42a] PackageName" should be present in terminal output
+        @test !isnothing(match(r" \[........\] ", terminals["PlutoPkgTestA"]))
 
         @test notebook.cells[2].output.body == "0.3.1" # A
         @test notebook.cells[8].output.body == "0.1.0" # D
@@ -485,7 +486,7 @@ import Distributed
 
         write(f, simple_import_notebook)
         @test !occursin("0.3.1", read(f, String))
-        
+
         @test num_backups_in(dir) == 0
         Pluto.update_notebook_environment(f)
 
diff --git a/test/packages/PkgCompat.jl b/test/packages/PkgCompat.jl
index ad0bdc0298..c30efc27bd 100644
--- a/test/packages/PkgCompat.jl
+++ b/test/packages/PkgCompat.jl
@@ -103,7 +103,7 @@ import Pkg
         @test haskey(ptoml["compat"], "PlutoPkgTestA")
         @test haskey(ptoml["compat"], "Artifacts")
         
-        notebook.nbpkg_ctx = PkgCompat.clear_stdlib_compat_entries(notebook.nbpkg_ctx)
+        PkgCompat.clear_stdlib_compat_entries!(notebook.nbpkg_ctx)
         
         ptoml = Pkg.TOML.parse(ptoml_contents())
         @test haskey(ptoml["deps"], "PlutoPkgTestA")
@@ -114,7 +114,7 @@ import Pkg
         end
         
         old_a_compat_entry = ptoml["compat"]["PlutoPkgTestA"]
-        notebook.nbpkg_ctx = PkgCompat.clear_auto_compat_entries(notebook.nbpkg_ctx)
+        PkgCompat.clear_auto_compat_entries!(notebook.nbpkg_ctx)
         
         ptoml = Pkg.TOML.parse(ptoml_contents())
         @test haskey(ptoml["deps"], "PlutoPkgTestA")
@@ -124,7 +124,7 @@ import Pkg
         @test !haskey(compat, "PlutoPkgTestA")
         @test !haskey(compat, "Artifacts")
         
-        notebook.nbpkg_ctx = PkgCompat.write_auto_compat_entries(notebook.nbpkg_ctx)
+        PkgCompat.write_auto_compat_entries!(notebook.nbpkg_ctx)
         
         ptoml = Pkg.TOML.parse(ptoml_contents())
         @test haskey(ptoml["deps"], "PlutoPkgTestA")

From 0f0b6f596fd4cf27b2665e1d93ddd44d96fe2a99 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Sun, 27 Nov 2022 19:28:14 +0100
Subject: [PATCH 516/821] Use CellLogger when formatting output (#2395)

* Use CellLogger when formatting output

* Refactor `with_logger` + `with_io_to_logs`

* Change closure to function
---
 src/evaluation/WorkspaceManager.jl |  8 ++-
 src/runner/PlutoRunner.jl          | 96 ++++++++++++++++--------------
 test/Logging.jl                    | 23 ++++++-
 3 files changed, 76 insertions(+), 51 deletions(-)

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index c57eaf6bb2..0cafb7772e 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -450,7 +450,7 @@ function eval_format_fetch_in_workspace(
     end
 
     if early_result === nothing
-        format_fetch_in_workspace(workspace, cell_id, ends_with_semicolon, known_published_objects)
+        format_fetch_in_workspace(workspace, cell_id, ends_with_semicolon, known_published_objects; capture_stdout)
     else
         early_result
     end
@@ -471,7 +471,8 @@ function format_fetch_in_workspace(
     cell_id,
     ends_with_semicolon,
     known_published_objects::Vector{String}=String[],
-    showmore_id::Union{PlutoRunner.ObjectDimPair,Nothing}=nothing,
+    showmore_id::Union{PlutoRunner.ObjectDimPair,Nothing}=nothing;
+    capture_stdout::Bool=true,
 )::PlutoRunner.FormattedCellResult
     workspace = get_workspace(session_notebook)
 
@@ -487,7 +488,8 @@ function format_fetch_in_workspace(
                     $ends_with_semicolon,
                     $known_published_objects,
                     $showmore_id,
-                    getfield(Main, $(QuoteNode(workspace.module_name))),
+                    getfield(Main, $(QuoteNode(workspace.module_name)));
+                    capture_stdout=$capture_stdout,
                 )
             end)
         catch e
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 38a2f1bc4f..43ae854a38 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -286,13 +286,11 @@ function try_macroexpand(mod::Module, notebook_id::UUID, cell_id::UUID, expr; ca
 
     capture_logger = CaptureLogger(nothing, logger, Dict[])
 
-    expanded_expr, elapsed_ns = Logging.with_logger(capture_logger) do
-        with_io_to_logs(; enabled=capture_stdout, loglevel=stdout_log_level) do
-            elapsed_ns = time_ns()
-            expanded_expr = macroexpand(mod, expr_not_toplevel)::Expr
-            elapsed_ns = time_ns() - elapsed_ns
-            expanded_expr, elapsed_ns
-        end
+    expanded_expr, elapsed_ns = with_logger_and_io_to_logs(capture_logger; capture_stdout, stdio_loglevel=stdout_log_level) do
+        elapsed_ns = time_ns()
+        expanded_expr = macroexpand(mod, expr_not_toplevel)::Expr
+        elapsed_ns = time_ns() - elapsed_ns
+        expanded_expr, elapsed_ns
     end
 
     logs = capture_logger.logs
@@ -586,37 +584,35 @@ function run_expression(
         throw("Expression still contains macro calls!!")
     end
 
-    result, runtime = Logging.with_logger(logger) do # about 200ns overhead
-        with_io_to_logs(; enabled=capture_stdout, loglevel=stdout_log_level) do # about 3ms overhead i think?
-            if function_wrapped_info === nothing
-                toplevel_expr = Expr(:toplevel, expr)
-                wrapped = timed_expr(toplevel_expr)
-                ans, runtime = run_inside_trycatch(m, wrapped)
-                (ans, add_runtimes(runtime, expansion_runtime))
-            else
-                expr_id = forced_expr_id !== nothing ? forced_expr_id : expr_hash(expr)
-                local computer = get(computers, cell_id, nothing)
-                if computer === nothing || computer.expr_id !== expr_id
-                    try
-                        computer = register_computer(expr, expr_id, cell_id, collect.(function_wrapped_info)...)
-                    catch e
-                        # @error "Failed to generate computer function" expr exception=(e,stacktrace(catch_backtrace()))
-                        return run_expression(m, original_expr, notebook_id, cell_id, nothing; user_requested_run=user_requested_run)
-                    end
-                end
-
-                # This check solves the problem of a cell like `false && variable_that_does_not_exist`. This should run without error, but will fail in our function-wrapping-magic because we get the value of `variable_that_does_not_exist` before calling the generated function.
-                # The fix is to detect this situation and run the expression in the classical way.
-                ans, runtime = if any(name -> !isdefined(m, name), computer.input_globals)
-                    # Do run_expression but with function_wrapped_info=nothing so it doesn't go in a Computer()
-                    # @warn "Got variables that don't exist, running outside of computer" not_existing=filter(name -> !isdefined(m, name), computer.input_globals)
-                    run_expression(m, original_expr, notebook_id, cell_id; user_requested_run)
-                else
-                    run_inside_trycatch(m, () -> compute(m, computer))
+    result, runtime = with_logger_and_io_to_logs(logger; capture_stdout, stdio_loglevel=stdout_log_level) do # about 200ns + 3ms overhead
+        if function_wrapped_info === nothing
+            toplevel_expr = Expr(:toplevel, expr)
+            wrapped = timed_expr(toplevel_expr)
+            ans, runtime = run_inside_trycatch(m, wrapped)
+            (ans, add_runtimes(runtime, expansion_runtime))
+        else
+            expr_id = forced_expr_id !== nothing ? forced_expr_id : expr_hash(expr)
+            local computer = get(computers, cell_id, nothing)
+            if computer === nothing || computer.expr_id !== expr_id
+                try
+                    computer = register_computer(expr, expr_id, cell_id, collect.(function_wrapped_info)...)
+                catch e
+                    # @error "Failed to generate computer function" expr exception=(e,stacktrace(catch_backtrace()))
+                    return run_expression(m, original_expr, notebook_id, cell_id, nothing; user_requested_run=user_requested_run)
                 end
+            end
 
-                ans, add_runtimes(runtime, expansion_runtime)
+            # This check solves the problem of a cell like `false && variable_that_does_not_exist`. This should run without error, but will fail in our function-wrapping-magic because we get the value of `variable_that_does_not_exist` before calling the generated function.
+            # The fix is to detect this situation and run the expression in the classical way.
+            ans, runtime = if any(name -> !isdefined(m, name), computer.input_globals)
+                # Do run_expression but with function_wrapped_info=nothing so it doesn't go in a Computer()
+                # @warn "Got variables that don't exist, running outside of computer" not_existing=filter(name -> !isdefined(m, name), computer.input_globals)
+                run_expression(m, original_expr, notebook_id, cell_id; user_requested_run)
+            else
+                run_inside_trycatch(m, () -> compute(m, computer))
             end
+
+            ans, add_runtimes(runtime, expansion_runtime)
         end
     end
     
@@ -884,7 +880,8 @@ function formatted_result_of(
     ends_with_semicolon::Bool, 
     known_published_objects::Vector{String}=String[],
     showmore::Union{ObjectDimPair,Nothing}=nothing, 
-    workspace::Module=Main,
+    workspace::Module=Main;
+    capture_stdout::Bool=true,
 )::FormattedCellResult
     load_integrations_if_needed()
     currently_running_cell_id[] = cell_id
@@ -902,7 +899,10 @@ function formatted_result_of(
     errored = ans isa CapturedException
 
     output_formatted = if (!ends_with_semicolon || errored)
-        format_output(ans; context=IOContext(default_iocontext, :extra_items=>extra_items, :module => workspace))
+        logger = get!(() -> PlutoCellLogger(notebook_id, cell_id), pluto_cell_loggers, cell_id)
+        with_logger_and_io_to_logs(logger; capture_stdout, stdio_loglevel=stdout_log_level) do
+            format_output(ans; context=IOContext(default_iocontext, :extra_items=>extra_items, :module => workspace))
+        end
     else
         ("", MIME"text/plain"())
     end
@@ -2324,6 +2324,13 @@ end
 format_log_value(v) = format_output_default(v)
 format_log_value(v::Tuple{<:Exception,Vector{<:Any}}) = format_output(CapturedException(v...))
 
+function _send_stdio_output!(output, loglevel)
+    output_str = String(take!(output))
+    if !isempty(output_str)
+        Logging.@logmsg loglevel output_str
+    end
+end
+
 const stdout_log_level = Logging.LogLevel(-555) # https://en.wikipedia.org/wiki/555_timer_IC
 function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogLevel=Logging.LogLevel(1))
     if !enabled
@@ -2350,12 +2357,6 @@ function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogL
     # user code.
     execution_done = Ref(false)
     output = IOBuffer()
-    function send_output()
-        output_str = String(take!(output))
-        if !isempty(output_str)
-            Logging.@logmsg loglevel output_str
-        end
-    end
 
     @async begin
         pipe_reader = Base.pipe_reader(pipe)
@@ -2366,10 +2367,10 @@ function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogL
                 # NOTE: we don't really have to wait for the end of execution to stream output logs
                 #       so maybe we should just enable it?
                 if execution_done[]
-                    send_output()
+                    _send_stdio_output!(output, loglevel)
                 end
             end
-            send_output()
+            _send_stdio_output!(output, loglevel)
         catch err
             @error "Failed to redirect stdout/stderr to logs"  exception=(err,catch_backtrace())
         end
@@ -2404,6 +2405,11 @@ function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogL
     result
 end
 
+function with_logger_and_io_to_logs(f, logger; capture_stdout=true, stdio_loglevel=Logging.LogLevel(1))
+    Logging.with_logger(logger) do
+        with_io_to_logs(f; enabled=capture_stdout, loglevel=stdio_loglevel)
+    end
+end
 
 function setup_plutologger(notebook_id::UUID, log_channel::Channel{Any})
     pluto_log_channels[notebook_id] = log_channel
diff --git a/test/Logging.jl b/test/Logging.jl
index 4324f9d32c..b744763e67 100644
--- a/test/Logging.jl
+++ b/test/Logging.jl
@@ -49,9 +49,18 @@ using Pluto.WorkspaceManager: poll
         
         "123", # 18
         
+
+        "struct StructWithCustomShowThatLogs end", # 19
+        """ # 20
+        function Base.show(io::IO, ::StructWithCustomShowThatLogs)
+            println("stdio log")
+            @info "showing StructWithCustomShowThatLogs"
+            show(io, "hello")
+        end
+        """,
+        "StructWithCustomShowThatLogs()", # 21
     ]))
-    
-    
+
     @testset "Stdout" begin
         
         idx_123 = [1,2,3,4,5,7,9]
@@ -103,7 +112,15 @@ using Pluto.WorkspaceManager: poll
         @test isempty(notebook.cells[16].logs)
         @test length(notebook.cells[17].logs) == 1
         @test isempty(notebook.cells[18].logs)
-        
+
+        update_run!(🍭, notebook, notebook.cells[19:21])
+
+        @test isempty(notebook.cells[19].logs)
+        @test isempty(notebook.cells[20].logs)
+
+        @test poll(5, 1/60) do
+            length(notebook.cells[21].logs) == 2
+        end
     end
 
     @testset "Logging respects maxlog" begin

From 736e987bb42fbe244f9be73a692efb375091565f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 28 Nov 2022 12:13:19 +0100
Subject: [PATCH 517/821] minor cleanups

---
 src/notebook/Notebook.jl        |  4 +-
 src/webserver/SessionActions.jl | 89 ++++++++++++---------------------
 2 files changed, 33 insertions(+), 60 deletions(-)

diff --git a/src/notebook/Notebook.jl b/src/notebook/Notebook.jl
index 3b7c4e6806..32013d119e 100644
--- a/src/notebook/Notebook.jl
+++ b/src/notebook/Notebook.jl
@@ -56,8 +56,8 @@ Base.@kwdef mutable struct Notebook
 
     process_status::String=ProcessStatus.starting
     wants_to_interrupt::Bool=false
-    last_save_time::typeof(time())=time()
-    last_hot_reload_time::typeof(time())=zero(time())
+    last_save_time::Float64=time()
+    last_hot_reload_time::Float64=zero(time())
 
     bonds::Dict{Symbol,BondValue}=Dict{Symbol,BondValue}()
 
diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 68c6542524..15b634dd07 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -80,7 +80,6 @@ function open(session::ServerSession, path::AbstractString;
     end
 
     update_save_run!(session, nb, nb.cells; run_async, prerender_text=true)
-    
     add(session, nb; run_async)
     try_event_call(session, OpenNotebookEvent(nb))
     nb
@@ -96,27 +95,29 @@ function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
     end
     
     
-    running = Ref(false)
-    function update_from_file_throttled()
-        if !running[]
-            running[] = true
-            
-            @info "Updating from file..."
-            
-            sleep(0.1) ## There seems to be a synchronization issue if your OS is VERYFAST
-            wait_until_file_unchanged(nb.path, .3)
-            
-            # call update_from_file. If it returns false, that means that the notebook file was corrupt, so we try again, a maximum of 10 times.
-            for _ in 1:10
-                if update_from_file(session, nb)
-                    break
+    update_from_file_throttled = let
+        running = Ref(false)
+        function()
+            if !running[]
+                running[] = true
+                
+                @info "Updating from file..."
+                
+                sleep(0.1) ## There seems to be a synchronization issue if your OS is VERYFAST
+                wait_until_file_unchanged(nb.path, .3)
+                
+                # call update_from_file. If it returns false, that means that the notebook file was corrupt, so we try again, a maximum of 10 times.
+                for _ in 1:10
+                    if update_from_file(session, nb)
+                        break
+                    end
                 end
+                
+                
+                @info "Updating from file done!"
+                
+                running[] = false
             end
-            
-            
-            @info "Updating from file done!"
-            
-            running[] = false
         end
     end
 
@@ -191,50 +192,22 @@ end
 
 "Create a new empty notebook inside `session::ServerSession`. Returns the `Notebook`."
 function new(session::ServerSession; run_async=true, notebook_id::UUID=uuid1())
-    nb = if session.options.server.init_with_file_viewer
-        
-        @warn "DEPRECATED: init_with_file_viewer will be removed soon."
-        
-        file_viewer_code = """html\"\"\"
-
-        <script>
-
-        const nbfile_url = window.location.href.replace("edit", "notebookfile")
-
-
-        const pre = html`<pre style="font-size: .6rem;">Loading...</pre>`
-
-        const handle = setInterval(async () => {
-
-        pre.innerText = await (await fetch(nbfile_url)).text()
-        }, 500)
-
-        invalidation.then(() => {
-        clearInterval(handle)
-        })
-
-        return pre
-
-        </script>
-
-        \"\"\"
-        """
-        Notebook([Cell(), Cell(code=file_viewer_code, code_folded=true)])
-
+    if session.options.server.init_with_file_viewer
+        @error "DEPRECATED: init_with_file_viewer has been removed."
+    end
+    
+    nb = if session.options.compiler.sysimage === nothing
+        emptynotebook()
     else
-        if session.options.compiler.sysimage === nothing
-            emptynotebook()
-        else
-            Notebook([Cell("import Pkg"), Cell("# This cell disables Pluto's package manager and activates the global environment. Click on ? inside the bubble next to Pkg.activate to learn more.\n# (added automatically because a sysimage is used)\nPkg.activate()"), Cell()])
-        end
+        Notebook([Cell("import Pkg"), Cell("# This cell disables Pluto's package manager and activates the global environment. Click on ? inside the bubble next to Pkg.activate to learn more.\n# (added automatically because a sysimage is used)\nPkg.activate()"), Cell()])
     end
+
     # Run NewNotebookEvent handler before assigning ID
     isid = try_event_call(session, NewNotebookEvent())
     nb.notebook_id = isnothing(isid) ? notebook_id : isid
 
-    update_save_run!(session, nb, nb.cells; run_async=run_async, prerender_text=true)
-    add(session, nb; run_async=run_async)
-
+    update_save_run!(session, nb, nb.cells; run_async, prerender_text=true)
+    add(session, nb; run_async)
     try_event_call(session, OpenNotebookEvent(nb))
     nb
 end

From cfe22993c69bebdfbc01acdcc6711b5b0223c1be Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 28 Nov 2022 12:59:27 +0100
Subject: [PATCH 518/821] whitespace

---
 src/webserver/SessionActions.jl | 68 ++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 15b634dd07..4d0fd9e2fe 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -32,12 +32,12 @@ function open_url(session::ServerSession, url::AbstractString; kwargs...)
     
     path = download_cool(url, random_notebook.path)
     result = try_event_call(session, NewNotebookEvent())
-    nb = if result isa UUID
+    notebook = if result isa UUID
         open(session, path; notebook_id=result, kwargs...)
     else
         open(session, path; kwargs...)
     end
-    return nb
+    return notebook
 end
 
 "Open the notebook at `path` into `session::ServerSession` and run it. Returns the `Notebook`."
@@ -57,36 +57,36 @@ function open(session::ServerSession, path::AbstractString;
         path = new_path
     end
 
-    for nb in values(session.notebooks)
-        if isfile(nb.path) && realpath(nb.path) == realpath(tamepath(path))
-            throw(NotebookIsRunningException(nb))
+    for notebook in values(session.notebooks)
+        if isfile(notebook.path) && realpath(notebook.path) == realpath(tamepath(path))
+            throw(NotebookIsRunningException(notebook))
         end
     end
     
-    nb = load_notebook(tamepath(path); disable_writing_notebook_files=session.options.server.disable_writing_notebook_files)
-    nb.notebook_id = notebook_id
+    notebook = load_notebook(tamepath(path); disable_writing_notebook_files=session.options.server.disable_writing_notebook_files)
+    notebook.notebook_id = notebook_id
 
     # overwrites the notebook environment if specified
     if compiler_options !== nothing
-        nb.compiler_options = compiler_options
+        notebook.compiler_options = compiler_options
     end
     if clear_frontmatter
-        Pluto.set_frontmatter!(nb, nothing)
+        Pluto.set_frontmatter!(notebook, nothing)
     end
 
-    session.notebooks[nb.notebook_id] = nb
-    for c in nb.cells
+    session.notebooks[notebook.notebook_id] = notebook
+    for c in notebook.cells
         c.queued = session.options.evaluation.run_notebook_on_load
     end
 
-    update_save_run!(session, nb, nb.cells; run_async, prerender_text=true)
-    add(session, nb; run_async)
-    try_event_call(session, OpenNotebookEvent(nb))
-    nb
+    update_save_run!(session, notebook, notebook.cells; run_async, prerender_text=true)
+    add(session, notebook; run_async)
+    try_event_call(session, OpenNotebookEvent(notebook))
+    return notebook
 end
 
-function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
-    session.notebooks[nb.notebook_id] = nb
+function add(session::ServerSession, notebook::Notebook; run_async::Bool=true)
+    session.notebooks[notebook.notebook_id] = notebook
     
     if run_async
         @asynclog putplutoupdates!(session, clientupdate_notebook_list(session.notebooks))
@@ -104,11 +104,11 @@ function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
                 @info "Updating from file..."
                 
                 sleep(0.1) ## There seems to be a synchronization issue if your OS is VERYFAST
-                wait_until_file_unchanged(nb.path, .3)
+                wait_until_file_unchanged(notebook.path, .3)
                 
                 # call update_from_file. If it returns false, that means that the notebook file was corrupt, so we try again, a maximum of 10 times.
                 for _ in 1:10
-                    if update_from_file(session, nb)
+                    if update_from_file(session, notebook)
                         break
                     end
                 end
@@ -121,42 +121,42 @@ function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
         end
     end
 
-    in_session() = get(session.notebooks, nb.notebook_id, nothing) === nb
+    in_session() = get(session.notebooks, notebook.notebook_id, nothing) === notebook
     
     session.options.server.auto_reload_from_file && @asynclog try
         while in_session()
-            if !isfile(nb.path)
+            if !isfile(notebook.path)
                 # notebook file deleted... let's ignore this, changing the notebook will cause it to save again. Fine for now
                 sleep(2)
             else
-                e = watch_file(nb.path, 3)
+                e = watch_file(notebook.path, 3)
                 if e.timedout
                     continue
                 end
                 
                 # the above call is blocking until the file changes
                 
-                local modified_time = mtime(nb.path)
+                local modified_time = mtime(notebook.path)
                 local _tries = 0
                 
                 # mtime might return zero if the file is temporarily removed
                 while modified_time == 0.0 && _tries < 10
-                    modified_time = mtime(nb.path)
+                    modified_time = mtime(notebook.path)
                     _tries += 1
                     sleep(.05)
                 end
                 
                 # current_time = time()
-                # @info "File changed" (current_time - nb.last_save_time) (modified_time - nb.last_save_time) (current_time - modified_time)
+                # @info "File changed" (current_time - notebook.last_save_time) (modified_time - notebook.last_save_time) (current_time - modified_time)
                 if !in_session()
                     break
                 end
                 
-                # if current_time - nb.last_save_time < 2.0
+                # if current_time - notebook.last_save_time < 2.0
                     # @info "Notebook was saved by me very recently, not reloading from file."
                 if modified_time == 0.0
                     # @warn "Failed to hot reload: file no longer exists."
-                elseif modified_time - nb.last_save_time < session.options.server.auto_reload_from_file_cooldown
+                elseif modified_time - notebook.last_save_time < session.options.server.auto_reload_from_file_cooldown
                     # @info "Modified time is very close to my last save time, not reloading from file."
                 else
                     update_from_file_throttled()
@@ -169,7 +169,7 @@ function add(session::ServerSession, nb::Notebook; run_async::Bool=true)
         end
     end
     
-    nb
+    return notebook
 end
 
 """
@@ -196,7 +196,7 @@ function new(session::ServerSession; run_async=true, notebook_id::UUID=uuid1())
         @error "DEPRECATED: init_with_file_viewer has been removed."
     end
     
-    nb = if session.options.compiler.sysimage === nothing
+    notebook = if session.options.compiler.sysimage === nothing
         emptynotebook()
     else
         Notebook([Cell("import Pkg"), Cell("# This cell disables Pluto's package manager and activates the global environment. Click on ? inside the bubble next to Pkg.activate to learn more.\n# (added automatically because a sysimage is used)\nPkg.activate()"), Cell()])
@@ -204,12 +204,12 @@ function new(session::ServerSession; run_async=true, notebook_id::UUID=uuid1())
 
     # Run NewNotebookEvent handler before assigning ID
     isid = try_event_call(session, NewNotebookEvent())
-    nb.notebook_id = isnothing(isid) ? notebook_id : isid
+    notebook.notebook_id = isnothing(isid) ? notebook_id : isid
 
-    update_save_run!(session, nb, nb.cells; run_async, prerender_text=true)
-    add(session, nb; run_async)
-    try_event_call(session, OpenNotebookEvent(nb))
-    nb
+    update_save_run!(session, notebook, notebook.cells; run_async, prerender_text=true)
+    add(session, notebook; run_async)
+    try_event_call(session, OpenNotebookEvent(notebook))
+    return notebook
 end
 
 "Shut down `notebook` inside `session`. If `keep_in_session` is `false` (default), you will not be allowed to run a notebook with the same notebook_id again."

From c92241cc1103c485171804c871908072635a01b9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 28 Nov 2022 13:54:03 +0100
Subject: [PATCH 519/821] whitespace

---
 src/analysis/Parse.jl              | 12 ++++++++----
 src/evaluation/Run.jl              |  2 +-
 src/evaluation/WorkspaceManager.jl |  2 +-
 src/packages/Packages.jl           | 12 ++++++------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/analysis/Parse.jl b/src/analysis/Parse.jl
index 470a2545bd..200b5faf4b 100644
--- a/src/analysis/Parse.jl
+++ b/src/analysis/Parse.jl
@@ -6,12 +6,14 @@ pluto_filename(notebook::Notebook, cell::Cell)::String = notebook.path * "#==#"
 "Is Julia new enough to support filenames in parsing?"
 const can_insert_filename = (Base.parse_input_line("1;2") != Base.parse_input_line("1\n2"))
 
-"Parse the code from `cell.code` into a Julia expression (`Expr`). Equivalent to `Meta.parse_input_line` in Julia v1.3, no matter the actual Julia version.
+"""
+Parse the code from `cell.code` into a Julia expression (`Expr`). Equivalent to `Meta.parse_input_line` in Julia v1.3, no matter the actual Julia version.
 
 1. Turn multiple expressions into an error expression.
 2. Fix some `LineNumberNode` idiosyncrasies to be more like modern Julia.
 3. Will always produce an expression of the form: `Expr(:toplevel, LineNumberNode(..), root)`. It gets transformed (i.e. wrapped) into this form if needed. A `LineNumberNode` contains a line number and a file name. We use the cell UUID as a 'file name', which makes the stack traces easier to interpret. (Otherwise it would be impossible to tell from which cell a stack frame originates.) Not all Julia versions insert these `LineNumberNode`s, so we insert it ourselves if Julia doesn't.
-4. Apply `preprocess_expr` (below) to `root` (from rule 2)."
+4. Apply `preprocess_expr` (below) to `root` (from rule 2).
+"""
 function parse_custom(notebook::Notebook, cell::Cell)::Expr
     # 1.
     raw = if can_insert_filename
@@ -90,11 +92,13 @@ function expression_boundaries(code::String, start=1)::Vector{<:Integer}
     end
 end
 
-"Make some small adjustments to the `expr` to make it work nicely inside a timed, wrapped expression:
+"""
+Make some small adjustments to the `expr` to make it work nicely inside a timed, wrapped expression:
 
 1. If `expr` is a `:toplevel` expression (this is the case iff the expression is a combination of expressions using semicolons, like `a = 1; b` or `123;`), then it gets turned into a `:block` expression. The reason for this transformation is that `:toplevel` does not return/relay the output of its last argument, unlike `begin`, `let`, `if`, etc. (But we want it!)
 2. If `expr` is a `:module` expression, wrap it in a `:toplevel` block - module creation needs to be at toplevel. Rule 1. is not applied.
-3. If `expr` is a `:(=)` expression with a curly assignment, wrap it in a `:const` to allow execution - see https://github.com/fonsp/Pluto.jl/issues/517 "
+3. If `expr` is a `:(=)` expression with a curly assignment, wrap it in a `:const` to allow execution - see https://github.com/fonsp/Pluto.jl/issues/517
+"""
 function preprocess_expr(expr::Expr)
     if expr.head == :toplevel
 		Expr(:block, expr.args...)
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index c370f91959..7ac6a98baa 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -134,7 +134,7 @@ function run_reactive_core!(
     # Send intermediate updates to the clients at most 20 times / second during a reactive run. (The effective speed of a slider is still unbounded, because the last update is not throttled.)
     # flush_send_notebook_changes_throttled, 
     send_notebook_changes_throttled, flush_notebook_changes = throttled(1.0 / 20) do
-        send_notebook_changes!(ClientRequest(session = session, notebook = notebook))
+        send_notebook_changes!(ClientRequest(; session, notebook))
     end
     send_notebook_changes_throttled()
 
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 0cafb7772e..f7cef2aca9 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -152,7 +152,7 @@ end
 
 function start_relaying_logs((session, notebook)::SN, log_channel::Distributed.RemoteChannel)
     update_throttled, flush_throttled = Pluto.throttled(0.1) do
-        Pluto.send_notebook_changes!(Pluto.ClientRequest(session=session, notebook=notebook))
+        Pluto.send_notebook_changes!(Pluto.ClientRequest(; session, notebook))
     end
 
     while true
diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 39052ad5f0..679518f765 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -257,7 +257,7 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
 					notebook.nbpkg_terminal_outputs[p] = s
 				end
                 update_nbpkg_cache!(notebook)
-				send_notebook_changes!(ClientRequest(session=session, notebook=notebook))
+				send_notebook_changes!(ClientRequest(; session, notebook))
 			end
 			 sync_nbpkg_core(notebook, old_topology, new_topology; on_terminal_output=iocallback, lag = session.options.server.simulated_pkg_lag)
 		end
@@ -276,7 +276,7 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
 
 			notebook.nbpkg_busy_packages = String[]
             update_nbpkg_cache!(notebook)
-			send_notebook_changes!(ClientRequest(session=session, notebook=notebook))
+			send_notebook_changes!(ClientRequest(; session, notebook))
 			save && save_notebook(session, notebook)
 		end
 	catch e
@@ -295,7 +295,7 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
 		end
 		notebook.nbpkg_busy_packages = String[]
         update_nbpkg_cache!(notebook)
-		send_notebook_changes!(ClientRequest(session=session, notebook=notebook))
+		send_notebook_changes!(ClientRequest(; session, notebook))
 
 		# Clear the embedded Project and Manifest and require a restart from the user.
 		reset_nbpkg!(notebook, new_topology; keep_project=false, save=save)
@@ -303,7 +303,7 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
         notebook.nbpkg_install_time_ns = nothing
         notebook.nbpkg_ctx_instantiated = false
         update_nbpkg_cache!(notebook)
-		send_notebook_changes!(ClientRequest(session=session, notebook=notebook))
+		send_notebook_changes!(ClientRequest(; session, notebook))
 
 		save && save_notebook(session, notebook)
 	end
@@ -456,7 +456,7 @@ function update_nbpkg(session, notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.U
 					notebook.nbpkg_terminal_outputs[p] = original * "\n\n" * s
 				end
                 update_nbpkg_cache!(notebook)
-				send_notebook_changes!(ClientRequest(session=session, notebook=notebook))
+				send_notebook_changes!(ClientRequest(; session, notebook))
 			end
 			update_nbpkg_core(notebook; level=level, on_terminal_output=iocallback)
 		end
@@ -476,7 +476,7 @@ function update_nbpkg(session, notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.U
 	finally
 		notebook.nbpkg_busy_packages = String[]
         update_nbpkg_cache!(notebook)
-		send_notebook_changes!(ClientRequest(session=session, notebook=notebook))
+		send_notebook_changes!(ClientRequest(; session, notebook))
 		save && save_notebook(session, notebook)
 	end
 end

From 2fa25721a6405d1e1fa7dd49029555368441d5bf Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 28 Nov 2022 14:52:50 +0100
Subject: [PATCH 520/821] Rework Live Docs layout to support new tabs in future
 (#2376)

---
 frontend/components/BottomRightPanel.js | 110 ++++++++++++
 frontend/components/Editor.js           |   4 +-
 frontend/components/LiveDocs.js         | 160 -----------------
 frontend/components/LiveDocsTab.js      | 139 +++++++++++++++
 frontend/dark_color.css                 |   5 +-
 frontend/editor.css                     | 104 ++++++++---
 frontend/light_color.css                | 223 ++++++++++++++++--------
 7 files changed, 483 insertions(+), 262 deletions(-)
 create mode 100644 frontend/components/BottomRightPanel.js
 delete mode 100644 frontend/components/LiveDocs.js
 create mode 100644 frontend/components/LiveDocsTab.js

diff --git a/frontend/components/BottomRightPanel.js b/frontend/components/BottomRightPanel.js
new file mode 100644
index 0000000000..3680762ba9
--- /dev/null
+++ b/frontend/components/BottomRightPanel.js
@@ -0,0 +1,110 @@
+import { html, useState, useRef, useEffect } from "../imports/Preact.js"
+import { cl } from "../common/ClassTable.js"
+
+import { LiveDocsTab } from "./LiveDocsTab.js"
+
+export const ENABLE_PROCESS_TAB = window.localStorage.getItem("ENABLE_PROCESS_TAB") === "true"
+
+if (ENABLE_PROCESS_TAB) {
+    console.log(`YOU ENABLED THE PROCESS TAB
+Thanks! Awesome!
+Please let us know if you find any bugs...
+If enough people do this, we turn it on by default. 💛
+`)
+}
+
+// Added this so we can have people test the mixed parser, because I LIKE IT SO MUCH - DRAL
+// @ts-ignore
+window.PLUTO_TOGGLE_PROCESS_TAB = () => {
+    window.localStorage.setItem("ENABLE_PROCESS_TAB", String(!ENABLE_PROCESS_TAB))
+    window.location.reload()
+}
+
+export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, notebook }) => {
+    let container_ref = useRef()
+
+    const focus_docs_on_open_ref = useRef(false)
+    const [open_tab, set_open_tab] = useState(/** @type { "docs" | "process" | null} */ (null))
+    const hidden = open_tab == null
+
+    // Open docs when "open_live_docs" event is triggered
+    useEffect(() => {
+        let handler = () => {
+            // https://github.com/fonsp/Pluto.jl/issues/321
+            focus_docs_on_open_ref.current = false
+            set_open_tab("docs")
+            if (window.getComputedStyle(container_ref.current).display === "none") {
+                alert("This browser window is too small to show docs.\n\nMake the window bigger, or try zooming out.")
+            }
+        }
+        window.addEventListener("open_live_docs", handler)
+        return () => window.removeEventListener("open_live_docs", handler)
+    }, [])
+
+    return html`
+        <aside id="helpbox-wrapper" ref=${container_ref}>
+            <pluto-helpbox class=${cl({ hidden, [`helpbox-${open_tab ?? hidden}`]: true })}>
+                <header translate=${false}>
+                    <button
+                        title="Live Docs: Search for Julia documentation, and get live documentation of everything you type."
+                        class=${cl({
+                            "helpbox-tab-key": true,
+                            "helpbox-docs": true,
+                            "active": open_tab === "docs",
+                        })}
+                        onClick=${() => {
+                            focus_docs_on_open_ref.current = true
+                            set_open_tab(open_tab === "docs" ? null : "docs")
+                            // TODO: focus the docs input
+                        }}
+                    >
+                        <span>Live Docs</span>
+                    </button>
+                    <button
+                        disabled=${!ENABLE_PROCESS_TAB}
+                        title=${ENABLE_PROCESS_TAB ? "Process status" : "We are still working on this feature. Check back soon!"}
+                        class=${cl({
+                            "helpbox-tab-key": true,
+                            "helpbox-process": true,
+                            "active": open_tab === "process",
+                        })}
+                        onClick=${() => {
+                            set_open_tab(open_tab === "process" ? null : "process")
+                        }}
+                    >
+                        <span>${ENABLE_PROCESS_TAB ? "Status" : "Coming soon"}</span>
+                    </button>
+                    ${hidden
+                        ? null
+                        : html`<button
+                              class="helpbox-close"
+                              onClick=${() => {
+                                  set_open_tab(null)
+                              }}
+                          >
+                              <span></span>
+                          </button>`}
+                </header>
+                ${open_tab === "docs"
+                    ? html`<${LiveDocsTab}
+                          focus_on_open=${focus_docs_on_open_ref.current}
+                          desired_doc_query=${desired_doc_query}
+                          on_update_doc_query=${on_update_doc_query}
+                          notebook=${notebook}
+                      />`
+                    : open_tab === "process"
+                    ? html`<section>
+                          <p>Congratulations, you found the secret!</p>
+                          <p>
+                              Have you considered becoming a Pluto.jl open source contributor? We are always looking for creative people with JavaScript
+                              experience! Take a look at our${" "}
+                              <a href="https://github.com/fonsp/Pluto.jl/issues?q=is%3Aopen+label%3A%22good+first+issue%22+sort%3Aupdated-desc"
+                                  >good first issues</a
+                              >, and our ${" "}<a href="https://juliapluto.github.io/weekly-call-notes/">weekly community call</a>.
+                          </p>
+                      </section>`
+                    : null}
+            </pluto-helpbox>
+        </aside>
+    `
+}
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index b06c9e0e12..aa88d45000 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -11,7 +11,7 @@ import { serialize_cells, deserialize_cells, detect_deserializer } from "../comm
 import { FilePicker } from "./FilePicker.js"
 import { Preamble } from "./Preamble.js"
 import { NotebookMemo as Notebook } from "./Notebook.js"
-import { LiveDocs } from "./LiveDocs.js"
+import { BottomRightPanel } from "./BottomRightPanel.js"
 import { DropRuler } from "./DropRuler.js"
 import { SelectionArea } from "./SelectionArea.js"
 import { RecentlyDisabledInfo, UndoDelete } from "./UndoDelete.js"
@@ -1530,7 +1530,7 @@ patch: ${JSON.stringify(
                             notebook_id=${this.state.notebook.notebook_id} 
                             environment_component=${this.state.extended_components.NonCellOutputComponents} />
                     </${Main}>
-                    <${LiveDocs}
+                    <${BottomRightPanel}
                         desired_doc_query=${this.state.desired_doc_query}
                         on_update_doc_query=${this.actions.set_doc_query}
                         notebook=${this.state.notebook}
diff --git a/frontend/components/LiveDocs.js b/frontend/components/LiveDocs.js
deleted file mode 100644
index 8de2d639a9..0000000000
--- a/frontend/components/LiveDocs.js
+++ /dev/null
@@ -1,160 +0,0 @@
-import { html, useState, useRef, useLayoutEffect, useEffect, useMemo, useContext } from "../imports/Preact.js"
-import immer from "../imports/immer.js"
-import observablehq from "../common/SetupCellEnvironment.js"
-import { cl } from "../common/ClassTable.js"
-
-import { RawHTMLContainer, highlight } from "./CellOutput.js"
-import { PlutoActionsContext } from "../common/PlutoContext.js"
-
-const without_workspace_stuff = (str) =>
-    str
-        .replace(/Main\.var&quot;workspace\#\d+&quot;\./g, "") // remove workspace modules from variable names
-        .replace(/Main\.workspace\#\d+\./g, "") // remove workspace modules from variable names
-        .replace(/ in Main\.var&quot;workspace\#\d+&quot;/g, "") // remove workspace modules from method lists
-        .replace(/ in Main\.workspace\#\d+/g, "") // remove workspace modules from method lists
-        .replace(/#&#61;&#61;#[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\:\d+/g, "") // remove UUIDs from filenames
-
-export let LiveDocs = ({ desired_doc_query, on_update_doc_query, notebook }) => {
-    let pluto_actions = useContext(PlutoActionsContext)
-    let container_ref = useRef()
-    let live_doc_search_ref = useRef()
-    let [state, set_state] = useState({
-        shown_query: null,
-        searched_query: null,
-        body: "<p>Welcome to the <b>Live docs</b>! Keep this little window open while you work on the notebook, and you will get documentation of everything you type!</p><p>You can also type a query above.</p><hr><p><em>Still stuck? Here are <a href='https://julialang.org/about/help/' target='_blank'>some tips</a>.</em></p>",
-        hidden: true,
-        loading: false,
-    })
-    let update_state = (mutation) => set_state(immer((state) => mutation(state)))
-
-    // Open docs when "open_live_docs" event is triggered
-    useEffect(() => {
-        let handler = () => {
-            // https://github.com/fonsp/Pluto.jl/issues/321
-            update_state((state) => {
-                state.hidden = false
-            })
-            if (window.getComputedStyle(container_ref.current).display === "none") {
-                alert("This browser window is too small to show docs.\n\nMake the window bigger, or try zooming out.")
-            }
-        }
-        window.addEventListener("open_live_docs", handler)
-        return () => window.removeEventListener("open_live_docs", handler)
-    }, [])
-
-    // Apply syntax highlighting to code blocks:
-    // In the standard HTML container we already do this for code.language-julia blocks,
-    // but in the docs it's safe to extend to to all highlighting I think
-    useLayoutEffect(() => {
-        // Actually, showing the jldoctest stuff wasn't as pretty... should make a mode for that sometimes
-        // for (let code_element of container_ref.current.querySelectorAll("code.language-jldoctest")) {
-        //     highlight(code_element, "julia")
-        // }
-        for (let code_element of container_ref.current.querySelectorAll("code:not([class])")) {
-            highlight(code_element, "julia")
-        }
-    }, [state.body])
-
-    useEffect(() => {
-        if (state.hidden || state.loading) {
-            return
-        }
-        if (!/[^\s]/.test(desired_doc_query)) {
-            // only whitespace
-            return
-        }
-
-        if (state.searched_query !== desired_doc_query) {
-            fetch_docs(desired_doc_query)
-        }
-    }, [desired_doc_query, state.hidden, state.loading, state.searched_query])
-
-    let fetch_docs = (new_query) => {
-        update_state((state) => {
-            state.loading = true
-            state.searched_query = new_query
-        })
-        Promise.race([
-            observablehq.Promises.delay(2000, false),
-            pluto_actions.send("docs", { query: new_query.replace(/^\?/, "") }, { notebook_id: notebook.notebook_id }).then((u) => {
-                if (u.message.status === "⌛") {
-                    return false
-                }
-                if (u.message.status === "👍") {
-                    update_state((state) => {
-                        state.shown_query = new_query
-                        state.body = u.message.doc
-                    })
-                    return true
-                }
-            }),
-        ]).then(() => {
-            update_state((state) => {
-                state.loading = false
-            })
-        })
-    }
-
-    let docs_element = useMemo(() => html` <${RawHTMLContainer} body=${without_workspace_stuff(state.body)} /> `, [state.body])
-    let no_docs_found = state.loading === false && state.searched_query !== "" && state.searched_query !== state.shown_query
-
-    return html`
-        <aside id="helpbox-wrapper" ref=${container_ref}>
-            <pluto-helpbox class=${cl({ hidden: state.hidden, loading: state.loading, notfound: no_docs_found })}>
-                <header
-                    translate=${false}
-                    onClick=${() => {
-                        if (state.hidden) {
-                            set_state((state) => ({ ...state, hidden: false }))
-                            // wait for next event loop
-                            setTimeout(
-                                () =>
-                                    live_doc_search_ref.current &&
-                                    live_doc_search_ref.current.focus({
-                                        preventScroll: true,
-                                    }),
-                                0
-                            )
-                        }
-                    }}
-                >
-                    ${state.hidden
-                        ? "Live docs"
-                        : html`
-                        <input
-                            title=${no_docs_found ? `"${state.searched_query}" not found` : ""}
-                            id="live-docs-search"
-                            placeholder="Search docs..."
-                            ref=${live_doc_search_ref}
-                            onInput=${(e) => on_update_doc_query(e.target.value)}
-                            value=${desired_doc_query}
-                            type="text"
-                        ></input>
-                        <button onClick=${(e) => {
-                            set_state((state) => ({ ...state, hidden: true }))
-                            e.stopPropagation()
-                            setTimeout(() => live_doc_search_ref.current && live_doc_search_ref.current.focus(), 0)
-                        }}><span></span></button>
-                    `}
-                </header>
-                <section ref=${(ref) => ref != null && resolve_doc_reference_links(ref, on_update_doc_query)}>
-                    <h1><code>${state.shown_query}</code></h1>
-                    ${docs_element}
-                </section>
-            </pluto-helpbox>
-        </aside>
-    `
-}
-
-const resolve_doc_reference_links = (node, on_update_doc_query) => {
-    for (let anchor of node.querySelectorAll("a")) {
-        const href = anchor.getAttribute("href")
-        if (href != null && href.startsWith("@ref")) {
-            const query = href.length > 4 ? href.substr(5) : anchor.textContent
-            anchor.onclick = (e) => {
-                on_update_doc_query(query)
-                e.preventDefault()
-            }
-        }
-    }
-}
diff --git a/frontend/components/LiveDocsTab.js b/frontend/components/LiveDocsTab.js
new file mode 100644
index 0000000000..3f05d039ff
--- /dev/null
+++ b/frontend/components/LiveDocsTab.js
@@ -0,0 +1,139 @@
+import { html, useState, useRef, useLayoutEffect, useEffect, useMemo, useContext } from "../imports/Preact.js"
+import immer from "../imports/immer.js"
+import observablehq from "../common/SetupCellEnvironment.js"
+
+import { RawHTMLContainer, highlight } from "./CellOutput.js"
+import { PlutoActionsContext } from "../common/PlutoContext.js"
+import { cl } from "../common/ClassTable.js"
+
+/**
+ * @param {{
+ * focus_on_open: boolean,
+ * desired_doc_query: string?,
+ * on_update_doc_query: (query: string) => void,
+ * notebook: import("./Editor.js").NotebookData,
+ * }} props
+ */
+export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_query, notebook }) => {
+    let pluto_actions = useContext(PlutoActionsContext)
+    let live_doc_search_ref = useRef(/** @type {HTMLInputElement?} */ (null))
+
+    // This is all in a single state object so that we can update multiple field simultaneously
+    let [state, set_state] = useState({
+        shown_query: null,
+        searched_query: null,
+        body: "<p>Welcome to the <b>Live docs</b>! Keep this little window open while you work on the notebook, and you will get documentation of everything you type!</p><p>You can also type a query above.</p><hr><p><em>Still stuck? Here are <a href='https://julialang.org/about/help/' target='_blank'>some tips</a>.</em></p>",
+        loading: false,
+    })
+    let update_state = (mutation) => set_state(immer((state) => mutation(state)))
+
+    useEffect(() => {
+        if (state.loading) {
+            return
+        }
+        if (desired_doc_query != null && !/[^\s]/.test(desired_doc_query)) {
+            // only whitespace
+            return
+        }
+
+        if (state.searched_query !== desired_doc_query) {
+            fetch_docs(desired_doc_query)
+        }
+    }, [desired_doc_query, state.loading, state.searched_query])
+
+    useLayoutEffect(() => {
+        if (focus_on_open && live_doc_search_ref.current) {
+            live_doc_search_ref.current.focus()
+            live_doc_search_ref.current.select()
+        }
+    }, [focus_on_open, live_doc_search_ref.current])
+
+    let fetch_docs = (new_query) => {
+        update_state((state) => {
+            state.loading = true
+            state.searched_query = new_query
+        })
+        Promise.race([
+            observablehq.Promises.delay(2000, false),
+            pluto_actions.send("docs", { query: new_query.replace(/^\?/, "") }, { notebook_id: notebook.notebook_id }).then((u) => {
+                if (u.message.status === "⌛") {
+                    return false
+                }
+                if (u.message.status === "👍") {
+                    update_state((state) => {
+                        state.shown_query = new_query
+                        state.body = u.message.doc
+                    })
+                    return true
+                }
+            }),
+        ]).then(() => {
+            update_state((state) => {
+                state.loading = false
+            })
+        })
+    }
+
+    let docs_element = useMemo(() => html`<${RawHTMLContainer} body=${without_workspace_stuff(state.body)} />`, [state.body])
+    let no_docs_found = state.loading === false && state.searched_query !== "" && state.searched_query !== state.shown_query
+
+    return html`
+        <div
+            class=${cl({
+                "live-docs-searchbox": true,
+                "loading": state.loading,
+                "notfound": no_docs_found,
+            })}
+            translate=${false}
+        >
+            <input
+                title=${no_docs_found ? `"${state.searched_query}" not found` : ""}
+                id="live-docs-search"
+                placeholder="Search docs..."
+                ref=${live_doc_search_ref}
+                onInput=${(e) => on_update_doc_query(e.target.value)}
+                value=${desired_doc_query}
+                type="search"
+            ></input>
+            
+        </div>
+        <section ref=${(ref) => ref != null && post_process_doc_node(ref, on_update_doc_query)}>
+            <h1><code>${state.shown_query}</code></h1>
+            ${docs_element}
+        </section>
+    `
+}
+
+const post_process_doc_node = (node, on_update_doc_query) => {
+    // Apply syntax highlighting to code blocks:
+
+    // In the standard HTML container we already do this for code.language-julia blocks,
+    // but in the docs it's safe to extend to to all highlighting I think
+    // Actually, showing the jldoctest stuff wasn't as pretty... should make a mode for that sometimes
+    // for (let code_element of container_ref.current.querySelectorAll("code.language-jldoctest")) {
+    //     highlight(code_element, "julia")
+    // }
+    for (let code_element of node.querySelectorAll("code:not([class])")) {
+        highlight(code_element, "julia")
+    }
+
+    // Resolve @doc reference links:
+    for (let anchor of node.querySelectorAll("a")) {
+        const href = anchor.getAttribute("href")
+        if (href != null && href.startsWith("@ref")) {
+            const query = href.length > 4 ? href.substr(5) : anchor.textContent
+            anchor.onclick = (e) => {
+                on_update_doc_query(query)
+                e.preventDefault()
+            }
+        }
+    }
+}
+
+const without_workspace_stuff = (str) =>
+    str
+        .replace(/Main\.var&quot;workspace\#\d+&quot;\./g, "") // remove workspace modules from variable names
+        .replace(/Main\.workspace\#\d+\./g, "") // remove workspace modules from variable names
+        .replace(/ in Main\.var&quot;workspace\#\d+&quot;/g, "") // remove workspace modules from method lists
+        .replace(/ in Main\.workspace\#\d+/g, "") // remove workspace modules from method lists
+        .replace(/#&#61;&#61;#[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\:\d+/g, "") // remove UUIDs from filenames
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index b6cdcb3a7c..ab94beabde 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -139,8 +139,11 @@
         --helpbox-bg-color: rgb(30 34 31);
         --helpbox-box-shadow-color: #00000017;
         --helpbox-header-bg-color: #2c3e36;
+        --helpbox-header-tab-bg-color: #554e4e;
         --helpbox-header-color: rgb(255 248 235);
-        --helpbox-notfound-header-color: rgb(139, 139, 139);
+        --helpbox-search-bg-color: #2c2c2c;
+        --helpbox-search-border-color: #757575;
+        --helpbox-notfound-search-color: rgb(139, 139, 139);
         --helpbox-text-color: rgb(230, 230, 230);
         --code-section-bg-color: rgb(44, 44, 44);
         --code-section-border-color: #555a64;
diff --git a/frontend/editor.css b/frontend/editor.css
index 1983f64ee2..22c8884ef7 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2034,7 +2034,7 @@ pluto-helpbox {
     flex-direction: column;
     width: calc(100vw - 50px - (700px + 25px + 6px)); /* compat */
     width: clamp(300px, calc(100vw - 50px - (700px + 25px + 6px)), 450px);
-    height: 70vh; /* compat */
+    height: 95vh; /* compat */
     height: min(70vh, 900px);
     /* overflow: hidden; */
     background-color: var(--helpbox-bg-color);
@@ -2048,44 +2048,85 @@ pluto-helpbox {
 }
 pluto-helpbox > header {
     display: flex;
-    padding: 15px;
+    padding: 0.6em;
     background-color: var(--helpbox-header-bg-color);
     color: var(--helpbox-header-color);
-    font-family: "Roboto Mono", monospace;
+    font-family: var(--system-ui-font-stack);
     font-size: 0.9rem;
-    font-weight: 700;
-    border-top-left-radius: 6px;
-    border-top-right-radius: 6px;
+    --border-radius: 0.4em;
+    font-weight: 500;
+    border-top-left-radius: var(--border-radius);
+    border-top-right-radius: var(--border-radius);
     /* border-top: 4px solid #8a8a8a; */
+    gap: 0.5em;
 }
-pluto-helpbox > header::before {
-    content: "📖 ";
-    margin-right: 10px;
+
+pluto-helpbox > header > button.helpbox-tab-key::before {
+    content: "";
+    /* font-size: 1em; */
+    --size: 1.1em;
+    width: var(--size);
+    height: var(--size);
+    background-size: var(--size);
+    margin-bottom: calc(-0.15 * var(--size));
+    filter: var(--image-filters);
+    margin-right: 0.6em;
+    display: inline-block;
 }
-/* pluto-helpbox.loading>header::before{
-    content: "⌛ ";
-    margin-right: 10px;
-} */
-pluto-helpbox.hidden > header::before {
-    content: "📚 ";
-    margin-right: 10px;
+pluto-helpbox > header > button.helpbox-docs::before {
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/search.svg");
+    /* content: "📚 "; */
 }
-pluto-helpbox > header > input {
+pluto-helpbox > header > button.helpbox-docs.active::before {
+    /* content: "📖 "; */
+}
+pluto-helpbox > header > button.helpbox-process::before {
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/terminal.svg");
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/pulse.svg");
+    /* content: "💻 "; */
+}
+
+pluto-helpbox > header > button.helpbox-tab-key:disabled::before {
+    /* display: none; */
+    opacity: 0.5;
+}
+
+pluto-helpbox .live-docs-searchbox input {
     flex-grow: 1;
     background-color: inherit;
     color: inherit;
-    font-family: inherit;
-    font-weight: inherit;
-    font-size: inherit;
     border: none;
+    padding: 0.5em;
+    margin: auto;
+    border: 3px solid var(--helpbox-search-border-color);
+    border-radius: 0.3em;
+    background: var(--helpbox-search-bg-color);
+    font-family: var(--julia-mono-font-stack);
+    font-size: 0.9rem;
 }
-pluto-helpbox.notfound > header > input {
-    color: var(--helpbox-notfound-header-color);
+pluto-helpbox .live-docs-searchbox.notfound input {
+    color: var(--helpbox-notfound-search-color);
 }
-pluto-helpbox > header > input:focus {
+pluto-helpbox .live-docs-searchbox input:focus {
     outline: none;
 }
-pluto-helpbox > header > button {
+
+button.helpbox-tab-key {
+    padding: 0.5em 0.6em;
+    cursor: pointer;
+    font-family: inherit;
+    font-weight: inherit;
+    font-style: inherit;
+    font-size: inherit;
+    border-radius: var(--border-radius);
+    border: none;
+    background: var(--helpbox-header-tab-bg-color);
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+pluto-helpbox > header > button.helpbox-close {
     border: none;
     background: none;
     cursor: pointer;
@@ -2093,8 +2134,10 @@ pluto-helpbox > header > button {
     /* for bigger hitbox */
     margin: -15px;
     border: 15px solid transparent;
+    margin-left: auto;
 }
-pluto-helpbox > header > button > span {
+
+pluto-helpbox > header > button.helpbox-close > span {
     display: block;
     content: " " !important;
     background-size: 1em 1em;
@@ -2105,7 +2148,7 @@ pluto-helpbox > header > button > span {
 }
 pluto-helpbox.hidden {
     height: initial;
-    cursor: pointer;
+    width: auto;
 }
 pluto-helpbox.hidden > section {
     display: none;
@@ -3012,3 +3055,12 @@ pluto-logs-container > header {
     font-weight: 700;
     /* background: #494949; */
 }
+
+button.active.helpbox-tab-key {
+    outline: 3px solid #99afb9;
+}
+
+.live-docs-searchbox {
+    display: flex;
+    margin: 1em;
+}
diff --git a/frontend/light_color.css b/frontend/light_color.css
index e443706d26..7ec5ea5fed 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -5,10 +5,12 @@
 
         /* Color scheme */
         --main-bg-color: white;
-        --rule-color: rgba(0, 0, 0, 0.15);
+        --rule-color:
+        rgba(0, 0, 0, 0.15);
         --kbd-border-color: #dfdfdf;
         --header-bg-color: white;
-        --header-border-color: rgba(0, 0, 0, 0.1);
+        --header-border-color:
+        rgba(0, 0, 0, 0.1);
         --ui-button-color: #2a2a2b;
         --cursor-color: black;
         --normal-cell: 0, 0, 0;
@@ -16,88 +18,138 @@
         --error-color: 240, 168, 168;
 
         /*Cells*/
-        --normal-cell-color: rgba(var(--normal-cell), 0.1);
-        --dark-normal-cell-color: rgba(var(--normal-cell), 0.2);
-        --selected-cell-color: rgba(40, 78, 189, 0.4);
-        --code-differs-cell-color: rgba(var(--code-differs), 0.68);
-        --error-cell-color: rgba(var(--error-color), 0.7);
-        --bright-error-cell-color: rgb(var(--error-color));
-        --light-error-cell-color: rgba(var(--error-color), 0.05);
+        --normal-cell-color:
+        rgba(var(--normal-cell), 0.1);
+        --dark-normal-cell-color:
+        rgba(var(--normal-cell), 0.2);
+        --selected-cell-color:
+        rgba(40, 78, 189, 0.4);
+        --code-differs-cell-color:
+        rgba(var(--code-differs), 0.68);
+        --error-cell-color:
+        rgba(var(--error-color), 0.7);
+        --bright-error-cell-color:
+        rgb(var(--error-color));
+        --light-error-cell-color:
+        rgba(var(--error-color), 0.05);
 
         /*Export styling*/
-        --export-bg-color: rgb(60, 67, 101);
-        --export-color: rgba(255, 255, 255, 0.7);
-        --export-card-bg-color: rgba(255, 255, 255, 0.8);
-        --export-card-title-color: rgba(0, 0, 0, 0.7);
-        --export-card-text-color: rgba(0, 0, 0, 0.5);
+        --export-bg-color:
+        rgb(60, 67, 101);
+        --export-color:
+        rgba(255, 255, 255, 0.7);
+        --export-card-bg-color:
+        rgba(255, 255, 255, 0.8);
+        --export-card-title-color:
+        rgba(0, 0, 0, 0.7);
+        --export-card-text-color:
+        rgba(0, 0, 0, 0.5);
         --export-card-shadow-color: #00000029;
 
         /*Pluto output styling */
-        --pluto-schema-types-color: rgba(0, 0, 0, 0.4);
-        --pluto-schema-types-border-color: rgba(0, 0, 0, 0.2);
-        --pluto-output-color: hsl(0, 0%, 25%);
-        --pluto-output-h-color: hsl(0, 0%, 12%);
+        --pluto-schema-types-color:
+        rgba(0, 0, 0, 0.4);
+        --pluto-schema-types-border-color:
+        rgba(0, 0, 0, 0.2);
+        --pluto-output-color:
+        hsl(0, 0%, 25%);
+        --pluto-output-h-color:
+        hsl(0, 0%, 12%);
         --pluto-output-bg-color: white;
         --a-underline: #00000059;
         --blockquote-color: #555;
         --blockquote-bg: #f2f2f2;
         --admonition-title-color: white;
-        --jl-message-color: rgb(219 233 212);
-        --jl-message-accent-color: rgb(158, 200, 137);
-        --jl-info-color: rgb(214 227 244);
-        --jl-info-accent-color: rgb(148, 182, 226);
-        --jl-warn-color: rgb(236 234 213);
-        --jl-warn-accent-color: rgb(207, 199, 138);
-        --jl-danger-color: rgb(245 218 215);
-        --jl-danger-accent-color: rgb(226, 157, 148);
-        --jl-debug-color: rgb(245 218 215);
-        --jl-debug-accent-color: rgb(226, 157, 148);
-        --footnote-border-color: rgba(23, 115, 119, 0.15);
-        --table-border-color: rgba(0, 0, 0, 0.2);
-        --table-bg-hover-color: rgba(159, 158, 224, 0.15);
-        --pluto-tree-color: rgb(0 0 0 / 38%);
+        --jl-message-color:
+        rgb(219 233 212);
+        --jl-message-accent-color:
+        rgb(158, 200, 137);
+        --jl-info-color:
+        rgb(214 227 244);
+        --jl-info-accent-color:
+        rgb(148, 182, 226);
+        --jl-warn-color:
+        rgb(236 234 213);
+        --jl-warn-accent-color:
+        rgb(207, 199, 138);
+        --jl-danger-color:
+        rgb(245 218 215);
+        --jl-danger-accent-color:
+        rgb(226, 157, 148);
+        --jl-debug-color:
+        rgb(245 218 215);
+        --jl-debug-accent-color:
+        rgb(226, 157, 148);
+        --footnote-border-color:
+        rgba(23, 115, 119, 0.15);
+        --table-border-color:
+        rgba(0, 0, 0, 0.2);
+        --table-bg-hover-color:
+        rgba(159, 158, 224, 0.15);
+        --pluto-tree-color:
+        rgb(0 0 0 / 38%);
 
         /*pluto cell styling*/
-        --disabled-cell-bg-color: rgba(139, 139, 139, 0.25);
-        --selected-cell-bg-color: rgba(40, 78, 189, 0.24);
-        --hover-scrollbar-color-1: rgba(0, 0, 0, 0.15);
-        --hover-scrollbar-color-2: rgba(0, 0, 0, 0.05);
+        --disabled-cell-bg-color:
+        rgba(139, 139, 139, 0.25);
+        --selected-cell-bg-color:
+        rgba(40, 78, 189, 0.24);
+        --hover-scrollbar-color-1:
+        rgba(0, 0, 0, 0.15);
+        --hover-scrollbar-color-2:
+        rgba(0, 0, 0, 0.05);
         --skip-as-script-background-color: #ccc;
         --depends-on-skip-as-script-background-color: #eee;
 
         /* Pluto shoulders */
-        --shoulder-hover-bg-color: rgba(0, 0, 0, 0.05);
+        --shoulder-hover-bg-color:
+        rgba(0, 0, 0, 0.05);
 
         /* Logs */
-        --pluto-logs-bg-color: hsl(0deg 0% 98%);
-        --pluto-logs-key-color: rgb(0 0 0 / 51%);
+        --pluto-logs-bg-color:
+        hsl(0deg 0% 98%);
+        --pluto-logs-key-color:
+        rgb(0 0 0 / 51%);
         --pluto-logs-progress-fill: #ffffff;
         --pluto-logs-progress-bg: #e7e7e7;
-        --pluto-logs-progress-border: hsl(210deg 16% 74%);
+        --pluto-logs-progress-border:
+        hsl(210deg 16% 74%);
 
         --pluto-logs-info-color: white;
         --pluto-logs-info-accent-color: inherit;
-        --pluto-logs-warn-color: rgb(236 234 213);
+        --pluto-logs-warn-color:
+        rgb(236 234 213);
         --pluto-logs-warn-accent-color: #665f26;
-        --pluto-logs-danger-color: rgb(245 218 215);
-        --pluto-logs-danger-accent-color: rgb(172 66 52);
-        --pluto-logs-debug-color: rgb(236 223 247);
-        --pluto-logs-debug-accent-color: rgb(100 50 179);
+        --pluto-logs-danger-color:
+        rgb(245 218 215);
+        --pluto-logs-danger-accent-color:
+        rgb(172 66 52);
+        --pluto-logs-debug-color:
+        rgb(236 223 247);
+        --pluto-logs-debug-accent-color:
+        rgb(100 50 179);
 
         /*Top navbar styling*/
         --nav-h1-text-color: black;
         --nav-filepicker-color: #6f6f6f;
         --nav-filepicker-border-color: #b2b2b2;
         --nav-process-status-bg-color: white;
-        --nav-process-status-color: var(--pluto-output-h-color);
+        --nav-process-status-color:
+        var(--pluto-output-h-color);
 
         /*header*/
-        --restart-recc-header-color: rgba(114, 192, 255, 0.56);
-        --restart-req-header-color: rgba(170, 41, 32, 0.56);
-        --dead-process-header-color: rgb(230 88 46 / 38%);
-        --loading-header-color: hsla(290, 10%, 80%, 0.5);
-        --disconnected-header-color: rgba(255, 169, 114, 0.56);
-        --binder-loading-header-color: hsl(51deg 64% 90% / 50%);
+        --restart-recc-header-color:
+        rgba(114, 192, 255, 0.56);
+        --restart-req-header-color:
+        rgba(170, 41, 32, 0.56);
+        --dead-process-header-color:
+        rgb(230 88 46 / 38%);
+        --loading-header-color:
+        hsla(290, 10%, 80%, 0.5);
+        --disconnected-header-color:
+        rgba(255, 169, 114, 0.56);
+        --binder-loading-header-color:
+        hsl(51deg 64% 90% / 50%);
 
         /*loading bar*/
         --loading-grad-color-1: #f1dba9;
@@ -109,10 +161,12 @@
         --overlay-button-border-save: #f3f2f2;
 
         /*input_context_menu*/
-        --input-context-menu-border-color: rgba(0, 0, 0, 0.1);
+        --input-context-menu-border-color:
+        rgba(0, 0, 0, 0.1);
         --input-context-menu-bg-color: white;
         --input-context-menu-soon-color: #55555544;
-        --input-context-menu-hover-bg-color: rgba(0, 0, 0, 0.1);
+        --input-context-menu-hover-bg-color:
+        rgba(0, 0, 0, 0.1);
         --input-context-menu-li-color: #6b6a6a;
 
         /*Pkg status*/
@@ -125,15 +179,19 @@
         --pkg-terminal-border-color: #c3c3c3;
 
         /* run area*/
-        --pluto-runarea-bg-color: hsl(0, 0, 97%);
-        --pluto-runarea-span-color: hsl(353, 5%, 64%);
+        --pluto-runarea-bg-color:
+        hsl(0, 0, 97%);
+        --pluto-runarea-span-color:
+        hsl(353, 5%, 64%);
 
         /*drop ruler*/
-        --dropruler-bg-color: rgba(0, 0, 0, 0.5);
+        --dropruler-bg-color:
+        rgba(0, 0, 0, 0.5);
 
         /* jlerror */
         --jlerror-header-color: #4f1616;
-        --jlerror-mark-bg-color: rgb(243 243 243);
+        --jlerror-mark-bg-color:
+        rgb(243 243 243);
         --jlerror-a-bg-color: #f5efd9;
         --jlerror-a-border-left-color: #704141;
         --jlerror-mark-color: black;
@@ -141,9 +199,16 @@
         /* helpbox */
         --helpbox-bg-color: white;
         --helpbox-box-shadow-color: #00000010;
-        --helpbox-header-bg-color: #eef1f7;
-        --helpbox-header-color: hsl(230, 14%, 11%);
-        --helpbox-notfound-header-color: rgb(139, 139, 139);
+        --helpbox-header-bg-color:
+        hsl(0deg 0% 92%);
+        --helpbox-header-tab-bg-color: white;
+        --helpbox-header-color:
+        hsl(230, 14%, 11%);
+        --helpbox-search-bg-color: #fbfbfb;
+        --helpbox-search-border-color:
+        hsl(207deg 24% 87%);
+        --helpbox-notfound-search-color:
+        rgb(139, 139, 139);
         --helpbox-text-color: black;
         --code-section-bg-color: whitesmoke;
         --code-section-bg-color: #f3f3f3;
@@ -155,21 +220,28 @@
         --footer-input-border-color: #818181;
         --footer-filepicker-button-color: white;
         --footer-filepicker-focus-color: #896c6c;
-        --footnote-border-color: rgba(23, 115, 119, 0.15);
+        --footnote-border-color:
+        rgba(23, 115, 119, 0.15);
 
         /* undo delete cell*/
         --undo-delete-box-shadow-color: #0083;
 
         /*codemirror hints*/
-        --cm-editor-tooltip-border-color: rgba(0, 0, 0, 0.2);
+        --cm-editor-tooltip-border-color:
+        rgba(0, 0, 0, 0.2);
         --cm-editor-li-aria-selected-bg-color: #16659d;
         --cm-editor-li-aria-selected-color: white;
-        --cm-editor-li-notexported-color: rgba(0, 0, 0, 0.5);
-        --code-background: hsla(46, 90%, 98%, 1);
-        --cm-code-differs-gutters-color: rgba(214, 172, 35, 0.2);
+        --cm-editor-li-notexported-color:
+        rgba(0, 0, 0, 0.5);
+        --code-background:
+        hsla(46, 90%, 98%, 1);
+        --cm-code-differs-gutters-color:
+        rgba(214, 172, 35, 0.2);
         --cm-line-numbers-color: #8d86875e;
-        --cm-selection-background: hsl(214deg 100% 73% / 48%);
-        --cm-selection-background-blurred: hsl(214deg 0% 73% / 48%);
+        --cm-selection-background:
+        hsl(214deg 100% 73% / 48%);
+        --cm-selection-background-blurred:
+        hsl(214deg 0% 73% / 48%);
 
         /* code highlighting */
         --cm-editor-text-color: #41323f;
@@ -184,7 +256,8 @@
         --cm-var2-color: #37768a;
         --cm-builtin-color: #5e7ad3;
         --cm-function-color: #cc80ac;
-        --cm-type-color: hsl(170deg 7% 56%);
+        --cm-type-color:
+        hsl(170deg 7% 56%);
         --cm-bracket-color: #41323f;
         --cm-tag-color: #ef6155;
         --cm-link-color: #815ba4;
@@ -192,17 +265,21 @@
         --cm-error-color: #f7f7f7;
         --cm-matchingBracket-color: black;
         --cm-matchingBracket-bg-color: #1b4bbb21;
-        --cm-placeholder-text-color: rgba(0, 0, 0, 0.2);
+        --cm-placeholder-text-color:
+        rgba(0, 0, 0, 0.2);
 
         /*autocomplete menu*/
         --autocomplete-menu-bg-color: white;
 
         /* Landing colors */
-        --index-text-color: hsl(0, 0, 60);
-        --index-clickable-text-color: hsl(0, 0, 30);
+        --index-text-color:
+        hsl(0, 0, 60);
+        --index-clickable-text-color:
+        hsl(0, 0, 30);
         --docs-binding-bg: #8383830a;
         --index-card-bg: white;
-        --welcome-mywork-bg: hsl(35deg 66% 93%);
+        --welcome-mywork-bg:
+        hsl(35deg 66% 93%);
         --welcome-newnotebook-bg: whitesmoke;
         --welcome-recentnotebook-bg: white;
         --welcome-recentnotebook-border: #dfdfdf;

From cb8ee019702922b6caef853907ff32084877953a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 28 Nov 2022 20:43:56 +0100
Subject: [PATCH 521/821] Don't write to file when changing bonds (#2402)

---
 src/evaluation/RunBonds.jl |  2 +-
 test/Bonds.jl              | 34 ++++++++++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/evaluation/RunBonds.jl b/src/evaluation/RunBonds.jl
index ff80d455b4..d23a212855 100644
--- a/src/evaluation/RunBonds.jl
+++ b/src/evaluation/RunBonds.jl
@@ -47,7 +47,7 @@ function set_bond_values_reactive(;
     end
     to_reeval = where_referenced(notebook, notebook.topology, Set{Symbol}(syms_to_set))
 
-    run_reactive_async!(session, notebook, to_reeval; deletion_hook=custom_deletion_hook, user_requested_run=false, run_async=false, bond_value_pairs, kwargs...)
+    run_reactive_async!(session, notebook, to_reeval; deletion_hook=custom_deletion_hook, save=false, user_requested_run=false, run_async=false, bond_value_pairs, kwargs...)
 end
 
 """
diff --git a/test/Bonds.jl b/test/Bonds.jl
index f438d96b64..471de7faa3 100644
--- a/test/Bonds.jl
+++ b/test/Bonds.jl
@@ -1,6 +1,6 @@
 using Test
 import Pluto
-import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Notebook, Cell
+import Pluto: update_run!, update_save_run!, WorkspaceManager, ClientSession, ServerSession, Notebook, Cell
 import Distributed
 
 @testset "Bonds" begin
@@ -8,8 +8,38 @@ import Distributed
     🍭 = ServerSession()
     🍭.options.evaluation.workspace_use_distributed = false
     
+    @testset "Don't write to file" begin
+        notebook = Notebook([
+            Cell("""
+            @bind x html"<input>"
+            """),
+            Cell("x"),
+        ])
+        update_save_run!(🍭, notebook, notebook.cells)
+        
+        old_mtime = mtime(notebook.path)
+        setcode!(notebook.cells[2], "x #asdf")
+        update_save_run!(🍭, notebook, notebook.cells[2])
+        @test old_mtime != mtime(notebook.path)
+        
+        
+        old_mtime = mtime(notebook.path)
+        function set_bond_value(name, value, is_first_value=false)
+            notebook.bonds[name] = Dict("value" => value)
+            Pluto.set_bond_values_reactive(; session=🍭, notebook, bound_sym_names=[name],
+                is_first_values=[is_first_value],
+                run_async=false,
+            )
+        end
+        
+        set_bond_value(:x, 1, true)
+        @test old_mtime == mtime(notebook.path)
+        set_bond_value(:x, 2, false)
+        @test old_mtime == mtime(notebook.path)
+    end
+    
     @testset "AbstractPlutoDingetjes.jl" begin
-        🍭.options.evaluation.workspace_use_distributed = true
+        🍭.options.evaluation.workspace_use_distributed = true # because we use AbstractPlutoDingetjes
         notebook = Notebook([
                 # 1
                 Cell("""

From 0cbbcb8d43e005a4b8a2f079619ddd0556d7ffa6 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 29 Nov 2022 12:22:09 +0100
Subject: [PATCH 522/821] whitespace

---
 frontend/editor.css | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 22c8884ef7..c75a234dc5 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2091,6 +2091,11 @@ pluto-helpbox > header > button.helpbox-tab-key:disabled::before {
     opacity: 0.5;
 }
 
+pluto-helpbox .live-docs-searchbox {
+    display: flex;
+    margin: 1em;
+}
+
 pluto-helpbox .live-docs-searchbox input {
     flex-grow: 1;
     background-color: inherit;
@@ -2126,6 +2131,10 @@ button.helpbox-tab-key {
     white-space: nowrap;
 }
 
+button.active.helpbox-tab-key {
+    outline: 3px solid #99afb9;
+}
+
 pluto-helpbox > header > button.helpbox-close {
     border: none;
     background: none;
@@ -2414,6 +2423,16 @@ pluto-logs-container:not(:empty) {
     padding: 6px;
 }
 
+pluto-logs-container > header {
+    font-family: "Roboto Mono", monospace;
+    font-size: 1.3rem;
+    padding: 0.2em;
+    padding-bottom: 0;
+    opacity: 0.6;
+    font-weight: 700;
+    /* background: #494949; */
+}
+
 pluto-logs-container pluto-progress-bars pluto-progress:not(:first-child) {
     margin-top: 10px;
 }
@@ -3045,22 +3064,3 @@ pluto-cell.hooked_up pluto-output {
     justify-content: flex-end;
     gap: 0.5em;
 }
-
-pluto-logs-container > header {
-    font-family: "Roboto Mono", monospace;
-    font-size: 1.3rem;
-    padding: 0.2em;
-    padding-bottom: 0;
-    opacity: 0.6;
-    font-weight: 700;
-    /* background: #494949; */
-}
-
-button.active.helpbox-tab-key {
-    outline: 3px solid #99afb9;
-}
-
-.live-docs-searchbox {
-    display: flex;
-    margin: 1em;
-}

From 45f0f9993f82abedfbe55bce5604f6d2670836ca Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 30 Nov 2022 16:48:58 +0100
Subject: [PATCH 523/821] MsgPack.jl performance tweak

---
 src/webserver/MsgPack.jl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/webserver/MsgPack.jl b/src/webserver/MsgPack.jl
index 8c1addee66..f0b5f135ad 100644
--- a/src/webserver/MsgPack.jl
+++ b/src/webserver/MsgPack.jl
@@ -37,10 +37,10 @@ MsgPack.to_msgpack(::MsgPack.NilType, ::Function) = nothing
 
 # We want typed integer arrays to arrive as JS typed integer arrays:
 const JSTypedIntSupport = [Int8, UInt8, Int16, UInt16, Int32, UInt32, Float32, Float64]
-JSTypedInt = Union{Int8,UInt8,Int16,UInt16,Int32,UInt32,Float32,Float64}
+const JSTypedInt = Union{Int8,UInt8,Int16,UInt16,Int32,UInt32,Float32,Float64}
 
 MsgPack.msgpack_type(::Type{Vector{T}}) where T <: JSTypedInt = MsgPack.ExtensionType()
-MsgPack.to_msgpack(::MsgPack.ExtensionType, x::Vector{T}) where T <: JSTypedInt = let
+function MsgPack.to_msgpack(::MsgPack.ExtensionType, x::Vector{T}) where T <: JSTypedInt
     type = findfirst(isequal(T), JSTypedIntSupport) + 0x10
     MsgPack.Extension(type, reinterpret(UInt8, x))
 end

From bd599795a6d6d0f426e242087b096f7a1c3169b7 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 6 Dec 2022 18:20:27 +0100
Subject: [PATCH 524/821] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Run=20process=20st?=
 =?UTF-8?q?art=20and=20pkg=20init=20in=20parallel=20(#2406)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/evaluation/Run.jl | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 7ac6a98baa..62f5ad4f9f 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -409,8 +409,25 @@ function update_save_run!(
 
 	maybe_async(run_async) do
         topological_order = withtoken(notebook.executetoken) do
-            sync_nbpkg(session, notebook, old, new; save=(save && !session.options.server.disable_writing_notebook_files), take_token=false)
-            if !(isempty(to_run_online) && session.options.evaluation.lazy_workspace_creation) && will_run_code(notebook)
+			run_code = !(
+				isempty(to_run_online) && 
+				session.options.evaluation.lazy_workspace_creation
+			) && will_run_code(notebook)
+			
+			if run_code
+				# this will trigger the notebook process to start. @async makes it run in the background, so that sync_nbpkg (below) can start running in parallel.
+				# Some notes:
+				# - @async is enough, we don't need multithreading because the notebook runs in a separate process.
+				# - sync_nbpkg manages the notebook package environment using Pkg on this server process. This means that sync_nbpkg does not need the notebook process at all, and it can run in parallel, before it has even started.
+				@async WorkspaceManager.get_workspace((session, notebook))
+			end
+			
+            sync_nbpkg(session, notebook, old, new; 
+				save=(save && !session.options.server.disable_writing_notebook_files), 
+				take_token=false
+			)
+			
+            if run_code
                 # not async because that would be double async
                 run_reactive_core!(session, notebook, old, new, to_run_online; save, kwargs...)
                 # run_reactive_async!(session, notebook, old, new, to_run_online; deletion_hook=deletion_hook, run_async=false, kwargs...)

From 490e4b265d01850b82334e303d6790718fb08c32 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Wed, 7 Dec 2022 20:53:41 +0100
Subject: [PATCH 525/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 28f589a740..57e9dea104 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.16"
+version = "0.19.17"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From f0aa1a32a92b9dd218f0bef6445794e51aea24d8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 12 Dec 2022 18:28:18 +0100
Subject: [PATCH 526/821] cleanup index.html

---
 frontend/editor.html   |  9 +++++----
 frontend/index.html    | 30 +++++++++++++++---------------
 src/notebook/Export.jl | 23 ++++++++++++++---------
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/frontend/editor.html b/frontend/editor.html
index ddfc9e7915..d1009de57f 100644
--- a/frontend/editor.html
+++ b/frontend/editor.html
@@ -4,9 +4,9 @@
 <head>
     <meta name="viewport" content="width=device-width" />
     <meta charset="utf-8" />
-    
+
     <meta name="pluto-insertion-spot-meta">
-    
+
     <meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
     <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#2a2928">
     <meta name="color-scheme" content="light dark">
@@ -16,7 +16,7 @@
     <link rel="icon" type="image/png" sizes="96x96" href="./img/favicon-96x96.png" />
     <link rel="pluto-logo-big" href="./img/logo.svg" />
     <link rel="pluto-logo-small" href="./img/favicon_unsaturated.svg" />
-    
+
     <script defer>
         console.log(
             "Pluto.jl, by Fons van der Plas (https://github.com/fonsp), Mikołaj Bochenski (https://github.com/malyvsen), Michiel Dral (https://github.com/dralletje) and friends 🌈"
@@ -52,4 +52,5 @@
         <pluto-editor class="fullscreen"></pluto-editor>
     </div>
 </body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/frontend/index.html b/frontend/index.html
index 9ada585d32..5aff4717ac 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -3,46 +3,46 @@
 
 <head>
     <meta name="viewport" content="width=device-width" />
-    <title>Pluto.jl</title>
     <meta charset="utf-8" />
-    <script>
-        console.log("Pluto.jl, by Fons van der Plas (https://github.com/fonsp) and Mikołaj Bochenski (https://github.com/malyvsen) 🌈");
-    </script>
+
+    <meta name="pluto-insertion-spot-meta">
+
+    <title>Pluto.jl</title>
     <meta name="author" content="Fons van der Plas; Mikołaj Bochenski" />
+    <meta name="description" content="Pluto.jl notebooks" />
+
     <meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
     <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#2a2928">
     <meta name="color-scheme" content="light dark">
+
     <link rel="icon" type="image/png" sizes="16x16" href="img/favicon-16x16.png">
     <link rel="icon" type="image/png" sizes="32x32" href="img/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="96x96" href="img/favicon-96x96.png">
-    <meta name="description" content="Pluto.jl notebooks" />
+    <link rel="pluto-logo-big" href="./img/logo.svg" />
+    <link rel="pluto-logo-small" href="./img/favicon_unsaturated.svg" />
 
     <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.20/lodash.min.js" defer></script>
     <script src="https://cdn.jsdelivr.net/npm/@observablehq/stdlib@3.3.1/dist/stdlib.js" defer></script>
 
-    <link rel="pluto-logo-big" href="./img/logo.svg" />
 
     <link rel="stylesheet" href="welcome.css">
     <link rel="stylesheet" href="index.css">
 
+    <meta name="pluto-insertion-spot-parameters">
     <script src="index.js" type="module" defer></script>
     <script src="warn_old_browsers.js"></script>
+
     <link rel="prefetch" as="stylesheet" type="text/html" href="editor.css">
     <link rel="prefetch" as="script" type="text/javascript" href="editor.js">
     <link rel="prerender" href="editor.html">
 </head>
 
-<!-- <body class="loading nosessions"> -->
-
 <body class="nosessions">
     <loading-bar></loading-bar>
-    <!-- <header>
-        <div>
-            <span class="pluto-logo"><img src="img/favicon_unsaturated_bg.svg"> Pluto.jl</span>
-        </div>
-    </header> -->
     <div id="app">
-        <section id="title"><h1>welcome to <img src="img/logo.svg"></h1></section>
+        <section id="title">
+            <h1>welcome to <img src="img/logo.svg"></h1>
+        </section>
         <section id="mywork">
             <div>
                 <h2>My work</h2>
@@ -72,4 +72,4 @@ <h2>Loading...</h2>
     </div>
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/src/notebook/Export.jl b/src/notebook/Export.jl
index 434d4da49f..014c552ce4 100644
--- a/src/notebook/Export.jl
+++ b/src/notebook/Export.jl
@@ -12,7 +12,9 @@ if cdn_version_override !== nothing
     @warn "Reminder to fonsi: Using a development version of Pluto for CDN assets. The binder button might not work. You should not see this on a released version of Pluto." cdn_version_override
 end
 
-function cdnified_editor_html(;
+cdnified_editor_html(; kwargs...) = cdnified_html("editor.html"; kwargs...)
+
+function cdnified_html(filename::AbstractString;
         version::Union{Nothing,VersionNumber,AbstractString}=nothing, 
         pluto_cdn_root::Union{Nothing,AbstractString}=nothing,
     )
@@ -21,7 +23,7 @@ function cdnified_editor_html(;
     something(
         if should_use_bundled_cdn
             try
-                original = read(project_relative_path("frontend-dist", "editor.html"), String)
+                original = read(project_relative_path("frontend-dist", filename), String)
     
                 replace_with_cdn(original) do url
                     # Because parcel creates filenames with a hash in them, we can check if the file exists locally to make sure that everything is in order.
@@ -30,12 +32,12 @@ function cdnified_editor_html(;
                     URIs.resolvereference("https://cdn.jsdelivr.net/gh/fonsp/Pluto.jl@$(string(PLUTO_VERSION))/frontend-dist/", url) |> string
                 end
             catch e
-                @warn "Could not use bundled CDN version of editor.html. You should only see this message if you are using a fork of Pluto." exception=(e,catch_backtrace()) maxlog=1
+                @warn "Could not use bundled CDN version of $(filename). You should only see this message if you are using a fork of Pluto." exception=(e,catch_backtrace()) maxlog=1
                 nothing
             end
         end,
         let
-            original = read(project_relative_path("frontend", "editor.html"), String)
+            original = read(project_relative_path("frontend", filename), String)
 
             cdn_root = something(pluto_cdn_root, "https://cdn.jsdelivr.net/gh/fonsp/Pluto.jl@$(something(cdn_version_override, string(something(version, PLUTO_VERSION))))/frontend/")
             @debug "Using CDN for Pluto assets:" cdn_root
@@ -47,6 +49,8 @@ function cdnified_editor_html(;
     )
 end
 
+const _insertion_meta = """<meta name="pluto-insertion-spot-parameters">"""
+
 """
 See [PlutoSliderServer.jl](https://github.com/JuliaPluto/PlutoSliderServer.jl) if you are interested in exporting notebooks programatically.
 """
@@ -72,12 +76,13 @@ function generate_html(;
 
     result = replace_at_least_once(
         replace_at_least_once(cdnified, 
-            "<meta name=\"pluto-insertion-spot-meta\">" => 
+            _insertion_meta => 
             """
             $(header_html)
-            <meta name=\"pluto-insertion-spot-meta\">
-            """),
-        "<meta name=\"pluto-insertion-spot-parameters\">" => 
+            $(_insertion_meta)
+            """
+        ),
+        _insertion_meta => 
         """
         <script data-pluto-file="launch-parameters">
         window.pluto_notebook_id = $(notebook_id_js);
@@ -89,7 +94,7 @@ function generate_html(;
         window.pluto_statefile = $(statefile_js);
         window.pluto_preamble_html = $(preamble_html_js);
         </script>
-        <meta name=\"pluto-insertion-spot-parameters\">
+        $(_insertion_meta)
         """
     )
 

From 19326af6e56d1c8dde3f52bd46b9cf4612142e51 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 12 Dec 2022 18:32:27 +0100
Subject: [PATCH 527/821] error.jl.html cleanup

---
 .vscode/settings.json  |  4 ++++
 frontend/error.jl.html | 14 +++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 80f29ab483..1af698f3ec 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -22,5 +22,9 @@
     "[css]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode",
         "editor.formatOnSave": true
+    },
+    "[html]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "editor.formatOnSave": true
     }
 }
diff --git a/frontend/error.jl.html b/frontend/error.jl.html
index e10761a7df..434f5c8927 100644
--- a/frontend/error.jl.html
+++ b/frontend/error.jl.html
@@ -3,19 +3,11 @@
 
 <head>
     <meta name="viewport" content="width=device-width" />
-    <title>⚡ Pluto.jl ⚡</title>
     <meta charset="utf-8" />
-    <script>
-        console.log("Pluto.jl, by Fons van der Plas (https://github.com/fonsp) and Mikołaj Bochenski (https://github.com/malyvsen) 🌈");
-    </script>
-    <meta name="author" content="Fons van der Plas; Mikołaj Bochenski" />
-    <meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
-    <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#2a2928">
+
+    <title>$TITLE</title>
+
     <meta name="color-scheme" content="light dark">
-    <link rel="icon" type="image/png" sizes="16x16" href="img/favicon-16x16.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="img/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="img/favicon-96x96.png">
-    <meta name="description" content="Pluto.jl notebooks" />
 
     <!-- The following import will be inserted inline to not depend on the URL path -->
     <!-- <link rel="stylesheet" href="./error.css"> -->

From 8dee2c4c131f188f561714cda91d58a11a4c663d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 12 Dec 2022 18:38:55 +0100
Subject: [PATCH 528/821] oopsie

---
 src/notebook/Export.jl | 63 ++++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/notebook/Export.jl b/src/notebook/Export.jl
index 014c552ce4..6c3ed4a7a5 100644
--- a/src/notebook/Export.jl
+++ b/src/notebook/Export.jl
@@ -49,7 +49,27 @@ function cdnified_html(filename::AbstractString;
     )
 end
 
-const _insertion_meta = """<meta name="pluto-insertion-spot-parameters">"""
+const _insertion_meta = """<meta name="pluto-insertion-spot-meta">"""
+const _insertion_parameters = """<meta name="pluto-insertion-spot-parameters">"""
+
+
+inserted_html(original_contents::AbstractString; 
+    meta::AbstractString="",
+    parameters::AbstractString="",
+) = replace_at_least_once(
+    replace_at_least_once(original_contents, 
+        _insertion_meta => 
+        """
+        $(meta)
+        $(_insertion_meta)
+        """
+    ),
+    _insertion_meta => 
+    """
+    $(parameters)
+    $(_insertion_parameters)
+    """
+)
 
 """
 See [PlutoSliderServer.jl](https://github.com/JuliaPluto/PlutoSliderServer.jl) if you are interested in exporting notebooks programatically.
@@ -73,32 +93,21 @@ function generate_html(;
     )::String
 
     cdnified = cdnified_editor_html(; version, pluto_cdn_root)
-
-    result = replace_at_least_once(
-        replace_at_least_once(cdnified, 
-            _insertion_meta => 
-            """
-            $(header_html)
-            $(_insertion_meta)
-            """
-        ),
-        _insertion_meta => 
-        """
-        <script data-pluto-file="launch-parameters">
-        window.pluto_notebook_id = $(notebook_id_js);
-        window.pluto_isolated_cell_ids = $(isolated_cell_ids_js);
-        window.pluto_notebookfile = $(notebookfile_js);
-        window.pluto_disable_ui = $(disable_ui ? "true" : "false");
-        window.pluto_slider_server_url = $(slider_server_url_js);
-        window.pluto_binder_url = $(binder_url_js);
-        window.pluto_statefile = $(statefile_js);
-        window.pluto_preamble_html = $(preamble_html_js);
-        </script>
-        $(_insertion_meta)
-        """
-    )
-
-    return result
+    
+    parameters = """
+    <script data-pluto-file="launch-parameters">
+    window.pluto_notebook_id = $(notebook_id_js);
+    window.pluto_isolated_cell_ids = $(isolated_cell_ids_js);
+    window.pluto_notebookfile = $(notebookfile_js);
+    window.pluto_disable_ui = $(disable_ui ? "true" : "false");
+    window.pluto_slider_server_url = $(slider_server_url_js);
+    window.pluto_binder_url = $(binder_url_js);
+    window.pluto_statefile = $(statefile_js);
+    window.pluto_preamble_html = $(preamble_html_js);
+    </script>
+    """
+    
+    inserted_html(cdnified; meta=header_html, parameters)
 end
 
 function replace_at_least_once(s, pair)

From cb08596dc1b71238c0628ad839b0edcfa4253922 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 12 Dec 2022 18:39:03 +0100
Subject: [PATCH 529/821] Update settings.json

---
 .vscode/settings.json | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1af698f3ec..3c537d6a8f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,15 +4,6 @@
     "prettier.semi": false,
     "prettier.quoteProps": "consistent",
     "prettier.singleQuote": false,
-    "julia.format.calls": false,
-    "julia.format.comments": false,
-    "julia.format.curly": false,
-    "julia.format.docs": false,
-    "julia.format.indents": false,
-    "julia.format.iterOps": false,
-    "julia.format.ops": false,
-    "julia.format.tuples": false,
-    "julia.format.kwarg": "off",
     
     "editor.formatOnSave": false,
     "[javascript]": {

From 007ae80e4c8c90725de5b0a13a4a39d37a3ec24c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 13 Dec 2022 12:53:56 +0100
Subject: [PATCH 530/821] Update CodemirrorPlutoSetup.js (#2414)

---
 frontend/imports/CodemirrorPlutoSetup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index 59c5854723..73412230ec 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -60,7 +60,7 @@ import {
     cssLanguage,
     selectNextOccurrence,
     //@ts-ignore
-} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.28.2/dist/index.es.min.js"
+} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.28.3/dist/index.es.min.js"
 
 export {
     EditorState,

From 8b8eb2c3b8259936716764d5a8b5b56af93c3995 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 13 Dec 2022 12:55:06 +0100
Subject: [PATCH 531/821] Run Bundle action on PRs (#2415)

---
 .github/workflows/Bundle.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/Bundle.yml b/.github/workflows/Bundle.yml
index 065b42f739..1849cdd1e9 100644
--- a/.github/workflows/Bundle.yml
+++ b/.github/workflows/Bundle.yml
@@ -5,6 +5,13 @@ on:
         branches:
             - main
     workflow_dispatch:
+    pull_request:
+        paths-ignore:
+            - "**.md"
+            - "**.jl"
+        branches-ignore:
+            - release
+
 concurrency:
     group: bundle
     cancel-in-progress: false
@@ -56,6 +63,7 @@ jobs:
             # Needs to be `add --force` because frontend-dist is normally gitignored.
             # Also needs `push --force` because we reset to main (which doesn't contain the previous frontend-dist)
             - name: Force push frontend-dist changes
+              if: github.event_name != 'pull_request'
               run: |
                   git add frontend-dist --force
                   git commit -m "$GITHUB_WORKFLOW" -m "Built from hash $GITHUB_SHA"

From afa4f7cfeb123b792106a95e2a25356fb7ae0aa6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Dec 2022 12:56:20 +0100
Subject: [PATCH 532/821] Bump decode-uri-component from 0.2.0 to 0.2.2 in
 /test/frontend (#2409)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/frontend/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/frontend/package-lock.json b/test/frontend/package-lock.json
index 4f7cb9e3f7..01991c803e 100644
--- a/test/frontend/package-lock.json
+++ b/test/frontend/package-lock.json
@@ -3458,9 +3458,9 @@
       "dev": true
     },
     "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10"
@@ -11800,9 +11800,9 @@
       "dev": true
     },
     "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true
     },
     "deep-is": {

From 2614b98129c14b79d1bad0f2af144108dd1f62bc Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 13 Dec 2022 13:03:40 +0100
Subject: [PATCH 533/821] Bundle GHA: dont use tokens and git commands for PR

---
 .github/workflows/Bundle.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/Bundle.yml b/.github/workflows/Bundle.yml
index 1849cdd1e9..665ead2577 100644
--- a/.github/workflows/Bundle.yml
+++ b/.github/workflows/Bundle.yml
@@ -26,17 +26,25 @@ jobs:
               # See https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
               with:
                 token: ${{ secrets.PAT_TOKEN }}
+              if: github.event_name != 'pull_request'
+              
             - uses: fregante/setup-git-user@v1
-
+              if: github.event_name != 'pull_request'
+              
             # Ignore the build changes from previous run.
             # This "just" hard resets to the latest commit on main.
             # The previous bundle commit will still exist, but will be "dangling", unless we made a tag for it.
             # Github will eventually clean dangling commits, which is fine because again, the ones with a tag will stay around.
             - name: Make Sure Release Is Reset To Main
+              if: github.event_name != 'pull_request'
               run: |
                   git checkout -b release
                   git reset --hard $GITHUB_SHA
 
+            # if this is a PR. then just checkout without fanciness
+            - uses: actions/checkout@v3
+              if: github.event_name == 'pull_request'
+
             # Do the actual bundling
             - uses: actions/setup-node@v3
               with:

From 1f6a8b410c127337b4a535c5121d3e0455f0cf8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Dec 2022 13:22:11 +0100
Subject: [PATCH 534/821] Bump minimatch and serve-handler in /frontend-bundler
 (#2371)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend-bundler/package-lock.json | 40 +++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index be027bfeb3..adfc7f5a64 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -3282,9 +3282,9 @@
             }
         },
         "node_modules/filelist/node_modules/minimatch": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-            "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.1.tgz",
+            "integrity": "sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==",
             "dependencies": {
                 "brace-expansion": "^2.0.1"
             },
@@ -4569,9 +4569,9 @@
             "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
         },
         "node_modules/minimatch": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
             "dependencies": {
                 "brace-expansion": "^1.1.7"
             },
@@ -6104,15 +6104,15 @@
             }
         },
         "node_modules/serve-handler": {
-            "version": "6.1.3",
-            "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.3.tgz",
-            "integrity": "sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w==",
+            "version": "6.1.5",
+            "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.5.tgz",
+            "integrity": "sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg==",
             "dependencies": {
                 "bytes": "3.0.0",
                 "content-disposition": "0.5.2",
                 "fast-url-parser": "1.1.3",
                 "mime-types": "2.1.18",
-                "minimatch": "3.0.4",
+                "minimatch": "3.1.2",
                 "path-is-inside": "1.0.2",
                 "path-to-regexp": "2.2.1",
                 "range-parser": "1.2.0"
@@ -9390,9 +9390,9 @@
                     }
                 },
                 "minimatch": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-                    "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+                    "version": "5.1.1",
+                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.1.tgz",
+                    "integrity": "sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==",
                     "requires": {
                         "brace-expansion": "^2.0.1"
                     }
@@ -10317,9 +10317,9 @@
             "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
         },
         "minimatch": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
             "requires": {
                 "brace-expansion": "^1.1.7"
             }
@@ -11369,15 +11369,15 @@
             "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         },
         "serve-handler": {
-            "version": "6.1.3",
-            "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.3.tgz",
-            "integrity": "sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w==",
+            "version": "6.1.5",
+            "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.5.tgz",
+            "integrity": "sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg==",
             "requires": {
                 "bytes": "3.0.0",
                 "content-disposition": "0.5.2",
                 "fast-url-parser": "1.1.3",
                 "mime-types": "2.1.18",
-                "minimatch": "3.0.4",
+                "minimatch": "3.1.2",
                 "path-is-inside": "1.0.2",
                 "path-to-regexp": "2.2.1",
                 "range-parser": "1.2.0"

From c0fffde72f0f53fba48108814ef99b58d68a4f42 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 13 Dec 2022 13:24:14 +0100
Subject: [PATCH 535/821] =?UTF-8?q?=F0=9F=95=B8=EF=B8=8F=20Don't=20scroll?=
 =?UTF-8?q?=20page=20when=20opening=20Live=20Docs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/LiveDocsTab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/LiveDocsTab.js b/frontend/components/LiveDocsTab.js
index 3f05d039ff..156297445f 100644
--- a/frontend/components/LiveDocsTab.js
+++ b/frontend/components/LiveDocsTab.js
@@ -43,7 +43,7 @@ export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_quer
 
     useLayoutEffect(() => {
         if (focus_on_open && live_doc_search_ref.current) {
-            live_doc_search_ref.current.focus()
+            live_doc_search_ref.current.focus({ preventScroll: true })
             live_doc_search_ref.current.select()
         }
     }, [focus_on_open, live_doc_search_ref.current])

From 4a20708af793c26adf54bc8d4a8b74d46ee45806 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 13 Dec 2022 13:24:40 +0100
Subject: [PATCH 536/821] =?UTF-8?q?=F0=9F=90=9D=20Fix=20#2404?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/CellInput.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index d6745023db..62504f7de2 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -629,12 +629,16 @@ export const CellInput = ({
                     // Remove selection on blur
                     EditorView.domEventHandlers({
                         blur: (event, view) => {
+                            // collapse the selection into a single point
                             view.dispatch({
                                 selection: {
                                     anchor: view.state.selection.main.head,
-                                    head: view.state.selection.main.head,
                                 },
+                                scrollIntoView: false,
                             })
+                            // and blur the DOM again (because the previous transaction might have re-focused it)
+                            view.contentDOM.blur()
+
                             set_cm_forced_focus(null)
                         },
                     }),

From c079fa83f5ccb05bdc80a0fdfc1a0c02875161b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Dec 2022 13:28:39 +0100
Subject: [PATCH 537/821] Bump qs from 6.5.2 to 6.5.3 in /frontend-bundler
 (#2411)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend-bundler/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index adfc7f5a64..9e767a5ec3 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -5825,9 +5825,9 @@
             }
         },
         "node_modules/qs": {
-            "version": "6.5.2",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-            "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+            "version": "6.5.3",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+            "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
             "engines": {
                 "node": ">=0.6"
             }
@@ -11188,9 +11188,9 @@
             }
         },
         "qs": {
-            "version": "6.5.2",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-            "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+            "version": "6.5.3",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+            "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
         },
         "querystring": {
             "version": "0.2.0",

From 134ffd097431e8b7040b68714433ef601866ac64 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 13 Dec 2022 14:21:28 +0100
Subject: [PATCH 538/821] remove window.tags

---
 frontend/components/CellInput.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 62504f7de2..95a2262185 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -575,9 +575,6 @@ export const CellInput = ({
             }
         })
 
-        // TODO remove me
-        //@ts-ignore
-        window.tags = tags
         const usesDarkTheme = window.matchMedia("(prefers-color-scheme: dark)").matches
         const newcm = (newcm_ref.current = new EditorView({
             state: EditorState.create({

From d57b22374a395216ff68b137e807200e5d85d4c1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 13 Dec 2022 15:57:56 +0100
Subject: [PATCH 539/821] Update Export.jl

---
 src/notebook/Export.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/notebook/Export.jl b/src/notebook/Export.jl
index 6c3ed4a7a5..c32d3442ce 100644
--- a/src/notebook/Export.jl
+++ b/src/notebook/Export.jl
@@ -64,7 +64,7 @@ inserted_html(original_contents::AbstractString;
         $(_insertion_meta)
         """
     ),
-    _insertion_meta => 
+    _insertion_parameters => 
     """
     $(parameters)
     $(_insertion_parameters)

From febc398cafc9f3901a7f001759323eb13e23f8fe Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 13 Dec 2022 22:04:25 +0100
Subject: [PATCH 540/821] =?UTF-8?q?=F0=9F=A9=BA=20Process=20status=20(#239?=
 =?UTF-8?q?9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/common/clock sync.js                 |  47 +++
 frontend/components/BottomRightPanel.js       |  95 ++++--
 frontend/components/CellInput.js              |   3 +-
 .../CellInput/pluto_autocomplete.js           |   3 +-
 frontend/components/DiscreteProgressBar.js    |  55 ++++
 frontend/components/Editor.js                 |  12 +
 frontend/components/ProcessTab.js             | 255 ++++++++++++++++
 frontend/components/RunArea.js                |   2 +-
 frontend/components/welcome/Welcome.js        |   1 +
 frontend/dark_color.css                       |   5 +
 frontend/editor.css                           | 271 +++++++++++++++++-
 frontend/editor.js                            |   1 +
 frontend/light_color.css                      | 227 +++++----------
 src/Pluto.jl                                  |   1 +
 src/evaluation/Run.jl                         |  17 +-
 src/evaluation/WorkspaceManager.jl            |  48 +++-
 src/notebook/Notebook.jl                      |  11 +-
 src/notebook/saving and loading.jl            |   6 +-
 src/packages/Packages.jl                      |  42 ++-
 src/webserver/Dynamic.jl                      |   6 +
 src/webserver/SessionActions.jl               |  17 +-
 src/webserver/Status.jl                       | 115 ++++++++
 22 files changed, 1050 insertions(+), 190 deletions(-)
 create mode 100644 frontend/common/clock sync.js
 create mode 100644 frontend/components/DiscreteProgressBar.js
 create mode 100644 frontend/components/ProcessTab.js
 create mode 100644 src/webserver/Status.jl

diff --git a/frontend/common/clock sync.js b/frontend/common/clock sync.js
new file mode 100644
index 0000000000..dd6bbdfa40
--- /dev/null
+++ b/frontend/common/clock sync.js	
@@ -0,0 +1,47 @@
+import { useContext, useState, useEffect } from "../imports/Preact.js"
+import { PlutoActionsContext } from "./PlutoContext.js"
+
+/** Request the current time from the server, compare with the local time, and return the current best estimate of our time difference. Updates regularly.
+ * @param {{connected: boolean}} props
+ */
+export const useMyClockIsAheadBy = ({ connected }) => {
+    let pluto_actions = useContext(PlutoActionsContext)
+
+    const [my_clock_is_ahead_by, set_my_clock_is_ahead_by] = useState(0)
+
+    useEffect(() => {
+        console.error({ connected })
+        if (connected) {
+            let f = async () => {
+                let getserver = () => pluto_actions.send("current_time").then((m) => m.message.time)
+                let getlocal = () => Date.now() / 1000
+
+                // once to precompile and to make sure that the server is not busy with other tasks
+                // console.log("getting server time warmup")
+                for (let i = 0; i < 16; i++) await getserver()
+                // console.log("getting server time warmup done")
+
+                let t1 = await getlocal()
+                let s1 = await getserver()
+                let s2 = await getserver()
+                let t2 = await getlocal()
+                // console.log("getting server time done")
+
+                let mytime = (t1 + t2) / 2
+                let servertime = (s1 + s2) / 2
+
+                let diff = mytime - servertime
+                // console.info("My clock is ahead by ", diff, " s")
+                if (!isNaN(diff)) set_my_clock_is_ahead_by(diff)
+            }
+
+            f()
+
+            let handle = setInterval(f, 60 * 1000)
+
+            return () => clearInterval(handle)
+        }
+    }, [connected])
+
+    return my_clock_is_ahead_by
+}
diff --git a/frontend/components/BottomRightPanel.js b/frontend/components/BottomRightPanel.js
index 3680762ba9..aba8793cbe 100644
--- a/frontend/components/BottomRightPanel.js
+++ b/frontend/components/BottomRightPanel.js
@@ -1,7 +1,9 @@
-import { html, useState, useRef, useEffect } from "../imports/Preact.js"
+import { html, useState, useRef, useEffect, useMemo } from "../imports/Preact.js"
 import { cl } from "../common/ClassTable.js"
 
 import { LiveDocsTab } from "./LiveDocsTab.js"
+import { is_finished, ProcessTab, total_done, total_tasks } from "./ProcessTab.js"
+import { useMyClockIsAheadBy } from "../common/clock sync.js"
 
 export const ENABLE_PROCESS_TAB = window.localStorage.getItem("ENABLE_PROCESS_TAB") === "true"
 
@@ -20,27 +22,63 @@ window.PLUTO_TOGGLE_PROCESS_TAB = () => {
     window.location.reload()
 }
 
-export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, notebook }) => {
+/**
+ * @typedef PanelTabName
+ * @type {"docs" | "process" | null}
+ */
+
+export const open_bottom_right_panel = (/** @type {PanelTabName} */ tab) => window.dispatchEvent(new CustomEvent("open_bottom_right_panel", { detail: tab }))
+
+/**
+ * @param {{
+ * notebook: import("./Editor.js").NotebookData,
+ * desired_doc_query: string?,
+ * on_update_doc_query: (query: string?) => void,
+ * connected: boolean,
+ * }} props
+ */
+export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, notebook, connected }) => {
     let container_ref = useRef()
 
     const focus_docs_on_open_ref = useRef(false)
-    const [open_tab, set_open_tab] = useState(/** @type { "docs" | "process" | null} */ (null))
+    const [open_tab, set_open_tab] = useState(/** @type { PanelTabName} */ (null))
     const hidden = open_tab == null
 
-    // Open docs when "open_live_docs" event is triggered
+    // Open panel when "open_bottom_right_panel" event is triggered
     useEffect(() => {
-        let handler = () => {
+        let handler = (/** @type {CustomEvent} */ e) => {
+            console.log(e.detail)
             // https://github.com/fonsp/Pluto.jl/issues/321
             focus_docs_on_open_ref.current = false
-            set_open_tab("docs")
+            set_open_tab(e.detail)
             if (window.getComputedStyle(container_ref.current).display === "none") {
                 alert("This browser window is too small to show docs.\n\nMake the window bigger, or try zooming out.")
             }
         }
-        window.addEventListener("open_live_docs", handler)
-        return () => window.removeEventListener("open_live_docs", handler)
+        window.addEventListener("open_bottom_right_panel", handler)
+        return () => window.removeEventListener("open_bottom_right_panel", handler)
     }, [])
 
+    const [status_total, status_done] = useMemo(
+        () =>
+            !ENABLE_PROCESS_TAB || notebook.status_tree == null
+                ? [0, 0]
+                : [
+                      // total_tasks minus 1, to exclude the notebook task itself
+                      total_tasks(notebook.status_tree) - 1,
+                      // the notebook task should never be done, but lets be sure and subtract 1 if it is:
+                      total_done(notebook.status_tree) - (is_finished(notebook.status_tree) ? 1 : 0),
+                  ],
+        [notebook.status_tree]
+    )
+
+    const busy = status_done < status_total
+
+    const show_business_outline = useDelayedTruth(busy, 700)
+    const show_business_counter = useDelayedTruth(busy, 3000)
+
+    const my_clock_is_ahead_by = useMyClockIsAheadBy({ connected })
+
     return html`
         <aside id="helpbox-wrapper" ref=${container_ref}>
             <pluto-helpbox class=${cl({ hidden, [`helpbox-${open_tab ?? hidden}`]: true })}>
@@ -58,7 +96,8 @@ export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, noteboo
                             // TODO: focus the docs input
                         }}
                     >
-                        <span>Live Docs</span>
+                        <span class="tabicon"></span>
+                        <span class="tabname">Live Docs</span>
                     </button>
                     <button
                         disabled=${!ENABLE_PROCESS_TAB}
@@ -67,12 +106,20 @@ export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, noteboo
                             "helpbox-tab-key": true,
                             "helpbox-process": true,
                             "active": open_tab === "process",
+                            "busy": ENABLE_PROCESS_TAB && show_business_outline,
                         })}
                         onClick=${() => {
                             set_open_tab(open_tab === "process" ? null : "process")
                         }}
                     >
-                        <span>${ENABLE_PROCESS_TAB ? "Status" : "Coming soon"}</span>
+                        <span class="tabicon"></span>
+                        <span class="tabname"
+                            >${ENABLE_PROCESS_TAB
+                                ? open_tab === "process" || !show_business_counter
+                                    ? "Status"
+                                    : html`Status${" "}<span class="subprogress-counter">(${status_done}/${status_total})</span>`
+                                : "Coming soon"}</span
+                        >
                     </button>
                     ${hidden
                         ? null
@@ -93,18 +140,26 @@ export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, noteboo
                           notebook=${notebook}
                       />`
                     : open_tab === "process"
-                    ? html`<section>
-                          <p>Congratulations, you found the secret!</p>
-                          <p>
-                              Have you considered becoming a Pluto.jl open source contributor? We are always looking for creative people with JavaScript
-                              experience! Take a look at our${" "}
-                              <a href="https://github.com/fonsp/Pluto.jl/issues?q=is%3Aopen+label%3A%22good+first+issue%22+sort%3Aupdated-desc"
-                                  >good first issues</a
-                              >, and our ${" "}<a href="https://juliapluto.github.io/weekly-call-notes/">weekly community call</a>.
-                          </p>
-                      </section>`
+                    ? html`<${ProcessTab} notebook=${notebook} my_clock_is_ahead_by=${my_clock_is_ahead_by} />`
                     : null}
             </pluto-helpbox>
         </aside>
     `
 }
+
+const useDelayedTruth = (/** @type {boolean} */ x, /** @type {number} */ timeout) => {
+    const [output, set_output] = useState(false)
+
+    useEffect(() => {
+        if (x) {
+            let handle = setTimeout(() => {
+                set_output(true)
+            }, timeout)
+            return () => clearTimeout(handle)
+        } else {
+            set_output(false)
+        }
+    }, [x])
+
+    return output
+}
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 95a2262185..b1d63f08b8 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -63,6 +63,7 @@ import { HighlightLineFacet, highlightLinePlugin } from "./CellInput/highlight_l
 import { commentKeymap } from "./CellInput/comment_mixed_parsers.js"
 import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
 import { mod_d_command } from "./CellInput/mod_d_command.js"
+import { open_bottom_right_panel } from "./BottomRightPanel.js"
 
 export const ENABLE_CM_MIXED_PARSER = window.localStorage.getItem("ENABLE_CM_MIXED_PARSER") === "true"
 
@@ -647,7 +648,7 @@ export const CellInput = ({
                     EditorView.updateListener.of((update) => {
                         if (!update.docChanged) return
                         if (update.state.doc.length > 0 && update.state.sliceDoc(0, 1) === "?") {
-                            window.dispatchEvent(new CustomEvent("open_live_docs"))
+                            open_bottom_right_panel("docs")
                         }
                     }),
                     EditorState.tabSize.of(4),
diff --git a/frontend/components/CellInput/pluto_autocomplete.js b/frontend/components/CellInput/pluto_autocomplete.js
index 35f9b7e29b..a7b3828c53 100644
--- a/frontend/components/CellInput/pluto_autocomplete.js
+++ b/frontend/components/CellInput/pluto_autocomplete.js
@@ -16,6 +16,7 @@ import {
 import { get_selected_doc_from_state } from "./LiveDocsFromCursor.js"
 import { cl } from "../../common/ClassTable.js"
 import { ScopeStateField } from "./scopestate_statefield.js"
+import { open_bottom_right_panel } from "../BottomRightPanel.js"
 
 let { autocompletion, completionKeymap, completionStatus, acceptCompletion } = autocomplete
 
@@ -90,7 +91,7 @@ const tab_completion_command = (cm) => {
 let open_docs_if_autocomplete_is_open_command = (cm) => {
     let autocompletion_open = cm.state.field(completionState, false)?.open ?? false
     if (autocompletion_open) {
-        window.dispatchEvent(new CustomEvent("open_live_docs"))
+        open_bottom_right_panel("docs")
         return true
     }
     return false
diff --git a/frontend/components/DiscreteProgressBar.js b/frontend/components/DiscreteProgressBar.js
new file mode 100644
index 0000000000..729de4b38c
--- /dev/null
+++ b/frontend/components/DiscreteProgressBar.js
@@ -0,0 +1,55 @@
+import { cl } from "../common/ClassTable.js"
+import { html, useEffect, useRef, useState } from "../imports/Preact.js"
+
+export const DiscreteProgressBar = ({ total, done, busy }) => {
+    total = Math.max(1, total)
+
+    return html`
+        <div
+            class=${cl({
+                "discrete-progress-bar": true,
+                "small": total < 8,
+                "mid": total >= 8 && total < 48,
+                "big": total >= 48,
+            })}
+            data-total=${total}
+        >
+            ${[...Array(total)].map((_, i) => {
+                return html`<div
+                    class=${cl({
+                        done: i < done,
+                        busy: i >= done && i < done + busy,
+                    })}
+                ></div>`
+            })}
+        </div>
+    `
+}
+
+export const DiscreteProgressBarTest = () => {
+    const [done_total, set_done_total] = useState([0, 0, 0])
+
+    const done_total_ref = useRef(done_total)
+    done_total_ref.current = done_total
+
+    useEffect(() => {
+        let handle = setInterval(() => {
+            const [done, busy, total] = done_total_ref.current
+
+            if (Math.random() < 0.3) {
+                if (done < total) {
+                    if (Math.random() < 0.1) {
+                        set_done_total([done, 1, total + 5])
+                    } else {
+                        set_done_total([done + 1, 1, total])
+                    }
+                } else {
+                    set_done_total([0, 1, Math.ceil(Math.random() * Math.random() * 100)])
+                }
+            }
+        }, 100)
+        return () => clearInterval(handle)
+    }, [])
+
+    return html`<${DiscreteProgressBar} total=${done_total[2]} busy=${done_total[1]} done=${done_total[0]} />`
+}
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index aa88d45000..a427918b71 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -136,6 +136,16 @@ const first_true_key = (obj) => {
  * }}
  */
 
+/**
+ * @typedef StatusEntryData
+ * @type {{
+ *   name: string,
+ *   started_at: number?,
+ *   finished_at: number?,
+ *   subtasks: Record<string,StatusEntryData>,
+ * }}
+ */
+
 /**
  * @typedef CellResultData
  * @type {{
@@ -233,6 +243,7 @@ const first_true_key = (obj) => {
  *  bonds: BondValuesDict,
  *  nbpkg: NotebookPkgData?,
  *  metadata: object,
+ *  status_tree: StatusEntryData?,
  * }}
  */
 
@@ -1533,6 +1544,7 @@ patch: ${JSON.stringify(
                     <${BottomRightPanel}
                         desired_doc_query=${this.state.desired_doc_query}
                         on_update_doc_query=${this.actions.set_doc_query}
+                        connected=${this.state.connected}
                         notebook=${this.state.notebook}
                     />
                     <${Popup} 
diff --git a/frontend/components/ProcessTab.js b/frontend/components/ProcessTab.js
new file mode 100644
index 0000000000..3a1db2e935
--- /dev/null
+++ b/frontend/components/ProcessTab.js
@@ -0,0 +1,255 @@
+import { html, useEffect, useRef, useState } from "../imports/Preact.js"
+
+import { cl } from "../common/ClassTable.js"
+import { prettytime, useMillisSinceTruthy } from "./RunArea.js"
+import { DiscreteProgressBar } from "./DiscreteProgressBar.js"
+
+/**
+ * @param {{
+ * notebook: import("./Editor.js").NotebookData,
+ * my_clock_is_ahead_by: number,
+ * }} props
+ */
+export let ProcessTab = ({ notebook, my_clock_is_ahead_by }) => {
+    return html`
+        <section>
+            <${StatusItem} status_tree=${notebook.status_tree} my_clock_is_ahead_by=${my_clock_is_ahead_by} path=${[]} />
+        </section>
+    `
+}
+
+/**
+ * Status items are sorted in the same order as they appear in list. Unspecified items are sorted to the end.
+ */
+const global_order = `
+workspace
+
+create_process
+init_process
+
+
+pkg
+
+analysis
+waiting_for_others
+resolve
+remove
+add
+instantiate
+
+run
+
+
+saving
+
+`
+    .split("\n")
+    .map((x) => x.trim())
+    .filter((x) => x.length > 0)
+
+const blocklist = ["saving"]
+
+/** @type {Record<string,string>} */
+const descriptions = {
+    workspace: "Workspace setup",
+    create_process: "Start Julia",
+    init_process: "Initialize",
+    pkg: "Package management",
+    run: "Evaluating cells",
+    evaluate: "Running code",
+    registry_update: "Updating package registry",
+    waiting_for_others: "Waiting for other notebooks to finish package operations",
+}
+
+export const friendly_name = (/** @type {string} */ task_name) => {
+    const descr = descriptions[task_name]
+
+    return descr != null ? descr : isnumber(task_name) ? `Step ${task_name}` : task_name
+}
+
+const to_ns = (x) => x * 1e9
+
+/**
+ * @param {{
+ * status_tree: import("./Editor.js").StatusEntryData?,
+ * path: string[],
+ * my_clock_is_ahead_by: number,
+ * }} props
+ */
+const StatusItem = ({ status_tree, path, my_clock_is_ahead_by }) => {
+    if (status_tree == null) return null
+    const mystatus = path.reduce((entry, key) => entry.subtasks[key], status_tree)
+    if (!mystatus) return null
+
+    const [is_open, set_is_open] = useState(path.length < 1)
+
+    const started = path.length > 0 && is_started(mystatus)
+    const finished = started && is_finished(mystatus)
+    const busy = started && !finished
+
+    const start = mystatus.started_at ?? 0
+    const end = mystatus.finished_at ?? 0
+
+    const local_busy_time = (useMillisSinceTruthy(busy) ?? 0) / 1000
+    const mytime = Date.now() / 1000
+
+    const busy_time = Math.max(local_busy_time, mytime - my_clock_is_ahead_by - start)
+
+    useEffect(() => {
+        if (busy) {
+            let handle = setTimeout(() => {
+                set_is_open(true)
+            }, Math.max(100, 500 - path.length * 200))
+
+            return () => clearTimeout(handle)
+        }
+    }, [busy])
+
+    useEffectWithPrevious(
+        ([old_finished]) => {
+            if (!old_finished && finished) {
+                // let audio = new Audio("https://proxy.notificationsounds.com/message-tones/succeeded-message-tone/download/file-sounds-1210-succeeded.mp3")
+                // audio.play()
+
+                let handle = setTimeout(() => {
+                    set_is_open(false)
+                }, 1800 - path.length * 200)
+
+                return () => clearTimeout(handle)
+            }
+        },
+        [finished]
+    )
+
+    const render_child_tasks = () =>
+        Object.entries(mystatus.subtasks)
+            .sort((a, b) => sort_on(a[1], b[1]))
+            .map(([key, _subtask]) =>
+                blocklist.includes(key)
+                    ? null
+                    : html`<${StatusItem} key=${key} status_tree=${status_tree} my_clock_is_ahead_by=${my_clock_is_ahead_by} path=${[...path, key]} />`
+            )
+
+    const render_child_progress = () => {
+        let kids = Object.values(mystatus.subtasks)
+        let done = kids.reduce((acc, x) => acc + (is_finished(x) ? 1 : 0), 0)
+        let busy = kids.reduce((acc, x) => acc + (is_busy(x) ? 1 : 0), 0)
+        let total = kids.length
+
+        return html`<${DiscreteProgressBar} busy=${busy} done=${done} total=${total} />`
+    }
+
+    const inner = is_open
+        ? // are all kids a numbered task?
+          Object.values(mystatus.subtasks).every((x) => isnumber(x.name)) && Object.values(mystatus.subtasks).length > 0
+            ? render_child_progress()
+            : render_child_tasks()
+        : null
+
+    let inner_progress = null
+    if (started) {
+        let t = total_tasks(mystatus)
+        let d = total_done(mystatus)
+
+        if (t > 1) {
+            inner_progress = html`<span class="subprogress-counter">${" "}(${d}/${t})</span>`
+        }
+    }
+
+    return path.length === 0
+        ? inner
+        : html`<pl-status
+              data-depth=${path.length}
+              class=${cl({
+                  started,
+                  finished,
+                  busy,
+                  is_open,
+                  can_open: Object.values(mystatus.subtasks).length > 0,
+              })}
+          >
+              <div
+                  onClick=${(e) => {
+                      set_is_open(!is_open)
+                  }}
+              >
+                  <span class="status-icon"></span>
+                  <span class="status-name">${friendly_name(mystatus.name)}${inner_progress}</span>
+                  <span class="status-time">${finished ? prettytime(to_ns(end - start)) : busy ? prettytime(to_ns(busy_time)) : null}</span>
+              </div>
+              ${inner}
+          </pl-status>`
+}
+
+const isnumber = (str) => /^\d+$/.test(str)
+
+/**
+ * @param {import("./Editor.js").StatusEntryData} a
+ * @param {import("./Editor.js").StatusEntryData} b
+ */
+const sort_on = (a, b) => {
+    const a_order = global_order.indexOf(a.name)
+    const b_order = global_order.indexOf(b.name)
+    if (a_order === -1 && b_order === -1) {
+        if (a.started_at != null || b.started_at != null) {
+            return (a.started_at ?? Infinity) - (b.started_at ?? Infinity)
+        } else if (isnumber(a.name) && isnumber(b.name)) {
+            return parseInt(a.name) - parseInt(b.name)
+        } else {
+            return a.name.localeCompare(b.name)
+        }
+    } else {
+        let m = (x) => (x === -1 ? Infinity : x)
+        return m(a_order) - m(b_order)
+    }
+}
+
+/**
+ * @param {import("./Editor.js").StatusEntryData} status
+ */
+export const is_finished = (status) => status.finished_at != null
+
+/**
+ * @param {import("./Editor.js").StatusEntryData} status
+ */
+export const is_started = (status) => status.started_at != null
+
+/**
+ * @param {import("./Editor.js").StatusEntryData} status
+ */
+export const is_busy = (status) => is_started(status) && !is_finished(status)
+
+/**
+ * @param {import("./Editor.js").StatusEntryData} status
+ * @returns {number}
+ */
+export const total_done = (status) => Object.values(status.subtasks).reduce((total, status) => total + total_done(status), is_finished(status) ? 1 : 0)
+
+/**
+ * @param {import("./Editor.js").StatusEntryData} status
+ * @returns {number}
+ */
+export const total_tasks = (status) => Object.values(status.subtasks).reduce((total, status) => total + total_tasks(status), 1)
+
+/**
+ * @param {import("./Editor.js").StatusEntryData} status
+ * @returns {string[]}
+ */
+export const path_to_first_busy_business = (status) => {
+    for (let [name, child_status] of Object.entries(status.subtasks).sort((a, b) => sort_on(a[1], b[1]))) {
+        if (is_busy(child_status)) {
+            return [name, ...path_to_first_busy_business(child_status)]
+        }
+    }
+    return []
+}
+
+/** Like `useEffect`, but the handler function gets the previous deps value as argument. */
+const useEffectWithPrevious = (fn, deps) => {
+    const ref = useRef(deps)
+    useEffect(() => {
+        let result = fn(ref.current)
+        ref.current = deps
+        return result
+    }, deps)
+}
diff --git a/frontend/components/RunArea.js b/frontend/components/RunArea.js
index 2c3bca724e..6cdb33d1a6 100644
--- a/frontend/components/RunArea.js
+++ b/frontend/components/RunArea.js
@@ -71,7 +71,7 @@ export const RunArea = ({
     `
 }
 
-const prettytime = (time_ns) => {
+export const prettytime = (time_ns) => {
     if (time_ns == null) {
         return "---"
     }
diff --git a/frontend/components/welcome/Welcome.js b/frontend/components/welcome/Welcome.js
index 6b74400aff..12bcdb638a 100644
--- a/frontend/components/welcome/Welcome.js
+++ b/frontend/components/welcome/Welcome.js
@@ -70,6 +70,7 @@ export const Welcome = () => {
             new_update_message(client)
 
             // to start JIT'ting
+            client.send("current_time")
             client.send("completepath", { query: "" }, {})
         })
     }, [])
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index ab94beabde..a04b2623bb 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -148,6 +148,11 @@
         --code-section-bg-color: rgb(44, 44, 44);
         --code-section-border-color: #555a64;
 
+        --process-item-bg: #443d44;
+        --process-busy: #ffcd70;
+        --process-finished: hsl(126deg 30% 60%);
+        --process-undefined: rgb(151, 151, 151);
+
         /*footer*/
         --footer-color: #cacaca;
         --footer-bg-color: rgb(38, 39, 44);
diff --git a/frontend/editor.css b/frontend/editor.css
index c75a234dc5..2515861e77 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2061,8 +2061,7 @@ pluto-helpbox > header {
     gap: 0.5em;
 }
 
-pluto-helpbox > header > button.helpbox-tab-key::before {
-    content: "";
+pluto-helpbox > header > button.helpbox-tab-key > .tabicon {
     /* font-size: 1em; */
     --size: 1.1em;
     width: var(--size);
@@ -2073,23 +2072,109 @@ pluto-helpbox > header > button.helpbox-tab-key::before {
     margin-right: 0.6em;
     display: inline-block;
 }
-pluto-helpbox > header > button.helpbox-docs::before {
+pluto-helpbox > header > button.helpbox-docs > .tabicon {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/search.svg");
     /* content: "📚 "; */
 }
-pluto-helpbox > header > button.helpbox-docs.active::before {
+
+pluto-helpbox > header > button.helpbox-docs.active > .tabicon {
     /* content: "📖 "; */
 }
-pluto-helpbox > header > button.helpbox-process::before {
+pluto-helpbox > header > button.helpbox-process > .tabicon {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/terminal.svg");
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/pulse.svg");
     /* content: "💻 "; */
 }
 
-pluto-helpbox > header > button.helpbox-tab-key:disabled::before {
+pluto-helpbox > header > button.helpbox-tab-key:disabled > .tabicon {
     /* display: none; */
     opacity: 0.5;
 }
+/* 
+button.helpbox-process.helpbox-tab-key::before {
+    content: "";
+    display: block;
+    position: absolute;
+    --offset: -5px;
+    top: var(--offset);
+    right: var(--offset);
+    left: var(--offset);
+    bottom: var(--offset);
+    background: var(--process-busy);
+    border-radius: var(--border-radius);
+    background: linear-gradient(447deg, var(--process-finished), var(--process-finished) 50%, var(--process-busy) 50%, var(--process-busy));
+    background: linear-gradient(
+        447deg,
+        var(--process-busy) 0%,
+        var(--process-busy) 25%,
+        var(--process-finished) 25%,
+        var(--process-finished) 50%,
+        var(--process-busy) 50%,
+        var(--process-busy) 75%,
+        var(--process-finished) 75%,
+        var(--process-finished) 100%
+    );
+    animation: move-bg 5s linear infinite;
+    background-size: 100px auto;
+    z-index: -1;
+    opacity: 0.6;
+} */
+
+/* @keyframes rotate-bg {
+    0% {
+        background: linear-gradient(
+            0deg,
+            var(--process-busy) 0%,
+            var(--process-busy) 20%,
+            var(--process-finished) 20%,
+            var(--process-finished) 40%,
+            var(--process-busy) 40%,
+            var(--process-busy) 60%,
+            var(--process-finished) 60%,
+            var(--process-finished) 80%,
+            var(--process-busy) 80%,
+            var(--process-busy)
+        );
+    }
+    100% {
+        background: linear-gradient(
+            70deg,
+            var(--process-busy) 0%,
+            var(--process-busy) 20%,
+            var(--process-finished) 20%,
+            var(--process-finished) 40%,
+            var(--process-busy) 40%,
+            var(--process-busy) 60%,
+            var(--process-finished) 60%,
+            var(--process-finished) 80%,
+            var(--process-busy) 80%,
+            var(--process-busy)
+        );
+    }
+} */
+/* 
+@keyframes move-bg {
+    0% {
+        background-position-x: 0;
+    }
+    100% {
+        background-position-x: 100px;
+    }
+}
+
+button.helpbox-process.helpbox-tab-key::after {
+    content: "";
+    display: block;
+    position: absolute;
+    top: 0;
+    right: 0;
+    left: 0;
+    bottom: 0;
+    border-radius: var(--border-radius);
+    border: none;
+    background: var(--helpbox-header-tab-bg-color);
+    z-index: -1;
+} */
 
 pluto-helpbox .live-docs-searchbox {
     display: flex;
@@ -2129,10 +2214,36 @@ button.helpbox-tab-key {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    /* position: relative; */
+    /* flex: 1 1 auto; */
+    /* z-index: 1; */
+    /* overflow: hidden; */
+}
+
+button.helpbox-process.busy {
+    outline: 6px solid var(--process-busy);
+}
+
+@media (prefers-reduced-motion: no-preference) {
+    button.helpbox-process.busy {
+        animation: outline-heartbeat 0.8s ease-in infinite;
+        animation-direction: alternate;
+    }
+}
+@keyframes outline-heartbeat {
+    0% {
+        outline-offset: -1px;
+        outline-width: 3px;
+    }
+    100% {
+        outline-offset: 0px;
+        outline-width: 6px;
+    }
 }
 
 button.active.helpbox-tab-key {
     outline: 3px solid #99afb9;
+    animation: none;
 }
 
 pluto-helpbox > header > button.helpbox-close {
@@ -2269,6 +2380,154 @@ pluto-helpbox > section hr {
     font-size: 1.1em;
 }
 
+/* PROCESS TAB */
+
+pl-status {
+    --status-color: var(--process-undefined);
+    font-family: var(--system-ui-font-stack);
+    display: flex;
+    flex-direction: column;
+    border-radius: 0.2em;
+    /* margin: 0.3em; */
+    margin-left: 0.7em;
+    border-left: 3px solid transparent;
+    margin-top: 0.4em;
+    overflow: hidden;
+    /* background: var(--status-color); */
+    /* transition: max-height 1s linear; */
+    /* max-height: 30px; */
+    flex: 1 0 auto;
+}
+
+pl-status::before {
+    flex: 1 2 auto;
+    /* content: ""; */
+    display: inline-block;
+    left: 0;
+    right: 0px;
+    width: 3px;
+    height: 10px;
+    bottom: 3px;
+    top: 3px;
+    background: pink;
+}
+
+pl-status.busy {
+    --status-color: var(--process-busy);
+}
+pl-status.finished {
+    --status-color: var(--process-finished);
+}
+
+pl-status.can_open {
+    cursor: auto;
+    border-color: #98989854;
+}
+pl-status.can_open > div {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    cursor: pointer;
+}
+pl-status.can_open.is_open {
+    border-color: var(--status-color);
+}
+
+pl-status[data-depth="0"],
+pl-status[data-depth="1"] {
+    margin-left: 0;
+}
+
+pl-status > div {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    /* margin: 0em 0em 0.4em 0; */
+    padding: 0.2em;
+    background: var(--process-item-bg);
+    border-radius: 0.4em;
+    /* flex: 1 0 auto; */
+}
+
+pl-status > div > .status-icon {
+    content: "";
+    display: inline-block;
+    width: 1em;
+    height: 1em;
+    border-radius: 50%;
+    background-color: var(--status-color);
+    /* border: 3px solid green; */
+    margin: 0em 0.5em;
+    flex: 0 0 auto;
+}
+
+pl-status.busy > div > .status-icon {
+    border: 3px solid transparent;
+    border-right-color: hsl(126deg 30% 60%);
+    border-bottom-color: hsl(126deg 30% 60%);
+    /* border-left-color: hsl(126deg 30% 60%); */
+    animation: identifier-spin 1.7s linear infinite;
+}
+
+@keyframes identifier-spin {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
+}
+
+.subprogress-counter {
+    opacity: 0.5;
+    /* font-variant-numeric: tabular-nums; */
+    font-size: 0.8em;
+}
+
+pl-status .status-time {
+    margin-left: auto;
+    /* align-self: end; */
+    padding-right: 0.5em;
+    padding-left: 0.5em;
+    /* font-family: "Roboto Mono", monospace; */
+    opacity: 0.6;
+    font-size: 0.7rem;
+    font-variant-numeric: tabular-nums;
+}
+
+.discrete-progress-bar {
+    display: flex;
+    flex-direction: row;
+    background: var(--process-item-bg);
+    padding: 3px;
+    border-radius: 4px;
+    gap: 2px;
+    contain: strict;
+    height: 1em;
+    align-items: stretch;
+}
+
+.discrete-progress-bar > div {
+    background: var(--process-undefined);
+    flex: 1 1 auto;
+    border-radius: 2px;
+    /* margin: 0.4px; */
+}
+
+.discrete-progress-bar > div.done {
+    background: var(--process-finished);
+}
+.discrete-progress-bar > div.busy {
+    background: var(--process-busy);
+}
+
+.discrete-progress-bar.mid {
+    gap: 1px;
+}
+
+.discrete-progress-bar.big {
+    gap: 0.5px;
+}
+
 /* FOOTER */
 
 footer {
diff --git a/frontend/editor.js b/frontend/editor.js
index f13806e96b..fa0c444ce6 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -94,6 +94,7 @@ export const empty_notebook_state = ({ notebook_id }) => ({
     published_objects: {},
     bonds: {},
     nbpkg: null,
+    status_tree: { name: "notebook", started_at: null, finished_at: null, subtasks: {} },
 })
 
 /**
diff --git a/frontend/light_color.css b/frontend/light_color.css
index 7ec5ea5fed..e97bf2687d 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -5,12 +5,10 @@
 
         /* Color scheme */
         --main-bg-color: white;
-        --rule-color:
-        rgba(0, 0, 0, 0.15);
+        --rule-color: rgba(0, 0, 0, 0.15);
         --kbd-border-color: #dfdfdf;
         --header-bg-color: white;
-        --header-border-color:
-        rgba(0, 0, 0, 0.1);
+        --header-border-color: rgba(0, 0, 0, 0.1);
         --ui-button-color: #2a2a2b;
         --cursor-color: black;
         --normal-cell: 0, 0, 0;
@@ -18,138 +16,88 @@
         --error-color: 240, 168, 168;
 
         /*Cells*/
-        --normal-cell-color:
-        rgba(var(--normal-cell), 0.1);
-        --dark-normal-cell-color:
-        rgba(var(--normal-cell), 0.2);
-        --selected-cell-color:
-        rgba(40, 78, 189, 0.4);
-        --code-differs-cell-color:
-        rgba(var(--code-differs), 0.68);
-        --error-cell-color:
-        rgba(var(--error-color), 0.7);
-        --bright-error-cell-color:
-        rgb(var(--error-color));
-        --light-error-cell-color:
-        rgba(var(--error-color), 0.05);
+        --normal-cell-color: rgba(var(--normal-cell), 0.1);
+        --dark-normal-cell-color: rgba(var(--normal-cell), 0.2);
+        --selected-cell-color: rgba(40, 78, 189, 0.4);
+        --code-differs-cell-color: rgba(var(--code-differs), 0.68);
+        --error-cell-color: rgba(var(--error-color), 0.7);
+        --bright-error-cell-color: rgb(var(--error-color));
+        --light-error-cell-color: rgba(var(--error-color), 0.05);
 
         /*Export styling*/
-        --export-bg-color:
-        rgb(60, 67, 101);
-        --export-color:
-        rgba(255, 255, 255, 0.7);
-        --export-card-bg-color:
-        rgba(255, 255, 255, 0.8);
-        --export-card-title-color:
-        rgba(0, 0, 0, 0.7);
-        --export-card-text-color:
-        rgba(0, 0, 0, 0.5);
+        --export-bg-color: rgb(60, 67, 101);
+        --export-color: rgba(255, 255, 255, 0.7);
+        --export-card-bg-color: rgba(255, 255, 255, 0.8);
+        --export-card-title-color: rgba(0, 0, 0, 0.7);
+        --export-card-text-color: rgba(0, 0, 0, 0.5);
         --export-card-shadow-color: #00000029;
 
         /*Pluto output styling */
-        --pluto-schema-types-color:
-        rgba(0, 0, 0, 0.4);
-        --pluto-schema-types-border-color:
-        rgba(0, 0, 0, 0.2);
-        --pluto-output-color:
-        hsl(0, 0%, 25%);
-        --pluto-output-h-color:
-        hsl(0, 0%, 12%);
+        --pluto-schema-types-color: rgba(0, 0, 0, 0.4);
+        --pluto-schema-types-border-color: rgba(0, 0, 0, 0.2);
+        --pluto-output-color: hsl(0, 0%, 25%);
+        --pluto-output-h-color: hsl(0, 0%, 12%);
         --pluto-output-bg-color: white;
         --a-underline: #00000059;
         --blockquote-color: #555;
         --blockquote-bg: #f2f2f2;
         --admonition-title-color: white;
-        --jl-message-color:
-        rgb(219 233 212);
-        --jl-message-accent-color:
-        rgb(158, 200, 137);
-        --jl-info-color:
-        rgb(214 227 244);
-        --jl-info-accent-color:
-        rgb(148, 182, 226);
-        --jl-warn-color:
-        rgb(236 234 213);
-        --jl-warn-accent-color:
-        rgb(207, 199, 138);
-        --jl-danger-color:
-        rgb(245 218 215);
-        --jl-danger-accent-color:
-        rgb(226, 157, 148);
-        --jl-debug-color:
-        rgb(245 218 215);
-        --jl-debug-accent-color:
-        rgb(226, 157, 148);
-        --footnote-border-color:
-        rgba(23, 115, 119, 0.15);
-        --table-border-color:
-        rgba(0, 0, 0, 0.2);
-        --table-bg-hover-color:
-        rgba(159, 158, 224, 0.15);
-        --pluto-tree-color:
-        rgb(0 0 0 / 38%);
+        --jl-message-color: rgb(219 233 212);
+        --jl-message-accent-color: rgb(158, 200, 137);
+        --jl-info-color: rgb(214 227 244);
+        --jl-info-accent-color: rgb(148, 182, 226);
+        --jl-warn-color: rgb(236 234 213);
+        --jl-warn-accent-color: rgb(207, 199, 138);
+        --jl-danger-color: rgb(245 218 215);
+        --jl-danger-accent-color: rgb(226, 157, 148);
+        --jl-debug-color: rgb(245 218 215);
+        --jl-debug-accent-color: rgb(226, 157, 148);
+        --footnote-border-color: rgba(23, 115, 119, 0.15);
+        --table-border-color: rgba(0, 0, 0, 0.2);
+        --table-bg-hover-color: rgba(159, 158, 224, 0.15);
+        --pluto-tree-color: rgb(0 0 0 / 38%);
 
         /*pluto cell styling*/
-        --disabled-cell-bg-color:
-        rgba(139, 139, 139, 0.25);
-        --selected-cell-bg-color:
-        rgba(40, 78, 189, 0.24);
-        --hover-scrollbar-color-1:
-        rgba(0, 0, 0, 0.15);
-        --hover-scrollbar-color-2:
-        rgba(0, 0, 0, 0.05);
+        --disabled-cell-bg-color: rgba(139, 139, 139, 0.25);
+        --selected-cell-bg-color: rgba(40, 78, 189, 0.24);
+        --hover-scrollbar-color-1: rgba(0, 0, 0, 0.15);
+        --hover-scrollbar-color-2: rgba(0, 0, 0, 0.05);
         --skip-as-script-background-color: #ccc;
         --depends-on-skip-as-script-background-color: #eee;
 
         /* Pluto shoulders */
-        --shoulder-hover-bg-color:
-        rgba(0, 0, 0, 0.05);
+        --shoulder-hover-bg-color: rgba(0, 0, 0, 0.05);
 
         /* Logs */
-        --pluto-logs-bg-color:
-        hsl(0deg 0% 98%);
-        --pluto-logs-key-color:
-        rgb(0 0 0 / 51%);
+        --pluto-logs-bg-color: hsl(0deg 0% 98%);
+        --pluto-logs-key-color: rgb(0 0 0 / 51%);
         --pluto-logs-progress-fill: #ffffff;
         --pluto-logs-progress-bg: #e7e7e7;
-        --pluto-logs-progress-border:
-        hsl(210deg 16% 74%);
+        --pluto-logs-progress-border: hsl(210deg 16% 74%);
 
         --pluto-logs-info-color: white;
         --pluto-logs-info-accent-color: inherit;
-        --pluto-logs-warn-color:
-        rgb(236 234 213);
+        --pluto-logs-warn-color: rgb(236 234 213);
         --pluto-logs-warn-accent-color: #665f26;
-        --pluto-logs-danger-color:
-        rgb(245 218 215);
-        --pluto-logs-danger-accent-color:
-        rgb(172 66 52);
-        --pluto-logs-debug-color:
-        rgb(236 223 247);
-        --pluto-logs-debug-accent-color:
-        rgb(100 50 179);
+        --pluto-logs-danger-color: rgb(245 218 215);
+        --pluto-logs-danger-accent-color: rgb(172 66 52);
+        --pluto-logs-debug-color: rgb(236 223 247);
+        --pluto-logs-debug-accent-color: rgb(100 50 179);
 
         /*Top navbar styling*/
         --nav-h1-text-color: black;
         --nav-filepicker-color: #6f6f6f;
         --nav-filepicker-border-color: #b2b2b2;
         --nav-process-status-bg-color: white;
-        --nav-process-status-color:
-        var(--pluto-output-h-color);
+        --nav-process-status-color: var(--pluto-output-h-color);
 
         /*header*/
-        --restart-recc-header-color:
-        rgba(114, 192, 255, 0.56);
-        --restart-req-header-color:
-        rgba(170, 41, 32, 0.56);
-        --dead-process-header-color:
-        rgb(230 88 46 / 38%);
-        --loading-header-color:
-        hsla(290, 10%, 80%, 0.5);
-        --disconnected-header-color:
-        rgba(255, 169, 114, 0.56);
-        --binder-loading-header-color:
-        hsl(51deg 64% 90% / 50%);
+        --restart-recc-header-color: rgba(114, 192, 255, 0.56);
+        --restart-req-header-color: rgba(170, 41, 32, 0.56);
+        --dead-process-header-color: rgb(230 88 46 / 38%);
+        --loading-header-color: hsla(290, 10%, 80%, 0.5);
+        --disconnected-header-color: rgba(255, 169, 114, 0.56);
+        --binder-loading-header-color: hsl(51deg 64% 90% / 50%);
 
         /*loading bar*/
         --loading-grad-color-1: #f1dba9;
@@ -161,12 +109,10 @@
         --overlay-button-border-save: #f3f2f2;
 
         /*input_context_menu*/
-        --input-context-menu-border-color:
-        rgba(0, 0, 0, 0.1);
+        --input-context-menu-border-color: rgba(0, 0, 0, 0.1);
         --input-context-menu-bg-color: white;
         --input-context-menu-soon-color: #55555544;
-        --input-context-menu-hover-bg-color:
-        rgba(0, 0, 0, 0.1);
+        --input-context-menu-hover-bg-color: rgba(0, 0, 0, 0.1);
         --input-context-menu-li-color: #6b6a6a;
 
         /*Pkg status*/
@@ -179,19 +125,15 @@
         --pkg-terminal-border-color: #c3c3c3;
 
         /* run area*/
-        --pluto-runarea-bg-color:
-        hsl(0, 0, 97%);
-        --pluto-runarea-span-color:
-        hsl(353, 5%, 64%);
+        --pluto-runarea-bg-color: hsl(0, 0, 97%);
+        --pluto-runarea-span-color: hsl(353, 5%, 64%);
 
         /*drop ruler*/
-        --dropruler-bg-color:
-        rgba(0, 0, 0, 0.5);
+        --dropruler-bg-color: rgba(0, 0, 0, 0.5);
 
         /* jlerror */
         --jlerror-header-color: #4f1616;
-        --jlerror-mark-bg-color:
-        rgb(243 243 243);
+        --jlerror-mark-bg-color: rgb(243 243 243);
         --jlerror-a-bg-color: #f5efd9;
         --jlerror-a-border-left-color: #704141;
         --jlerror-mark-color: black;
@@ -199,20 +141,21 @@
         /* helpbox */
         --helpbox-bg-color: white;
         --helpbox-box-shadow-color: #00000010;
-        --helpbox-header-bg-color:
-        hsl(0deg 0% 92%);
+        --helpbox-header-bg-color: hsl(0deg 0% 92%);
         --helpbox-header-tab-bg-color: white;
-        --helpbox-header-color:
-        hsl(230, 14%, 11%);
+        --helpbox-header-color: hsl(230, 14%, 11%);
         --helpbox-search-bg-color: #fbfbfb;
-        --helpbox-search-border-color:
-        hsl(207deg 24% 87%);
-        --helpbox-notfound-search-color:
-        rgb(139, 139, 139);
+        --helpbox-search-border-color: hsl(207deg 24% 87%);
+        --helpbox-notfound-search-color: rgb(139, 139, 139);
         --helpbox-text-color: black;
         --code-section-bg-color: whitesmoke;
         --code-section-bg-color: #f3f3f3;
 
+        --process-item-bg: #f2f2f2;
+        --process-busy: #ffcd70;
+        --process-finished: hsl(126deg 30% 60%);
+        --process-undefined: rgb(151, 151, 151);
+
         /*footer*/
         --footer-color: #333333;
         --footer-bg-color: #d7dcd3;
@@ -220,28 +163,21 @@
         --footer-input-border-color: #818181;
         --footer-filepicker-button-color: white;
         --footer-filepicker-focus-color: #896c6c;
-        --footnote-border-color:
-        rgba(23, 115, 119, 0.15);
+        --footnote-border-color: rgba(23, 115, 119, 0.15);
 
         /* undo delete cell*/
         --undo-delete-box-shadow-color: #0083;
 
         /*codemirror hints*/
-        --cm-editor-tooltip-border-color:
-        rgba(0, 0, 0, 0.2);
+        --cm-editor-tooltip-border-color: rgba(0, 0, 0, 0.2);
         --cm-editor-li-aria-selected-bg-color: #16659d;
         --cm-editor-li-aria-selected-color: white;
-        --cm-editor-li-notexported-color:
-        rgba(0, 0, 0, 0.5);
-        --code-background:
-        hsla(46, 90%, 98%, 1);
-        --cm-code-differs-gutters-color:
-        rgba(214, 172, 35, 0.2);
+        --cm-editor-li-notexported-color: rgba(0, 0, 0, 0.5);
+        --code-background: hsla(46, 90%, 98%, 1);
+        --cm-code-differs-gutters-color: rgba(214, 172, 35, 0.2);
         --cm-line-numbers-color: #8d86875e;
-        --cm-selection-background:
-        hsl(214deg 100% 73% / 48%);
-        --cm-selection-background-blurred:
-        hsl(214deg 0% 73% / 48%);
+        --cm-selection-background: hsl(214deg 100% 73% / 48%);
+        --cm-selection-background-blurred: hsl(214deg 0% 73% / 48%);
 
         /* code highlighting */
         --cm-editor-text-color: #41323f;
@@ -256,8 +192,7 @@
         --cm-var2-color: #37768a;
         --cm-builtin-color: #5e7ad3;
         --cm-function-color: #cc80ac;
-        --cm-type-color:
-        hsl(170deg 7% 56%);
+        --cm-type-color: hsl(170deg 7% 56%);
         --cm-bracket-color: #41323f;
         --cm-tag-color: #ef6155;
         --cm-link-color: #815ba4;
@@ -265,21 +200,17 @@
         --cm-error-color: #f7f7f7;
         --cm-matchingBracket-color: black;
         --cm-matchingBracket-bg-color: #1b4bbb21;
-        --cm-placeholder-text-color:
-        rgba(0, 0, 0, 0.2);
+        --cm-placeholder-text-color: rgba(0, 0, 0, 0.2);
 
         /*autocomplete menu*/
         --autocomplete-menu-bg-color: white;
 
         /* Landing colors */
-        --index-text-color:
-        hsl(0, 0, 60);
-        --index-clickable-text-color:
-        hsl(0, 0, 30);
+        --index-text-color: hsl(0, 0, 60);
+        --index-clickable-text-color: hsl(0, 0, 30);
         --docs-binding-bg: #8383830a;
         --index-card-bg: white;
-        --welcome-mywork-bg:
-        hsl(35deg 66% 93%);
+        --welcome-mywork-bg: hsl(35deg 66% 93%);
         --welcome-newnotebook-bg: whitesmoke;
         --welcome-recentnotebook-bg: white;
         --welcome-recentnotebook-border: #dfdfdf;
diff --git a/src/Pluto.jl b/src/Pluto.jl
index 01b2878730..125aa188f3 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -50,6 +50,7 @@ include("./analysis/ExpressionExplorer.jl")
 include("./analysis/FunctionDependencies.jl")
 include("./analysis/ReactiveNode.jl")
 include("./packages/PkgCompat.jl")
+include("./webserver/Status.jl")
 
 include("./notebook/Cell.jl")
 include("./analysis/data structures.jl")
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 62f5ad4f9f..14d2e2d041 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -55,9 +55,13 @@ function run_reactive_core!(
 )::TopologicalOrder
     @assert !isready(notebook.executetoken) "run_reactive_core!() was called with a free notebook.executetoken."
     @assert will_run_code(notebook)
-
+	
     old_workspace_name, _ = WorkspaceManager.bump_workspace_module((session, notebook))
-
+	
+	run_status = Status.report_business_started!(notebook.status_tree, :run)
+	Status.report_business_started!(run_status, :resolve_topology)
+	cell_status = Status.report_business_planned!(run_status, :evaluate)
+	
     if !is_resolved(new_topology)
         unresolved_topology = new_topology
         new_topology = notebook.topology = resolve_topology(session, notebook, unresolved_topology, old_workspace_name; current_roots = setdiff(roots, already_run))
@@ -137,6 +141,12 @@ function run_reactive_core!(
         send_notebook_changes!(ClientRequest(; session, notebook))
     end
     send_notebook_changes_throttled()
+	
+	Status.report_business_finished!(run_status, :resolve_topology)
+	Status.report_business_started!(cell_status)
+	for i in eachindex(to_run)
+		Status.report_business_planned!(cell_status, Symbol(i))
+	end
 
     # delete new variables that will be defined by a cell unless this cell has already run in the current reactive run
     to_delete_vars = union!(to_delete_vars, defined_variables(new_topology, new_runnable)...)
@@ -158,6 +168,7 @@ function run_reactive_core!(
 
     local any_interrupted = false
     for (i, cell) in enumerate(to_run)
+		Status.report_business_started!(cell_status, Symbol(i))
 
         cell.queued = false
         cell.running = true
@@ -186,6 +197,7 @@ function run_reactive_core!(
         end
 
         cell.running = false
+		Status.report_business_finished!(cell_status, Symbol(i))
 
         defined_macros_in_cell = defined_macros(new_topology, cell) |> Set{Symbol}
 
@@ -222,6 +234,7 @@ function run_reactive_core!(
 
     notebook.wants_to_interrupt = false
     flush_notebook_changes()
+	Status.report_business_finished!(run_status)
     return new_order
 end
 
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index f7cef2aca9..0f16165302 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -1,7 +1,8 @@
 module WorkspaceManager
-import UUIDs: UUID
+import UUIDs: UUID, uuid1
 import ..Pluto
 import ..Pluto: Configuration, Notebook, Cell, ProcessStatus, ServerSession, ExpressionExplorer, pluto_filename, Token, withtoken, tamepath, project_relative_path, putnotebookupdates!, UpdateMessage
+import ..Pluto.Status
 import ..Pluto.PkgCompat
 import ..Configuration: CompilerOptions, _merge_notebook_compiler_options, _convert_to_flags
 import ..Pluto.ExpressionExplorer: FunctionName
@@ -49,13 +50,20 @@ end
 
 "Create a workspace for the notebook, optionally in the main process."
 function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false)::Workspace
+    workspace_business = is_offline_renderer ? Status.Business(name=:gobble) : Status.report_business_started!(notebook.status_tree, :workspace)
+    create_status = Status.report_business_started!(workspace_business, :create_process)
+    Status.report_business_planned!(workspace_business, :init_process)
+    
     is_offline_renderer || (notebook.process_status = ProcessStatus.starting)
 
     use_distributed = !is_offline_renderer && session.options.evaluation.workspace_use_distributed
 
     pid = if use_distributed
         @debug "Creating workspace process" notebook.path length(notebook.cells)
-        create_workspaceprocess(; compiler_options=_merge_notebook_compiler_options(notebook, session.options.compiler))
+        create_workspaceprocess(; 
+            compiler_options=_merge_notebook_compiler_options(notebook, session.options.compiler),
+            status=create_status,
+        )
     else
         pid = Distributed.myid()
         if !(isdefined(Main, :PlutoRunner) && Main.PlutoRunner isa Module)
@@ -66,6 +74,13 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
         end
         pid
     end
+    
+    Status.report_business_finished!(workspace_business, :create_process)
+    init_status = Status.report_business_started!(workspace_business, :init_process)
+    Status.report_business_started!(init_status, Symbol(1))
+    Status.report_business_planned!(init_status, Symbol(2))
+    Status.report_business_planned!(init_status, Symbol(3))
+    Status.report_business_planned!(init_status, Symbol(4))
 
     Distributed.remotecall_eval(Main, [pid], session.options.evaluation.workspace_custom_startup_expr)
 
@@ -101,11 +116,30 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
         original_ACTIVE_PROJECT,
         is_offline_renderer,
     )
+    
+    
+    Status.report_business_finished!(init_status, Symbol(1))
+    Status.report_business_started!(init_status, Symbol(2))
 
     @async start_relaying_logs((session, notebook), remote_log_channel)
     @async start_relaying_self_updates((session, notebook), run_channel)
     cd_workspace(workspace, notebook.path)
+    
+    Status.report_business_finished!(init_status, Symbol(2))
+    Status.report_business_started!(init_status, Symbol(3))
+    
     use_nbpkg_environment((session, notebook), workspace)
+    
+    Status.report_business_finished!(init_status, Symbol(3))
+    Status.report_business_started!(init_status, Symbol(4))
+    
+    # TODO: precompile 1+1 with display
+    # sleep(3)
+    eval_format_fetch_in_workspace(workspace, Expr(:toplevel, LineNumberNode(-1), :(1+1)), uuid1())
+    
+    Status.report_business_finished!(init_status, Symbol(4))
+    Status.report_business_finished!(workspace_business, :init_process)
+    Status.report_business_finished!(workspace_business)
 
     is_offline_renderer || if notebook.process_status == ProcessStatus.starting
         notebook.process_status = ProcessStatus.ready
@@ -265,12 +299,18 @@ end
 # NOTE: this function only start a worker process using given
 # compiler options, it does not resolve paths for notebooks
 # compiler configurations passed to it should be resolved before this
-function create_workspaceprocess(; compiler_options=CompilerOptions())::Integer
+function create_workspaceprocess(; compiler_options=CompilerOptions(), status::Status.Business=Business())::Integer
+    
+    Status.report_business_started!(status, Symbol(1))
+    Status.report_business_planned!(status, Symbol(2))
     # run on proc 1 in case Pluto is being used inside a notebook process
     # Workaround for "only process 1 can add/remove workers"
     pid = Distributed.remotecall_eval(Main, 1, quote
         $(Distributed_expr).addprocs(1; exeflags=$(_convert_to_flags(compiler_options))) |> first
     end)
+    
+    Status.report_business_finished!(status, Symbol(1))
+    Status.report_business_started!(status, Symbol(2))
 
     Distributed.remotecall_eval(Main, [pid], process_preamble())
 
@@ -282,6 +322,8 @@ function create_workspaceprocess(; compiler_options=CompilerOptions())::Integer
             catch end
         end
     end)
+    
+    Status.report_business_finished!(status)
 
     pid
 end
diff --git a/src/notebook/Notebook.jl b/src/notebook/Notebook.jl
index 32013d119e..712152cc4f 100644
--- a/src/notebook/Notebook.jl
+++ b/src/notebook/Notebook.jl
@@ -4,7 +4,7 @@ import .Configuration
 import .PkgCompat: PkgCompat, PkgContext
 import Pkg
 import TOML
-
+import .Status
 
 const DEFAULT_NOTEBOOK_METADATA = Dict{String, Any}()
 
@@ -55,6 +55,7 @@ Base.@kwdef mutable struct Notebook
     nbpkg_installed_versions_cache::Dict{String,String}=Dict{String,String}()
 
     process_status::String=ProcessStatus.starting
+    status_tree::Status.Business=_initial_nb_status()
     wants_to_interrupt::Bool=false
     last_save_time::Float64=time()
     last_hot_reload_time::Float64=zero(time())
@@ -64,6 +65,14 @@ Base.@kwdef mutable struct Notebook
     metadata::Dict{String, Any}=copy(DEFAULT_NOTEBOOK_METADATA)
 end
 
+function _initial_nb_status()
+    b = Status.Business(name=:notebook, started_at=time())
+    Status.report_business_planned!(b, :workspace)
+    Status.report_business_planned!(b, :pkg)
+    Status.report_business_planned!(b, :run)
+    return b
+end
+
 _collect_cells(cells_dict::Dict{UUID,Cell}, cells_order::Vector{UUID}) = 
     map(i -> cells_dict[i], cells_order)
 _initial_topology(cells_dict::Dict{UUID,Cell}, cells_order::Vector{UUID}) =
diff --git a/src/notebook/saving and loading.jl b/src/notebook/saving and loading.jl
index 912b6a6c32..b0299ddd48 100644
--- a/src/notebook/saving and loading.jl	
+++ b/src/notebook/saving and loading.jl	
@@ -130,8 +130,10 @@ end
 function save_notebook(notebook::Notebook, path::String)
     # @warn "Saving to file!!" exception=(ErrorException(""), backtrace())
     notebook.last_save_time = time()
-    write_buffered(path) do io
-        save_notebook(io, notebook)
+    Status.report_business!(notebook.status_tree, :saving) do
+        write_buffered(path) do io
+            save_notebook(io, notebook)
+        end
     end
 end
 
diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 679518f765..9d0847c77b 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -50,6 +50,8 @@ Update the notebook package environment to match the notebook's code. This will:
 - Detect the use of `Pkg.activate` and enable/disabled nbpkg accordingly.
 """
 function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new_topology::NotebookTopology; on_terminal_output::Function=((args...) -> nothing), lag::Real=0)
+    pkg_status = Status.report_business_started!(notebook.status_tree, :pkg)
+    Status.report_business_started!(pkg_status, :analysis)
     
     👺 = false
 
@@ -108,12 +110,33 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
 
         can_skip = isempty(removed) && isempty(added) && notebook.nbpkg_ctx_instantiated
 
+        Status.report_business_finished!(pkg_status, :analysis)
+        
         if !can_skip
+            wait_business = if !isready(pkg_token)
+                Status.report_business_started!(pkg_status, 
+                    !PkgCompat._updated_registries_compat[] ? 
+                        :registry_update : 
+                        :waiting_for_others
+                )
+            end
+            
             return withtoken(pkg_token) do
+                isnothing(wait_business) || Status.report_business_finished!(wait_business)
+                
+                notebook.nbpkg_ctx_instantiated || Status.report_business_planned!(pkg_status, :resolve)
+                isempty(removed) || Status.report_business_planned!(pkg_status, :remove)
+                isempty(added) || Status.report_business_planned!(pkg_status, :add)
+                if !notebook.nbpkg_ctx_instantiated || !isempty(added) || !isempty(removed)
+                    Status.report_business_planned!(pkg_status, :instantiate)
+                end
+                
                 PkgCompat.refresh_registry_cache()
 
                 if !notebook.nbpkg_ctx_instantiated
-                    resolve_with_auto_fixes(notebook, iolistener)
+                    Status.report_business!(pkg_status, :resolve) do
+                        resolve_with_auto_fixes(notebook, iolistener)
+                    end
                 end
                 
                 to_add = filter(PkgCompat.package_exists, added)
@@ -123,6 +146,7 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                 @debug "PlutoPkg:" notebook.path to_add to_remove
                 
                 if !isempty(to_remove)
+                    Status.report_business_started!(pkg_status, :remove)
                     # See later comment
                     mkeys() = Set(filter(!is_stdlib, [m.name for m in values(PkgCompat.dependencies(notebook.nbpkg_ctx))]))
                     old_manifest_keys = mkeys()
@@ -137,6 +161,7 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                     new_manifest_keys = mkeys()
                     
                     # TODO: we might want to upgrade other packages now that constraints have loosened? Does this happen automatically?
+                    Status.report_business_finished!(pkg_status, :remove)
                 end
 
                 
@@ -144,6 +169,7 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                 # "Pkg.PRESERVE_DIRECT, but preserve exact verisons of Base.loaded_modules"
                 
                 if !isempty(to_add)
+                    Status.report_business_started!(pkg_status, :add)
                     start_time = time_ns()
                     startlistening(iolistener)
                     PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
@@ -183,11 +209,14 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                         end
                     end
                     notebook.nbpkg_install_time_ns = notebook.nbpkg_install_time_ns === nothing ? nothing : (notebook.nbpkg_install_time_ns + (time_ns() - start_time))
+                    Status.report_business_finished!(pkg_status, :add)
                     @debug "PlutoPkg: done" notebook.path 
                 end
 
                 should_instantiate = !notebook.nbpkg_ctx_instantiated || !isempty(to_add) || !isempty(to_remove)
+                
                 if should_instantiate
+                    Status.report_business_started!(pkg_status, :instantiate)
                     start_time = time_ns()
                     startlistening(iolistener)
                     PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
@@ -207,10 +236,13 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                         popfirst!(LOAD_PATH)
                     end
                     notebook.nbpkg_install_time_ns = notebook.nbpkg_install_time_ns === nothing ? nothing : (notebook.nbpkg_install_time_ns + (time_ns() - start_time))
+                    Status.report_business_finished!(pkg_status, :instantiate)
                     notebook.nbpkg_ctx_instantiated = true
                 end
 
                 stoplistening(iolistener)
+                
+                Status.report_business_finished!(pkg_status)
 
                 return (
                     did_something=👺 || (
@@ -229,6 +261,8 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
             end
         end
     end
+    Status.report_business_finished!(pkg_status)
+
     return (
         did_something=👺 || (use_plutopkg_old != use_plutopkg_new),
         used_tier=Pkg.PRESERVE_ALL,
@@ -250,6 +284,8 @@ In addition to the steps performed by [`sync_nbpkg_core`](@ref):
 """
 function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topology::NotebookTopology; save::Bool=true, take_token::Bool=true)
 	try
+        Status.report_business_started!(notebook.status_tree, :pkg)
+        
         pkg_result = (take_token ? withtoken : (f, _) -> f())(notebook.executetoken) do
 			function iocallback(pkgs, s)
 				notebook.nbpkg_busy_packages = pkgs
@@ -306,7 +342,9 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
 		send_notebook_changes!(ClientRequest(; session, notebook))
 
 		save && save_notebook(session, notebook)
-	end
+	finally
+        Status.report_business_finished!(notebook.status_tree, :pkg)
+    end
 end
 
 function writebackup(notebook::Notebook)
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index e0090c4806..1e6790e42b 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -1,6 +1,7 @@
 import UUIDs: uuid1
 
 import .PkgCompat
+import .Status
 
 "Will hold all 'response handlers': functions that respond to a WebSocket request from the client."
 const responses = Dict{Symbol,Function}()
@@ -163,6 +164,7 @@ function notebook_to_js(notebook::Notebook)
                 "instantiated" => notebook.nbpkg_ctx_instantiated,
             )
         end,
+        "status_tree" => Status.tojs(notebook.status_tree),
         "cell_execution_order" => cell_id.(collect(topological_order(notebook))),
     )
 end
@@ -377,6 +379,10 @@ end
 # MISC RESPONSES
 ###
 
+responses[:current_time] = function response_current_time(🙋::ClientRequest)
+    putclientupdates!(🙋.session, 🙋.initiator, UpdateMessage(:current_time, Dict(:time => time()), nothing, nothing, 🙋.initiator))
+end
+
 responses[:connect] = function response_connect(🙋::ClientRequest)
     putclientupdates!(🙋.session, 🙋.initiator, UpdateMessage(:👋, Dict(
         :notebook_exists => (🙋.notebook !== nothing),
diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 4d0fd9e2fe..42ba4e976d 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -1,6 +1,6 @@
 module SessionActions
 
-import ..Pluto: Pluto, ServerSession, Notebook, Cell, emptynotebook, tamepath, new_notebooks_directory, without_pluto_file_extension, numbered_until_new, cutename, readwrite, update_save_run!, update_from_file, wait_until_file_unchanged, putnotebookupdates!, putplutoupdates!, load_notebook, clientupdate_notebook_list, WorkspaceManager, try_event_call, NewNotebookEvent, OpenNotebookEvent, ShutdownNotebookEvent, @asynclog, ProcessStatus, maybe_convert_path_to_wsl, move_notebook!
+import ..Pluto: Pluto, Status, ServerSession, Notebook, Cell, emptynotebook, tamepath, new_notebooks_directory, without_pluto_file_extension, numbered_until_new, cutename, readwrite, update_save_run!, update_from_file, wait_until_file_unchanged, putnotebookupdates!, putplutoupdates!, load_notebook, clientupdate_notebook_list, WorkspaceManager, try_event_call, NewNotebookEvent, OpenNotebookEvent, ShutdownNotebookEvent, @asynclog, ProcessStatus, maybe_convert_path_to_wsl, move_notebook!, throttled
 using FileWatching
 import ..Pluto.DownloadCool: download_cool
 import HTTP
@@ -75,8 +75,14 @@ function open(session::ServerSession, path::AbstractString;
     end
 
     session.notebooks[notebook.notebook_id] = notebook
-    for c in notebook.cells
-        c.queued = session.options.evaluation.run_notebook_on_load
+    
+    run_status = Status.report_business_planned!(notebook.status_tree, :run)
+    if session.options.evaluation.run_notebook_on_load
+        Status.report_business_planned!(run_status, :resolve_topology)
+        for (i,c) in enumerate(notebook.cells)
+            c.queued = true
+            Status.report_business_planned!(run_status, Symbol(i))
+        end
     end
 
     update_save_run!(session, notebook, notebook.cells; run_async, prerender_text=true)
@@ -169,6 +175,11 @@ function add(session::ServerSession, notebook::Notebook; run_async::Bool=true)
         end
     end
     
+    notebook.status_tree.update_listener_ref[] = first(throttled(1.0 / 20) do
+        # TODO: this throttle should be trailing
+        Pluto.send_notebook_changes!(Pluto.ClientRequest(; session, notebook))
+    end)
+
     return notebook
 end
 
diff --git a/src/webserver/Status.jl b/src/webserver/Status.jl
new file mode 100644
index 0000000000..0cc196aa9d
--- /dev/null
+++ b/src/webserver/Status.jl
@@ -0,0 +1,115 @@
+module Status
+
+
+Base.@kwdef mutable struct Business
+    name::Symbol=:ignored
+    started_at::Union{Nothing,Float64}=nothing
+    finished_at::Union{Nothing,Float64}=nothing
+    subtasks::Dict{Symbol,Business}=Dict{Symbol,Business}()
+    update_listener_ref::Ref{Union{Nothing,Function}}=Ref{Union{Nothing,Function}}(nothing)
+    lock::Threads.SpinLock=Threads.SpinLock()
+end
+
+
+
+tojs(b::Business) = Dict{String,Any}(
+    "name" => b.name,
+    "started_at" => b.started_at,
+    "finished_at" => b.finished_at,
+    "subtasks" => Dict{String,Any}(
+        String(s) => tojs(r)
+        for (s, r) in b.subtasks
+    ),
+)
+
+
+function report_business_started!(business::Business)
+    lock(business.lock) do
+        business.started_at = time()
+        business.finished_at = nothing
+        
+        empty!(business.subtasks)
+    end
+    
+    isnothing(business.update_listener_ref[]) || business.update_listener_ref[]()
+    return business
+end
+
+
+
+function report_business_finished!(business::Business)
+    lock(business.lock) do
+        # if it never started, then lets "start" it now
+        business.started_at = something(business.started_at, time())
+        # if it already finished, then leave the old finish time. 
+        business.finished_at = something(business.finished_at, max(business.started_at, time()))
+    end
+    
+    # also finish all subtasks (this can't be inside the same lock)
+    for v in values(business.subtasks)
+        report_business_finished!(v)
+    end
+    
+    isnothing(business.update_listener_ref[]) || business.update_listener_ref[]()
+    
+    return business
+end
+
+
+
+create_for_child(parent::Business, name::Symbol) = function()
+    Business(; name, update_listener_ref=parent.update_listener_ref, lock=parent.lock)
+end
+
+get_child(parent::Business, name::Symbol) = lock(parent.lock) do
+    get!(create_for_child(parent, name), parent.subtasks, name)
+end
+
+report_business_finished!(parent::Business, name::Symbol) = get_child(parent, name) |> report_business_finished!
+report_business_started!(parent::Business, name::Symbol) = get_child(parent, name) |> report_business_started!
+report_business_planned!(parent::Business, name::Symbol) = get_child(parent, name)
+
+
+report_business!(f::Function, parent::Business, args...) = try
+    report_business_started!(parent, args...)
+    f()
+finally
+    report_business_finished!(parent, args...)
+end
+
+
+
+# GLOBAL
+
+# registry update
+## once per process
+
+# waiting for other notebook packages
+
+
+
+
+
+
+
+
+
+
+# PER NOTEBOOK
+
+# notebook process starting
+
+# installing packages
+# updating packages
+
+# running cells
+
+
+
+
+
+
+end
+
+
+

From be6d9107da54ecae136703905282b2e912391478 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 13 Dec 2022 23:46:17 +0100
Subject: [PATCH 541/821] Update index.css

---
 frontend/index.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/index.css b/frontend/index.css
index a4ae4b25e2..7d84ec6445 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -347,7 +347,7 @@ featured-card {
     align-items: stretch;
     grid-template-columns: repeat(auto-fit, minmax(var(--card-width), 1fr));
     gap: 0rem;
-    justify-items: stretch;
+    justify-items: center;
 }
 
 featured-card .banner img {

From 72d7b6891378cc8dae07bb2f63712b53410f1495 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 14 Dec 2022 00:24:24 +0100
Subject: [PATCH 542/821] Make featured notebook sources a frontend launch
 param (#2412)

---
 frontend/common/URLTools.js                 |   2 +-
 frontend/components/welcome/Featured.js     | 112 ++++++++++--------
 frontend/components/welcome/FeaturedCard.js |  43 ++++---
 frontend/components/welcome/Welcome.js      | 122 +++++++++++++-------
 frontend/index.js                           |  25 +++-
 src/notebook/Export.jl                      |  35 +++++-
 src/notebook/path helpers.jl                |   3 +
 test/Notebook.jl                            |  12 +-
 8 files changed, 245 insertions(+), 109 deletions(-)

diff --git a/frontend/common/URLTools.js b/frontend/common/URLTools.js
index 6f71eb7332..7e10b58185 100644
--- a/frontend/common/URLTools.js
+++ b/frontend/common/URLTools.js
@@ -1,4 +1,4 @@
-export const with_query_params = (/** @type {String | URL} */ url_str, /** @type {Record<string,string?>} */ params) => {
+export const with_query_params = (/** @type {String | URL} */ url_str, /** @type {Record<string,string | null | undefined>} */ params) => {
     const fake_base = "http://delete-me.com/"
     const url = new URL(url_str, fake_base)
     Object.entries(params).forEach(([key, val]) => {
diff --git a/frontend/components/welcome/Featured.js b/frontend/components/welcome/Featured.js
index 5457e6904a..03b9e97484 100644
--- a/frontend/components/welcome/Featured.js
+++ b/frontend/components/welcome/Featured.js
@@ -1,28 +1,26 @@
-import featured_sources from "../../featured_sources.js"
 import _ from "../../imports/lodash.js"
 import { html, useEffect, useState } from "../../imports/Preact.js"
+import register from "../../imports/PreactCustomElement.js"
 import { FeaturedCard } from "./FeaturedCard.js"
 
-const run = (f) => f()
-
 /**
  * @typedef SourceManifestNotebookEntry
  * @type {{
  *   id: String,
  *   hash: String,
- *   html_path: String,
- *   statefile_path: String,
- *   notebookfile_path: String,
- *   frontmatter: Record<string,any>,
+ *   html_path?: String,
+ *   statefile_path?: String,
+ *   notebookfile_path?: String,
+ *   frontmatter?: Record<string,any>,
  * }}
  */
 
 /**
  * @typedef SourceManifestCollectionEntry
  * @type {{
- *   title: String?,
- *   description: String?,
- *   tags: Array<String>?,
+ *   title?: String,
+ *   description?: String,
+ *   tags?: Array<String> | "everything",
  * }}
  */
 
@@ -30,16 +28,20 @@ const run = (f) => f()
  * @typedef SourceManifest
  * @type {{
  *   notebooks: Record<string,SourceManifestNotebookEntry>,
- *   collections: Array<SourceManifestCollectionEntry>?,
- *   pluto_version: String,
- *   julia_version: String,
- *   format_version: String,
- *   source_url: String,
- *   title: String?,
- *   description: String?,
+ *   collections?: Array<SourceManifestCollectionEntry>,
+ *   pluto_version?: String,
+ *   julia_version?: String,
+ *   format_version?: String,
+ *   source_url?: String,
+ *   title?: String,
+ *   description?: String,
  * }}
  */
 
+/**
+ * This data is used as placeholder while the real data is loading from the network.
+ * @type {SourceManifest[]}
+ */
 const placeholder_data = [
     {
         title: "Featured Notebooks",
@@ -50,10 +52,11 @@ const placeholder_data = [
                 tags: [],
             },
         ],
-        notebooks: [],
+        notebooks: {},
     },
 ]
 
+/** This HTML is shown instead of the featured notebooks if the user is offline. */
 const offline_html = html`
     <div class="featured-source">
         <h1>${placeholder_data[0].title}</h1>
@@ -77,24 +80,36 @@ const offline_html = html`
     </div>
 `
 
-export const Featured = () => {
-    // Option 1: Dynamically load source list from a json:
-    // const [sources, set_sources] = useState(/** @type{Array<{url: String, integrity: String?}>?} */ (null))
-    // useEffect(() => {
-    //     run(async () => {
-    //         const data = await (await fetch("featured_sources.json")).json()
-
-    //         set_sources(data.sources)
-    //     })
-    // }, [])
+/**
+ * If no collections are defined, then this special collection will just show all notebooks under the "Notebooks" category.
+ * No collections are defined if no `pluto_export_configuration.json` file was provided to PlutoSliderServer.jl.
+ * @type {SourceManifestCollectionEntry[]}
+ */
+const fallback_collections = [
+    {
+        title: "Notebooks",
+        tags: "everything",
+    },
+]
 
-    // Option 2: From a JS file. This means that the source list can be bundled together.
-    const sources = featured_sources.sources
+/**
+ * @typedef FeaturedSource
+ * @type {{url: String, integrity?: String}}
+ */
 
-    const [source_data, set_source_data] = useState(/** @type{Array<SourceManifest>} */ ([]))
+/**
+ * @param {{
+ * sources: FeaturedSource[]?,
+ * direct_html_links: boolean,
+ * }} props
+ */
+export const Featured = ({ sources, direct_html_links }) => {
+    // source_data will be a mapping from [source URL] => [data from that source]
+    const [source_data, set_source_data] = useState(/** @type {Record<String,SourceManifest>} */ ({}))
 
     useEffect(() => {
         if (sources != null) {
+            // Start downloading the sources
             const promises = sources.map(async ({ url, integrity }) => {
                 const data = await (await fetch(new Request(url, { integrity: integrity ?? undefined }))).json()
 
@@ -102,13 +117,13 @@ export const Featured = () => {
                     throw new Error(`Invalid format version: ${data.format_version}`)
                 }
 
-                set_source_data((old) => [
+                set_source_data((old) => ({
                     ...old,
-                    {
+                    [url]: {
                         ...data,
                         source_url: url,
                     },
-                ])
+                }))
             })
 
             Promise.any(promises).catch((e) => {
@@ -119,7 +134,7 @@ export const Featured = () => {
     }, [sources])
 
     useEffect(() => {
-        if (source_data?.length > 0) {
+        if (Object.entries(source_data).length > 0) {
             console.log("Sources:", source_data)
         }
     }, [source_data])
@@ -131,24 +146,27 @@ export const Featured = () => {
         }, 8 * 1000)
     }, [])
 
-    const no_data = !(source_data?.length > 0)
+    const no_data = Object.entries(source_data).length === 0
 
     return no_data && waited_too_long
         ? offline_html
         : html`
-              ${(no_data ? placeholder_data : source_data).map(
-                  (data) => html`
+              ${(no_data ? placeholder_data : Object.values(source_data)).map((/** @type {SourceManifest} */ data) => {
+                  let collections = data?.collections ?? fallback_collections
+
+                  return html`
                       <div class="featured-source">
                           <h1>${data.title}</h1>
                           <p>${data.description}</p>
-                          ${data.collections.map((coll) => {
+                          ${collections.map((coll) => {
                               return html`
                                   <div class="collection">
                                       <h2>${coll.title}</h2>
                                       <p>${coll.description}</p>
                                       <div class="card-list">
-                                          ${collection(Object.values(data.notebooks), coll.tags).map(
-                                              (entry) => html`<${FeaturedCard} entry=${entry} source_url=${data.source_url} />`
+                                          ${collection(Object.values(data.notebooks), coll.tags ?? []).map(
+                                              (entry) =>
+                                                  html`<${FeaturedCard} entry=${entry} source_url=${data.source_url} direct_html_links=${direct_html_links} />`
                                           )}
                                       </div>
                                   </div>
@@ -156,12 +174,16 @@ export const Featured = () => {
                           })}
                       </div>
                   `
-              )}
+              })}
           `
 }
 
-const collection = (/** @type {SourceManifestNotebookEntry[]} */ notebooks, /** @type {String[]} */ tags) => {
-    const nbs = notebooks.filter((notebook) => tags.some((t) => (notebook.frontmatter?.tags ?? []).includes(t)))
+register(Featured, "pluto-featured", ["sources", "direct_html_links"])
+
+/** Return all notebook entries that have at least one of the given `tags`. Notebooks are sorted on `notebook.frontmatter.order` or `notebook.id`. */
+const collection = (/** @type {SourceManifestNotebookEntry[]} */ notebooks, /** @type {String[] | "everything"} */ tags) => {
+    const nbs = tags === "everything" ? notebooks : notebooks.filter((notebook) => tags.some((t) => (notebook.frontmatter?.tags ?? []).includes(t)))
 
-    return /** @type {SourceManifestNotebookEntry[]} */ (_.sortBy(nbs, [(nb) => Number(nb?.frontmatter?.order), "id"]))
+    let n = (s) => (isNaN(s) ? s : Number(s))
+    return /** @type {SourceManifestNotebookEntry[]} */ (_.sortBy(nbs, [(nb) => n(nb?.frontmatter?.order), "id"]))
 }
diff --git a/frontend/components/welcome/FeaturedCard.js b/frontend/components/welcome/FeaturedCard.js
index b12f0529dc..98424a5626 100644
--- a/frontend/components/welcome/FeaturedCard.js
+++ b/frontend/components/welcome/FeaturedCard.js
@@ -10,27 +10,42 @@ const str_to_degree = (s) => ([...s].reduce((a, b) => a + b.charCodeAt(0), 0) *
 /**
  * @param {{
  *  entry: import("./Featured.js").SourceManifestNotebookEntry,
- *  source_url: String,
+ *  source_url?: string,
+ *  direct_html_links: boolean,
  * }} props
  */
-export const FeaturedCard = ({ entry, source_url }) => {
+export const FeaturedCard = ({ entry, source_url, direct_html_links }) => {
     const title = entry.frontmatter?.title
-    const u = (x) => (x == null ? null : new URL(x, source_url).href)
 
-    const href = with_query_params(`editor.html`, {
-        statefile: u(entry.statefile_path),
-        notebookfile: u(entry.notebookfile_path),
-        notebookfile_integrity: `sha256-${base64url_to_base64(entry.hash)}`,
-        disable_ui: `true`,
-        pluto_server_url: `.`,
-        name: title == null ? null : `sample ${title}`,
-    })
+    const u = (/** @type {string | null | undefined} */ x) =>
+        source_url == null
+            ? x
+            : x == null
+            ? null
+            : // URLs are relative to the source URL...
+              new URL(
+                  x,
+                  // ...and the source URL is relative to the current location
+                  new URL(source_url, window.location.href)
+              ).href
+
+    // `direct_html_links` means that we will navigate you directly to the exported HTML file. Otherwise, we use our local editor, with the exported state as parameters. This lets users run the featured notebooks locally.
+    const href = direct_html_links
+        ? u(entry.html_path)
+        : with_query_params(`editor.html`, {
+              statefile: u(entry.statefile_path),
+              notebookfile: u(entry.notebookfile_path),
+              notebookfile_integrity: `sha256-${base64url_to_base64(entry.hash)}`,
+              disable_ui: `true`,
+              pluto_server_url: `.`,
+              name: title == null ? null : `sample ${title}`,
+          })
 
     const author = author_info(entry.frontmatter)
 
     return html`
         <featured-card style=${`--card-color-hue: ${str_to_degree(entry.id)}deg;`}>
-            <a class="banner" href=${href}><img src=${u(entry.frontmatter.image) ?? transparent_svg} /></a>
+            <a class="banner" href=${href}><img src=${u(entry?.frontmatter?.image) ?? transparent_svg} /></a>
             ${author?.name == null
                 ? null
                 : html`
@@ -38,8 +53,8 @@ export const FeaturedCard = ({ entry, source_url }) => {
                           <a href=${author.url}> <img src=${author.image ?? transparent_svg} /><span>${author.name}</span></a>
                       </div>
                   `}
-            <h3><a href=${href} title=${entry.frontmatter.title}>${entry.frontmatter.title}</a></h3>
-            <p title=${entry.frontmatter.description}>${entry.frontmatter.description}</p>
+            <h3><a href=${href} title=${entry?.frontmatter?.title}>${entry?.frontmatter?.title ?? entry.id}</a></h3>
+            <p title=${entry?.frontmatter?.description}>${entry?.frontmatter?.description}</p>
         </featured-card>
     `
 }
diff --git a/frontend/components/welcome/Welcome.js b/frontend/components/welcome/Welcome.js
index 12bcdb638a..f52fc7aeb3 100644
--- a/frontend/components/welcome/Welcome.js
+++ b/frontend/components/welcome/Welcome.js
@@ -1,5 +1,5 @@
 import _ from "../../imports/lodash.js"
-import { html, useEffect, useState, useRef, useLayoutEffect } from "../../imports/Preact.js"
+import { html, useEffect, useState, useRef } from "../../imports/Preact.js"
 import * as preact from "../../imports/Preact.js"
 
 import { create_pluto_connection } from "../../common/PlutoConnection.js"
@@ -8,6 +8,7 @@ import { Open } from "./Open.js"
 import { Recent } from "./Recent.js"
 import { Featured } from "./Featured.js"
 import { get_environment } from "../../common/Environment.js"
+import default_featured_sources from "../../featured_sources.js"
 
 // This is imported asynchronously - uncomment for development
 // import environment from "../../common/Environment.js"
@@ -15,17 +16,32 @@ import { get_environment } from "../../common/Environment.js"
 /**
  * @typedef NotebookListEntry
  * @type {{
- *  notebook_id: String,
- *  path: String,
- *  in_temp_dir: Boolean,
- *  shortpath: String,
+ *  notebook_id: string,
+ *  path: string,
+ *  in_temp_dir: boolean,
+ *  shortpath: string,
+ * }}
+ */
+
+/**
+ * @typedef LaunchParameters
+ * @type {{
+ * featured_direct_html_links: boolean,
+ * featured_sources: import("./Featured.js").FeaturedSource[]?,
+ * featured_source_url?: string,
+ * featured_source_integrity?: string,
  * }}
  */
 
 // We use a link from the head instead of directing linking "img/logo.svg" because parcel does not bundle preact files
 const url_logo_big = document.head.querySelector("link[rel='pluto-logo-big']")?.getAttribute("href") ?? ""
 
-export const Welcome = () => {
+/**
+ * @param {{
+ * launch_params: LaunchParameters,
+ * }} props
+ */
+export const Welcome = ({ launch_params }) => {
     const [remote_notebooks, set_remote_notebooks] = useState(/** @type {Array<NotebookListEntry>} */ ([]))
 
     const [connected, set_connected] = useState(false)
@@ -79,7 +95,6 @@ export const Welcome = () => {
 
     // When block_screen_with_this_text is null (default), all is fine. When it is a string, we show a big banner with that text, and disable all other UI. https://github.com/fonsp/Pluto.jl/pull/2292
     const [block_screen_with_this_text, set_block_screen_with_this_text] = useState(/** @type {string?} */ (null))
-
     const on_start_navigation = (value, expect_navigation = true) => {
         if (expect_navigation) {
             // Instead of calling set_block_screen_with_this_text(value) directly, we wait for the beforeunload to happen, and then we do it. If this event does not happen within 1 second, then that means that the user right-clicked, or Ctrl+Clicked (to open in a new tab), and we don't want to clear the main menu. https://github.com/fonsp/Pluto.jl/issues/2301
@@ -93,41 +108,60 @@ export const Welcome = () => {
         }
     }
 
-    return block_screen_with_this_text != null
-        ? html`<div class="navigating-away-banner"><h2>Loading ${block_screen_with_this_text}...</h2></div>`
-        : html`
-              <section id="title">
-                  <h1>welcome to <img src=${url_logo_big} /></h1>
-                  <!-- <a id="github" href="https://github.com/fonsp/Pluto.jl"
-                ><img src="https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/logo-github.svg"
-            /></a> -->
-              </section>
-              <section id="mywork">
-                  <div>
-                      <${Recent}
-                          client=${client_ref.current}
-                          connected=${connected}
-                          remote_notebooks=${remote_notebooks}
-                          CustomRecent=${CustomRecent}
-                          on_start_navigation=${on_start_navigation}
-                      />
-                  </div>
-              </section>
-              <section id="open">
-                  <div>
-                      <${Open}
-                          client=${client_ref.current}
-                          connected=${connected}
-                          CustomPicker=${CustomPicker}
-                          show_samples=${show_samples}
-                          on_start_navigation=${on_start_navigation}
-                      />
-                  </div>
-              </section>
-              <section id="featured">
-                  <div>
-                      <${Featured} />
-                  </div>
-              </section>
-          `
+    /**
+     * These are the sources from which we will download the featured notebook titles and metadata.
+     * @type {import("./Featured.js").FeaturedSource[]}
+     */
+    const featured_sources = preact.useMemo(
+        () =>
+            // Option 1: configured directly
+            launch_params.featured_sources ??
+            // Option 2: configured through url and integrity strings
+            (launch_params.featured_source_url
+                ? [{ url: launch_params.featured_source_url, integrity: launch_params.featured_source_integrity }]
+                : // Option 3: default
+                  default_featured_sources.sources),
+        [launch_params]
+    )
+
+    if (block_screen_with_this_text != null) {
+        return html`
+            <div class="navigating-away-banner">
+                <h2>Loading ${block_screen_with_this_text}...</h2>
+            </div>
+        `
+    }
+
+    return html`
+        <section id="title">
+            <h1>welcome to <img src=${url_logo_big} /></h1>
+        </section>
+        <section id="mywork">
+            <div>
+                <${Recent}
+                    client=${client_ref.current}
+                    connected=${connected}
+                    remote_notebooks=${remote_notebooks}
+                    CustomRecent=${CustomRecent}
+                    on_start_navigation=${on_start_navigation}
+                />
+            </div>
+        </section>
+        <section id="open">
+            <div>
+                <${Open}
+                    client=${client_ref.current}
+                    connected=${connected}
+                    CustomPicker=${CustomPicker}
+                    show_samples=${show_samples}
+                    on_start_navigation=${on_start_navigation}
+                />
+            </div>
+        </section>
+        <section id="featured">
+            <div>
+                <${Featured} sources=${featured_sources} direct_html_links=${launch_params.featured_direct_html_links} />
+            </div>
+        </section>
+    `
 }
diff --git a/frontend/index.js b/frontend/index.js
index bffd178ba6..1c918a2115 100644
--- a/frontend/index.js
+++ b/frontend/index.js
@@ -3,5 +3,28 @@ import "./common/NodejsCompatibilityPolyfill.js"
 
 import { Welcome } from "./components/welcome/Welcome.js"
 
+const url_params = new URLSearchParams(window.location.search)
+
+/**
+ *
+ * @type {import("./components/welcome/Welcome.js").LaunchParameters}
+ */
+const launch_params = {
+    //@ts-ignore
+    featured_direct_html_links: !!(url_params.get("featured_direct_html_links") ?? window.pluto_featured_direct_html_links),
+
+    //@ts-ignore
+    featured_sources: window.pluto_featured_sources,
+
+    // Setting the featured_sources object is preferred, but you can also specify a single featured source using the URL (and integrity), which also supports being set as a URL parameter.
+
+    //@ts-ignore
+    featured_source_url: url_params.get("featured_source_url") ?? window.pluto_featured_source_url,
+    //@ts-ignore
+    featured_source_integrity: url_params.get("featured_source_integrity") ?? window.pluto_featured_source_integrity,
+}
+
+console.log("Launch parameters: ", launch_params)
+
 // @ts-ignore
-render(html`<${Welcome} />`, document.querySelector("#app"))
+render(html`<${Welcome} launch_params=${launch_params} />`, document.querySelector("#app"))
diff --git a/src/notebook/Export.jl b/src/notebook/Export.jl
index c32d3442ce..0b7a35cba8 100644
--- a/src/notebook/Export.jl
+++ b/src/notebook/Export.jl
@@ -181,9 +181,6 @@ function frontmatter_html(frontmatter::Dict{String,Any}; default_frontmatter::Di
 end
 
 
-
-
-
 replace_substring(s::String, sub::SubString, newval::AbstractString) = *(
 	SubString(s, 1, prevind(s, sub.offset + 1, 1)), 
 	newval, 
@@ -210,3 +207,35 @@ function replace_with_cdn(cdnify::Function, s::String, idx::Integer=1)
 		end
 	end
 end
+
+"""
+Generate a custom index.html that is designed to display a custom set of featured notebooks, without the file UI or Pluto logo. This is to be used by [PlutoSliderServer.jl](https://github.com/JuliaPluto/PlutoSliderServer.jl) to show a fancy index page.
+"""
+function generate_index_html(;
+    version::Union{Nothing,VersionNumber,AbstractString}=nothing, 
+    pluto_cdn_root::Union{Nothing,AbstractString}=nothing,
+
+    featured_direct_html_links::Bool=false,
+    featured_sources_js::AbstractString="undefined",
+)
+    cdnified = cdnified_html("index.html"; version, pluto_cdn_root)
+    
+    meta = """
+    <style>
+    section#open,
+    section#mywork,
+    section#title {
+        display: none !important;
+    }
+    </style>
+    """
+    
+    parameters = """
+    <script data-pluto-file="launch-parameters">
+    window.pluto_featured_direct_html_links = $(featured_direct_html_links ? "true" : "false");
+    window.pluto_featured_sources = $(featured_sources_js);
+    </script>
+    """
+    
+    inserted_html(cdnified; meta, parameters)
+end
diff --git a/src/notebook/path helpers.jl b/src/notebook/path helpers.jl
index 8f486a57ea..ddba7f3415 100644
--- a/src/notebook/path helpers.jl	
+++ b/src/notebook/path helpers.jl	
@@ -119,6 +119,9 @@ const pluto_file_extensions = [
 
 endswith_pluto_file_extension(s) = any(endswith(s, e) for e in pluto_file_extensions)
 
+"""
+Extract the Julia notebook file contents from a Pluto-exported HTML file.
+"""
 function embedded_notebookfile(html_contents::AbstractString)::String
 	if !occursin("</html>", html_contents)
 		throw(ArgumentError("Pass the contents of a Pluto-exported HTML file as argument."))
diff --git a/test/Notebook.jl b/test/Notebook.jl
index 7e7d5480ec..c295fcc6dd 100644
--- a/test/Notebook.jl
+++ b/test/Notebook.jl
@@ -541,7 +541,7 @@ end
         end
     end
 
-    @testset "Import & export HTML" begin
+    @testset "Export HTML" begin
         nb = basic_notebook()
         nb.metadata["frontmatter"] = Dict{String,Any}(
             "title" => "My<Title",
@@ -550,6 +550,7 @@ end
         )
         export_html = replace(Pluto.generate_html(nb), "'" => "\"")
         
+        @test occursin("<pluto-editor", export_html)
         @test occursin("<title>My&lt;Title</title>", export_html)
         @test occursin("""<meta name="description" content="ccc">""", export_html)
         @test occursin("""<meta property="og:description" content="ccc">""", export_html)
@@ -570,6 +571,15 @@ end
         export_html = Pluto.generate_html(nb; notebookfile_js=filename)
         @test occursin(filename, export_html)
         @test_throws ArgumentError Pluto.embedded_notebookfile(export_html)
+        
+        
+        export_html = Pluto.generate_index_html()
+        @test occursin("</html>", export_html)
+        @test !occursin("<pluto-editor", export_html)
+        
+        export_html = Pluto.generate_index_html(; featured_direct_html_links=true, featured_sources_js="[{url:`./zozozo.json`}]")
+        
+        @test occursin("zozozo", export_html)
     end
 
     @testset "Utilities" begin

From 74dfb33d68ac2f6a4ebb5affec019669d154b1a9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 14 Dec 2022 00:25:41 +0100
Subject: [PATCH 543/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 57e9dea104..3db38ce08e 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.17"
+version = "0.19.18"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 17c3c969fcb3e36af2553d2bd29bdf45e830b51b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 14 Dec 2022 10:43:53 +0100
Subject: [PATCH 544/821] Revert "Update index.css"

This reverts commit be6d9107da54ecae136703905282b2e912391478.
---
 frontend/index.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/index.css b/frontend/index.css
index 7d84ec6445..a4ae4b25e2 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -347,7 +347,7 @@ featured-card {
     align-items: stretch;
     grid-template-columns: repeat(auto-fit, minmax(var(--card-width), 1fr));
     gap: 0rem;
-    justify-items: center;
+    justify-items: stretch;
 }
 
 featured-card .banner img {

From 5f57f266765fc49a591c053b3001537a3a57ff16 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 14 Dec 2022 11:20:14 +0100
Subject: [PATCH 545/821] Update editor.css

---
 frontend/editor.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 2515861e77..8b7593749d 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1663,11 +1663,6 @@ pluto-input > button.input_context_menu ul {
 .ctx_icon.hide_logs {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg");
 }
-
-.ctx_icon.bandage {
-    filter: var(--image-filters) opacity(0.3);
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/bandage-outline.svg");
-}
 .ctx_icon.enable_cell {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/caret-forward-circle-outline.svg");
 }

From f2cd2271f7f0cd55cc1640aeddf10a395edeb5c8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 15 Dec 2022 14:50:10 +0100
Subject: [PATCH 546/821] Create TestBundledExport.yml

---
 .github/workflows/TestBundledExport.yml | 31 +++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/TestBundledExport.yml

diff --git a/.github/workflows/TestBundledExport.yml b/.github/workflows/TestBundledExport.yml
new file mode 100644
index 0000000000..7208719f4a
--- /dev/null
+++ b/.github/workflows/TestBundledExport.yml
@@ -0,0 +1,31 @@
+name: Test bundled HTML export
+
+on:
+    push:
+        branches:
+            - release
+
+jobs:
+    frontend-test:
+        runs-on: "ubuntu-latest"
+
+        steps:
+            - uses: actions/checkout@v3
+
+            - uses: julia-actions/setup-julia@v1
+              with:
+                  version: "1.8"
+
+            - name: Run & export Pluto notebooks
+              run: |
+                julia --project=$GITHUB_WORKSPACE -e '
+                  import Pkg
+                  Pkg.activate(".")
+                  Pkg.instantiate()
+                  import Pluto
+                  using Test
+                  
+                  @test_logs Pluto.generate_html()
+                  @test_logs Pluto.generate_index_html()
+                  '
+

From 255047a8c1a84f6120711f0ae299f55f18a8a355 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 15 Dec 2022 14:50:37 +0100
Subject: [PATCH 547/821] improve warn message for bundled HTML export

---
 src/notebook/Export.jl | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/notebook/Export.jl b/src/notebook/Export.jl
index 0b7a35cba8..80573bcd65 100644
--- a/src/notebook/Export.jl
+++ b/src/notebook/Export.jl
@@ -24,12 +24,16 @@ function cdnified_html(filename::AbstractString;
         if should_use_bundled_cdn
             try
                 original = read(project_relative_path("frontend-dist", filename), String)
-    
+                
+                cdn_root = "https://cdn.jsdelivr.net/gh/fonsp/Pluto.jl@$(string(PLUTO_VERSION))/frontend-dist/"
+
+                @debug "Using CDN for Pluto assets:" cdn_root
+
                 replace_with_cdn(original) do url
                     # Because parcel creates filenames with a hash in them, we can check if the file exists locally to make sure that everything is in order.
-                    @assert isfile(project_relative_path("frontend-dist", url))
+                    @assert isfile(project_relative_path("frontend-dist", url)) "Could not find the file $(project_relative_path("frontend-dist", url)) locally, that's a bad sign."
                     
-                    URIs.resolvereference("https://cdn.jsdelivr.net/gh/fonsp/Pluto.jl@$(string(PLUTO_VERSION))/frontend-dist/", url) |> string
+                    URIs.resolvereference(cdn_root, url) |> string
                 end
             catch e
                 @warn "Could not use bundled CDN version of $(filename). You should only see this message if you are using a fork of Pluto." exception=(e,catch_backtrace()) maxlog=1
@@ -40,6 +44,7 @@ function cdnified_html(filename::AbstractString;
             original = read(project_relative_path("frontend", filename), String)
 
             cdn_root = something(pluto_cdn_root, "https://cdn.jsdelivr.net/gh/fonsp/Pluto.jl@$(something(cdn_version_override, string(something(version, PLUTO_VERSION))))/frontend/")
+
             @debug "Using CDN for Pluto assets:" cdn_root
     
             replace_with_cdn(original) do url

From 9f1dfeec664dd01ee930a657c2451413f2ab767e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 15 Dec 2022 14:58:16 +0100
Subject: [PATCH 548/821] Fix bundled index.hmtl export

---
 .github/workflows/TestBundledExport.yml | 2 +-
 src/notebook/Export.jl                  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/TestBundledExport.yml b/.github/workflows/TestBundledExport.yml
index 7208719f4a..6cc8a31339 100644
--- a/.github/workflows/TestBundledExport.yml
+++ b/.github/workflows/TestBundledExport.yml
@@ -16,7 +16,7 @@ jobs:
               with:
                   version: "1.8"
 
-            - name: Run & export Pluto notebooks
+            - name: Generate exports and check for warnings
               run: |
                 julia --project=$GITHUB_WORKSPACE -e '
                   import Pkg
diff --git a/src/notebook/Export.jl b/src/notebook/Export.jl
index 80573bcd65..e05186b4b9 100644
--- a/src/notebook/Export.jl
+++ b/src/notebook/Export.jl
@@ -192,6 +192,8 @@ replace_substring(s::String, sub::SubString, newval::AbstractString) = *(
 	SubString(s, nextind(s, sub.offset + sub.ncodeunits))
 )
 
+const dont_cdnify = ("new","open","shutdown","move","notebooklist","notebookfile","statefile","notebookexport","notebookupload")
+
 const source_pattern = r"\s(?:src|href)=\"(.+?)\""
 
 function replace_with_cdn(cdnify::Function, s::String, idx::Integer=1)
@@ -200,7 +202,7 @@ function replace_with_cdn(cdnify::Function, s::String, idx::Integer=1)
 		s
 	else
 		url = only(next_match.captures)
-		if occursin("//", url)
+		if occursin("//", url) || url ∈ dont_cdnify
 			# skip this one
 			replace_with_cdn(cdnify, s, nextind(s, next_match.offset))
 		else

From d66cad4fdd13303da6042a64d4e3e4e7c540277c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 22 Dec 2022 17:34:17 +0100
Subject: [PATCH 549/821] Packages.jl mini refactor

---
 src/packages/Packages.jl | 107 ++++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 52 deletions(-)

diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 9d0847c77b..917045ab63 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -171,43 +171,41 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                 if !isempty(to_add)
                     Status.report_business_started!(pkg_status, :add)
                     start_time = time_ns()
-                    startlistening(iolistener)
-                    PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
-                        withinteractive(false) do
-                            # We temporarily clear the "semver-compatible" [deps] entries, because Pkg already respects semver, unless it doesn't, in which case we don't want to force it.
-                            PkgCompat.clear_auto_compat_entries!(notebook.nbpkg_ctx)
-
-                            try
-                                for tier in [
-                                    Pkg.PRESERVE_ALL,
-                                    Pkg.PRESERVE_DIRECT,
-                                    Pkg.PRESERVE_SEMVER,
-                                    Pkg.PRESERVE_NONE,
-                                ]
-                                    used_tier = tier
-
-                                    try
-                                        Pkg.add(notebook.nbpkg_ctx, [
-                                            Pkg.PackageSpec(name=p)
-                                            for p in to_add
-                                        ]; preserve=used_tier)
-
-                                        break
-                                    catch e
-                                        if used_tier == Pkg.PRESERVE_NONE
-                                            # give up
-                                            rethrow(e)
-                                        end
+                    with_io_setup(notebook, iolistener) do
+                        # We temporarily clear the "semver-compatible" [deps] entries, because Pkg already respects semver, unless it doesn't, in which case we don't want to force it.
+                        PkgCompat.clear_auto_compat_entries!(notebook.nbpkg_ctx)
+
+                        try
+                            for tier in [
+                                Pkg.PRESERVE_ALL,
+                                Pkg.PRESERVE_DIRECT,
+                                Pkg.PRESERVE_SEMVER,
+                                Pkg.PRESERVE_NONE,
+                            ]
+                                used_tier = tier
+
+                                try
+                                    Pkg.add(notebook.nbpkg_ctx, [
+                                        Pkg.PackageSpec(name=p)
+                                        for p in to_add
+                                    ]; preserve=used_tier)
+
+                                    break
+                                catch e
+                                    if used_tier == Pkg.PRESERVE_NONE
+                                        # give up
+                                        rethrow(e)
                                     end
                                 end
-                            finally
-                                PkgCompat.write_auto_compat_entries!(notebook.nbpkg_ctx)
                             end
-
-                            # Now that Pkg is set up, the notebook process will call `using Package`, which can take some time. We write this message to the io, to notify the user.
-                            println(iolistener.buffer, "\e[32m\e[1mLoading\e[22m\e[39m packages...")
+                        finally
+                            PkgCompat.write_auto_compat_entries!(notebook.nbpkg_ctx)
                         end
+
+                        # Now that Pkg is set up, the notebook process will call `using Package`, which can take some time. We write this message to the io, to notify the user.
+                        println(iolistener.buffer, "\e[32m\e[1mLoading\e[22m\e[39m packages...")
                     end
+                
                     notebook.nbpkg_install_time_ns = notebook.nbpkg_install_time_ns === nothing ? nothing : (notebook.nbpkg_install_time_ns + (time_ns() - start_time))
                     Status.report_business_finished!(pkg_status, :add)
                     @debug "PlutoPkg: done" notebook.path 
@@ -218,8 +216,7 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                 if should_instantiate
                     Status.report_business_started!(pkg_status, :instantiate)
                     start_time = time_ns()
-                    startlistening(iolistener)
-                    PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
+                    with_io_setup(notebook, iolistener) do
                         @debug "PlutoPkg: Instantiating" notebook.path 
                         
                         # Pkg.instantiate assumes that the environment to be instantiated is active, so we will have to modify the LOAD_PATH of this Pluto server
@@ -362,30 +359,28 @@ Run `Pkg.resolve` on the notebook's package environment. Keep trying more and mo
 function resolve_with_auto_fixes(notebook::Notebook, iolistener::IOListener)
     PkgCompat.clear_stdlib_compat_entries!(notebook.nbpkg_ctx)
 
-    PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
-        withinteractive(false) do
+    with_io_setup(notebook, iolistener) do
+        try
+            Pkg.resolve(notebook.nbpkg_ctx)
+        catch e
+            @warn "Failed to resolve Pkg environment. Updating registries and trying again..." exception=e
+            
+            PkgCompat.update_registries(; force=true)
             try
                 Pkg.resolve(notebook.nbpkg_ctx)
             catch e
-                @warn "Failed to resolve Pkg environment. Updating registries and trying again..." exception=e
+                @warn "Failed to resolve Pkg environment. Removing Manifest and trying again..." exception=e
                 
-                PkgCompat.update_registries(; force=true)
+                reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
                 try
                     Pkg.resolve(notebook.nbpkg_ctx)
                 catch e
-                    @warn "Failed to resolve Pkg environment. Removing Manifest and trying again..." exception=e
+                    @warn "Failed to resolve Pkg environment. Removing Project compat entries and Manifest and trying again..." exception=e
                     
                     reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
-                    try
-                        Pkg.resolve(notebook.nbpkg_ctx)
-                    catch e
-                        @warn "Failed to resolve Pkg environment. Removing Project compat entries and Manifest and trying again..." exception=e
-                        
-                        reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
-                        PkgCompat.clear_compat_entries!(notebook.nbpkg_ctx)
-                        
-                        Pkg.resolve(notebook.nbpkg_ctx)
-                    end
+                    PkgCompat.clear_compat_entries!(notebook.nbpkg_ctx)
+                    
+                    Pkg.resolve(notebook.nbpkg_ctx)
                 end
             end
         end
@@ -446,9 +441,7 @@ function update_nbpkg_core(notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.UPLEV
                 resolve_with_auto_fixes(notebook, iolistener)
             end
 
-            startlistening(iolistener)
-
-            PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
+            with_io_setup(notebook, iolistener) do
                 # We temporarily clear the "semver-compatible" [deps] entries, because it is difficult to update them after the update 🙈. TODO
                 PkgCompat.clear_auto_compat_entries!(notebook.nbpkg_ctx)
 
@@ -559,6 +552,16 @@ function is_nbpkg_equal(a::Union{Nothing,PkgContext}, b::Union{Nothing,PkgContex
     end
 end
 
+function with_io_setup(f::Function, notebook::Notebook, iolistener::IOListener)
+    startlistening(iolistener)
+    PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
+        withinteractive(false) do
+            f()
+        end
+    end
+end
+
+
 const is_interactive_defined = isdefined(Base, :is_interactive) && !Base.isconst(Base, :is_interactive)
 function withinteractive(f::Function, value::Bool)
     old_value = isinteractive()

From 8ca62be173c13a0f09729e0a365376894d4a9ec1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 22 Dec 2022 20:42:14 +0100
Subject: [PATCH 550/821] Pkg.instantiate before initial resolve when opening a
 notebook (#2420)

---
 frontend/components/ProcessTab.js |   2 +
 src/packages/Packages.jl          | 158 ++++++++++++++++++++----------
 test/packages/Basic.jl            |  26 +++++
 test/packages/url_import.jl       | 151 ++++++++++++++++++++++++++++
 4 files changed, 283 insertions(+), 54 deletions(-)
 create mode 100644 test/packages/url_import.jl

diff --git a/frontend/components/ProcessTab.js b/frontend/components/ProcessTab.js
index 3a1db2e935..03bee6491c 100644
--- a/frontend/components/ProcessTab.js
+++ b/frontend/components/ProcessTab.js
@@ -55,6 +55,8 @@ const descriptions = {
     create_process: "Start Julia",
     init_process: "Initialize",
     pkg: "Package management",
+    instantiate1: "instantiate",
+    instantiate2: "instantiate",
     run: "Evaluating cells",
     evaluate: "Running code",
     registry_update: "Updating package registry",
diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 917045ab63..aaaa14e7c1 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -122,20 +122,46 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
             end
             
             return withtoken(pkg_token) do
-                isnothing(wait_business) || Status.report_business_finished!(wait_business)
                 
-                notebook.nbpkg_ctx_instantiated || Status.report_business_planned!(pkg_status, :resolve)
-                isempty(removed) || Status.report_business_planned!(pkg_status, :remove)
-                isempty(added) || Status.report_business_planned!(pkg_status, :add)
-                if !notebook.nbpkg_ctx_instantiated || !isempty(added) || !isempty(removed)
-                    Status.report_business_planned!(pkg_status, :instantiate)
+                let
+                    isnothing(wait_business) || Status.report_business_finished!(wait_business)
+                    
+                    notebook.nbpkg_ctx_instantiated || Status.report_business_planned!(pkg_status, :instantiate1)
+                    notebook.nbpkg_ctx_instantiated || Status.report_business_planned!(pkg_status, :resolve)
+                    isempty(removed) || Status.report_business_planned!(pkg_status, :remove)
+                    isempty(added) || Status.report_business_planned!(pkg_status, :add)
+                    if !isempty(added) || !isempty(removed)
+                        Status.report_business_planned!(pkg_status, :instantiate2)
+                    end
                 end
                 
                 PkgCompat.refresh_registry_cache()
-
-                if !notebook.nbpkg_ctx_instantiated
+                
+                PkgCompat.clear_stdlib_compat_entries!(notebook.nbpkg_ctx)
+                
+                
+                should_instantiate_initially = !notebook.nbpkg_ctx_instantiated
+                if should_instantiate_initially
+                    
+                    # First, we instantiate. This will:
+                    # - Verify that the Manifest can be parsed and is in the correct format (important for compat across Julia versions). If not, we will fix it by deleting the Manifest.
+                    # - If no Manifest exists, resolve the environment and create one.
+                    # - Start downloading all registered packages, artifacts.
+                    # - Start downloading all unregistered packages, which are added through a URL. This also makes the Project.tomls of those packages available.
+                    # - Precompile all packages.                    
+                    Status.report_business!(pkg_status, :instantiate1) do
+                        with_auto_fixes(notebook) do
+                            instantiate(notebook, iolistener)
+                        end
+                    end
+                    
+                    # Second, we resolve. This will:
+                    # - Verify that the Manifest contains a correct dependency tree (e.g. all versions exists in a registry). If not, we will fix it using `with_auto_fixes`
+                    # - If we are tracking local packages by path (] dev), their Project.tomls are reparsed and everything is updated.
                     Status.report_business!(pkg_status, :resolve) do
-                        resolve_with_auto_fixes(notebook, iolistener)
+                        with_auto_fixes(notebook) do
+                            resolve(notebook, iolistener)
+                        end
                     end
                 end
                 
@@ -211,39 +237,20 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
                     @debug "PlutoPkg: done" notebook.path 
                 end
 
-                should_instantiate = !notebook.nbpkg_ctx_instantiated || !isempty(to_add) || !isempty(to_remove)
+                should_instantiate_again = !notebook.nbpkg_ctx_instantiated || !isempty(to_add) || !isempty(to_remove)
                 
-                if should_instantiate
-                    Status.report_business_started!(pkg_status, :instantiate)
-                    start_time = time_ns()
-                    with_io_setup(notebook, iolistener) do
-                        @debug "PlutoPkg: Instantiating" notebook.path 
-                        
-                        # Pkg.instantiate assumes that the environment to be instantiated is active, so we will have to modify the LOAD_PATH of this Pluto server
-                        # We could also run the Pkg calls on the notebook process, but somehow I think that doing it on the server is more charming, though it requires this workaround.
-                        env_dir = PkgCompat.env_dir(notebook.nbpkg_ctx)
-                        pushfirst!(LOAD_PATH, env_dir)
-
-                        # update registries if this is the first time
-                        PkgCompat.update_registries(; force=false)
-                        # instantiate without forcing registry update
-                        PkgCompat.instantiate(notebook.nbpkg_ctx; update_registry=false)
-                        
-                        @assert LOAD_PATH[1] == env_dir
-                        popfirst!(LOAD_PATH)
+                if should_instantiate_again
+                    Status.report_business!(pkg_status, :instantiate2) do
+                        instantiate(notebook, iolistener)
                     end
-                    notebook.nbpkg_install_time_ns = notebook.nbpkg_install_time_ns === nothing ? nothing : (notebook.nbpkg_install_time_ns + (time_ns() - start_time))
-                    Status.report_business_finished!(pkg_status, :instantiate)
-                    notebook.nbpkg_ctx_instantiated = true
                 end
 
                 stoplistening(iolistener)
-                
                 Status.report_business_finished!(pkg_status)
 
                 return (
                     did_something=👺 || (
-                        should_instantiate || (use_plutopkg_old != use_plutopkg_new)
+                        should_instantiate_initially || should_instantiate_again || (use_plutopkg_old != use_plutopkg_new)
                     ),
                     used_tier=used_tier,
                     # changed_versions=Dict{String,Pair}(),
@@ -353,35 +360,71 @@ function writebackup(notebook::Notebook)
     backup_path
 end
 
-"""
-Run `Pkg.resolve` on the notebook's package environment. Keep trying more and more invasive strategies to fix problems until the operation succeeds.
-"""
-function resolve_with_auto_fixes(notebook::Notebook, iolistener::IOListener)
-    PkgCompat.clear_stdlib_compat_entries!(notebook.nbpkg_ctx)
 
+function instantiate(notebook::Notebook, iolistener::IOListener)
+    start_time = time_ns()
+    startlistening(iolistener)
     with_io_setup(notebook, iolistener) do
+        @debug "PlutoPkg: Instantiating" notebook.path 
+        
+        # update registries if this is the first time
+        PkgCompat.update_registries(; force=false)
+        
+        # Pkg.instantiate assumes that the environment to be instantiated is active, so we will have to modify the LOAD_PATH of this Pluto server
+        # We could also run the Pkg calls on the notebook process, but somehow I think that doing it on the server is more charming, though it requires this workaround.
+        env_dir = PkgCompat.env_dir(notebook.nbpkg_ctx)
+        pushfirst!(LOAD_PATH, env_dir)
+        
         try
-            Pkg.resolve(notebook.nbpkg_ctx)
+            # instantiate without forcing registry update
+            PkgCompat.instantiate(notebook.nbpkg_ctx; update_registry=false)
+        finally
+            # reset the LOAD_PATH
+            if LOAD_PATH[1] == env_dir
+                popfirst!(LOAD_PATH)
+            else
+                @warn "LOAD_PATH modified during Pkg.instantiate... this is unexpected!"
+            end
+        end
+    end
+    notebook.nbpkg_install_time_ns = notebook.nbpkg_install_time_ns === nothing ? nothing : (notebook.nbpkg_install_time_ns + (time_ns() - start_time))
+    notebook.nbpkg_ctx_instantiated = true
+end
+
+function resolve(notebook::Notebook, iolistener::IOListener)
+    startlistening(iolistener)
+    with_io_setup(notebook, iolistener) do
+        @debug "PlutoPkg: Instantiating" notebook.path 
+        Pkg.resolve(notebook.nbpkg_ctx)
+    end
+end
+
+
+"""
+Run `f` (e.g. `Pkg.instantiate`) on the notebook's package environment. Keep trying more and more invasive strategies to fix problems until the operation succeeds.
+"""
+function with_auto_fixes(f::Function, notebook::Notebook)
+    try
+        f()
+    catch e
+        @warn "Operation failed. Updating registries and trying again..." exception=e
+        
+        PkgCompat.update_registries(; force=true)
+        try
+            f()
         catch e
-            @warn "Failed to resolve Pkg environment. Updating registries and trying again..." exception=e
+            @warn "Operation failed. Removing Manifest and trying again..." exception=e
             
-            PkgCompat.update_registries(; force=true)
+            reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
             try
-                Pkg.resolve(notebook.nbpkg_ctx)
+                f()
             catch e
-                @warn "Failed to resolve Pkg environment. Removing Manifest and trying again..." exception=e
+                @warn "Operation failed. Removing Project compat entries and Manifest and trying again..." exception=e
                 
                 reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
-                try
-                    Pkg.resolve(notebook.nbpkg_ctx)
-                catch e
-                    @warn "Failed to resolve Pkg environment. Removing Project compat entries and Manifest and trying again..." exception=e
-                    
-                    reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
-                    PkgCompat.clear_compat_entries!(notebook.nbpkg_ctx)
-                    
-                    Pkg.resolve(notebook.nbpkg_ctx)
-                end
+                PkgCompat.clear_compat_entries!(notebook.nbpkg_ctx)
+                
+                f()
             end
         end
     end
@@ -436,9 +479,16 @@ function update_nbpkg_core(notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.UPLEV
 
         return withtoken(pkg_token) do
             PkgCompat.refresh_registry_cache()
+            PkgCompat.clear_stdlib_compat_entries!(notebook.nbpkg_ctx)
 
             if !notebook.nbpkg_ctx_instantiated
-                resolve_with_auto_fixes(notebook, iolistener)
+                with_auto_fixes(notebook) do
+                    instantiate(notebook, iolistener)
+                end
+            
+                with_auto_fixes(notebook) do
+                    resolve(notebook, iolistener)
+                end
             end
 
             with_io_setup(notebook, iolistener) do
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index 5f4e8232c7..68aeca6b5c 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -236,6 +236,31 @@ import Distributed
         WorkspaceManager.unmake_workspace((🍭, notebook))
     end
     
+    @testset "Package added by url" begin
+        url_notebook = read(joinpath(@__DIR__, "url_import.jl"), String)
+
+        🍭 = ServerSession()
+
+        dir = mktempdir()
+        path = joinpath(dir, "hello.jl")
+        write(path, url_notebook)
+
+        notebook = SessionActions.open(🍭, path; run_async=false)
+        
+        @test num_backups_in(dir) == 0
+
+        @test notebook.nbpkg_ctx !== nothing
+        @test notebook.nbpkg_restart_recommended_msg === nothing
+        @test notebook.nbpkg_restart_required_msg === nothing
+
+        @test noerror(notebook.cells[1])
+        @test noerror(notebook.cells[2])
+
+        @test notebook.cells[2].output.body == "1.0.0"
+
+        WorkspaceManager.unmake_workspace((🍭, notebook))
+    end
+    
     future_notebook = read(joinpath(@__DIR__, "future_nonexisting_version.jl"), String)
     @testset "Recovery from unavailable versions" begin
         🍭 = ServerSession()
@@ -393,6 +418,7 @@ import Distributed
 
     pre_pkg_notebook = read(joinpath(@__DIR__, "old_import.jl"), String)
     local post_pkg_notebook = nothing
+
     @testset "File format -- Backwards compat" begin
         🍭 = ServerSession()
 
diff --git a/test/packages/url_import.jl b/test/packages/url_import.jl
new file mode 100644
index 0000000000..8b05d5d1d3
--- /dev/null
+++ b/test/packages/url_import.jl
@@ -0,0 +1,151 @@
+### A Pluto.jl notebook ###
+# v0.19.18
+
+using Markdown
+using InteractiveUtils
+
+# ╔═╡ 3717ac9c-821f-11ed-14bc-d3b0f9fd1efe
+import PlutoPkgTestF
+
+# ╔═╡ f6d8e48e-f400-4e27-8a83-f7bf2e72e992
+PlutoPkgTestF.MY_VERSION |> Text
+
+# ╔═╡ 00000000-0000-0000-0000-000000000001
+PLUTO_PROJECT_TOML_CONTENTS = """
+[deps]
+PlutoPkgTestF = "7007ab80-a928-4ddc-1332-8dd20f5a112f"
+"""
+
+# ╔═╡ 00000000-0000-0000-0000-000000000002
+PLUTO_MANIFEST_TOML_CONTENTS = """
+# This file is machine-generated - editing it directly is not advised
+
+[[ArgTools]]
+uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
+
+[[Artifacts]]
+uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+
+[[Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+
+[[Dates]]
+deps = ["Printf"]
+uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
+
+[[Downloads]]
+deps = ["ArgTools", "LibCURL", "NetworkOptions"]
+uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
+
+[[InteractiveUtils]]
+deps = ["Markdown"]
+uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+
+[[LibCURL]]
+deps = ["LibCURL_jll", "MozillaCACerts_jll"]
+uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
+
+[[LibCURL_jll]]
+deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
+uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
+
+[[LibGit2]]
+deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
+uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
+
+[[LibSSH2_jll]]
+deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
+uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
+
+[[Libdl]]
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
+[[Logging]]
+uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
+
+[[Markdown]]
+deps = ["Base64"]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+
+[[MbedTLS_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
+
+[[MozillaCACerts_jll]]
+uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
+
+[[NetworkOptions]]
+uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
+
+[[Pkg]]
+deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
+uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+
+[[PlutoPkgTestA]]
+deps = ["Pkg"]
+git-tree-sha1 = "9615c7f69a1780f70fe32890ac370728afbcb2f6"
+uuid = "419c6f8d-b8cd-4309-abdc-cee491252f94"
+version = "0.3.1"
+
+[[PlutoPkgTestF]]
+deps = ["Pkg", "PlutoPkgTestA"]
+git-tree-sha1 = "f486ebc1188475df900413cbd570ff7fabed738f"
+repo-rev = "main"
+repo-url = "https://github.com/JuliaPluto/PlutoPkgTestF.jl"
+uuid = "7007ab80-a928-4ddc-1332-8dd20f5a112f"
+version = "1.0.0"
+
+[[Printf]]
+deps = ["Unicode"]
+uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[[REPL]]
+deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
+uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+
+[[Random]]
+deps = ["Serialization"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+
+[[Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[Sockets]]
+uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
+
+[[TOML]]
+deps = ["Dates"]
+uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
+
+[[Tar]]
+deps = ["ArgTools", "SHA"]
+uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
+
+[[UUIDs]]
+deps = ["Random", "SHA"]
+uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
+[[Unicode]]
+uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
+
+[[Zlib_jll]]
+deps = ["Libdl"]
+uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
+
+[[nghttp2_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
+
+[[p7zip_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
+"""
+
+# ╔═╡ Cell order:
+# ╠═3717ac9c-821f-11ed-14bc-d3b0f9fd1efe
+# ╠═f6d8e48e-f400-4e27-8a83-f7bf2e72e992
+# ╟─00000000-0000-0000-0000-000000000001
+# ╟─00000000-0000-0000-0000-000000000002

From 7d5164618acbeaecf61dc68d4e553c3326855099 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 22 Dec 2022 21:23:38 +0100
Subject: [PATCH 551/821] =?UTF-8?q?=F0=9F=8D=84=20Fix=20#2390?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/common/clock sync.js     |  1 -
 frontend/components/FilePicker.js | 24 +++++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/frontend/common/clock sync.js b/frontend/common/clock sync.js
index dd6bbdfa40..0d30823fde 100644
--- a/frontend/common/clock sync.js	
+++ b/frontend/common/clock sync.js	
@@ -10,7 +10,6 @@ export const useMyClockIsAheadBy = ({ connected }) => {
     const [my_clock_is_ahead_by, set_my_clock_is_ahead_by] = useState(0)
 
     useEffect(() => {
-        console.error({ connected })
         if (connected) {
             let f = async () => {
                 let getserver = () => pluto_actions.send("current_time").then((m) => m.message.time)
diff --git a/frontend/components/FilePicker.js b/frontend/components/FilePicker.js
index c2149dd823..18cdfc2f12 100644
--- a/frontend/components/FilePicker.js
+++ b/frontend/components/FilePicker.js
@@ -32,20 +32,18 @@ const assert_not_null = (x) => {
 }
 
 const set_cm_value = (/** @type{EditorView} */ cm, /** @type {string} */ value, scroll = true) => {
+    let had_focus_before = cm.hasFocus
+
     cm.dispatch({
         changes: { from: 0, to: cm.state.doc.length, insert: value },
         selection: EditorSelection.cursor(value.length),
-        // effects: scroll ? EditorView.scrollIntoView(value.length,) : undefined,
+        // a long path like /Users/fons/Documents/article-test-1/asdfasdfasdfsadf.jl does not fit in the little box, so we scroll it to the left so that you can see the filename easily.
+        scrollIntoView: scroll,
     })
 
-    // a long path like /Users/fons/Documents/article-test-1/asdfasdfasdfsadf.jl does not fit in the little box, so we scroll it to the left so that you can see the filename easily.
-    if (scroll) {
-        // We do a manual `scrollLeft` instead of `EditorView.scrollIntoView(value.length)` because `scrollIntoView` will also scroll the page *vertically* to move the filepicker into view. We only want to scroll the internal overflow box *horizontally* to the left, without affecting the vertical page scroll position.
-        cm.scrollDOM.scrollLeft = 100000
-        setTimeout(() => {
-            // TODO: do we need this?
-            cm.scrollDOM.scrollLeft = 100000
-        }, 100)
+    if (!had_focus_before) {
+        // and blur the DOM again (because the previous transaction might have re-focused it)
+        cm.contentDOM.blur()
     }
 }
 
@@ -104,7 +102,7 @@ export const FilePicker = ({ value, suggest_new_file, button_label, placeholder,
                 } else await on_submit(current_cm.state.doc.toString())
                 current_cm.dom.blur()
             } catch (error) {
-                set_cm_value(current_cm, value, true)
+                set_cm_value(current_cm, forced_value.current, true)
                 current_cm.dom.blur()
             }
         })
@@ -145,7 +143,7 @@ export const FilePicker = ({ value, suggest_new_file, button_label, placeholder,
                         blur: (event, cm) => {
                             setTimeout(() => {
                                 if (!cm.hasFocus) {
-                                    set_cm_value(cm, value, true)
+                                    set_cm_value(cm, forced_value.current, true)
                                 }
                             }, 200)
                         },
@@ -223,9 +221,9 @@ export const FilePicker = ({ value, suggest_new_file, button_label, placeholder,
                             run: (cm) => {
                                 assert_not_null(close_autocomplete_command).run(cm)
                                 cm.dispatch({
-                                    changes: { from: 0, to: cm.state.doc.length, insert: value },
+                                    changes: { from: 0, to: cm.state.doc.length, insert: forced_value.current },
                                     selection: EditorSelection.cursor(value.length),
-                                    effects: EditorView.scrollIntoView(value.length),
+                                    effects: EditorView.scrollIntoView(forced_value.current.length),
                                 })
                                 // @ts-ignore
                                 document.activeElement.blur()

From 931abc4968770c7b4fa6aff97029d1c789b9673c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 22 Dec 2022 21:53:53 +0100
Subject: [PATCH 552/821] =?UTF-8?q?=F0=9F=AB=A7=20Fix=20#2421=20(#2422)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/Packages.jl | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index aaaa14e7c1..866c072146 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -49,7 +49,14 @@ Update the notebook package environment to match the notebook's code. This will:
 - Make sure that the environment is instantiated.
 - Detect the use of `Pkg.activate` and enable/disabled nbpkg accordingly.
 """
-function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new_topology::NotebookTopology; on_terminal_output::Function=((args...) -> nothing), lag::Real=0)
+function sync_nbpkg_core(
+    notebook::Notebook, 
+    old_topology::NotebookTopology, 
+    new_topology::NotebookTopology; 
+    on_terminal_output::Function=((args...) -> nothing), 
+    cleanup::Ref{Union{Function,Nothing}}=Ref{Union{Function,Nothing}}(nothing),
+    lag::Real=0,
+)
     pkg_status = Status.report_business_started!(notebook.status_tree, :pkg)
     Status.report_business_started!(pkg_status, :analysis)
     
@@ -99,6 +106,7 @@ function sync_nbpkg_core(notebook::Notebook, old_topology::NotebookTopology, new
             busy_packages = notebook.nbpkg_ctx_instantiated ? added : new_packages
             IOListener(callback=(s -> on_terminal_output(busy_packages, s)))
         end
+        cleanup[] = () -> stoplistening(iolistener)
         
         # We remember which Pkg.Types.PreserveLevel was used. If it's too low, we will recommend/require a notebook restart later.
         local used_tier = Pkg.PRESERVE_ALL
@@ -287,6 +295,7 @@ In addition to the steps performed by [`sync_nbpkg_core`](@ref):
 - `try` `catch` and reset the package environment on failure.
 """
 function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topology::NotebookTopology; save::Bool=true, take_token::Bool=true)
+    cleanup = Ref{Union{Function,Nothing}}(nothing)
 	try
         Status.report_business_started!(notebook.status_tree, :pkg)
         
@@ -299,7 +308,14 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
                 update_nbpkg_cache!(notebook)
 				send_notebook_changes!(ClientRequest(; session, notebook))
 			end
-			 sync_nbpkg_core(notebook, old_topology, new_topology; on_terminal_output=iocallback, lag = session.options.server.simulated_pkg_lag)
+			sync_nbpkg_core(
+                notebook, 
+                old_topology, 
+                new_topology; 
+                on_terminal_output=iocallback, 
+                cleanup,
+                lag=session.options.server.simulated_pkg_lag
+            )
 		end
 
 		if pkg_result.did_something
@@ -347,6 +363,7 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
 
 		save && save_notebook(session, notebook)
 	finally
+        isnothing(cleanup[]) || cleanup[]()
         Status.report_business_finished!(notebook.status_tree, :pkg)
     end
 end
@@ -458,7 +475,12 @@ function reset_nbpkg!(notebook::Notebook, topology::Union{NotebookTopology,Nothi
     save && save_notebook(notebook)
 end
 
-function update_nbpkg_core(notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.UPLEVEL_MAJOR, on_terminal_output::Function=((args...) -> nothing))
+function update_nbpkg_core(
+    notebook::Notebook; 
+    level::Pkg.UpgradeLevel=Pkg.UPLEVEL_MAJOR, 
+    on_terminal_output::Function=((args...) -> nothing),
+    cleanup::Ref{Union{Function,Nothing}}=Ref{Union{Function,Nothing}}(nothing),
+)
     if notebook.nbpkg_ctx !== nothing
         PkgCompat.mark_original!(notebook.nbpkg_ctx)
 
@@ -468,6 +490,7 @@ function update_nbpkg_core(notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.UPLEV
             # we don't know which packages will be updated, so we send terminal output to all installed packages
             IOListener(callback=(s -> on_terminal_output(old_packages, s)))
         end
+        cleanup[] = () -> stoplistening(iolistener)
         
         # We remember which Pkg.Types.PreserveLevel was used. If it's too low, we will recommend/require a notebook restart later.
         local used_tier = Pkg.PRESERVE_ALL
@@ -526,6 +549,7 @@ function update_nbpkg(session, notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.U
     bp = if backup && save
         writebackup(notebook)
     end
+    cleanup = Ref{Union{Function,Nothing}}(nothing)
 
     try
 		pkg_result = withtoken(notebook.executetoken) do
@@ -539,7 +563,12 @@ function update_nbpkg(session, notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.U
                 update_nbpkg_cache!(notebook)
 				send_notebook_changes!(ClientRequest(; session, notebook))
 			end
-			update_nbpkg_core(notebook; level=level, on_terminal_output=iocallback)
+			update_nbpkg_core(
+                notebook; 
+                level, 
+                on_terminal_output=iocallback,
+                cleanup,
+            )
 		end
 
 		if pkg_result.did_something
@@ -555,6 +584,7 @@ function update_nbpkg(session, notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.U
             !isnothing(bp) && isfile(bp) && rm(bp)
         end
 	finally
+        isnothing(cleanup[]) || cleanup[]()
 		notebook.nbpkg_busy_packages = String[]
         update_nbpkg_cache!(notebook)
 		send_notebook_changes!(ClientRequest(; session, notebook))

From a9185e43bca1a38d0294f62f32334a56acabfa0d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 22 Dec 2022 22:29:00 +0100
Subject: [PATCH 553/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 3db38ce08e..2851bc1d04 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.18"
+version = "0.19.19"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From d35714c8a9a08abdfa026deede493156e4a0f8a7 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 22 Dec 2022 23:11:42 +0100
Subject: [PATCH 554/821] Update featured_sources.js

---
 frontend/featured_sources.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/featured_sources.js b/frontend/featured_sources.js
index 15976c33d4..6eb88b4a73 100644
--- a/frontend/featured_sources.js
+++ b/frontend/featured_sources.js
@@ -2,8 +2,8 @@ export default {
     // check out https://github.com/JuliaPluto/pluto-developer-instructions/blob/main/How%20to%20update%20the%20featured%20notebooks.md to learn more
     sources: [
         {
-            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@6828b12/pluto_export.json",
-            integrity: "sha256-RKFITj6QfwcuqpQE3nhVyhNO5REaCuo84HQulf32l7A=",
+            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@08d6f16/pluto_export.json",
+            integrity: "sha256-DyxjtJQ+7/LkrO2y+MldQng8fcwFWY7FwRHwbtIooWM=",
         },
     ],
 }

From d18e339859443506ca7d85ae0992936821e44b17 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 22 Dec 2022 23:18:52 +0100
Subject: [PATCH 555/821] Update featured_sources.js

---
 frontend/featured_sources.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/featured_sources.js b/frontend/featured_sources.js
index 6eb88b4a73..77f05e4ef4 100644
--- a/frontend/featured_sources.js
+++ b/frontend/featured_sources.js
@@ -2,8 +2,8 @@ export default {
     // check out https://github.com/JuliaPluto/pluto-developer-instructions/blob/main/How%20to%20update%20the%20featured%20notebooks.md to learn more
     sources: [
         {
-            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@08d6f16/pluto_export.json",
-            integrity: "sha256-DyxjtJQ+7/LkrO2y+MldQng8fcwFWY7FwRHwbtIooWM=",
+            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@fa62114/pluto_export.json",
+            integrity: "sha256-mqaCAS0NOcrmgfYmN4284eP44913HWPQfM8OaXj01II=",
         },
     ],
 }

From 81833de84f9c3d61b01adb92ec8a4278d72bc1c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 11:10:56 +0530
Subject: [PATCH 556/821] Bump json5 from 2.2.1 to 2.2.3 in /test/frontend
 (#2437)

---
 test/frontend/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/frontend/package-lock.json b/test/frontend/package-lock.json
index 01991c803e..df0fc81029 100644
--- a/test/frontend/package-lock.json
+++ b/test/frontend/package-lock.json
@@ -6403,9 +6403,9 @@
       "dev": true
     },
     "node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
       "bin": {
         "json5": "lib/cli.js"
@@ -14015,9 +14015,9 @@
       "dev": true
     },
     "json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true
     },
     "kind-of": {

From 63fd9482eada46aabfbcdb4fb5e12ff3b9cd2fc9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 20:41:29 +0100
Subject: [PATCH 557/821] Bump json5 from 2.2.1 to 2.2.3 in /frontend-bundler
 (#2436)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend-bundler/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index 9e767a5ec3..ee443a186a 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -4301,9 +4301,9 @@
             "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
         },
         "node_modules/json5": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-            "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+            "version": "2.2.3",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
             "bin": {
                 "json5": "lib/cli.js"
             },
@@ -10112,9 +10112,9 @@
             "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
         },
         "json5": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-            "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
+            "version": "2.2.3",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
         },
         "jsprim": {
             "version": "1.4.2",

From 70436d92d30ecf42dcc3d1c71e99344099933b63 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Tue, 10 Jan 2023 20:44:26 +0100
Subject: [PATCH 558/821] Test Julia 1.9 (#2433)

---
 .github/workflows/Test.yml         |  2 +-
 src/analysis/ExpressionExplorer.jl |  2 +-
 src/analysis/ReactiveNode.jl       |  5 ++++-
 test/ExpressionExplorer.jl         | 10 ++++++++++
 test/MacroAnalysis.jl              | 10 +++++-----
 test/React.jl                      |  7 ++++---
 test/helpers.jl                    | 12 ++++++++++++
 test/packages/Basic.jl             |  2 +-
 8 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 269eac0b02..0b2ff933e4 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -34,7 +34,7 @@ jobs:
             fail-fast: false
             matrix:
                 # We test quite a lot of versions because we do some OS and version specific things unfortunately
-                julia-version: ["1.6", "1.7", "1.8"] #, "~1.9.0-0"] #, "nightly"]
+                julia-version: ["1.6", "1.7", "1.8", "~1.9.0-0"] #, "nightly"]
                 os: [ubuntu-latest, macOS-latest, windows-latest]
 
         steps:
diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 500dbb8aef..73bf3b79dc 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -567,7 +567,7 @@ function explore_function_macro!(ex::Expr, scopestate::ScopeState)
     # Macro are called using @funcname, but defined with funcname. We need to change that in our scopestate
     # (The `!= 0` is for when the function named couldn't be parsed)
     if ex.head == :macro && length(funcname) != 0
-        funcname = Symbol[Symbol("@$(funcname[1])")]
+        funcname = Symbol[Symbol('@', funcname[1])]
         push!(innerscopestate.hiddenglobals, only(funcname))
     elseif length(funcname) == 1
         push!(scopestate.definedfuncs, funcname[end])
diff --git a/src/analysis/ReactiveNode.jl b/src/analysis/ReactiveNode.jl
index 1a65180ef9..9b34ee1fa2 100644
--- a/src/analysis/ReactiveNode.jl
+++ b/src/analysis/ReactiveNode.jl
@@ -41,7 +41,10 @@ function ReactiveNode(symstate::SymbolsState)
 		)
 
 	# defined functions are 'exploded' into the cell's reactive node
-	union!(result, (ReactiveNode(body_symstate) for (_, body_symstate) in symstate.funcdefs)...)
+	for (_, body_symstate) in symstate.funcdefs
+		union!(result, ReactiveNode(body_symstate))
+	end
+	# union!(result, (ReactiveNode(body_symstate) for (_, body_symstate) in symstate.funcdefs)...)
 
 	# now we will add the function names to our edges:
 	funccalls = Set{Symbol}(symstate.funccalls .|> join_funcname_parts)
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index 627f404014..15d8271605 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -337,6 +337,9 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(:((x;p) -> f(x+p)), [], [], [], [
             :anon => ([], [], [:f, :+], [])
         ])
+        @test testee(:(() -> Date), [], [], [], [
+            :anon => ([:Date], [], [], [])
+        ])
         @test testee(:(begin x; p end -> f(x+p)), [], [], [], [
             :anon => ([], [], [:f, :+], [])
         ])
@@ -766,4 +769,11 @@ Some of these @test_broken lines are commented out to prevent printing to the te
 
         @test ExpressionExplorer.external_package_names(Meta.parse("import Foo as Bar, Baz.Naz as Jazz")) == Set([:Foo, :Baz])
     end
+
+    @testset "ReactiveNode" begin
+        rn = Pluto.ReactiveNode_from_expr(quote
+            () -> Date
+        end)
+        @test :Date ∈ rn.references
+    end
 end
diff --git a/test/MacroAnalysis.jl b/test/MacroAnalysis.jl
index 59e79157c3..171f9e8ce0 100644
--- a/test/MacroAnalysis.jl
+++ b/test/MacroAnalysis.jl
@@ -292,7 +292,7 @@ import Memoize: @memoize
         @test notebook.cells[begin] |> noerror
         @test notebook.cells[end].errored
 
-        @test occursinerror("UndefVarError: @m", notebook.cells[end])
+        @test expecterror(UndefVarError(Symbol("@m")), notebook.cells[end]; strict=VERSION >= v"1.7")
     end
 
     @testset "Redefines macro with new SymbolsState" begin
@@ -583,7 +583,7 @@ import Memoize: @memoize
 
         update_run!(🍭, notebook, cell(5))
 
-        @test occursin("UndefVarError: x", cell(1).output.body[:msg])
+        @test expecterror(UndefVarError(:x), cell(1))
 
         update_run!(🍭, notebook, cell(3))
         update_run!(🍭, notebook, cell(2))
@@ -605,7 +605,7 @@ import Memoize: @memoize
         update_run!(🍭, notebook, cell(2))
 
         @test cell(2).errored == true
-        @test occursinerror("UndefVarError: @dateformat_str", cell(2)) == true
+        @test expecterror(UndefVarError(Symbol("@dateformat_str")), cell(2); strict=VERSION >= v"1.7")
 
         update_run!(🍭, notebook, notebook.cells)
 
@@ -919,8 +919,8 @@ import Memoize: @memoize
         update_run!(🍭, notebook, notebook.cells)
         
         @test :custom_func ∉ notebook.topology.nodes[cell(3)].funcdefs_without_signatures
-        @test occursinerror("UndefVarError: custom_func", cell(4))
+        @test expecterror(UndefVarError(:custom_func), cell(4))
         @test :memoized_func ∉ notebook.topology.nodes[cell(5)].funcdefs_without_signatures
-        @test occursinerror("UndefVarError: memoized_func", cell(6))
+        @test expecterror(UndefVarError(:memoized_func), cell(6))
     end
 end
diff --git a/test/React.jl b/test/React.jl
index eff57fc685..b5bbd71bea 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -191,7 +191,8 @@ import Distributed
         @test length(notebook.cells) == 1
 
         update_run!(🍭, notebook, Cell[])
-        @test occursinerror("UndefVarError: x", notebook.cells[begin])
+
+        @test expecterror(UndefVarError(:x), notebook.cells[begin])
     end
 
     @testset ".. as an identifier" begin
@@ -541,7 +542,7 @@ import Distributed
 
         @test notebook.cells[end].errored == true
         @test occursinerror("Cyclic", notebook.cells[1])
-        @test occursinerror("UndefVarError: y", notebook.cells[end]) # this is an UndefVarError and not a CyclicError
+        @test expecterror(UndefVarError(:y), notebook.cells[end]) # this is an UndefVarError and not a CyclicError
 
         setcode!.(notebook.cells, [""])
         update_run!(🍭, notebook, notebook.cells)
@@ -991,7 +992,7 @@ import Distributed
         setcode!(notebook.cells[1], "")
         update_run!(🍭, notebook, notebook.cells[1])
         @test notebook.cells[1] |> noerror
-        @test occursinerror("x not defined", notebook.cells[2])
+        @test expecterror(UndefVarError(:x), notebook.cells[2])
 
         update_run!(🍭, notebook, notebook.cells[4])
         update_run!(🍭, notebook, notebook.cells[3])
diff --git a/test/helpers.jl b/test/helpers.jl
index c254a748f2..f536eb037b 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -153,6 +153,18 @@ function occursinerror(needle, haystack::Pluto.Cell)
     haystack.errored && occursin(needle, haystack.output.body[:msg])
 end
 
+function expecterror(err, cell; strict=true)
+    cell.errored || return false
+    io = IOBuffer()
+    showerror(io, err)
+    msg = String(take!(io))
+    if strict
+        return cell.output.body[:msg] == msg
+    else
+        return occursin(msg, cell.output.body[:msg])
+    end
+end
+
 "Test notebook equality, ignoring cell UUIDs and such."
 macro test_notebook_inputs_equal(nbA, nbB, check_paths_equality::Bool=true)
     quote
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index 68aeca6b5c..5ad58bdf8b 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -57,7 +57,7 @@ import Distributed
         # they were installed in one batch, so their terminal outputs should be the same
         @test terminals["PlutoPkgTestA"] == terminals["PlutoPkgTestD"]
         # " [9e88b42a] PackageName" should be present in terminal output
-        @test !isnothing(match(r" \[........\] ", terminals["PlutoPkgTestA"]))
+        @test !isnothing(match(r"\[........\] ", terminals["PlutoPkgTestA"]))
 
         @test notebook.cells[2].output.body == "0.3.1" # A
         @test notebook.cells[8].output.body == "0.1.0" # D

From 0c5a9727f74a34c5296bb9a5609b4548ed1d14d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Wed, 11 Jan 2023 13:33:42 +0200
Subject: [PATCH 559/821] fix: linter warning (#2439)

---
 frontend/common/KeyboardShortcuts.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/common/KeyboardShortcuts.js b/frontend/common/KeyboardShortcuts.js
index 2590783a6c..2fca1c80a0 100644
--- a/frontend/common/KeyboardShortcuts.js
+++ b/frontend/common/KeyboardShortcuts.js
@@ -21,10 +21,10 @@ export let map_cmd_to_ctrl_on_mac = (keymap) => {
 }
 
 export let in_textarea_or_input = () => {
-    const in_footer = document.activeElement.closest("footer") != null
-    const in_header = document.activeElement.closest("header") != null
-    const in_cm = document.activeElement.closest(".cm-editor") != null
+    const in_footer = document.activeElement?.closest("footer") != null
+    const in_header = document.activeElement?.closest("header") != null
+    const in_cm = document.activeElement?.closest(".cm-editor") != null
 
-    const { tagName } = document.activeElement
+    const { tagName } = document.activeElement ?? {}
     return tagName === "INPUT" || tagName === "TEXTAREA" || in_footer || in_header || in_cm
 }

From 7bbdc7b55bd5149a9eb92cdfc2b540464dc32626 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 16 Jan 2023 16:06:56 +0100
Subject: [PATCH 560/821] ENV variable JULIA_PLUTO_NEW_NOTEBOOKS_DIR

This is not included in Configurations.jl because this code can also run outside of a Session...

Needed for PlutoDesktop
---
 src/notebook/path helpers.jl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/notebook/path helpers.jl b/src/notebook/path helpers.jl
index ddba7f3415..78aa62b139 100644
--- a/src/notebook/path helpers.jl	
+++ b/src/notebook/path helpers.jl	
@@ -91,7 +91,11 @@ end
 
 function new_notebooks_directory()
     try
-        path = joinpath(first(DEPOT_PATH), "pluto_notebooks")
+        path = get(
+			ENV,
+			"JULIA_PLUTO_NEW_NOTEBOOKS_DIR",
+			joinpath(first(DEPOT_PATH), "pluto_notebooks")
+		)
         if !isdir(path)
             mkdir(path)
         end

From 04ff65c3de53edd388cccb6ecf5d6e44010e458d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 16 Jan 2023 17:29:11 +0100
Subject: [PATCH 561/821] =?UTF-8?q?=E2=9C=A8=20Enable=20new=20process=20ta?=
 =?UTF-8?q?b=20by=20default?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/BottomRightPanel.js | 32 +++++--------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/frontend/components/BottomRightPanel.js b/frontend/components/BottomRightPanel.js
index aba8793cbe..aa20f300fd 100644
--- a/frontend/components/BottomRightPanel.js
+++ b/frontend/components/BottomRightPanel.js
@@ -5,23 +5,6 @@ import { LiveDocsTab } from "./LiveDocsTab.js"
 import { is_finished, ProcessTab, total_done, total_tasks } from "./ProcessTab.js"
 import { useMyClockIsAheadBy } from "../common/clock sync.js"
 
-export const ENABLE_PROCESS_TAB = window.localStorage.getItem("ENABLE_PROCESS_TAB") === "true"
-
-if (ENABLE_PROCESS_TAB) {
-    console.log(`YOU ENABLED THE PROCESS TAB
-Thanks! Awesome!
-Please let us know if you find any bugs...
-If enough people do this, we turn it on by default. 💛
-`)
-}
-
-// Added this so we can have people test the mixed parser, because I LIKE IT SO MUCH - DRAL
-// @ts-ignore
-window.PLUTO_TOGGLE_PROCESS_TAB = () => {
-    window.localStorage.setItem("ENABLE_PROCESS_TAB", String(!ENABLE_PROCESS_TAB))
-    window.location.reload()
-}
-
 /**
  * @typedef PanelTabName
  * @type {"docs" | "process" | null}
@@ -61,7 +44,7 @@ export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, noteboo
 
     const [status_total, status_done] = useMemo(
         () =>
-            !ENABLE_PROCESS_TAB || notebook.status_tree == null
+            notebook.status_tree == null
                 ? [0, 0]
                 : [
                       // total_tasks minus 1, to exclude the notebook task itself
@@ -100,13 +83,12 @@ export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, noteboo
                         <span class="tabname">Live Docs</span>
                     </button>
                     <button
-                        disabled=${!ENABLE_PROCESS_TAB}
-                        title=${ENABLE_PROCESS_TAB ? "Process status" : "We are still working on this feature. Check back soon!"}
+                        title=${"Process status"}
                         class=${cl({
                             "helpbox-tab-key": true,
                             "helpbox-process": true,
                             "active": open_tab === "process",
-                            "busy": ENABLE_PROCESS_TAB && show_business_outline,
+                            "busy": show_business_outline,
                         })}
                         onClick=${() => {
                             set_open_tab(open_tab === "process" ? null : "process")
@@ -114,11 +96,9 @@ export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, noteboo
                     >
                         <span class="tabicon"></span>
                         <span class="tabname"
-                            >${ENABLE_PROCESS_TAB
-                                ? open_tab === "process" || !show_business_counter
-                                    ? "Status"
-                                    : html`Status${" "}<span class="subprogress-counter">(${status_done}/${status_total})</span>`
-                                : "Coming soon"}</span
+                            >${open_tab === "process" || !show_business_counter
+                                ? "Status"
+                                : html`Status${" "}<span class="subprogress-counter">(${status_done}/${status_total})</span>`}</span
                         >
                     </button>
                     ${hidden

From a694fae8abbc69cb0f8c0caa160af90ed0bd9230 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 17 Jan 2023 12:44:43 +0100
Subject: [PATCH 562/821] =?UTF-8?q?=F0=9F=8D=84=20Fix=20#2442?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/runner/PlutoRunner.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 43ae854a38..51beed8d79 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1586,7 +1586,7 @@ const integrations = Integration[
         code = quote
             approx_size(p::Plots.Plot) = try
                 sum(p.series_list; init=0) do series
-                    length(series[:y])
+                    length(something(get(series, :y, ()), ()))
                 end
             catch e
                 @warn "Failed to guesstimate plot size" exception=(e,catch_backtrace())

From 33cb224892eb5cbc0b7caeb35bf3de276a320930 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 19 Jan 2023 20:21:36 +0100
Subject: [PATCH 563/821] =?UTF-8?q?=F0=9F=93=83=20PDF=20export:=20Show=20l?=
 =?UTF-8?q?ine=20numbers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/editor.css | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 8b7593749d..7cd77016fa 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -3142,10 +3142,10 @@ pluto-cell.code_differs .cm-editor .cm-gutters {
     background-color: var(--cm-code-differs-gutters-color);
 }
 
+/* We show a small dot instead of line number, until you hover. */
 .cm-editor .cm-lineNumbers .cm-gutterElement {
     color: transparent;
 }
-
 .cm-editor .cm-lineNumbers .cm-gutterElement::after {
     content: "⋅";
     font-size: 0.75rem;
@@ -3154,15 +3154,31 @@ pluto-cell.code_differs .cm-editor .cm-gutters {
     right: 3px;
     pointer-events: none;
 }
-
 .cm-editor .cm-lineNumbers .cm-gutterElement:hover {
     color: var(--cm-line-numbers-color);
 }
-
 .cm-editor .cm-lineNumbers .cm-gutterElement:hover::after {
     color: transparent;
 }
 
+/* Disabling this feature in two cases: */
+/* Case 1: The cell input is in focus */
+/* pluto-input:focus-within .cm-editor .cm-lineNumbers .cm-gutterElement {
+    color: var(--cm-line-numbers-color);
+}
+pluto-input:focus-within .cm-editor .cm-lineNumbers .cm-gutterElement::after {
+    color: transparent;
+} */
+/* Case 2: Print */
+@media print {
+    .cm-editor .cm-lineNumbers .cm-gutterElement {
+        color: var(--cm-line-numbers-color) !important;
+    }
+    .cm-editor .cm-lineNumbers .cm-gutterElement::after {
+        color: transparent !important;
+    }
+}
+
 .cm-completionIcon-c_Number::before {
     color: var(--cm-number-color);
 }

From 9add36611d46ec21fea867c5323718a240a00ed9 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 19 Jan 2023 20:25:49 +0100
Subject: [PATCH 564/821] =?UTF-8?q?=F0=9F=93=83=20PDF=20export:=20Hide=20P?=
 =?UTF-8?q?kg=20status=20checkmarks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/editor.css | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 7cd77016fa..a4a8a55a80 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1704,16 +1704,20 @@ pluto-input > button.input_context_menu > span.icon::after {
 
 /* PKG UI */
 
-body.nbpkg_disabled pkg-status-mark:not(.disable_pkg) {
-    display: none;
-}
-
 pkg-status-mark {
     width: 1em;
     height: 1em;
     margin: 0px 0.6em 0px 0.2em;
     display: inline-block;
 }
+body.nbpkg_disabled pkg-status-mark:not(.disable_pkg) {
+    display: none;
+}
+@media print {
+    pkg-status-mark {
+        display: none;
+    }
+}
 
 pkg-status-mark > button {
     margin: 0px;

From 527dc60073b3ee90b31cdb72144005a6e48bdac2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 19 Jan 2023 21:44:23 +0100
Subject: [PATCH 565/821] Update treeview.css

---
 frontend/treeview.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/treeview.css b/frontend/treeview.css
index db84e598cf..b8973eecd2 100644
--- a/frontend/treeview.css
+++ b/frontend/treeview.css
@@ -21,12 +21,13 @@ pluto-tree,
 pluto-tree-items {
     display: inline-flex;
     flex-direction: column;
-    align-items: baseline;
+    align-items: flex-start;
 }
 pluto-tree.collapsed,
 pluto-tree.collapsed pluto-tree,
 pluto-tree.collapsed pluto-tree-items {
     flex-direction: row;
+    align-items: baseline;
 }
 
 pluto-tree-items {

From 1a0afb849cdf828c142c3f2ec6f96e5938db2eb1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 20 Jan 2023 00:17:50 +0100
Subject: [PATCH 566/821] =?UTF-8?q?=F0=9F=93=9A=20Tree=20viewer:=20Limit?=
 =?UTF-8?q?=20size=20of=20<pre>=20inside=20collapsed=20node=20(#2451)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/treeview.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/treeview.css b/frontend/treeview.css
index b8973eecd2..8616a6ba30 100644
--- a/frontend/treeview.css
+++ b/frontend/treeview.css
@@ -339,3 +339,8 @@ table.pluto-table .pluto-tree-more-td pluto-tree-more {
     top: 2rem;
     max-width: 650px;
 }
+
+pluto-tree.collapsed p-v > pre {
+    max-height: 2em;
+    overflow-y: hidden;
+}

From 50ead6014e00ebb6ef455bf16a25319c91a4d86e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 20 Jan 2023 00:24:07 +0100
Subject: [PATCH 567/821] Use <a> tag for global variable links (#2450)

---
 .../components/CellInput/go_to_definition_plugin.js  | 12 ++++--------
 frontend/components/Editor.js                        |  2 +-
 frontend/editor.css                                  |  4 +++-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/frontend/components/CellInput/go_to_definition_plugin.js b/frontend/components/CellInput/go_to_definition_plugin.js
index b2bea6aa3c..809ef476ed 100644
--- a/frontend/components/CellInput/go_to_definition_plugin.js
+++ b/frontend/components/CellInput/go_to_definition_plugin.js
@@ -19,11 +19,7 @@ let get_variable_marks = (state, { scopestate, global_definitions }) => {
                     // .... Because now it will only show variables after it has run once
                     if (global_definitions[name]) {
                         return Decoration.mark({
-                            // TODO This used to be tagName: "a", but codemirror doesn't like that...
-                            // .... https://github.com/fonsp/Pluto.jl/issues/1790
-                            // .... Ideally we'd change it back to `a` (feels better), but functionally there is no difference..
-                            // .... When I ever happen to find a lot of time I can spend on this, I'll debug and change it back to `a`
-                            tagName: "pluto-variable-link",
+                            tagName: "a",
                             attributes: {
                                 "title": `${ctrl_or_cmd_name}-Click to jump to the definition of ${name}.`,
                                 "data-pluto-variable": name,
@@ -46,7 +42,7 @@ let get_variable_marks = (state, { scopestate, global_definitions }) => {
                 } else {
                     // Could be used to select the definition of a variable inside the current cell
                     return Decoration.mark({
-                        tagName: "pluto-variable-link",
+                        tagName: "a",
                         attributes: {
                             "title": `${ctrl_or_cmd_name}-Click to jump to the definition of ${name}.`,
                             "data-cell-variable": name,
@@ -106,8 +102,8 @@ export const go_to_definition_plugin = ViewPlugin.fromClass(
         decorations: (v) => v.decorations,
 
         eventHandlers: {
-            pointerdown: (event, view) => {
-                if (has_ctrl_or_cmd_pressed(event) && event.button === 0 && event.target instanceof Element) {
+            click: (event, view) => {
+                if (has_ctrl_or_cmd_pressed(event) && event.target instanceof Element) {
                     let pluto_variable = event.target.closest("[data-pluto-variable]")
                     if (pluto_variable) {
                         let variable = pluto_variable.getAttribute("data-pluto-variable")
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index a427918b71..a6384056ad 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1122,7 +1122,7 @@ patch: ${JSON.stringify(
         const set_ctrl_down = (value) => {
             if (value !== ctrl_down_last_val.current) {
                 ctrl_down_last_val.current = value
-                document.body.querySelectorAll("pluto-variable-link").forEach((el) => {
+                document.body.querySelectorAll("[data-pluto-variable]").forEach((el) => {
                     el.setAttribute("data-ctrl-down", value ? "true" : "false")
                 })
             }
diff --git a/frontend/editor.css b/frontend/editor.css
index a4a8a55a80..8af0352e91 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -3055,6 +3055,7 @@ Based on "Paraíso (Light)" by Jan T. Sott:
 }
 
 [data-pluto-variable],
+[data-pluto-variable]:hover,
 .cm-editor .cm-tooltip.cm-tooltip-autocomplete li.c_from_notebook .cm-completionLabel {
     font-weight: bold;
     text-decoration: underline;
@@ -3064,7 +3065,8 @@ Based on "Paraíso (Light)" by Jan T. Sott:
 }
 
 @media (prefers-color-scheme: dark) {
-    [data-pluto-variable] {
+    [data-pluto-variable],
+    [data-pluto-variable]:hover {
         text-decoration-color: #5d5f70;
     }
 }

From 9f560b11d3bab2c5b6aebcf1b9e0389653b2648b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 20 Jan 2023 00:47:22 +0100
Subject: [PATCH 568/821] Update codemirror

---
 frontend/imports/CodemirrorPlutoSetup.d.ts | 55 ++++++++++++++++++----
 frontend/imports/CodemirrorPlutoSetup.js   |  2 +-
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/frontend/imports/CodemirrorPlutoSetup.d.ts b/frontend/imports/CodemirrorPlutoSetup.d.ts
index 4b130571c2..6919393ed4 100644
--- a/frontend/imports/CodemirrorPlutoSetup.d.ts
+++ b/frontend/imports/CodemirrorPlutoSetup.d.ts
@@ -476,7 +476,7 @@ declare class EditorSelection {
     /**
     Create a selection range.
     */
-    static range(anchor: number, head: number, goalColumn?: number): SelectionRange;
+    static range(anchor: number, head: number, goalColumn?: number, bidiLevel?: number): SelectionRange;
 }
 
 declare type FacetConfig<Input, Output> = {
@@ -1586,7 +1586,7 @@ interface Input {
     readonly lineChunks: boolean;
     read(from: number, to: number): string;
 }
-declare type ParseWrapper = (inner: PartialParse, input: Input, fragments: readonly TreeFragment[], ranges: readonly {
+type ParseWrapper = (inner: PartialParse, input: Input, fragments: readonly TreeFragment[], ranges: readonly {
     from: number;
     to: number;
 }[]) => PartialParse;
@@ -1620,7 +1620,7 @@ declare class MountedTree {
         to: number;
     }[] | null, parser: Parser);
 }
-declare type NodePropSource = (type: NodeType) => null | [NodeProp<any>, any];
+type NodePropSource = (type: NodeType) => null | [NodeProp<any>, any];
 declare class NodeType {
     readonly name: string;
     readonly id: number;
@@ -1680,7 +1680,7 @@ declare class Tree {
     }): Tree;
     static build(data: BuildData): Tree;
 }
-declare type BuildData = {
+type BuildData = {
     buffer: BufferCursor | readonly number[];
     nodeSet: NodeSet;
     topID: number;
@@ -3802,6 +3802,13 @@ interface HistoryConfig {
     apart and still be grouped together. Defaults to 500.
     */
     newGroupDelay?: number;
+    /**
+    By default, when close enough together in time, changes are
+    joined into an existing undo event if they touch any of the
+    changed ranges from that event. You can pass a custom predicate
+    here to influence that logic.
+    */
+    joinToEvent?: (tr: Transaction, isAdjacent: boolean) => boolean;
 }
 /**
 Create a history extension with the given configuration.
@@ -3897,6 +3904,11 @@ interface CompletionConfig {
     */
     aboveCursor?: boolean;
     /**
+    When given, this may return an additional CSS class to add to
+    the completion dialog element.
+    */
+    tooltipClass?: (state: EditorState) => string;
+    /**
     This can be used to add additional CSS classes to completion
     options.
     */
@@ -4173,10 +4185,9 @@ The order of fields defaults to textual order, but you can add
 numbers to placeholders (`${1}` or `${1:defaultText}`) to provide
 a custom order.
 
-To include a literal `${` or `#{` in your template, put a
-backslash after the dollar or hash and before the brace (`$\\{`).
-This will be removed and the sequence will not be interpreted as a
-placeholder.
+To include a literal `{` or `}` in your template, put a backslash
+in front of it. This will be removed and the brace will not be
+interpreted as indicating a placeholder.
 */
 declare function snippet(template: string): (editor: {
     state: EditorState;
@@ -4617,12 +4628,28 @@ interface TagSpec {
     */
     attrs?: Record<string, null | readonly string[]>;
     /**
+    When set to false, don't complete global attributes on this tag.
+    */
+    globalAttrs?: boolean;
+    /**
     Can be used to specify a list of child tags that are valid
     inside this tag. The default is to allow any tag.
     */
     children?: readonly string[];
 }
 
+declare type NestedLang = {
+    tag: string;
+    attrs?: (attrs: {
+        [attr: string]: string;
+    }) => boolean;
+    parser: Parser;
+};
+declare type NestedAttr = {
+    name: string;
+    tagName?: string;
+    parser: Parser;
+};
 /**
 A language provider based on the [Lezer HTML
 parser](https://github.com/lezer-parser/html), extended with the
@@ -4643,6 +4670,7 @@ declare function html(config?: {
     document).
     */
     matchClosingTags?: boolean;
+    selfClosingTags?: boolean;
     /**
     Determines whether [`autoCloseTags`](https://codemirror.net/6/docs/ref/#lang-html.autoCloseTags)
     is included in the support extensions. Defaults to true.
@@ -4656,6 +4684,17 @@ declare function html(config?: {
     Add additional completable attributes to all tags.
     */
     extraGlobalAttributes?: Record<string, null | readonly string[]>;
+    /**
+    Register additional languages to parse the content of specific
+    tags. If given, `attrs` should be a function that, given an
+    object representing the tag's attributes, returns `true` if this
+    language applies.
+    */
+    nestedLanguages?: NestedLang[];
+    /**
+    Register additional languages to parse attribute values with.
+    */
+    nestedAttributes?: NestedAttr[];
 }): LanguageSupport;
 
 /**
diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index 73412230ec..ce8c635152 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -60,7 +60,7 @@ import {
     cssLanguage,
     selectNextOccurrence,
     //@ts-ignore
-} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.28.3/dist/index.es.min.js"
+} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.28.4/dist/index.es.min.js"
 
 export {
     EditorState,

From 61951fa26594c832dec02b1ea0d46db7af53bc69 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Fri, 20 Jan 2023 12:55:43 +0100
Subject: [PATCH 569/821] Use `SnoopPrecompile` (#2441)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 .github/workflows/FrontendTest.yml |  1 +
 .github/workflows/Test.yml         |  4 +-
 .gitignore                         |  3 ++
 Project.toml                       |  2 +
 src/Configuration.jl               |  8 ++-
 src/Pluto.jl                       |  7 +--
 src/precompile.jl                  | 81 ++++++++++++++++++++++++++++++
 7 files changed, 97 insertions(+), 9 deletions(-)
 create mode 100644 src/precompile.jl

diff --git a/.github/workflows/FrontendTest.yml b/.github/workflows/FrontendTest.yml
index e32d7bc0a0..a9b5d55961 100644
--- a/.github/workflows/FrontendTest.yml
+++ b/.github/workflows/FrontendTest.yml
@@ -19,6 +19,7 @@ on:
 jobs:
     frontend-test:
         runs-on: "ubuntu-latest"
+        timeout-minutes: 30
 
         steps:
             # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 0b2ff933e4..88053e98aa 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -28,7 +28,7 @@ jobs:
     test:
         runs-on: ${{ matrix.os }}
         timeout-minutes: 40
-        
+
         strategy:
             # Without setting this, a failing test cancels all others
             fail-fast: false
@@ -41,7 +41,7 @@ jobs:
             # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
             - uses: actions/checkout@v3
 
-            # Makes thes `julia` command available
+            # Makes the `julia` command available
             - uses: julia-actions/setup-julia@v1
               with:
                   version: ${{ matrix.julia-version }}
diff --git a/.gitignore b/.gitignore
index 83001189e5..a2b07a1d8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@ frontend/dist
 .net
 net
 frontend/package-lock.json
+
+# PProf
+profile.pb.gz
diff --git a/Project.toml b/Project.toml
index 2851bc1d04..2555a461d3 100644
--- a/Project.toml
+++ b/Project.toml
@@ -23,6 +23,7 @@ PrecompileSignatures = "91cefc8d-f054-46dc-8f8c-26e11d7c5411"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 RegistryInstances = "2792f1a3-b283-48e8-9a74-f99dce5104f3"
 RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
+SnoopPrecompile = "66db9d55-30c0-4569-8b51-7e840670fc0c"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
@@ -39,6 +40,7 @@ MsgPack = "1.1"
 PrecompileSignatures = "3"
 RegistryInstances = "0.1"
 RelocatableFolders = "0.1, 0.2, 0.3, 1"
+SnoopPrecompile = "1"
 Tables = "1"
 URIs = "1.3"
 julia = "^1.6"
diff --git a/src/Configuration.jl b/src/Configuration.jl
index c10ac0d65d..372ff32ed7 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -22,9 +22,13 @@ catch e
 end
 
 # Using a ref to avoid fixing the pwd() output during the compilation phase. We don't want this value to be baked into the sysimage, because it depends on the `pwd()`. We do want to cache it, because the pwd might change while Pluto is running.
-const pwd_ref = Ref{Union{Nothing,String}}()
+const pwd_ref = Ref{String}()
 function notebook_path_suggestion()
-    pwd_val = something(pwd_ref[], safepwd())
+    pwd_val = if isassigned(pwd_ref)
+        pwd_ref[]
+    else
+        safepwd()
+    end
     preferred_dir = startswith(Sys.BINDIR, pwd_val) ? homedir() : pwd_val
     # so that it ends with / or \
     string(joinpath(preferred_dir, ""))
diff --git a/src/Pluto.jl b/src/Pluto.jl
index 125aa188f3..f57a51da28 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -94,6 +94,8 @@ export reset_notebook_environment
 export update_notebook_environment
 export activate_notebook_environment
 
+include("./precompile.jl")
+
 if get(ENV, "JULIA_PLUTO_SHOW_BANNER", "1") != "0" && get(ENV, "CI", "🍄") != "true"
 @info """\n
     Welcome to Pluto $(PLUTO_VERSION_STR) 🎈
@@ -106,9 +108,4 @@ if get(ENV, "JULIA_PLUTO_SHOW_BANNER", "1") != "0" && get(ENV, "CI", "🍄") !=
 \n"""
 end
 
-# Generate and include `precompile` directives during the precompilation phase.
-# This aims to reduce the time to first X (time to first running notebook in this case).
-using PrecompileSignatures: @precompile_signatures
-@precompile_signatures(Pluto)
-
 end
diff --git a/src/precompile.jl b/src/precompile.jl
new file mode 100644
index 0000000000..c64c834dd1
--- /dev/null
+++ b/src/precompile.jl
@@ -0,0 +1,81 @@
+using SnoopPrecompile: SnoopPrecompile
+
+const __TEST_NOTEBOOK_ID = uuid1()
+
+SnoopPrecompile.@precompile_all_calls begin
+    let
+        channel = Channel{Any}(10)
+        Pluto.PlutoRunner.setup_plutologger(
+            __TEST_NOTEBOOK_ID,
+            channel,
+        )
+    end
+    expr = Expr(:toplevel, :(1 + 1))
+    Pluto.PlutoRunner.run_expression(Module(), expr, __TEST_NOTEBOOK_ID, uuid1(), nothing);
+
+    nb = Pluto.Notebook([
+        Pluto.Cell("""md"Hello *world*" """)
+        Pluto.Cell("""[f(x)]""")
+        Pluto.Cell("""x = 1""")
+        Pluto.Cell(
+            """
+            function f(z::Integer)
+                z / 123
+            end
+            """)
+        Pluto.Cell(
+            """
+            "asdf"
+            begin
+                while false
+                    local p = 123
+                    try
+                        [(x,a...) for x in (a for a in b)]
+                        A.B.hello() do z
+                            @gensym z
+                            (z) -> z/:(z / z)
+                        end
+                    catch
+                    end
+                end
+            end
+            """
+        )
+    ])
+    let
+        topology = Pluto.updated_topology(nb.topology, nb, nb.cells)
+        # Our reactive sorting algorithm.
+        Pluto.topological_order(topology, topology.cell_order)
+    end
+
+    let
+        io = IOBuffer()
+        # Notebook file format.
+        Pluto.save_notebook(io, nb)
+        seekstart(io)
+        Pluto.load_notebook_nobackup(io, "whatever.jl")
+    end
+
+    let
+        state1 = Pluto.notebook_to_js(nb)
+        state2 = Pluto.notebook_to_js(nb)
+        # MsgPack
+        Pluto.unpack(Pluto.pack(state1))
+        # State diffing
+        Pluto.Firebasey.diff(state1, state2)
+    end
+
+    s = Pluto.ServerSession(;
+        options=Pluto.Configuration.from_flat_kwargs(
+            disable_writing_notebook_files=true,
+            workspace_use_distributed=false,
+            auto_reload_from_file=false,
+            run_notebook_on_load=false,
+            lazy_workspace_creation=true,
+            capture_stdout=false,
+        )
+    )
+end
+
+using PrecompileSignatures: @precompile_signatures
+@precompile_signatures(Pluto)

From b0d4df3cf95477dcb8e47e22c72d2d23b304ee2c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 20 Jan 2023 13:03:00 +0100
Subject: [PATCH 570/821] Update featured_sources.js

---
 frontend/featured_sources.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/featured_sources.js b/frontend/featured_sources.js
index 77f05e4ef4..6267e65efc 100644
--- a/frontend/featured_sources.js
+++ b/frontend/featured_sources.js
@@ -2,8 +2,8 @@ export default {
     // check out https://github.com/JuliaPluto/pluto-developer-instructions/blob/main/How%20to%20update%20the%20featured%20notebooks.md to learn more
     sources: [
         {
-            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@fa62114/pluto_export.json",
-            integrity: "sha256-mqaCAS0NOcrmgfYmN4284eP44913HWPQfM8OaXj01II=",
+            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@v1/pluto_export.json",
+            integrity: "sha256-HjgcS33T86/pD8eXoNu8mzig0u9MQ/MJQ+YgZ+cLzkk=",
         },
     ],
 }

From e81eeb5e98f5793efb14c9ca95fdce1bd2af8c13 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 20 Jan 2023 15:40:52 +0100
Subject: [PATCH 571/821] =?UTF-8?q?=F0=9F=91=86=20Jump-to-definition=20on?=
 =?UTF-8?q?=20click=20without=20Ctrl/Cmd=20in=20static=20export=20(#2452)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CellInput/go_to_definition_plugin.js  |  6 +++++-
 frontend/components/Editor.js                        |  2 ++
 frontend/editor.css                                  | 12 ++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/frontend/components/CellInput/go_to_definition_plugin.js b/frontend/components/CellInput/go_to_definition_plugin.js
index 809ef476ed..8d8ad4994f 100644
--- a/frontend/components/CellInput/go_to_definition_plugin.js
+++ b/frontend/components/CellInput/go_to_definition_plugin.js
@@ -103,7 +103,7 @@ export const go_to_definition_plugin = ViewPlugin.fromClass(
 
         eventHandlers: {
             click: (event, view) => {
-                if (has_ctrl_or_cmd_pressed(event) && event.target instanceof Element) {
+                if (event.target instanceof Element) {
                     let pluto_variable = event.target.closest("[data-pluto-variable]")
                     if (pluto_variable) {
                         let variable = pluto_variable.getAttribute("data-pluto-variable")
@@ -111,6 +111,10 @@ export const go_to_definition_plugin = ViewPlugin.fromClass(
                             return false
                         }
 
+                        if (!(has_ctrl_or_cmd_pressed(event) || view.state.readOnly)) {
+                            return false
+                        }
+
                         event.preventDefault()
                         let scrollto_selector = `[id='${encodeURI(variable)}']`
                         document.querySelector(scrollto_selector)?.scrollIntoView({
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index a6384056ad..9a5a5843b6 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1294,6 +1294,8 @@ patch: ${JSON.stringify(
     componentDidUpdate(old_props, old_state) {
         //@ts-ignore
         window.editor_state = this.state
+        //@ts-ignore
+        window.editor_state_set = this.setStatePromise
 
         const new_state = this.state
 
diff --git a/frontend/editor.css b/frontend/editor.css
index 8af0352e91..664e436278 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -3071,13 +3071,17 @@ Based on "Paraíso (Light)" by Jan T. Sott:
     }
 }
 
-[data-ctrl-down="true"][data-pluto-variable],
-[data-ctrl-down="true"][data-cell-variable] {
+body.disable_ui [data-pluto-variable],
+body.disable_ui [data-cell-variable] {
+    cursor: pointer;
+}
+body:not(.disable_ui) [data-ctrl-down="true"][data-pluto-variable],
+body:not(.disable_ui) [data-ctrl-down="true"][data-cell-variable] {
     text-decoration-color: #d177e6;
     cursor: pointer;
 }
-[data-ctrl-down="true"][data-pluto-variable]:hover,
-[data-ctrl-down="true"][data-pluto-variable]:hover * {
+body:not(.disable_ui) [data-ctrl-down="true"][data-pluto-variable]:hover,
+body:not(.disable_ui) [data-ctrl-down="true"][data-pluto-variable]:hover * {
     /* This basically `color: #af5bc3`, but it works for emoji too!! */
     color: transparent !important;
     text-shadow: 0 0 #af5bc3;

From 7e0eec905d1123fed954d99b57c88657f13787d1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 20 Jan 2023 15:51:58 +0100
Subject: [PATCH 572/821] whitespace

---
 src/analysis/ExpressionExplorer.jl |  8 ++++----
 src/analysis/ReactiveNode.jl       |  8 ++++----
 src/evaluation/Run.jl              | 11 +++++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 73bf3b79dc..87ab7aa3b5 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -141,7 +141,7 @@ function get_assignees(ex::Expr)::FunctionName
             # e.g. (x, y) in the ex (x, y) = (1, 23)
             args = ex.args
         end
-        union!(Symbol[], get_assignees.(args)...)
+        union!(Symbol[], Iterators.map(get_assignees, args)...)
         # filter(s->s isa Symbol, ex.args)
     elseif ex.head == :(::)
         # TODO: type is referenced
@@ -151,7 +151,7 @@ function get_assignees(ex::Expr)::FunctionName
     elseif ex.head == :...
         # Handles splat assignments. e.g. _, y... = 1:5
         args = ex.args
-        union!(Symbol[], get_assignees.(args)...)
+        union!(Symbol[], Iterators.map(get_assignees, args)...)
     else
         @warn "unknown use of `=`. Assignee is unrecognised." ex
         Symbol[]
@@ -1240,7 +1240,7 @@ end
 
 function collect_implicit_usings(ex::Expr)
     if is_implicit_using(ex)
-        Set{Expr}(transform_dot_notation.(ex.args))
+        Set{Expr}(Iterators.map(transform_dot_notation, ex.args))
     else
         return Set{Expr}()
     end
@@ -1290,7 +1290,7 @@ function external_package_names(ex::Expr)::Set{Symbol}
 end
 
 function external_package_names(x::UsingsImports)::Set{Symbol}
-    union!(Set{Symbol}(), external_package_names.(x.usings)..., external_package_names.(x.imports)...)
+    union!(Set{Symbol}(), Iterators.map(external_package_names, x.usings)..., Iterators.map(external_package_names, x.imports)...)
 end
 
 "Get the sets of `using Module` and `import Module` subexpressions that are contained in this expression."
diff --git a/src/analysis/ReactiveNode.jl b/src/analysis/ReactiveNode.jl
index 9b34ee1fa2..8fbf6dda99 100644
--- a/src/analysis/ReactiveNode.jl
+++ b/src/analysis/ReactiveNode.jl
@@ -33,12 +33,12 @@ end
 - A `SymbolsState` is a nested structure of function definitions inside function definitions inside... This conversion flattens this structure by merging `SymbolsState`s from defined functions.
 - `ReactiveNode` functions as a cache to improve efficienty, by turning the nested structures into multiple `Set{Symbol}`s with fast lookups."
 function ReactiveNode(symstate::SymbolsState)
-	macrocalls = join_funcname_parts.(symstate.macrocalls) |> Set{Symbol}
-	result = ReactiveNode(
+	macrocalls = Iterators.map(join_funcname_parts, symstate.macrocalls) |> Set{Symbol}
+	result = ReactiveNode(;
 		references=Set{Symbol}(symstate.references), 
 		definitions=Set{Symbol}(symstate.assignments),
 		macrocalls=macrocalls,
-		)
+	)
 
 	# defined functions are 'exploded' into the cell's reactive node
 	for (_, body_symstate) in symstate.funcdefs
@@ -58,7 +58,7 @@ function ReactiveNode(symstate::SymbolsState)
 		push!(result.funcdefs_without_signatures, join_funcname_parts(namesig.name))
 
 		generated_names = generate_funcnames(namesig.name)
-		generated_names_syms = Set{Symbol}(join_funcname_parts.(generated_names))
+		generated_names_syms = Iterators.map(join_funcname_parts, generated_names) |> Set{Symbol}
 
 		# add the generated names so that they are added as soft definitions
 		# this means that they will not be used if a cycle is created
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 14d2e2d041..561fd9b098 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -157,14 +157,17 @@ function run_reactive_core!(
     to_delete_vars = union!(to_delete_vars, defined_variables(new_topology, new_errable)...)
     to_delete_funcs = union!(to_delete_funcs, defined_functions(new_topology, new_errable)...)
 
-    cells_to_macro_invalidate = map(c -> c.cell_id, cells_with_deleted_macros(old_topology, new_topology)) |> Set{UUID}
+    cells_to_macro_invalidate = Set{UUID}(c.cell_id for c in cells_with_deleted_macros(old_topology, new_topology))
+
+    to_reimport = union!(Set{Expr}(), (
+			new_topology.codes[c].module_usings_imports.usings for c in notebook.cells if c ∉ to_run
+		)...)
 
-    to_reimport = union!(Set{Expr}(), map(c -> new_topology.codes[c].module_usings_imports.usings, setdiff(notebook.cells, to_run))...)
     if will_run_code(notebook)
-        deletion_hook((session, notebook), old_workspace_name, nothing, to_delete_vars, to_delete_funcs, to_reimport, cells_to_macro_invalidate; to_run = to_run) # `deletion_hook` defaults to `WorkspaceManager.move_vars`
+        deletion_hook((session, notebook), old_workspace_name, nothing, to_delete_vars, to_delete_funcs, to_reimport, cells_to_macro_invalidate; to_run) # `deletion_hook` defaults to `WorkspaceManager.move_vars`
     end
 
-    delete!.([notebook.bonds], to_delete_vars)
+	foreach(v -> delete!(notebook.bonds, v), to_delete_vars)
 
     local any_interrupted = false
     for (i, cell) in enumerate(to_run)

From bedc7767d76439477bae8a5165f4f39906f9064c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Fri, 20 Jan 2023 17:49:50 +0200
Subject: [PATCH 573/821] fix: don't use `wslpath` if path is a regular file
 (#2428)

---
 src/notebook/path helpers.jl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/notebook/path helpers.jl b/src/notebook/path helpers.jl
index 78aa62b139..9a3a387931 100644
--- a/src/notebook/path helpers.jl	
+++ b/src/notebook/path helpers.jl	
@@ -26,6 +26,7 @@ but "/mnt/c/Users/pankg/OneDrive/Desktop/pluto/bakery_pnl_ready2.jl" stays the s
 """
 function maybe_convert_path_to_wsl(path)
     try
+        isfile(path) && return path
         if detectwsl()
             # wslpath utility prints path to stderr if it fails to convert
             # (it used to fail for WSL-valid paths)

From d2bca8e71157c6aa53beb47c5d05d62a339e6329 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 20 Jan 2023 17:33:24 +0100
Subject: [PATCH 574/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 2555a461d3..b501d3a453 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.19"
+version = "0.19.20"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 44c5f3ed576fb3138d9cd120fe4b188ba9f3dbbb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 23 Jan 2023 13:09:22 +0100
Subject: [PATCH 575/821] =?UTF-8?q?=F0=9F=8F=A2=20Fix=20#2190?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See #2425
---
 frontend/treeview.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/treeview.css b/frontend/treeview.css
index 8616a6ba30..7a60b91637 100644
--- a/frontend/treeview.css
+++ b/frontend/treeview.css
@@ -278,7 +278,7 @@ table.pluto-table {
 
 table.pluto-table td {
     max-width: 300px;
-    overflow: hidden;
+    overflow: auto;
 }
 
 table.pluto-table .schema-types {

From fdca1daaa7095eb072805bbefb9534d846c127c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Mon, 23 Jan 2023 14:16:45 +0200
Subject: [PATCH 576/821] fix: `pluto_showable` for objects without
 implementation of `length(rows(::Tablelike))` (#2438)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/TreeView.js | 45 ++++++++++++++++++++++++---------
 frontend/treeview.css           | 12 +++++++++
 src/runner/PlutoRunner.jl       |  8 ++++--
 3 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/frontend/components/TreeView.js b/frontend/components/TreeView.js
index 841aba546d..32e8de53c9 100644
--- a/frontend/components/TreeView.js
+++ b/frontend/components/TreeView.js
@@ -132,6 +132,23 @@ export const TreeView = ({ mime, body, cell_id, persist_js_state }) => {
     return html`<pluto-tree class="collapsed ${body.type}" onclick=${onclick} ref=${node_ref}>${inner}</pluto-tree>`
 }
 
+const EmptyCols = ({ colspan = 999 }) => html`<thead>
+    <tr class="empty">
+        <td colspan=${colspan}>
+            <div>⌀ <small>(This table has no columns)</small></div>
+        </td>
+    </tr>
+</thead>`
+
+const EmptyRows = ({ colspan = 999 }) => html`<tr class="empty">
+    <td colspan=${colspan}>
+        <div>
+            <div>⌀</div>
+            <small>(This table has no rows)</small>
+        </div>
+    </td>
+</tr>`
+
 export const TableView = ({ mime, body, cell_id, persist_js_state }) => {
     let pluto_actions = useContext(PlutoActionsContext)
     const node_ref = useRef(null)
@@ -148,10 +165,11 @@ export const TableView = ({ mime, body, cell_id, persist_js_state }) => {
             })
         }}
     />`
-
+    // More than the columns, not big enough to break Firefox (https://bugzilla.mozilla.org/show_bug.cgi?id=675417)
+    const maxcolspan = 3 + (body?.schema?.names?.length ?? 1)
     const thead =
-        body.schema == null
-            ? null
+        (body?.schema?.names?.length ?? 0) === 0
+            ? html`<${EmptyCols} colspan=${maxcolspan} />`
             : html`<thead>
                   <tr class="schema-names">
                       ${["", ...body.schema.names].map((x) => html`<th>${x === "more" ? more(2) : x}</th>`)}
@@ -160,16 +178,19 @@ export const TableView = ({ mime, body, cell_id, persist_js_state }) => {
                       ${["", ...body.schema.types].map((x) => html`<th>${x === "more" ? null : x}</th>`)}
                   </tr>
               </thead>`
+
     const tbody = html`<tbody>
-        ${body.rows.map(
-            (row) =>
-                html`<tr>
-                    ${row === "more"
-                        ? html`<td class="pluto-tree-more-td" colspan="999">${more(1)}</td>`
-                        : html`<th>${row[0]}</th>
-                              ${row[1].map((x) => html`<td>${x === "more" ? null : mimepair_output(x)}</td>`)}`}
-                </tr>`
-        )}
+        ${(body.rows?.length ?? 0) !== 0
+            ? body.rows.map(
+                  (row) =>
+                      html`<tr>
+                          ${row === "more"
+                              ? html`<td class="pluto-tree-more-td" colspan=${maxcolspan}>${more(1)}</td>`
+                              : html`<th>${row[0]}</th>
+                                    ${row[1].map((x) => html`<td>${x === "more" ? null : mimepair_output(x)}</td>`)}`}
+                      </tr>`
+              )
+            : html`<${EmptyRows} colspan=${maxcolspan} />`}
     </tbody>`
 
     return html`<table class="pluto-table" ref=${node_ref}>
diff --git a/frontend/treeview.css b/frontend/treeview.css
index 7a60b91637..ce4e3aa023 100644
--- a/frontend/treeview.css
+++ b/frontend/treeview.css
@@ -340,6 +340,18 @@ table.pluto-table .pluto-tree-more-td pluto-tree-more {
     max-width: 650px;
 }
 
+table.pluto-table tr.empty div {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    font-size: 1.5rem;
+    flex-flow: column nowrap;
+}
+table.pluto-table tr.empty small {
+    font-size: 0.5rem;
+}
+
 pluto-tree.collapsed p-v > pre {
     max-height: 2em;
     overflow-y: hidden;
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 51beed8d79..31cce87b7a 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1516,7 +1516,6 @@ const integrations = Integration[
 
             function table_data(x::Any, io::Context)
                 rows = Tables.rows(x)
-
                 my_row_limit = get_my_display_limit(x, 1, 0, io, table_row_display_limit, table_row_display_limit_increase)
 
                 # TODO: the commented line adds support for lazy loading columns, but it uses the same extra_items counter as the rows. So clicking More Rows will also give more columns, and vice versa, which isn't ideal. To fix, maybe use (objectid,dimension) as index instead of (objectid)?
@@ -1573,7 +1572,12 @@ const integrations = Integration[
             end
 
 
-            pluto_showable(::MIME"application/vnd.pluto.table+object", x::Any) = try Tables.rowaccess(x)::Bool && !isempty(x) catch; false end
+            #=
+            If the object we're trying to fileview provides rowaccess, let's try to show it. This is guaranteed to be fast
+            (while Table.rows() may be slow). If the object is a lazy iterator, the show method will probably crash and return text repr.
+            That's good because we don't want the show method of lazy iterators (e.g. database cursors) to be changing the (external)
+            iterator implicitly =#
+            pluto_showable(::MIME"application/vnd.pluto.table+object", x::Any) = try Tables.rowaccess(x)::Bool catch; false end
             pluto_showable(::MIME"application/vnd.pluto.table+object", t::Type) = false
             pluto_showable(::MIME"application/vnd.pluto.table+object", t::AbstractVector{<:NamedTuple}) = false
             pluto_showable(::MIME"application/vnd.pluto.table+object", t::AbstractVector{<:Dict{Symbol,<:Any}}) = false

From d7782183da26673d853ed58bbb3e63d998845c80 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 23 Jan 2023 13:52:56 +0100
Subject: [PATCH 577/821] whitespace

---
 frontend/editor.css  | 5 -----
 frontend/hide-ui.css | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 664e436278..b8a6b92fd0 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1713,11 +1713,6 @@ pkg-status-mark {
 body.nbpkg_disabled pkg-status-mark:not(.disable_pkg) {
     display: none;
 }
-@media print {
-    pkg-status-mark {
-        display: none;
-    }
-}
 
 pkg-status-mark > button {
     margin: 0px;
diff --git a/frontend/hide-ui.css b/frontend/hide-ui.css
index 819dd32c34..e4861a62f2 100644
--- a/frontend/hide-ui.css
+++ b/frontend/hide-ui.css
@@ -10,6 +10,8 @@ pluto-input > button,
 pluto-shoulder,
 footer,
 pluto-runarea,
-#helpbox-wrapper {
+#helpbox-wrapper,
+.edit_or_run,
+pkg-status-mark {
     display: none !important;
 }

From c0bea128137add2b1ece2a8b99563b4ff889954a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 23 Jan 2023 15:58:31 +0100
Subject: [PATCH 578/821] Update JuliaMono to 0.047

---
 frontend/juliamono.css | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/juliamono.css b/frontend/juliamono.css
index 33535553c7..cd3d10d465 100644
--- a/frontend/juliamono.css
+++ b/frontend/juliamono.css
@@ -1,6 +1,6 @@
 @font-face {
     font-family: JuliaMono;
-    src: url("https://cdn.jsdelivr.net/gh/cormullion/juliamono@0.043/webfonts/JuliaMono-RegularLatin.woff2") format("woff2");
+    src: url("https://cdn.jsdelivr.net/gh/cormullion/juliamono@0.047/webfonts/JuliaMono-RegularLatin.woff2") format("woff2");
     font-display: swap;
     font-weight: 400;
     unicode-range: U+00-7F; /* Basic Latin characters */
@@ -8,7 +8,7 @@
 
 @font-face {
     font-family: JuliaMono;
-    src: url("https://cdn.jsdelivr.net/gh/cormullion/juliamono@0.043/webfonts/JuliaMono-BoldLatin.woff2") format("woff2");
+    src: url("https://cdn.jsdelivr.net/gh/cormullion/juliamono@0.047/webfonts/JuliaMono-BoldLatin.woff2") format("woff2");
     font-display: swap;
     font-weight: 700;
     unicode-range: U+00-7F; /* Basic Latin characters */
@@ -16,21 +16,21 @@
 
 @font-face {
     font-family: JuliaMono;
-    src: url("https://cdn.jsdelivr.net/gh/cormullion/juliamono@0.043/webfonts/JuliaMono-Regular.woff2") format("woff2");
+    src: url("https://cdn.jsdelivr.net/gh/cormullion/juliamono@0.047/webfonts/JuliaMono-Regular.woff2") format("woff2");
     font-display: swap;
     font-weight: 400;
 }
 
 @font-face {
     font-family: JuliaMono;
-    src: url("https://cdn.jsdelivr.net/gh/cormullion/juliamono@0.043/webfonts/JuliaMono-Bold.woff2") format("woff2");
+    src: url("https://cdn.jsdelivr.net/gh/cormullion/juliamono@0.047/webfonts/JuliaMono-Bold.woff2") format("woff2");
     font-display: swap;
     font-weight: 700;
 }
 
 @font-face {
     font-family: JuliaMono;
-    src: url("https://cdn.jsdelivr.net/gh/cormullion/juliamono@0.043/webfonts/JuliaMono-RegularItalic.woff2") format("woff2");
+    src: url("https://cdn.jsdelivr.net/gh/cormullion/juliamono@0.047/webfonts/JuliaMono-RegularItalic.woff2") format("woff2");
     font-display: swap;
     font-weight: 400;
     font-style: italic;

From 2ea897fe1fb52304011f1c23839e3307585a0b5b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 23 Jan 2023 15:59:20 +0100
Subject: [PATCH 579/821] CompilerOptions: add compiled_modules,
 sysimage_native_code, depwarn, min_optlevel, inline, check_bounds (#2455)

---
 src/Configuration.jl | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index 372ff32ed7..70b80f76b6 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -165,9 +165,15 @@ These options are not intended to be changed during normal use.
 end
 
 const COMPILE_DEFAULT = nothing
+const COMPILED_MODULES_DEFAULT = nothing
 const SYSIMAGE_DEFAULT = nothing
+const SYSIMAGE_NATIVE_CODE_DEFAULT = nothing
 const BANNER_DEFAULT = nothing
+const DEPWARN_DEFAULT = nothing
 const OPTIMIZE_DEFAULT = nothing
+const MIN_OPTLEVEL_DEFAULT = nothing
+const INLINE_DEFAULT = nothing
+const CHECK_BOUNDS_DEFAULT = nothing
 const MATH_MODE_DEFAULT = nothing
 const STARTUP_FILE_DEFAULT = "no"
 const HISTORY_FILE_DEFAULT = "no"
@@ -206,9 +212,15 @@ These options will be passed as command line argument to newly launched processe
 
 # Arguments
 - `compile::Union{Nothing,String} = $COMPILE_DEFAULT`
+- `compiled_modules::Union{Nothing,String} = $COMPILED_MODULES_DEFAULT`
 - `sysimage::Union{Nothing,String} = $SYSIMAGE_DEFAULT`
+- `sysimage_native_code::Union{Nothing,String} = $SYSIMAGE_NATIVE_CODE_DEFAULT`
 - `banner::Union{Nothing,String} = $BANNER_DEFAULT`
+- `depwarn::Union{Nothing,String} = $DEPWARN_DEFAULT`
 - `optimize::Union{Nothing,Int} = $OPTIMIZE_DEFAULT`
+- `min_optlevel::Union{Nothing,Int} = $MIN_OPTLEVEL_DEFAULT`
+- `inline::Union{Nothing,String} = $INLINE_DEFAULT`
+- `check_bounds::Union{Nothing,String} = $CHECK_BOUNDS_DEFAULT`
 - `math_mode::Union{Nothing,String} = $MATH_MODE_DEFAULT`
 - `startup_file::Union{Nothing,String} = "$STARTUP_FILE_DEFAULT"` By default, the startup file isn't loaded in notebooks.
 - `history_file::Union{Nothing,String} = "$HISTORY_FILE_DEFAULT"` By default, the history isn't loaded in notebooks.
@@ -216,9 +228,18 @@ These options will be passed as command line argument to newly launched processe
 """
 @option mutable struct CompilerOptions
     compile::Union{Nothing,String} = COMPILE_DEFAULT
+    compiled_modules::Union{Nothing,String} = COMPILED_MODULES_DEFAULT
+
     sysimage::Union{Nothing,String} = SYSIMAGE_DEFAULT
+    sysimage_native_code::Union{Nothing,String} = SYSIMAGE_NATIVE_CODE_DEFAULT
+
     banner::Union{Nothing,String} = BANNER_DEFAULT
+    depwarn::Union{Nothing,String} = DEPWARN_DEFAULT
+
     optimize::Union{Nothing,Int} = OPTIMIZE_DEFAULT
+    min_optlevel::Union{Nothing,Int} = MIN_OPTLEVEL_DEFAULT
+    inline::Union{Nothing,String} = INLINE_DEFAULT
+    check_bounds::Union{Nothing,String} = CHECK_BOUNDS_DEFAULT
     math_mode::Union{Nothing,String} = MATH_MODE_DEFAULT
 
     # notebook specified options
@@ -262,17 +283,26 @@ function from_flat_kwargs(;
         simulated_pkg_lag::Real = SIMULATED_PKG_LAG_DEFAULT,
         injected_javascript_data_url::String = INJECTED_JAVASCRIPT_DATA_URL_DEFAULT,
         on_event::Function = ON_EVENT_DEFAULT,
+
         require_secret_for_open_links::Bool = REQUIRE_SECRET_FOR_OPEN_LINKS_DEFAULT,
         require_secret_for_access::Bool = REQUIRE_SECRET_FOR_ACCESS_DEFAULT,
+
         run_notebook_on_load::Bool = RUN_NOTEBOOK_ON_LOAD_DEFAULT,
         workspace_use_distributed::Bool = WORKSPACE_USE_DISTRIBUTED_DEFAULT,
         lazy_workspace_creation::Bool = LAZY_WORKSPACE_CREATION_DEFAULT,
         capture_stdout::Bool = CAPTURE_STDOUT_DEFAULT,
         workspace_custom_startup_expr::Union{Nothing,Expr} = WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT,
+
         compile::Union{Nothing,String} = COMPILE_DEFAULT,
+        compiled_modules::Union{Nothing,String} = COMPILED_MODULES_DEFAULT,
         sysimage::Union{Nothing,String} = SYSIMAGE_DEFAULT,
+        sysimage_native_code::Union{Nothing,String} = SYSIMAGE_NATIVE_CODE_DEFAULT,
         banner::Union{Nothing,String} = BANNER_DEFAULT,
+        depwarn::Union{Nothing,String} = DEPWARN_DEFAULT,
         optimize::Union{Nothing,Int} = OPTIMIZE_DEFAULT,
+        min_optlevel::Union{Nothing,Int} = MIN_OPTLEVEL_DEFAULT,
+        inline::Union{Nothing,String} = INLINE_DEFAULT,
+        check_bounds::Union{Nothing,String} = CHECK_BOUNDS_DEFAULT,
         math_mode::Union{Nothing,String} = MATH_MODE_DEFAULT,
         startup_file::Union{Nothing,String} = STARTUP_FILE_DEFAULT,
         history_file::Union{Nothing,String} = HISTORY_FILE_DEFAULT,
@@ -312,9 +342,15 @@ function from_flat_kwargs(;
     )
     compiler = CompilerOptions(;
         compile,
+        compiled_modules,
         sysimage,
+        sysimage_native_code,
         banner,
+        depwarn,
         optimize,
+        min_optlevel,
+        inline,
+        check_bounds,
         math_mode,
         startup_file,
         history_file,

From 7322a2d2725cc4af58cc77d18171598657797fa6 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 24 Jan 2023 00:13:08 +0100
Subject: [PATCH 580/821] minor contrast improvements

---
 frontend/dark_color.css | 6 ++++++
 frontend/editor.css     | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index a04b2623bb..a43d151a63 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -227,6 +227,12 @@
         --cm-md-color: #a2c9d5;
         --cm-md-accent-color: #00a9d1;
     }
+
+    @media (prefers-contrast: more) {
+        :root {
+            --cm-line-numbers-color: #b3b3b3;
+        }
+    }
     body:not(.disable_ui):not(.more-specificity) {
         /* background by SVGBackgrounds.com */
         /* background-color: #0e2a2a; */
diff --git a/frontend/editor.css b/frontend/editor.css
index b8a6b92fd0..494fe87f70 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2818,7 +2818,7 @@ pluto-log-dot.Stdout {
     --inner: hsl(36deg 20% 37%);
     --outer: hsl(31deg 12% 28%);
     background: radial-gradient(var(--inner), var(--inner) 20%, var(--outer));
-    color: #8ed975;
+    color: #c0ffab;
     border: 6px solid #b7b7b7;
     text-shadow: 1px 1px 2px #0000005e;
     min-width: 18em;
@@ -2877,6 +2877,11 @@ a.stdout-info {
         animation-play-state: running;
     }
 }
+@media (prefers-contrast: more) {
+    pluto-log-dot.Stdout::after {
+        display: none !important;
+    }
+}
 
 pluto-log-dot jlerror {
     display: block;
@@ -3158,6 +3163,7 @@ pluto-cell.code_differs .cm-editor .cm-gutters {
     position: absolute;
     right: 3px;
     pointer-events: none;
+    color: #b3b3b3;
 }
 .cm-editor .cm-lineNumbers .cm-gutterElement:hover {
     color: var(--cm-line-numbers-color);

From ec89d6499f92909d1008241579521f78bcbeee46 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 24 Jan 2023 00:13:43 +0100
Subject: [PATCH 581/821] minor contrast improvements

---
 frontend/editor.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 494fe87f70..84b329c60d 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -3163,7 +3163,6 @@ pluto-cell.code_differs .cm-editor .cm-gutters {
     position: absolute;
     right: 3px;
     pointer-events: none;
-    color: #b3b3b3;
 }
 .cm-editor .cm-lineNumbers .cm-gutterElement:hover {
     color: var(--cm-line-numbers-color);

From c943e9fd1f67017b8a0c10510f2212a6667ff8d2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 24 Jan 2023 01:25:51 +0100
Subject: [PATCH 582/821] CompilerOptions: add pkgimages (Julia 1.9) (#2456)

---
 src/Configuration.jl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index 70b80f76b6..353458b023 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -165,6 +165,7 @@ These options are not intended to be changed during normal use.
 end
 
 const COMPILE_DEFAULT = nothing
+const PKGIMAGES_DEFAULT = nothing
 const COMPILED_MODULES_DEFAULT = nothing
 const SYSIMAGE_DEFAULT = nothing
 const SYSIMAGE_NATIVE_CODE_DEFAULT = nothing
@@ -212,6 +213,7 @@ These options will be passed as command line argument to newly launched processe
 
 # Arguments
 - `compile::Union{Nothing,String} = $COMPILE_DEFAULT`
+- `pkgimages::Union{Nothing,String} = $PKGIMAGES_DEFAULT`
 - `compiled_modules::Union{Nothing,String} = $COMPILED_MODULES_DEFAULT`
 - `sysimage::Union{Nothing,String} = $SYSIMAGE_DEFAULT`
 - `sysimage_native_code::Union{Nothing,String} = $SYSIMAGE_NATIVE_CODE_DEFAULT`
@@ -228,6 +230,7 @@ These options will be passed as command line argument to newly launched processe
 """
 @option mutable struct CompilerOptions
     compile::Union{Nothing,String} = COMPILE_DEFAULT
+    pkgimages::Union{Nothing,String} = PKGIMAGES_DEFAULT
     compiled_modules::Union{Nothing,String} = COMPILED_MODULES_DEFAULT
 
     sysimage::Union{Nothing,String} = SYSIMAGE_DEFAULT
@@ -294,6 +297,7 @@ function from_flat_kwargs(;
         workspace_custom_startup_expr::Union{Nothing,Expr} = WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT,
 
         compile::Union{Nothing,String} = COMPILE_DEFAULT,
+        pkgimages::Union{Nothing,String} = PKGIMAGES_DEFAULT,
         compiled_modules::Union{Nothing,String} = COMPILED_MODULES_DEFAULT,
         sysimage::Union{Nothing,String} = SYSIMAGE_DEFAULT,
         sysimage_native_code::Union{Nothing,String} = SYSIMAGE_NATIVE_CODE_DEFAULT,
@@ -342,6 +346,7 @@ function from_flat_kwargs(;
     )
     compiler = CompilerOptions(;
         compile,
+        pkgimages,
         compiled_modules,
         sysimage,
         sysimage_native_code,

From 17da71b6ad278df540ddb8a9339bd2ef721c29be Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Wed, 25 Jan 2023 19:12:12 +0100
Subject: [PATCH 583/821] Don't cleanup variables not defined in Pluto
 workspaces. (#2459)

---
 src/runner/PlutoRunner.jl | 54 ++++++++++++++++++++++++++++++-------
 test/React.jl             | 57 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 100 insertions(+), 11 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 31cce87b7a..575cdad13c 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -82,15 +82,17 @@ const workspace_preamble = [
     :(show, showable, showerror, repr, string, print, println), # https://github.com/JuliaLang/julia/issues/18181
 ]
 
+const PLUTO_INNER_MODULE_NAME = Symbol("#___this_pluto_module_name")
+
 const moduleworkspace_count = Ref(0)
 function increment_current_module()::Symbol
     id = (moduleworkspace_count[] += 1)
     new_workspace_name = Symbol("workspace#", id)
 
-    new_module = Core.eval(Main, :(
+    Core.eval(Main, :(
         module $(new_workspace_name)
             $(workspace_preamble...)
-            const var"#___this_module_name" = $(new_workspace_name)
+            const $(PLUTO_INNER_MODULE_NAME) = $(new_workspace_name)
         end
     ))
 
@@ -121,8 +123,7 @@ We don't re-build the macro in every workspace, so we need to remove these refs
 TODO? Don't remove the refs, but instead replace them with a new ref pointing to the new module?
 """
 function collect_and_eliminate_globalrefs!(ref::GlobalRef, mutable_ref_list=[])
-    test_mod_name = nameof(ref.mod) |> string
-    if startswith(test_mod_name, "workspace#")
+    if is_pluto_workspace(ref.mod)
         new_name = gensym(ref.name)
         push!(mutable_ref_list, ref.name => new_name)
         new_name
@@ -177,8 +178,8 @@ replace_pluto_properties_in_expr(::GiveMeCellID; cell_id, kwargs...) = cell_id
 replace_pluto_properties_in_expr(::GiveMeRerunCellFunction; rerun_cell_function, kwargs...) = rerun_cell_function
 replace_pluto_properties_in_expr(::GiveMeRegisterCleanupFunction; register_cleanup_function, kwargs...) = register_cleanup_function
 replace_pluto_properties_in_expr(expr::Expr; kwargs...) = Expr(expr.head, map(arg -> replace_pluto_properties_in_expr(arg; kwargs...), expr.args)...)
-replace_pluto_properties_in_expr(m::Module; kwargs...) = if startswith(string(nameof(m)), "workspace#")
-    Symbol("#___this_module_name")
+replace_pluto_properties_in_expr(m::Module; kwargs...) = if is_pluto_workspace(m)
+    PLUTO_INNER_MODULE_NAME
 else
     m
 end
@@ -715,10 +716,14 @@ function move_vars(
 
                 try
                     # We are clearing this variable from the notebook, so we need to find it's root
-                    # Just clearing out the definition in the old_module, besides giving an error (so that's what that `catch; end` is for)
+                    # If its root is "controlled" by Pluto's workspace system (and is not a package module for example),
+                    # we are just clearing out the definition in the old_module, besides giving an error
+                    # (so that's what that `catch; end` is for)
                     # will not actually free it from Julia, the older module will still have a reference.
                     module_to_remove_from = which(old_workspace, symbol)
-                    Core.eval(module_to_remove_from, :($(symbol) = nothing))
+                    if is_pluto_controlled(module_to_remove_from) && !isconst(module_to_remove_from, symbol)
+                        Core.eval(module_to_remove_from, :($(symbol) = nothing))
+                    end
                 catch; end # sometimes impossible, eg. when $symbol was constant
             end
         else
@@ -1680,8 +1685,37 @@ completion_detail(completion::BslashCompletion) =
         nothing
 
 function is_pluto_workspace(m::Module)
-    mod_name = nameof(m) |> string
-    startswith(mod_name, "workspace#")
+    isdefined(m, PLUTO_INNER_MODULE_NAME) &&
+        which(m, PLUTO_INNER_MODULE_NAME) == m
+end
+
+"""
+Returns wether the module is a pluto workspace or any of its ancestors is.
+
+For example, writing the following julia code in Pluto:
+
+```julia
+import Plots
+
+module A
+end
+```
+
+will give the following module tree:
+
+```
+Main                 (not pluto controlled)
+└── var"workspace#1" (pluto controlled)
+    └── A            (pluto controlled)
+└── var"workspace#2" (pluto controlled)
+    └── A            (pluto controlled)
+Plots                (not pluto controlled)
+```
+"""
+function is_pluto_controlled(m::Module)
+    is_pluto_workspace(m) && return true
+    parent = parentmodule(m)
+    parent != m && is_pluto_controlled(parent)
 end
 
 function completions_exported(cs::Vector{<:Completion})
diff --git a/test/React.jl b/test/React.jl
index b5bbd71bea..191540c53a 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -287,7 +287,62 @@ import Distributed
         @test comesbefore(run_order, 4, 3)
     end
 
-    
+    @testset "Cleanup of workspace variable" begin
+        notebook = Notebook([
+            Cell("x = 10000"),
+        ])
+
+        update_run!(🍭, notebook, notebook.cells[1:1])
+
+        @test haskey(WorkspaceManager.active_workspaces, notebook.notebook_id)
+        w = fetch(WorkspaceManager.active_workspaces[notebook.notebook_id])
+        oldmod = getproperty(Main, w.module_name)
+
+        setcode!(notebook.cells[begin], "")
+        update_run!(🍭, notebook, notebook.cells[1:1])
+
+        @test isdefined(oldmod, :x)
+        @test isnothing(getproperty(oldmod, :x))
+
+        newmod = getproperty(Main, w.module_name)
+        @test !isdefined(newmod, :x)
+    end
+
+    @testset "Cleanup only Pluto controlled modules" begin
+        notebook = Notebook([
+            Cell("""Core.eval(Main, :(
+                 module var\"Pluto#2443\"
+                    x = 1000
+                 end
+            ))"""),
+            Cell("import .Main.var\"Pluto#2443\": x"),
+            Cell("x"),
+        ])
+
+        update_run!(🍭, notebook, notebook.cells)
+        @test noerror(notebook.cells[1])
+        @test noerror(notebook.cells[2])
+        @test noerror(notebook.cells[3])
+
+        @test haskey(WorkspaceManager.active_workspaces, notebook.notebook_id)
+        w = fetch(WorkspaceManager.active_workspaces[notebook.notebook_id])
+        oldmod = getproperty(Main, w.module_name)
+
+        setcode!(notebook.cells[2], "")
+        setcode!(notebook.cells[3], "")
+
+        update_run!(🍭, notebook, notebook.cells)
+
+        @test isdefined(oldmod, :x)
+        @test which(oldmod, :x) != oldmod
+        @test !isnothing(getproperty(oldmod, :x))
+
+        newmod = getproperty(Main, w.module_name)
+        @test !isdefined(newmod, :x)
+
+        @test !isnothing(Main.var"Pluto#2443".x)
+    end
+
     @testset "Mixed usings and reactivity" begin
         notebook = Notebook([
             Cell("a; using Dates"),

From 469b82b36877b03969020efd946bac16b3400557 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 26 Jan 2023 17:06:08 +0100
Subject: [PATCH 584/821] Fix Cmd+Click behaviour on local variables

Continued from #2452
---
 .../components/CellInput/go_to_definition_plugin.js    | 10 ++++++++++
 frontend/components/Editor.js                          |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/frontend/components/CellInput/go_to_definition_plugin.js b/frontend/components/CellInput/go_to_definition_plugin.js
index 8d8ad4994f..4dd753747f 100644
--- a/frontend/components/CellInput/go_to_definition_plugin.js
+++ b/frontend/components/CellInput/go_to_definition_plugin.js
@@ -151,6 +151,16 @@ export const go_to_definition_plugin = ViewPlugin.fromClass(
                         let variable_from = Number(cell_variable.getAttribute("data-cell-variable-from"))
                         let variable_to = Number(cell_variable.getAttribute("data-cell-variable-to"))
 
+                        if (variable_name == null || variable_from == null || variable_to == null) {
+                            return false
+                        }
+
+                        if (!(has_ctrl_or_cmd_pressed(event) || view.state.readOnly)) {
+                            return false
+                        }
+
+                        event.preventDefault()
+
                         view.dispatch({
                             scrollIntoView: true,
                             selection: { anchor: variable_from, head: variable_to },
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 9a5a5843b6..dabbe9c7a0 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1122,7 +1122,7 @@ patch: ${JSON.stringify(
         const set_ctrl_down = (value) => {
             if (value !== ctrl_down_last_val.current) {
                 ctrl_down_last_val.current = value
-                document.body.querySelectorAll("[data-pluto-variable]").forEach((el) => {
+                document.body.querySelectorAll("[data-pluto-variable], [data-cell-variable]").forEach((el) => {
                     el.setAttribute("data-ctrl-down", value ? "true" : "false")
                 })
             }

From cffd65a2c55f4e23eb2537e170dab690fb56e657 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 27 Jan 2023 11:19:29 +0100
Subject: [PATCH 585/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index b501d3a453..25b117e624 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.20"
+version = "0.19.21"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From ee20b89315480ee95dca98487ecd6b70110615dd Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 27 Jan 2023 14:03:27 +0100
Subject: [PATCH 586/821] =?UTF-8?q?=F0=9F=99=8A=20Fix=20hidden=20Edit=20or?=
 =?UTF-8?q?=20Run=20button?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Project.toml         |  2 +-
 frontend/hide-ui.css | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Project.toml b/Project.toml
index 25b117e624..01c52b0836 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.21"
+version = "0.19.22"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
diff --git a/frontend/hide-ui.css b/frontend/hide-ui.css
index e4861a62f2..72b6d8d140 100644
--- a/frontend/hide-ui.css
+++ b/frontend/hide-ui.css
@@ -1,3 +1,5 @@
+/* This CSS file will be loaded when you print the notebook (@media print), or when the disable_ui frontend parameter is set (in a static HTML export). */
+
 main {
     margin-top: 20px;
     cursor: auto;
@@ -10,8 +12,14 @@ pluto-input > button,
 pluto-shoulder,
 footer,
 pluto-runarea,
-#helpbox-wrapper,
-.edit_or_run,
-pkg-status-mark {
+#helpbox-wrapper {
     display: none !important;
 }
+
+/* These next rules only apply to @media print, i.e. the PDF export. We want to hide these items in the PDF, but not in a static HTML. */
+@media print {
+    .edit_or_run,
+    pkg-status-mark {
+        display: none !important;
+    }
+}

From 75c8de02d5289a95587f38132ca8beb7e9413807 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 30 Jan 2023 01:56:09 +0100
Subject: [PATCH 587/821] AbstractPlutoDingetjes.transform_value: better error
 message

---
 src/runner/PlutoRunner.jl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 575cdad13c..96ab0f2eed 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1938,8 +1938,14 @@ function transform_bond_value(s::Symbol, value_from_js)
     return try
         transform_value_ref[](element, value_from_js)
     catch e
-        @error "AbstractPlutoDingetjes: Bond value transformation errored." exception=(e, catch_backtrace())
-        (Text("❌ AbstractPlutoDingetjes: Bond value transformation errored."), e, stacktrace(catch_backtrace()), value_from_js)
+        @error "🚨 AbstractPlutoDingetjes: Bond value transformation errored." exception=(e, catch_backtrace())
+        (;
+            message=Text("🚨 AbstractPlutoDingetjes: Bond value transformation errored."), 
+            exception=Text(
+                sprint(showerror, e, stacktrace(catch_backtrace()))
+            ),
+            value_from_js,
+        )
     end
 end
 

From 8d825151f1d771d123f7448d620acc06105230b5 Mon Sep 17 00:00:00 2001
From: tecosaur <notifications.github@tec.tecosaur.net>
Date: Wed, 8 Feb 2023 02:43:36 +0800
Subject: [PATCH 588/821] Change "Static PDF" export title to just "PDF"
 (#2469)

---
 frontend/components/ExportBanner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index 458af3e9c7..0c1bac5383 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -54,7 +54,7 @@ export const ExportBanner = ({ notebook_id, onClose, notebookfile_url, notebooke
                     <section>An <b>.html</b> file for your web page, or to share online.</section>
                 </a>
                 <a href="#" class="export_card" onClick=${() => window.print()}>
-                    <header><${Square} fill="#619b3d" /> Static PDF</header>
+                    <header><${Square} fill="#619b3d" /> PDF</header>
                     <section>A static <b>.pdf</b> file for print or email.</section>
                 </a>
                 ${

From 994ba026386ebf89999eb0ef6057c0bc93eae6a0 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 7 Feb 2023 19:45:52 +0100
Subject: [PATCH 589/821] update link to plutojl.org

---
 frontend/components/Editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index dabbe9c7a0..a036274fcc 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1576,7 +1576,7 @@ patch: ${JSON.stringify(
                             <a href="https://github.com/fonsp/Pluto.jl/wiki" target="_blank">FAQ</a>
                             <span style="flex: 1"></span>
                             <form id="feedback" action="#" method="post">
-                                <label for="opinion">🙋 How can we make <a href="https://github.com/fonsp/Pluto.jl" target="_blank">Pluto.jl</a> better?</label>
+                                <label for="opinion">🙋 How can we make <a href="https://plutojl.org/" target="_blank">Pluto.jl</a> better?</label>
                                 <input type="text" name="opinion" id="opinion" autocomplete="off" placeholder="Instant feedback..." />
                                 <button>Send</button>
                             </form>

From 84ec0472824cef1716e3219bf77ba1f0da31aeb2 Mon Sep 17 00:00:00 2001
From: Vikrantpalle <vikrantpalle@gmail.com>
Date: Mon, 20 Feb 2023 16:22:27 +0530
Subject: [PATCH 590/821] Fix #2474 (#2481)

---
 frontend/hide-ui.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/hide-ui.css b/frontend/hide-ui.css
index 72b6d8d140..afcb5bf12c 100644
--- a/frontend/hide-ui.css
+++ b/frontend/hide-ui.css
@@ -19,7 +19,8 @@ pluto-runarea,
 /* These next rules only apply to @media print, i.e. the PDF export. We want to hide these items in the PDF, but not in a static HTML. */
 @media print {
     .edit_or_run,
-    pkg-status-mark {
+    pkg-status-mark,
+    nav#undo_delete {
         display: none !important;
     }
 }

From 91b0e9280840817bedb11227fc9980753f75246c Mon Sep 17 00:00:00 2001
From: Alberto Mengali <disberd@gmail.com>
Date: Mon, 20 Feb 2023 22:02:08 +0100
Subject: [PATCH 591/821] Update skipped/disabled cell dependency before saving
 notebook (#2239)

* Add function to update disabled_cells_dependency

* update disabled/skipped dependency inside load_notebook

* add a test

---------

Co-authored-by: Paul Berg <paul@plutojl.org>
---
 src/evaluation/Run.jl              | 11 +++++++++++
 src/notebook/saving and loading.jl |  3 +++
 test/Notebook.jl                   |  8 ++++++++
 3 files changed, 22 insertions(+)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 561fd9b098..d58c31b710 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -617,3 +617,14 @@ function update_skipped_cells_dependency!(notebook::Notebook, topology::Notebook
         cell.depends_on_skipped_cells = true
     end
 end
+
+function update_disabled_cells_dependency!(notebook::Notebook, topology::NotebookTopology=notebook.topology)
+    disabled_cells = filter(is_disabled, notebook.cells)
+    indirectly_disabled = collect(topological_order(topology, disabled_cells))
+    for cell in notebook.cells
+        cell.depends_on_disabled_cells = false
+    end
+    for cell in indirectly_disabled
+        cell.depends_on_disabled_cells = true
+    end
+end
diff --git a/src/notebook/saving and loading.jl b/src/notebook/saving and loading.jl
index b0299ddd48..b081d8c749 100644
--- a/src/notebook/saving and loading.jl	
+++ b/src/notebook/saving and loading.jl	
@@ -340,6 +340,9 @@ function load_notebook(path::String; disable_writing_notebook_files::Bool=false)
     loaded = load_notebook_nobackup(path)
     # Analyze cells so that the initial save is in topological order
     loaded.topology = updated_topology(loaded.topology, loaded, loaded.cells) |> static_resolve_topology
+    # We update cell dependency on skip_as_script and disabled to avoid removing block comments on the file. See https://github.com/fonsp/Pluto.jl/issues/2182
+    update_disabled_cells_dependency!(loaded)
+    update_skipped_cells_dependency!(loaded)
     update_dependency_cache!(loaded)
 
     disable_writing_notebook_files || save_notebook(loaded)
diff --git a/test/Notebook.jl b/test/Notebook.jl
index c295fcc6dd..1fc4776502 100644
--- a/test/Notebook.jl
+++ b/test/Notebook.jl
@@ -274,6 +274,13 @@ end
         @test !isdefined(m, :skipped_var)
         @test !isdefined(m, :dependent_var)
         @test m.non_skipped_var == 15
+
+        # Test that `load_notebook` doesn't break commented out cells
+        load_notebook(nb.path)
+        m = ingredients(nb.path)
+        @test !isdefined(m, :skipped_var)
+        @test !isdefined(m, :dependent_var)
+        @test m.non_skipped_var == 15
         
         nb.cells[1].metadata["skip_as_script"] = false
         update_skipped_cells_dependency!(nb)
@@ -283,6 +290,7 @@ end
         @test m.skipped_var == 10
         @test m.non_skipped_var == 15        
         @test m.dependent_var == 11
+
         
         WorkspaceManager.unmake_workspace((🍭, nb); verbose=false)
     end

From d7abb4ec965dedefd7fbfdad4a089cc36da5e8e7 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 28 Feb 2023 14:19:14 +0100
Subject: [PATCH 592/821] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 824fb1b002..613c7a3cf4 100644
--- a/README.md
+++ b/README.md
@@ -172,9 +172,9 @@ The Pluto project is an ambition to [_rethink what a programming environment sho
 
 ### You can chat with us
 
--   contact me (fonsi) **[via email](mailto:fons@plutojl.org)** or on my <a href="https://whereby.com/plutojl"><b>video chat room</b></a> (wait a minute for me to join)
 -   talk with fellow Pluto users in the **[Zulip chat room](https://gist.github.com/fonsp/db7d00fd3fe5bc0b379b4af9ec6674b6)** (_search for the `pluto.jl` stream_)
 -   use Pluto's **[built-in feedback system:](https://github.com/fonsp/Pluto.jl/issues/182#issue-637726414)**
+-   contact fons **[via email](mailto:fons@plutojl.org)**
 
 <img alt="feedback screencap" src="https://user-images.githubusercontent.com/6933510/84502876-6f08db00-acb9-11ea-84c3-f5daaba29273.png" width="100%">
 

From 776cbf7cb37770dbc60bc037737ed143a1fa0f58 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Tue, 28 Feb 2023 20:16:05 +0100
Subject: [PATCH 593/821] Unregister Bonds at the start of the reactive run.
 (#2467)

* Use `PlutoRunner.move_vars` to deregister Bond elements

* Use `GiveCellID` in `@bind`
---
 src/evaluation/RunBonds.jl         | 26 ++++++++++++------
 src/evaluation/WorkspaceManager.jl |  4 ++-
 src/runner/PlutoRunner.jl          | 18 +++++++------
 test/Bonds.jl                      | 42 +++++++++++++++++++++++-------
 4 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/src/evaluation/RunBonds.jl b/src/evaluation/RunBonds.jl
index d23a212855..291b6eef85 100644
--- a/src/evaluation/RunBonds.jl
+++ b/src/evaluation/RunBonds.jl
@@ -1,7 +1,7 @@
-function set_bond_values_reactive(; 
-    session::ServerSession, notebook::Notebook, 
-    bound_sym_names::AbstractVector{Symbol}, 
-    is_first_values::AbstractVector{Bool}=[false for x in bound_sym_names], 
+function set_bond_values_reactive(;
+    session::ServerSession, notebook::Notebook,
+    bound_sym_names::AbstractVector{Symbol},
+    is_first_values::AbstractVector{Bool}=[false for x in bound_sym_names],
     initiator=nothing,
     kwargs...
 )::Union{Task,TopologicalOrder}
@@ -39,13 +39,23 @@ function set_bond_values_reactive(;
 
     new_values = Any[notebook.bonds[bound_sym].value for bound_sym in syms_to_set]
     bond_value_pairs = zip(syms_to_set, new_values)
-    
+
+    syms_to_set_set = Set{Symbol}(syms_to_set)
     function custom_deletion_hook((session, notebook)::Tuple{ServerSession,Notebook}, old_workspace_name, new_workspace_name, to_delete_vars::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, to_reimport::Set{Expr}, invalidated_cell_uuids::Set{UUID}; to_run::AbstractVector{Cell})
-        to_delete_vars = Set([to_delete_vars..., syms_to_set...]) # also delete the bound symbols
-        WorkspaceManager.move_vars((session, notebook), old_workspace_name, new_workspace_name, to_delete_vars, methods_to_delete, to_reimport, invalidated_cell_uuids)
+        to_delete_vars = union(to_delete_vars, syms_to_set_set) # also delete the bound symbols
+        WorkspaceManager.move_vars(
+            (session, notebook),
+            old_workspace_name,
+            new_workspace_name,
+            to_delete_vars,
+            methods_to_delete,
+            to_reimport,
+            invalidated_cell_uuids,
+            syms_to_set_set,
+        )
         set_bond_value_pairs!(session, notebook, zip(syms_to_set, new_values))
     end
-    to_reeval = where_referenced(notebook, notebook.topology, Set{Symbol}(syms_to_set))
+    to_reeval = where_referenced(notebook, notebook.topology, syms_to_set_set)
 
     run_reactive_async!(session, notebook, to_reeval; deletion_hook=custom_deletion_hook, save=false, user_requested_run=false, run_async=false, bond_value_pairs, kwargs...)
 end
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 0f16165302..78be0b281a 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -596,7 +596,8 @@ function move_vars(
     to_delete::Set{Symbol},
     methods_to_delete::Set{Tuple{UUID,FunctionName}},
     module_imports_to_move::Set{Expr},
-    invalidated_cell_uuids::Set{UUID};
+    invalidated_cell_uuids::Set{UUID},
+    keep_registered::Set{Symbol}=Set{Symbol}();
     kwargs...
     )
 
@@ -611,6 +612,7 @@ function move_vars(
             $methods_to_delete,
             $module_imports_to_move,
             $invalidated_cell_uuids,
+            $keep_registered,
         )
     end)
 end
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 96ab0f2eed..cf187d9a51 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -529,9 +529,6 @@ function run_expression(
     cell_published_objects[cell_id] = Dict{String,Any}()
 
     # reset registered bonds
-    for s in get(cell_registered_bond_names, cell_id, Set{Symbol}())
-        delete!(registered_bond_elements, s)
-    end
     cell_registered_bond_names[cell_id] = Set{Symbol}()
 
     # If the cell contains macro calls, we want those macro calls to preserve their identity,
@@ -683,6 +680,7 @@ function move_vars(
     methods_to_delete::Set{Tuple{UUID,Vector{Symbol}}},
     module_imports_to_move::Set{Expr},
     invalidated_cell_uuids::Set{UUID},
+    keep_registered::Set{Symbol},
 )
     old_workspace = getfield(Main, old_workspace_name)
     new_workspace = getfield(Main, new_workspace_name)
@@ -706,6 +704,10 @@ function move_vars(
         if (symbol ∈ vars_to_delete) || (symbol ∈ name_symbols_of_funcs_with_no_methods_left)
             # var will be redefined - unreference the value so that GC can snoop it
 
+            if haskey(registered_bond_elements, symbol) && symbol ∉ keep_registered
+                delete!(registered_bond_elements, symbol)
+            end
+
             # free memory for other variables
             # & delete methods created in the old module:
             # for example, the old module might extend an imported function:
@@ -2012,8 +2014,8 @@ struct Bond
     Bond(element, defines::Symbol) = showable(MIME"text/html"(), element) ? new(element, defines, Base64.base64encode(rand(UInt8,9))) : error("""Can only bind to html-showable objects, ie types T for which show(io, ::MIME"text/html", x::T) is defined.""")
 end
 
-function create_bond(element, defines::Symbol)
-    push!(cell_registered_bond_names[currently_running_cell_id[]], defines)
+function create_bond(element, defines::Symbol, cell_id::UUID)
+    push!(cell_registered_bond_names[cell_id], defines)
     registered_bond_elements[defines] = element
     Bond(element, defines)
 end
@@ -2051,10 +2053,10 @@ The second cell will show the square of `x`, and is updated in real-time as the
 macro bind(def, element)    
 	if def isa Symbol
 		quote
-            $(load_integrations_if_needed)()
+			$(load_integrations_if_needed)()
 			local el = $(esc(element))
-            global $(esc(def)) = Core.applicable(Base.get, el) ? Base.get(el) : $(initial_value_getter_ref)[](el)
-			PlutoRunner.create_bond(el, $(Meta.quot(def)))
+			global $(esc(def)) = Core.applicable(Base.get, el) ? Base.get(el) : $(initial_value_getter_ref)[](el)
+			PlutoRunner.create_bond(el, $(Meta.quot(def)), $(GiveMeCellID()))
 		end
 	else
 		:(throw(ArgumentError("""\nMacro example usage: \n\n\t@bind my_number html"<input type='range'>"\n\n""")))
diff --git a/test/Bonds.jl b/test/Bonds.jl
index 471de7faa3..3fe9e559c4 100644
--- a/test/Bonds.jl
+++ b/test/Bonds.jl
@@ -44,8 +44,7 @@ import Distributed
                 # 1
                 Cell("""
                 begin
-                    import AbstractPlutoDingetjes
-                    const APD = AbstractPlutoDingetjes
+                    import AbstractPlutoDingetjes as APD
                     import AbstractPlutoDingetjes.Bonds
                 end
                 """),
@@ -205,9 +204,13 @@ import Distributed
                 Cell("@bind pv4 PossibleValuesTest((x+1 for x in 1:10))"),
                 # 34
                 Cell("@bind pv5 PossibleValuesTest(1:10)"),
+
+                # 35 - https://github.com/fonsp/Pluto.jl/issues/2465
+                Cell(""),
+                Cell("@bind ts2465 TransformSlider()"),
+                Cell("ts2465"),
             ])
-        
-        
+
         function set_bond_value(name, value, is_first_value=false)
             notebook.bonds[name] = Dict("value" => value)
             Pluto.set_bond_values_reactive(; session=🍭, notebook, bound_sym_names=[name],
@@ -225,8 +228,7 @@ import Distributed
         @test notebook.cells[10].output.body == "missing"
         set_bond_value(:x_simple, 1, true)
         @test notebook.cells[10].output.body == "1"
-        
-        
+
         update_run!(🍭, notebook, notebook.cells)
 
         @test noerror(notebook.cells[1])
@@ -271,7 +273,7 @@ import Distributed
         @test noerror(notebook.cells[32])
         @test noerror(notebook.cells[33])
         @test noerror(notebook.cells[34])
-        @test length(notebook.cells) == 34
+        @test length(notebook.cells) == 37
         
         
         @test Pluto.possible_bond_values(🍭, notebook, :x_new) == [1,2,3]
@@ -326,8 +328,30 @@ import Distributed
         @test notebook.cells[25].output.body == "1"
         set_bond_value(:x_counter, 7, false)
         @test notebook.cells[25].output.body == "2"
-        
-        
+
+        # https://github.com/fonsp/Pluto.jl/issues/2465
+        update_run!(🍭, notebook, notebook.cells[35:37])
+
+        @test noerror(notebook.cells[35])
+        @test noerror(notebook.cells[36])
+        @test noerror(notebook.cells[37])
+        @test notebook.cells[37].output.body == "\"x\""
+        @test isempty(notebook.cells[35].code)
+
+        # this should not deregister the TransformSlider
+        setcode!(notebook.cells[35], notebook.cells[36].code)
+        setcode!(notebook.cells[36], "")
+
+        update_run!(🍭, notebook, notebook.cells[35:36])
+        @test noerror(notebook.cells[35])
+        @test noerror(notebook.cells[36])
+        @test notebook.cells[37].output.body == "\"x\""
+
+        set_bond_value(:ts2465, 2, false)
+        @test noerror(notebook.cells[35])
+        @test noerror(notebook.cells[36])
+        @test notebook.cells[37].output.body == "\"xx\""
+
         WorkspaceManager.unmake_workspace((🍭, notebook))
         🍭.options.evaluation.workspace_use_distributed = false
         

From a8ae9cbd1ee1ec4273e3ce71b7ab7932dc16d9c1 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Wed, 8 Mar 2023 18:50:41 +0100
Subject: [PATCH 594/821] Add latex reverse search in docs (#2476)

* Add latex reverse search

 - Use JuliaMono on the docs tab.
 - Fix unicode string indexing bug.

* Show docs for `return`

* Update PlutoRunner.jl
---
 frontend/editor.css        |  2 +-
 src/runner/PlutoRunner.jl  | 75 ++++++++++++++++++++++++--------------
 src/webserver/REPLTools.jl | 17 ++++++---
 test/Dynamic.jl            |  8 ++++
 4 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 84b329c60d..d86fa0415d 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2282,7 +2282,7 @@ pluto-helpbox pre,
 pluto-helpbox code,
 pluto-helpbox .cm-line {
     /* from https://docs.julialang.org/en/v1/assets/themes/documenter-light.css */
-    font-family: "Roboto Mono", "SFMono-Regular", "Menlo", "Consolas", "Liberation Mono", "DejaVu Sans Mono", monospace;
+    font-family: "JuliaMono", "SFMono-Regular", "Menlo", "Consolas", "Liberation Mono", "DejaVu Sans Mono", monospace;
     font-size: 0.95em;
     line-height: initial;
 }
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index cf187d9a51..8135c12989 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1866,7 +1866,7 @@ function doc_fetcher(query, workspace::Module)
     try
         parsed_query = Meta.parse(query; raise=false, depwarn=false)
 
-        doc_md = if Meta.isexpr(parsed_query, [:incomplete, :error]) && haskey(Docs.keywords, Symbol(query))
+        doc_md = if Meta.isexpr(parsed_query, (:incomplete, :error, :return)) && haskey(Docs.keywords, Symbol(query))
             Docs.parsedoc(Docs.keywords[Symbol(query)])
         else
             binding = binding_from(parsed_query, workspace)
@@ -1878,32 +1878,7 @@ function doc_fetcher(query, workspace::Module)
                 doc_md = Markdown.parse(repr(doc_md))
             end
 
-            # Add suggestions results if no docstring was found
-            if parsed_query isa Symbol &&
-                !Docs.defined(binding) &&
-                doc_md isa Markdown.MD &&
-                haskey(doc_md.meta, :results) &&
-                isempty(doc_md.meta[:results])
-
-                suggestions = REPL.accessible(workspace)
-                suggestions_scores = map(s -> REPL.fuzzyscore(query, s), suggestions)
-                removed_indices = [i for (i, s) in enumerate(suggestions_scores) if s < 0]
-                deleteat!(suggestions_scores, removed_indices)
-                deleteat!(suggestions, removed_indices)
-
-                perm = sortperm(suggestions_scores; lt=Base.:>)
-                permute!(suggestions, perm)
-                links = map(s -> Suggestion(s, query), @view(suggestions[begin:min(end,DOC_SUGGESTION_LIMIT)]))
-
-                if length(links) > 0
-                    push!(doc_md.content,
-                          Markdown.HorizontalRule(),
-                          Markdown.Paragraph(["Similar result$(length(links) > 1 ? "s" : ""):"]),
-                          Markdown.List(links))
-                end
-            end
-
-            doc_md
+            improve_docs!(doc_md, parsed_query, binding)
         end
 
         (repr(MIME("text/html"), doc_md), :👍)
@@ -1912,6 +1887,51 @@ function doc_fetcher(query, workspace::Module)
     end
 end
 
+function improve_docs!(doc_md::Markdown.MD, query::Symbol, binding::Docs.Binding)
+    # Reverse latex search ("\scrH" -> "\srcH<tab>")
+
+    symbol = string(query)
+    latex = REPL.symbol_latex(symbol)
+
+    if !isempty(latex)
+        push!(doc_md.content,
+              Markdown.HorizontalRule(),
+              Markdown.Paragraph([
+                  Markdown.Code(symbol),
+                  " can be typed by ",
+                  Markdown.Code(latex),
+                  Base.Docs.HTML("<kbd>&lt;tab&gt;</kbd>"),
+                  ".",
+              ]))
+    end
+
+    # Add suggestions results if no docstring was found
+
+    if !Docs.defined(binding) &&
+        haskey(doc_md.meta, :results) &&
+        isempty(doc_md.meta[:results])
+
+        suggestions = REPL.accessible(binding.mod)
+        suggestions_scores = map(s -> REPL.fuzzyscore(symbol, s), suggestions)
+        removed_indices = [i for (i, s) in enumerate(suggestions_scores) if s < 0]
+        deleteat!(suggestions_scores, removed_indices)
+        deleteat!(suggestions, removed_indices)
+
+        perm = sortperm(suggestions_scores; rev=true)
+        permute!(suggestions, perm)
+        links = map(s -> Suggestion(s, symbol), @view(suggestions[begin:min(end,DOC_SUGGESTION_LIMIT)]))
+
+        if length(links) > 0
+            push!(doc_md.content,
+                  Markdown.HorizontalRule(),
+                  Markdown.Paragraph(["Similar result$(length(links) > 1 ? "s" : ""):"]),
+                  Markdown.List(links))
+        end
+    end
+
+    doc_md
+end
+improve_docs!(other, _, _) = other
 
 
 
@@ -2388,7 +2408,6 @@ function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogL
     # Save the default output streams.
     default_stdout = stdout
     default_stderr = stderr
-
     # Redirect both the `stdout` and `stderr` streams to a single `Pipe` object.
     pipe = Pipe()
     Base.link_pipe!(pipe; reader_supports_async = true, writer_supports_async = true)
diff --git a/src/webserver/REPLTools.jl b/src/webserver/REPLTools.jl
index d6a09b7c93..74f432b19d 100644
--- a/src/webserver/REPLTools.jl
+++ b/src/webserver/REPLTools.jl
@@ -113,17 +113,24 @@ responses[:docs] = function response_docs(🙋::ClientRequest)
     # Expand string macro calls to their macro form:
     # `html"` should yield `@html_str` and
     # `Markdown.md"` should yield `@Markdown.md_str`. (Ideally `Markdown.@md_str` but the former is easier)
-    if endswith(query, "\"") && query != "\""
-        query = "@$(query[begin:end-1])_str"
+    if endswith(query, '"') && query != "\""
+        query = string("@", SubString(query, firstindex(query), prevind(query, lastindex(query))), "_str")
     end
 
-    doc_html, status = if (doc_md = Docs.doc(Docs.Binding(Base, Symbol(query)))) isa Markdown.MD &&
+    workspace = WorkspaceManager.get_workspace((🙋.session, 🙋.notebook); allow_creation=false)
+
+    query_as_symbol = Symbol(query)
+    base_binding = Docs.Binding(Base, query_as_symbol)
+    doc_md = Docs.doc(base_binding)
+
+    doc_html, status = if doc_md isa Markdown.MD &&
             haskey(doc_md.meta, :results) && !isempty(doc_md.meta[:results])
+
         # available in Base, no need to ask worker
+        PlutoRunner.improve_docs!(doc_md, query_as_symbol, base_binding)
+
         (repr(MIME("text/html"), doc_md), :👍)
     else
-        workspace = WorkspaceManager.get_workspace((🙋.session, 🙋.notebook); allow_creation=false)
-
         if will_run_code(🙋.notebook) && workspace isa WorkspaceManager.Workspace && isready(workspace.dowork_token)
             Distributed.remotecall_eval(Main, workspace.pid, :(PlutoRunner.doc_fetcher(
                 $query,
diff --git a/test/Dynamic.jl b/test/Dynamic.jl
index 7ea16bb8c9..ed0e3e12c8 100644
--- a/test/Dynamic.jl
+++ b/test/Dynamic.jl
@@ -159,6 +159,14 @@ end
             @test occursin("<b>s</b><b>o</b><b>r</b>tperm", doc_output)
         end
 
+        @test occursin("\\div", Pluto.PlutoRunner.doc_fetcher("÷", Main)[1])
+        @test occursin("\\gamma", Pluto.PlutoRunner.doc_fetcher("γ", Main)[1])
+        let # the expression is not valid, so this doc fetch fails
+            doc_output, result = Pluto.PlutoRunner.doc_fetcher("🍕\"", Main)
+            @test isnothing(doc_output)
+            @test result == :👎
+        end
+
         # Issue #1128
         # Ref https://docs.julialang.org/en/v1/manual/documentation/#Dynamic-documentation
         m = Module()

From 1e6a2de37dcbea309d3f0ac091030a28e6403d6a Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Wed, 8 Mar 2023 20:49:46 +0100
Subject: [PATCH 595/821] Logging: move `maxlog` handling to PlutoRunner
 (#2493)

---
 src/evaluation/WorkspaceManager.jl | 18 ------------------
 src/runner/PlutoRunner.jl          | 26 ++++++++++++++++++++------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 78be0b281a..c9d27466ab 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -229,24 +229,6 @@ function start_relaying_logs((session, notebook)::SN, log_channel::Distributed.R
 
             @assert !isnothing(display_cell)
 
-            maybe_max_log = findfirst(((key, _),) -> key == "maxlog", next_log["kwargs"])
-            if maybe_max_log !== nothing
-                n_logs = count(log -> log["id"] == next_log["id"], display_cell.logs)
-                try
-                    max_log = parse(Int, next_log["kwargs"][maybe_max_log][2] |> first)
-
-                    # Don't include maxlog in the log-message, in line
-                    # with how Julia handles it.
-                    deleteat!(next_log["kwargs"], maybe_max_log)
-
-                    # Don't show message with id more than max_log times
-                    if max_log isa Int && n_logs >= max_log
-                        continue
-                    end
-                catch
-                end
-            end
-
             push!(display_cell.logs, next_log)
             Pluto.@asynclog update_throttled()
         catch e
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 8135c12989..bf62932f27 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -2315,10 +2315,14 @@ struct PlutoCellLogger <: Logging.AbstractLogger
     log_channel::Channel{Any}
     cell_id::UUID
     workspace_count::Int # Used to invalidate previous logs
+    message_limits::Dict{Any,Int}
 end
 function PlutoCellLogger(notebook_id, cell_id)
     notebook_log_channel = pluto_log_channels[notebook_id]
-    PlutoCellLogger(nothing, notebook_log_channel, cell_id, moduleworkspace_count[])
+    PlutoCellLogger(nothing,
+                    notebook_log_channel, cell_id,
+                    moduleworkspace_count[],
+                    Dict{Any,Int}())
 end
 
 struct CaptureLogger <: Logging.AbstractLogger
@@ -2328,10 +2332,10 @@ struct CaptureLogger <: Logging.AbstractLogger
 end
 
 Logging.shouldlog(cl::CaptureLogger, args...) = Logging.shouldlog(cl.logger, args...)
-Logging.min_enabled_level(::CaptureLogger) = min(Logging.Debug, stdout_log_level)
-Logging.catch_exceptions(::CaptureLogger) = Logging.catch_exceptions(cl.logger)
-function Logging.handle_message(pl::CaptureLogger, level, msg, _module, group, id, file, line; kwargs...)
-    push!(pl.logs, (level, msg, _module, group, id, file, line, kwargs))
+Logging.min_enabled_level(cl::CaptureLogger) = Logging.min_enabled_level(cl.logger)
+Logging.catch_exceptions(cl::CaptureLogger) = Logging.catch_exceptions(cl.logger)
+function Logging.handle_message(cl::CaptureLogger, level, msg, _module, group, id, file, line; kwargs...)
+    push!(cl.logs, (level, msg, _module, group, id, file, line, kwargs))
 end
 
 
@@ -2362,6 +2366,16 @@ function Logging.handle_message(pl::PlutoCellLogger, level, msg, _module, group,
     # println("receiving msg from ", _module, " ", group, " ", id, " ", msg, " ", level, " ", line, " ", file)
     # println("with types: ", "_module: ", typeof(_module), ", ", "msg: ", typeof(msg), ", ", "group: ", typeof(group), ", ", "id: ", typeof(id), ", ", "file: ", typeof(file), ", ", "line: ", typeof(line), ", ", "kwargs: ", typeof(kwargs)) # thanks Copilot
 
+    # https://github.com/JuliaLang/julia/blob/eb2e9687d0ac694d0aa25434b30396ee2cfa5cd3/stdlib/Logging/src/ConsoleLogger.jl#L110-L115
+    if get(kwargs, :maxlog, nothing) isa Core.BuiltinInts
+        maxlog = kwargs[:maxlog]
+        remaining = get!(pl.message_limits, id, Int(maxlog)::Int)
+        pl.message_limits[id] = remaining - 1
+        if remaining <= 0
+            return
+        end
+    end
+
     try
 
         yield()
@@ -2374,7 +2388,7 @@ function Logging.handle_message(pl::PlutoCellLogger, level, msg, _module, group,
             "file" => string(file),
             "cell_id" => pl.cell_id,
             "line" => line isa Union{Int32,Int64} ? line : nothing,
-            "kwargs" => Tuple{String,Any}[(string(k), format_log_value(v)) for (k, v) in kwargs],
+            "kwargs" => Tuple{String,Any}[(string(k), format_log_value(v)) for (k, v) in kwargs if k != :maxlog],
         ))
 
         yield()

From 18a6a0f653b3e67bd4174e93471ceca9ed980d68 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 9 Mar 2023 11:48:18 +0100
Subject: [PATCH 596/821] future julia compat for Core.BuiltinInts

---
 src/runner/PlutoRunner.jl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index bf62932f27..f2f872b00e 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -2360,6 +2360,8 @@ function Logging.shouldlog(logger::PlutoCellLogger, level, _module, _...)
         level == stdout_log_level
 end
 
+const BuiltinInts = @static isdefined(Core, :BuiltinInts) ? Core.BuiltinInts : Union{Bool, Int32, Int64, UInt32, UInt64, UInt8, Int128, Int16, Int8, UInt128, UInt16}
+
 Logging.min_enabled_level(::PlutoCellLogger) = min(Logging.Debug, stdout_log_level)
 Logging.catch_exceptions(::PlutoCellLogger) = false
 function Logging.handle_message(pl::PlutoCellLogger, level, msg, _module, group, id, file, line; kwargs...)
@@ -2367,7 +2369,7 @@ function Logging.handle_message(pl::PlutoCellLogger, level, msg, _module, group,
     # println("with types: ", "_module: ", typeof(_module), ", ", "msg: ", typeof(msg), ", ", "group: ", typeof(group), ", ", "id: ", typeof(id), ", ", "file: ", typeof(file), ", ", "line: ", typeof(line), ", ", "kwargs: ", typeof(kwargs)) # thanks Copilot
 
     # https://github.com/JuliaLang/julia/blob/eb2e9687d0ac694d0aa25434b30396ee2cfa5cd3/stdlib/Logging/src/ConsoleLogger.jl#L110-L115
-    if get(kwargs, :maxlog, nothing) isa Core.BuiltinInts
+    if get(kwargs, :maxlog, nothing) isa BuiltinInts
         maxlog = kwargs[:maxlog]
         remaining = get!(pl.message_limits, id, Int(maxlog)::Int)
         pl.message_limits[id] = remaining - 1

From 6950747e6670da4f9c6054c4ed9025ad0de2a6c3 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 11 Mar 2023 01:26:11 +0100
Subject: [PATCH 597/821] Show Pkg logs in Process Status tab (#2498)

---
 frontend/components/PkgTerminalView.js |  8 ++--
 frontend/components/ProcessTab.js      | 16 ++++++--
 frontend/editor.css                    | 57 +++++++++++++++-----------
 src/packages/Packages.jl               | 35 +++++++++-------
 src/webserver/Status.jl                |  1 +
 5 files changed, 71 insertions(+), 46 deletions(-)

diff --git a/frontend/components/PkgTerminalView.js b/frontend/components/PkgTerminalView.js
index 6c13c6538f..070806342d 100644
--- a/frontend/components/PkgTerminalView.js
+++ b/frontend/components/PkgTerminalView.js
@@ -11,9 +11,11 @@ const TerminalViewAnsiUp = ({ value }) => {
         if (parent) parent.scrollTop = 1e5
     }, [node_ref.current, value])
 
-    return html`<pkg-terminal
-        ><div class="scroller"><pre ref=${node_ref} class="pkg-terminal"></pre></div
-    ></pkg-terminal>`
+    return !!value
+        ? html`<pkg-terminal
+              ><div class="scroller"><pre ref=${node_ref} class="pkg-terminal"></pre></div
+          ></pkg-terminal>`
+        : null
 }
 
 export const PkgTerminalView = TerminalViewAnsiUp
diff --git a/frontend/components/ProcessTab.js b/frontend/components/ProcessTab.js
index 03bee6491c..fad12c5f1b 100644
--- a/frontend/components/ProcessTab.js
+++ b/frontend/components/ProcessTab.js
@@ -3,6 +3,7 @@ import { html, useEffect, useRef, useState } from "../imports/Preact.js"
 import { cl } from "../common/ClassTable.js"
 import { prettytime, useMillisSinceTruthy } from "./RunArea.js"
 import { DiscreteProgressBar } from "./DiscreteProgressBar.js"
+import { PkgTerminalView } from "./PkgTerminalView.js"
 
 /**
  * @param {{
@@ -13,7 +14,7 @@ import { DiscreteProgressBar } from "./DiscreteProgressBar.js"
 export let ProcessTab = ({ notebook, my_clock_is_ahead_by }) => {
     return html`
         <section>
-            <${StatusItem} status_tree=${notebook.status_tree} my_clock_is_ahead_by=${my_clock_is_ahead_by} path=${[]} />
+            <${StatusItem} status_tree=${notebook.status_tree} path=${[]} my_clock_is_ahead_by=${my_clock_is_ahead_by} nbpkg=${notebook.nbpkg} />
         </section>
     `
 }
@@ -76,9 +77,10 @@ const to_ns = (x) => x * 1e9
  * status_tree: import("./Editor.js").StatusEntryData?,
  * path: string[],
  * my_clock_is_ahead_by: number,
+ * nbpkg: import("./Editor.js").NotebookPkgData?,
  * }} props
  */
-const StatusItem = ({ status_tree, path, my_clock_is_ahead_by }) => {
+const StatusItem = ({ status_tree, path, my_clock_is_ahead_by, nbpkg }) => {
     if (status_tree == null) return null
     const mystatus = path.reduce((entry, key) => entry.subtasks[key], status_tree)
     if (!mystatus) return null
@@ -129,7 +131,13 @@ const StatusItem = ({ status_tree, path, my_clock_is_ahead_by }) => {
             .map(([key, _subtask]) =>
                 blocklist.includes(key)
                     ? null
-                    : html`<${StatusItem} key=${key} status_tree=${status_tree} my_clock_is_ahead_by=${my_clock_is_ahead_by} path=${[...path, key]} />`
+                    : html`<${StatusItem}
+                          key=${key}
+                          status_tree=${status_tree}
+                          my_clock_is_ahead_by=${my_clock_is_ahead_by}
+                          path=${[...path, key]}
+                          nbpkg=${nbpkg}
+                      />`
             )
 
     const render_child_progress = () => {
@@ -179,7 +187,7 @@ const StatusItem = ({ status_tree, path, my_clock_is_ahead_by }) => {
                   <span class="status-name">${friendly_name(mystatus.name)}${inner_progress}</span>
                   <span class="status-time">${finished ? prettytime(to_ns(end - start)) : busy ? prettytime(to_ns(busy_time)) : null}</span>
               </div>
-              ${inner}
+              ${inner}${is_open && mystatus.name === "pkg" ? html`<${PkgTerminalView} value=${nbpkg?.terminal_outputs?.nbpkg_sync} />` : undefined}
           </pl-status>`
 }
 
diff --git a/frontend/editor.css b/frontend/editor.css
index d86fa0415d..7c4ee7da17 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2040,6 +2040,12 @@ pluto-helpbox {
     border-top-right-radius: 9px;
     box-shadow: 0 0 11px 0px var(--helpbox-box-shadow-color);
 }
+pluto-helpbox > section {
+    height: 100%;
+    overflow: auto;
+    padding: 10px;
+}
+
 pluto-helpbox > header {
     display: flex;
     padding: 0.6em;
@@ -2273,54 +2279,49 @@ pluto-helpbox.hidden > section {
 /* https://docs.julialang.org/en/v1/assets/themes/documenter-light.css */
 /* see https://github.com/JuliaDocs/Documenter.jl for author information */
 
-pluto-helpbox {
+.helpbox-docs {
     font-family: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
     line-height: 1.5;
     font-size: 0.9rem;
 }
-pluto-helpbox pre,
-pluto-helpbox code,
-pluto-helpbox .cm-line {
+.helpbox-docs pre,
+.helpbox-docs code,
+.helpbox-docs .cm-line {
     /* from https://docs.julialang.org/en/v1/assets/themes/documenter-light.css */
-    font-family: "JuliaMono", "SFMono-Regular", "Menlo", "Consolas", "Liberation Mono", "DejaVu Sans Mono", monospace;
+    font-family: "Roboto Mono", "SFMono-Regular", "Menlo", "Consolas", "Liberation Mono", "DejaVu Sans Mono", monospace;
     font-size: 0.95em;
     line-height: initial;
 }
-pluto-helpbox pre code {
+.helpbox-docs pre code {
     font-size: 1em;
 }
 
-pluto-helpbox pre code.hljs {
+.helpbox-docs pre code.hljs {
     padding: 0;
 }
 
-pluto-helpbox code .cm-editor .cm-content {
+.helpbox-docs code .cm-editor .cm-content {
     padding: 0px;
 }
 
-pluto-helpbox img {
+.helpbox-docs img {
     max-width: 100%;
 }
 
-pluto-helpbox > section {
-    height: 100%;
-    overflow: auto;
-    padding: 10px;
-}
-pluto-helpbox > section h1,
-pluto-helpbox > section h2,
-pluto-helpbox > section h3,
-pluto-helpbox > section h4,
-pluto-helpbox > section h5,
-pluto-helpbox > section h6 {
+.helpbox-docs > section h1,
+.helpbox-docs > section h2,
+.helpbox-docs > section h3,
+.helpbox-docs > section h4,
+.helpbox-docs > section h5,
+.helpbox-docs > section h6 {
     font-family: inherit;
     border-bottom: none;
     font-size: 1rem;
 }
-pluto-helpbox > section h1 {
+.helpbox-docs > section h1 {
     font-size: 1.3rem;
 }
-pluto-helpbox > section pre {
+.helpbox-docs > section pre {
     padding: 0.7rem 0.5rem;
     -webkit-overflow-scrolling: touch;
     overflow-x: auto;
@@ -2330,11 +2331,11 @@ pluto-helpbox > section pre {
     white-space: pre;
     word-wrap: normal;
 }
-/* pluto-helpbox > section code {
+/* .helpbox-docs > section code {
     background-color: whitesmoke;
     padding: 0.1em;
 } */
-pluto-helpbox > section hr {
+.helpbox-docs > section hr {
     border: none;
     border-top: 3px solid var(--rule-color);
 }
@@ -2379,11 +2380,13 @@ pluto-helpbox > section hr {
 pl-status {
     --status-color: var(--process-undefined);
     font-family: var(--system-ui-font-stack);
+    font-size: 0.9rem;
     display: flex;
     flex-direction: column;
     border-radius: 0.2em;
     /* margin: 0.3em; */
-    margin-left: 0.7em;
+    --indent: 0.7rem;
+    margin-left: var(--indent);
     border-left: 3px solid transparent;
     margin-top: 0.4em;
     overflow: hidden;
@@ -2522,6 +2525,10 @@ pl-status .status-time {
     gap: 0.5px;
 }
 
+pl-status pkg-terminal {
+    margin-left: var(--indent);
+}
+
 /* FOOTER */
 
 footer {
diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 866c072146..0672d6752d 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -101,31 +101,34 @@ function sync_nbpkg_core(
         
         removed = setdiff(old_packages, new_packages)
         added = setdiff(new_packages, old_packages)
+        can_skip = isempty(removed) && isempty(added) && notebook.nbpkg_ctx_instantiated
 
         iolistener = let
             busy_packages = notebook.nbpkg_ctx_instantiated ? added : new_packages
-            IOListener(callback=(s -> on_terminal_output(busy_packages, s)))
+            report_to = ["nbpkg_sync", busy_packages...]
+            IOListener(callback=(s -> on_terminal_output(report_to, s)))
         end
         cleanup[] = () -> stoplistening(iolistener)
-        
-        # We remember which Pkg.Types.PreserveLevel was used. If it's too low, we will recommend/require a notebook restart later.
-        local used_tier = Pkg.PRESERVE_ALL
-        
-        if !isready(pkg_token)
-            println(iolistener.buffer, "Waiting for other notebooks to finish Pkg operations...")
-            trigger(iolistener)
-        end
 
-        can_skip = isempty(removed) && isempty(added) && notebook.nbpkg_ctx_instantiated
+
 
         Status.report_business_finished!(pkg_status, :analysis)
         
+        # We remember which Pkg.Types.PreserveLevel was used. If it's too low, we will recommend/require a notebook restart later.
+        local used_tier = Pkg.PRESERVE_ALL
         if !can_skip
+            # We have a global lock, `pkg_token`, on Pluto-managed Pkg operations, which is shared between all notebooks. If this lock is not ready right now then that means that we are going to wait at the `withtoken(pkg_token)` line below. 
+            # We want to report that we are waiting, with a best guess of why.
             wait_business = if !isready(pkg_token)
+                reg = !PkgCompat._updated_registries_compat[]
+                
+                # Print something in the terminal logs
+                println(iolistener.buffer, "Waiting for $(reg ? "the package registry to update" : "other notebooks to finish Pkg operations")...")
+                trigger(iolistener) # manual trigger because we did not start listening yet
+                
+                # Create a business item
                 Status.report_business_started!(pkg_status, 
-                    !PkgCompat._updated_registries_compat[] ? 
-                        :registry_update : 
-                        :waiting_for_others
+                    reg ? :registry_update : :waiting_for_others
                 )
             end
             
@@ -206,6 +209,8 @@ function sync_nbpkg_core(
                     Status.report_business_started!(pkg_status, :add)
                     start_time = time_ns()
                     with_io_setup(notebook, iolistener) do
+                        println(iolistener.buffer, "\nAdding packages...")
+                        
                         # We temporarily clear the "semver-compatible" [deps] entries, because Pkg already respects semver, unless it doesn't, in which case we don't want to force it.
                         PkgCompat.clear_auto_compat_entries!(notebook.nbpkg_ctx)
 
@@ -380,8 +385,8 @@ end
 
 function instantiate(notebook::Notebook, iolistener::IOListener)
     start_time = time_ns()
-    startlistening(iolistener)
     with_io_setup(notebook, iolistener) do
+        println(iolistener.buffer, "\nInstantiating...")
         @debug "PlutoPkg: Instantiating" notebook.path 
         
         # update registries if this is the first time
@@ -411,6 +416,7 @@ end
 function resolve(notebook::Notebook, iolistener::IOListener)
     startlistening(iolistener)
     with_io_setup(notebook, iolistener) do
+        println(iolistener.buffer, "\nResolving...")
         @debug "PlutoPkg: Instantiating" notebook.path 
         Pkg.resolve(notebook.nbpkg_ctx)
     end
@@ -488,6 +494,7 @@ function update_nbpkg_core(
 
         iolistener = let
             # we don't know which packages will be updated, so we send terminal output to all installed packages
+            report_to = ["nbpkg_update", old_packages...]
             IOListener(callback=(s -> on_terminal_output(old_packages, s)))
         end
         cleanup[] = () -> stoplistening(iolistener)
diff --git a/src/webserver/Status.jl b/src/webserver/Status.jl
index 0cc196aa9d..ec3ea910cd 100644
--- a/src/webserver/Status.jl
+++ b/src/webserver/Status.jl
@@ -6,6 +6,7 @@ Base.@kwdef mutable struct Business
     started_at::Union{Nothing,Float64}=nothing
     finished_at::Union{Nothing,Float64}=nothing
     subtasks::Dict{Symbol,Business}=Dict{Symbol,Business}()
+
     update_listener_ref::Ref{Union{Nothing,Function}}=Ref{Union{Nothing,Function}}(nothing)
     lock::Threads.SpinLock=Threads.SpinLock()
 end

From de6a312b09d09081d549681d05d286033d894ce7 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 11 Mar 2023 15:42:28 +0100
Subject: [PATCH 598/821] =?UTF-8?q?=F0=9F=90=9E=20Fix=20#2494?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/common/Binder.js       |  7 ++--
 frontend/components/Cell.js     |  2 +-
 frontend/components/Editor.js   | 64 +++++++++++++++++++--------------
 frontend/components/Notebook.js |  2 +-
 4 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/frontend/common/Binder.js b/frontend/common/Binder.js
index 2ecbcd3e99..fb45117c86 100644
--- a/frontend/common/Binder.js
+++ b/frontend/common/Binder.js
@@ -161,12 +161,14 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
         // Opening a notebook gives us the notebook ID, which means that we have a running session! Time to connect.
 
         const new_notebook_id = await open_response.text()
+        const edit_url = with_token(with_query_params(new URL("edit", binder_session_url), { id: new_notebook_id }))
         console.info("notebook_id:", new_notebook_id)
 
         await setStatePromise(
-            immer((state) => {
+            immer((/** @type {import("../components/Editor.js").EditorState} */ state) => {
                 state.notebook.notebook_id = new_notebook_id
                 state.backend_launch_phase = BackendLaunchPhase.notebook_running
+                state.refresh_target = edit_url
             })
         )
 
@@ -177,8 +179,7 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
         const connect_promise = connect(with_token(new URL("channels", ws_address_from_base(binder_session_url))))
         await timeout_promise(connect_promise, 20_000).catch((e) => {
             console.error("Failed to establish connection within 20 seconds. Navigating to the edit URL directly.", e)
-            const edit_url = with_query_params(new URL("edit", binder_session_url), { id: new_notebook_id })
-            window.parent.location.href = with_token(edit_url)
+            window.parent.location.href = edit_url
         })
     } catch (err) {
         console.error("Failed to initialize binder!", err)
diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index f8104971ba..ea30b29e07 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -90,7 +90,7 @@ const on_jump = (hasBarrier, pluto_actions, cell_id) => () => {
  * @param {{
  *  cell_result: import("./Editor.js").CellResultData,
  *  cell_input: import("./Editor.js").CellInputData,
- *  cell_input_local: import("./Editor.js").CellInputData,
+ *  cell_input_local: { code: String },
  *  cell_dependencies: import("./Editor.js").CellDependencyData
  *  nbpkg: import("./Editor.js").NotebookPkgData?,
  *  selected: boolean,
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index a036274fcc..9aadd86974 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -262,7 +262,7 @@ const url_logo_small = document.head.querySelector("link[rel='pluto-logo-small']
  * @typedef EditorState
  * @type {{
  * notebook: NotebookData,
- * cell_inputs_local: { [uuid: string]: CellInputData },
+ * cell_inputs_local: { [uuid: string]: { code: String } },
  * desired_doc_query: ?String,
  * recently_deleted: ?Array<{ index: number, cell: CellInputData }>,
  * last_update_time: number,
@@ -271,6 +271,7 @@ const url_logo_small = document.head.querySelector("link[rel='pluto-logo-small']
  * backend_launch_phase: ?number,
  * binder_session_url: ?string,
  * binder_session_token: ?string,
+ * refresh_target: ?string,
  * connected: boolean,
  * initializing: boolean,
  * moving_file: boolean,
@@ -312,6 +313,7 @@ export class Editor extends Component {
                     : null,
             binder_session_url: null,
             binder_session_token: null,
+            refresh_target: null,
             connected: false,
             initializing: true,
 
@@ -345,7 +347,7 @@ export class Editor extends Component {
             set_doc_query: (query) => this.setState({ desired_doc_query: query }),
             set_local_cell: (cell_id, new_val) => {
                 return this.setStatePromise(
-                    immer((state) => {
+                    immer((/** @type {EditorState} */ state) => {
                         state.cell_inputs_local[cell_id] = {
                             code: new_val,
                         }
@@ -370,12 +372,14 @@ export class Editor extends Component {
             },
             add_deserialized_cells: async (data, index_or_id, deserializer = deserialize_cells) => {
                 let new_codes = deserializer(data)
-                /** @type {Array<CellInputData>} */
-                /** Create copies of the cells with fresh ids */
+                /** @type {Array<CellInputData>} Create copies of the cells with fresh ids */
                 let new_cells = new_codes.map((code) => ({
                     cell_id: uuidv4(),
                     code: code,
                     code_folded: false,
+                    metadata: {
+                        ...DEFAULT_CELL_METADATA,
+                    },
                 }))
 
                 let index
@@ -400,7 +404,7 @@ export class Editor extends Component {
                  * See ** 1 **
                  */
                 this.setState(
-                    immer((state) => {
+                    immer((/** @type {EditorState} */ state) => {
                         // Deselect everything first, to clean things up
                         state.selected_cells = []
 
@@ -438,10 +442,8 @@ export class Editor extends Component {
                 const new_code = `${block_start}\n\t${cell.code.replace(/\n/g, "\n\t")}\n${block_end}`
 
                 await this.setStatePromise(
-                    immer((state) => {
+                    immer((/** @type {EditorState} */ state) => {
                         state.cell_inputs_local[cell_id] = {
-                            ...cell,
-                            ...state.cell_inputs_local[cell_id],
                             code: new_code,
                         }
                     })
@@ -468,7 +470,7 @@ export class Editor extends Component {
                 })
 
                 this.setState(
-                    immer((state) => {
+                    immer((/** @type {EditorState} */ state) => {
                         for (let cell of cells_to_add) {
                             state.cell_inputs_local[cell.cell_id] = cell
                         }
@@ -591,7 +593,7 @@ export class Editor extends Component {
                     // This is a "dirty" trick, as this should actually be stored in some shared request_status => status state
                     // But for now... this is fine 😼
                     await this.setStatePromise(
-                        immer((state) => {
+                        immer((/** @type {EditorState} */ state) => {
                             for (let cell_id of cell_ids) {
                                 if (state.notebook.cell_results[cell_id] != null) {
                                     state.notebook.cell_results[cell_id].queued = this.is_process_ready()
@@ -647,10 +649,12 @@ export class Editor extends Component {
         const apply_notebook_patches = (patches, /** @type {NotebookData?} */ old_state = null, get_reverse_patches = false) =>
             new Promise((resolve) => {
                 if (patches.length !== 0) {
-                    let copy_of_patches,
+                    const should_ignore_patch_error = (/** @type {string} */ failing_path) => failing_path.startsWith("status_tree")
+
+                    let _copy_of_patches,
                         reverse_of_patches = []
                     this.setState(
-                        immer((state) => {
+                        immer((/** @type {EditorState} */ state) => {
                             let new_notebook
                             try {
                                 // To test this, uncomment the lines below:
@@ -659,7 +663,7 @@ export class Editor extends Component {
                                 // }
 
                                 if (get_reverse_patches) {
-                                    ;[new_notebook, copy_of_patches, reverse_of_patches] = produceWithPatches(old_state ?? state.notebook, (state) => {
+                                    ;[new_notebook, _copy_of_patches, reverse_of_patches] = produceWithPatches(old_state ?? state.notebook, (state) => {
                                         applyPatches(state, patches)
                                     })
                                     // TODO: why was `new_notebook` not updated?
@@ -667,12 +671,10 @@ export class Editor extends Component {
                                 }
                                 new_notebook = applyPatches(old_state ?? state.notebook, patches)
                             } catch (exception) {
+                                /** @type {String} Example: `"a.b[2].c"` */
                                 const failing_path = String(exception).match(".*'(.*)'.*")?.[1].replace(/\//gi, ".") ?? exception
                                 const path_value = _.get(this.state.notebook, failing_path, "Not Found")
                                 console.log(String(exception).match(".*'(.*)'.*")?.[1].replace(/\//gi, ".") ?? exception, failing_path, typeof failing_path)
-                                // The alert below is not catastrophic: the editor will try to recover.
-                                // Deactivating to be user-friendly!
-                                // alert(`Ooopsiee.`)
 
                                 console.error(
                                     `#######################**************************########################
@@ -688,15 +690,23 @@ patch: ${JSON.stringify(
 #######################**************************########################`,
                                     exception
                                 )
-                                console.log("Trying to recover: Refetching notebook...")
-                                this.client.send(
-                                    "reset_shared_state",
-                                    {},
-                                    {
-                                        notebook_id: this.state.notebook.notebook_id,
-                                    },
-                                    false
-                                )
+
+                                if (should_ignore_patch_error(failing_path)) {
+                                    console.info("Safe to ignore this patch failure...")
+                                } else if (this.state.connected) {
+                                    console.error("Trying to recover: Refetching notebook...")
+                                    this.client.send(
+                                        "reset_shared_state",
+                                        {},
+                                        {
+                                            notebook_id: this.state.notebook.notebook_id,
+                                        },
+                                        false
+                                    )
+                                } else {
+                                    console.error("Trying to recover: reloading...")
+                                    window.parent.location.href = this.state.refresh_target ?? window.location.href
+                                }
                                 return
                             }
 
@@ -1081,7 +1091,7 @@ patch: ${JSON.stringify(
             window.plutoDesktop?.ipcRenderer.once("PLUTO-MOVE-NOTEBOOK", async (/** @type {string?} */ loc) => {
                 if (!!loc)
                     await this.setStatePromise(
-                        immer((state) => {
+                        immer((/** @type {EditorState} */ state) => {
                             state.notebook.in_temp_dir = false
                             state.notebook.path = loc
                         })
@@ -1481,7 +1491,7 @@ patch: ${JSON.stringify(
                         apply_notebook_patches=${this.apply_notebook_patches}
                         reset_notebook_state=${() =>
                             this.setStatePromise(
-                                immer((state) => {
+                                immer((/** @type {EditorState} */ state) => {
                                     state.notebook = this.props.initial_notebook_state
                                 })
                             )}
diff --git a/frontend/components/Notebook.js b/frontend/components/Notebook.js
index 1448297a1d..c5d8d9d736 100644
--- a/frontend/components/Notebook.js
+++ b/frontend/components/Notebook.js
@@ -105,7 +105,7 @@ const render_cell_outputs_minimum = 20
 /**
  * @param {{
  *  notebook: import("./Editor.js").NotebookData,
- *  cell_inputs_local: { [uuid: string]: import("./Editor.js").CellInputData },
+ *  cell_inputs_local: { [uuid: string]: { code: String } },
  *  on_update_doc_query: any,
  *  on_cell_input: any,
  *  on_focus_neighbor: any,

From 5513ec86722e9f5f5a5157d953f7c22ceeebfc48 Mon Sep 17 00:00:00 2001
From: Steve Kelly <kd2cca@gmail.com>
Date: Mon, 13 Mar 2023 15:10:14 -0400
Subject: [PATCH 599/821] A few random cleanups (#2496)

---
 src/analysis/Errors.jl             | 11 +++++++----
 src/evaluation/MacroAnalysis.jl    |  2 +-
 src/evaluation/Run.jl              |  4 ++--
 src/evaluation/WorkspaceManager.jl |  4 ++--
 src/packages/Packages.jl           | 14 ++++++++------
 src/webserver/Dynamic.jl           |  4 ++--
 src/webserver/Status.jl            |  8 ++++----
 7 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/analysis/Errors.jl b/src/analysis/Errors.jl
index 446ed475a1..eb63f550f0 100644
--- a/src/analysis/Errors.jl
+++ b/src/analysis/Errors.jl
@@ -23,16 +23,19 @@ function MultipleDefinitionsError(topology::NotebookTopology, cell::Cell, all_de
 	)
 end
 
-hint1 = "Combine all definitions into a single reactive cell using a `begin ... end` block."
-hint2 = "Wrap all code in a `begin ... end` block."
+const hint1 = "Combine all definitions into a single reactive cell using a `begin ... end` block."
 
 # TODO: handle case when cells are in cycle, but variables aren't
 function showerror(io::IO, cre::CyclicReferenceError)
-	print(io, "Cyclic references among $(join(cre.syms, ", ", " and ")).\n$hint1")
+	print(io, "Cyclic references among ")
+	println(io, join(cre.syms, ", ", " and "))
+	print(io, hint1)
 end
 
 function showerror(io::IO, mde::MultipleDefinitionsError)
-	print(io, "Multiple definitions for $(join(mde.syms, ", ", " and ")).\n$hint1") # TODO: hint about mutable globals
+	print(io, "Multiple definitions for ")
+	println(io, join(mde.syms, ", ", " and "))
+	print(io, hint1) # TODO: hint about mutable globals
 end
 
 "Send `error` to the frontend without backtrace. Runtime errors are handled by `WorkspaceManager.eval_format_fetch_in_workspace` - this function is for Reactivity errors."
diff --git a/src/evaluation/MacroAnalysis.jl b/src/evaluation/MacroAnalysis.jl
index a9e6d55c97..3043e3284b 100644
--- a/src/evaluation/MacroAnalysis.jl
+++ b/src/evaluation/MacroAnalysis.jl
@@ -83,7 +83,7 @@ function resolve_topology(
 	sn = (session, notebook)
 
 	function macroexpand_cell(cell)
-		try_macroexpand(module_name::Union{Nothing,Symbol}=nothing) = begin
+		try_macroexpand(module_name::Symbol=Symbol("")) = begin
 			success, result = macroexpand_in_workspace(sn, unresolved_topology.codes[cell].parsedcode, cell.cell_id, module_name)
 			if success
 				Success(result)
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index d58c31b710..ed272de5c0 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -349,7 +349,7 @@ function update_save_run!(
 	run_async::Bool=false, 
 	prerender_text::Bool=false, 
 	auto_solve_multiple_defs::Bool=false,
-	on_auto_solve_multiple_defs::Union{Nothing,Function}=nothing,
+	on_auto_solve_multiple_defs::Function=identity,
 	kwargs...
 )
 	old = notebook.topology
@@ -370,7 +370,7 @@ function update_save_run!(
 			new = notebook.topology = updated_topology(new, notebook, to_disable)
 		end
 		
-		isnothing(on_auto_solve_multiple_defs) || on_auto_solve_multiple_defs(to_disable_dict)
+		on_auto_solve_multiple_defs(to_disable_dict)
 	end
 
 	update_dependency_cache!(notebook)
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index c9d27466ab..9412903f4a 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -530,9 +530,9 @@ function collect_soft_definitions(session_notebook::SN, modules::Set{Expr})
     end)
 end
 
-function macroexpand_in_workspace(session_notebook::SN, macrocall, cell_id, module_name = nothing; capture_stdout::Bool=true)::Tuple{Bool, Any}
+function macroexpand_in_workspace(session_notebook::SN, macrocall, cell_id, module_name = Symbol(""); capture_stdout::Bool=true)::Tuple{Bool, Any}
     workspace = get_workspace(session_notebook)
-    module_name = module_name === nothing ? workspace.module_name : module_name
+    module_name = module_name === Symbol("") ? workspace.module_name : module_name
 
     Distributed.remotecall_eval(Main, workspace.pid, quote
         try
diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 0672d6752d..b013c8d4a0 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -12,6 +12,8 @@ const tiers = [
 
 const pkg_token = Token()
 
+_default_cleanup() = nothing
+
 # This list appears multiple times in our codebase. Be sure to match edits everywhere.
 function use_plutopkg(topology::NotebookTopology)
     !any(values(topology.nodes)) do node
@@ -54,7 +56,7 @@ function sync_nbpkg_core(
     old_topology::NotebookTopology, 
     new_topology::NotebookTopology; 
     on_terminal_output::Function=((args...) -> nothing), 
-    cleanup::Ref{Union{Function,Nothing}}=Ref{Union{Function,Nothing}}(nothing),
+    cleanup::Ref{Function}=Ref{Function}(_default_cleanup),
     lag::Real=0,
 )
     pkg_status = Status.report_business_started!(notebook.status_tree, :pkg)
@@ -300,7 +302,7 @@ In addition to the steps performed by [`sync_nbpkg_core`](@ref):
 - `try` `catch` and reset the package environment on failure.
 """
 function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topology::NotebookTopology; save::Bool=true, take_token::Bool=true)
-    cleanup = Ref{Union{Function,Nothing}}(nothing)
+    cleanup = Ref{Function}(_default_cleanup)
 	try
         Status.report_business_started!(notebook.status_tree, :pkg)
         
@@ -368,7 +370,7 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
 
 		save && save_notebook(session, notebook)
 	finally
-        isnothing(cleanup[]) || cleanup[]()
+        cleanup[]()
         Status.report_business_finished!(notebook.status_tree, :pkg)
     end
 end
@@ -485,7 +487,7 @@ function update_nbpkg_core(
     notebook::Notebook; 
     level::Pkg.UpgradeLevel=Pkg.UPLEVEL_MAJOR, 
     on_terminal_output::Function=((args...) -> nothing),
-    cleanup::Ref{Union{Function,Nothing}}=Ref{Union{Function,Nothing}}(nothing),
+    cleanup::Ref{Function}=Ref{Function}(default_cleanup),
 )
     if notebook.nbpkg_ctx !== nothing
         PkgCompat.mark_original!(notebook.nbpkg_ctx)
@@ -556,7 +558,7 @@ function update_nbpkg(session, notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.U
     bp = if backup && save
         writebackup(notebook)
     end
-    cleanup = Ref{Union{Function,Nothing}}(nothing)
+    cleanup = Ref{Function}(_default_cleanup)
 
     try
 		pkg_result = withtoken(notebook.executetoken) do
@@ -591,7 +593,7 @@ function update_nbpkg(session, notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.U
             !isnothing(bp) && isfile(bp) && rm(bp)
         end
 	finally
-        isnothing(cleanup[]) || cleanup[]()
+        cleanup[]()
 		notebook.nbpkg_busy_packages = String[]
         update_nbpkg_cache!(notebook)
 		send_notebook_changes!(ClientRequest(; session, notebook))
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 1e6790e42b..88fec7d1ce 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -359,7 +359,7 @@ function trigger_resolver(anything, path, values=[])
 end
 function trigger_resolver(resolvers::Dict, path, values=[])
 	if isempty(path)
-		throw(BoundsError("resolver path ends at Dict with keys $(keys(resolver))"))
+		throw(BoundsError("resolver path ends at Dict with keys $(keys(resolvers))"))
 	end
 	
 	segment, rest... = path
@@ -368,7 +368,7 @@ function trigger_resolver(resolvers::Dict, path, values=[])
 	elseif haskey(resolvers, Wildcard())
 		trigger_resolver(resolvers[Wildcard()], rest, (values..., segment))
     else
-        throw(BoundsError("failed to match path $(path), possible keys $(keys(resolver))"))
+        throw(BoundsError("failed to match path $(path), possible keys $(keys(resolvers))"))
 	end
 end
 
diff --git a/src/webserver/Status.jl b/src/webserver/Status.jl
index ec3ea910cd..8a139af2c0 100644
--- a/src/webserver/Status.jl
+++ b/src/webserver/Status.jl
@@ -1,13 +1,13 @@
 module Status
 
+_default_update_listener() = nothing
 
 Base.@kwdef mutable struct Business
     name::Symbol=:ignored
     started_at::Union{Nothing,Float64}=nothing
     finished_at::Union{Nothing,Float64}=nothing
     subtasks::Dict{Symbol,Business}=Dict{Symbol,Business}()
-
-    update_listener_ref::Ref{Union{Nothing,Function}}=Ref{Union{Nothing,Function}}(nothing)
+    update_listener_ref::Ref{Function}=Ref{Function}(_default_update_listener)
     lock::Threads.SpinLock=Threads.SpinLock()
 end
 
@@ -32,7 +32,7 @@ function report_business_started!(business::Business)
         empty!(business.subtasks)
     end
     
-    isnothing(business.update_listener_ref[]) || business.update_listener_ref[]()
+    business.update_listener_ref[]()
     return business
 end
 
@@ -51,7 +51,7 @@ function report_business_finished!(business::Business)
         report_business_finished!(v)
     end
     
-    isnothing(business.update_listener_ref[]) || business.update_listener_ref[]()
+    business.update_listener_ref[]()
     
     return business
 end

From 9194c52c79165072af424d09d5c8b8aa2f7446bb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 13 Mar 2023 20:15:15 +0100
Subject: [PATCH 600/821] Fix #2503

---
 frontend/editor.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 7c4ee7da17..6671d77a62 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2522,7 +2522,7 @@ pl-status .status-time {
 }
 
 .discrete-progress-bar.big {
-    gap: 0.5px;
+    gap: 0px;
 }
 
 pl-status pkg-terminal {

From 24b28b77330d15b479afda346be7e1918f322978 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 13 Mar 2023 20:59:31 +0100
Subject: [PATCH 601/821] nbpkg: minor tweaks

---
 src/packages/Packages.jl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index b013c8d4a0..7c3a3aff36 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -432,19 +432,19 @@ function with_auto_fixes(f::Function, notebook::Notebook)
     try
         f()
     catch e
-        @warn "Operation failed. Updating registries and trying again..." exception=e
+        @warn "Operation failed. Updating registries and trying again..." exception=(e, catch_backtrace())
         
         PkgCompat.update_registries(; force=true)
         try
             f()
         catch e
-            @warn "Operation failed. Removing Manifest and trying again..." exception=e
+            @warn "Operation failed. Removing Manifest and trying again..." exception=(e, catch_backtrace())
             
             reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
             try
                 f()
             catch e
-                @warn "Operation failed. Removing Project compat entries and Manifest and trying again..." exception=e
+                @warn "Operation failed. Removing Project compat entries and Manifest and trying again..." exception=(e, catch_backtrace())
                 
                 reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
                 PkgCompat.clear_compat_entries!(notebook.nbpkg_ctx)
@@ -497,7 +497,7 @@ function update_nbpkg_core(
         iolistener = let
             # we don't know which packages will be updated, so we send terminal output to all installed packages
             report_to = ["nbpkg_update", old_packages...]
-            IOListener(callback=(s -> on_terminal_output(old_packages, s)))
+            IOListener(callback=(s -> on_terminal_output(report_to, s)))
         end
         cleanup[] = () -> stoplistening(iolistener)
         

From ab0a2fff93127bbe110977aad3914ef9aeb0b57b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 14 Mar 2023 14:32:49 +0100
Subject: [PATCH 602/821] Capture and display Pkg logs in the notebook (#2507)

---
 Project.toml              |   2 +
 src/packages/Packages.jl  | 323 ++++++++++++++++++++------------------
 src/packages/PkgCompat.jl |   5 +-
 3 files changed, 174 insertions(+), 156 deletions(-)

diff --git a/Project.toml b/Project.toml
index 01c52b0836..1562039d54 100644
--- a/Project.toml
+++ b/Project.toml
@@ -15,6 +15,7 @@ HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
 HypertextLiteral = "ac1192a8-f4b3-4bfe-ba22-af5b92cd3ab2"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
+LoggingExtras = "e6f89c97-d47a-5376-807f-9c37f3926c36"
 MIMEs = "6c6e2e6c-3030-632d-7369-2d6c69616d65"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 MsgPack = "99f44e22-a591-53d1-9472-aa23ef4bd671"
@@ -35,6 +36,7 @@ Configurations = "0.15, 0.16, 0.17"
 FuzzyCompletions = "0.3, 0.4, 0.5"
 HTTP = "^1.0.2"
 HypertextLiteral = "0.7, 0.8, 0.9"
+LoggingExtras = "0.4, 1"
 MIMEs = "0.1"
 MsgPack = "1.1"
 PrecompileSignatures = "3"
diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 7c3a3aff36..bd7b8658ec 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -2,6 +2,8 @@
 import .ExpressionExplorer: external_package_names
 import .PkgCompat
 import .PkgCompat: select, is_stdlib
+import Logging
+import LoggingExtras
 
 const tiers = [
 	Pkg.PRESERVE_ALL,
@@ -135,148 +137,150 @@ function sync_nbpkg_core(
             end
             
             return withtoken(pkg_token) do
-                
-                let
-                    isnothing(wait_business) || Status.report_business_finished!(wait_business)
+                withlogcapture(iolistener) do
                     
-                    notebook.nbpkg_ctx_instantiated || Status.report_business_planned!(pkg_status, :instantiate1)
-                    notebook.nbpkg_ctx_instantiated || Status.report_business_planned!(pkg_status, :resolve)
-                    isempty(removed) || Status.report_business_planned!(pkg_status, :remove)
-                    isempty(added) || Status.report_business_planned!(pkg_status, :add)
-                    if !isempty(added) || !isempty(removed)
-                        Status.report_business_planned!(pkg_status, :instantiate2)
+                    let
+                        isnothing(wait_business) || Status.report_business_finished!(wait_business)
+                        
+                        notebook.nbpkg_ctx_instantiated || Status.report_business_planned!(pkg_status, :instantiate1)
+                        notebook.nbpkg_ctx_instantiated || Status.report_business_planned!(pkg_status, :resolve)
+                        isempty(removed) || Status.report_business_planned!(pkg_status, :remove)
+                        isempty(added) || Status.report_business_planned!(pkg_status, :add)
+                        if !isempty(added) || !isempty(removed)
+                            Status.report_business_planned!(pkg_status, :instantiate2)
+                        end
                     end
-                end
-                
-                PkgCompat.refresh_registry_cache()
-                
-                PkgCompat.clear_stdlib_compat_entries!(notebook.nbpkg_ctx)
-                
-                
-                should_instantiate_initially = !notebook.nbpkg_ctx_instantiated
-                if should_instantiate_initially
                     
-                    # First, we instantiate. This will:
-                    # - Verify that the Manifest can be parsed and is in the correct format (important for compat across Julia versions). If not, we will fix it by deleting the Manifest.
-                    # - If no Manifest exists, resolve the environment and create one.
-                    # - Start downloading all registered packages, artifacts.
-                    # - Start downloading all unregistered packages, which are added through a URL. This also makes the Project.tomls of those packages available.
-                    # - Precompile all packages.                    
-                    Status.report_business!(pkg_status, :instantiate1) do
-                        with_auto_fixes(notebook) do
-                            instantiate(notebook, iolistener)
+                    PkgCompat.refresh_registry_cache()
+                    
+                    PkgCompat.clear_stdlib_compat_entries!(notebook.nbpkg_ctx)
+                    
+                    
+                    should_instantiate_initially = !notebook.nbpkg_ctx_instantiated
+                    if should_instantiate_initially
+                        
+                        # First, we instantiate. This will:
+                        # - Verify that the Manifest can be parsed and is in the correct format (important for compat across Julia versions). If not, we will fix it by deleting the Manifest.
+                        # - If no Manifest exists, resolve the environment and create one.
+                        # - Start downloading all registered packages, artifacts.
+                        # - Start downloading all unregistered packages, which are added through a URL. This also makes the Project.tomls of those packages available.
+                        # - Precompile all packages.                    
+                        Status.report_business!(pkg_status, :instantiate1) do
+                            with_auto_fixes(notebook) do
+                                instantiate(notebook, iolistener)
+                            end
+                        end
+                        
+                        # Second, we resolve. This will:
+                        # - Verify that the Manifest contains a correct dependency tree (e.g. all versions exists in a registry). If not, we will fix it using `with_auto_fixes`
+                        # - If we are tracking local packages by path (] dev), their Project.tomls are reparsed and everything is updated.
+                        Status.report_business!(pkg_status, :resolve) do
+                            with_auto_fixes(notebook) do
+                                resolve(notebook, iolistener)
+                            end
                         end
                     end
                     
-                    # Second, we resolve. This will:
-                    # - Verify that the Manifest contains a correct dependency tree (e.g. all versions exists in a registry). If not, we will fix it using `with_auto_fixes`
-                    # - If we are tracking local packages by path (] dev), their Project.tomls are reparsed and everything is updated.
-                    Status.report_business!(pkg_status, :resolve) do
-                        with_auto_fixes(notebook) do
-                            resolve(notebook, iolistener)
-                        end
+                    to_add = filter(PkgCompat.package_exists, added)
+                    to_remove = filter(removed) do p
+                        haskey(PkgCompat.project(notebook.nbpkg_ctx).dependencies, p)
                     end
-                end
-                
-                to_add = filter(PkgCompat.package_exists, added)
-                to_remove = filter(removed) do p
-                    haskey(PkgCompat.project(notebook.nbpkg_ctx).dependencies, p)
-                end
-                @debug "PlutoPkg:" notebook.path to_add to_remove
-                
-                if !isempty(to_remove)
-                    Status.report_business_started!(pkg_status, :remove)
-                    # See later comment
-                    mkeys() = Set(filter(!is_stdlib, [m.name for m in values(PkgCompat.dependencies(notebook.nbpkg_ctx))]))
-                    old_manifest_keys = mkeys()
-
-                    Pkg.rm(notebook.nbpkg_ctx, [
-                        Pkg.PackageSpec(name=p)
-                        for p in to_remove
-                    ])
-
-                    notebook.nbpkg_install_time_ns = nothing # we lose our estimate of install time
-                    # We record the manifest before and after, to prevent recommending a reboot when nothing got removed from the manifest (e.g. when removing GR, but leaving Plots), or when only stdlibs got removed.
-                    new_manifest_keys = mkeys()
+                    @debug "PlutoPkg:" notebook.path to_add to_remove
                     
-                    # TODO: we might want to upgrade other packages now that constraints have loosened? Does this happen automatically?
-                    Status.report_business_finished!(pkg_status, :remove)
-                end
-
-                
-                # TODO: instead of Pkg.PRESERVE_ALL, we actually want:
-                # "Pkg.PRESERVE_DIRECT, but preserve exact verisons of Base.loaded_modules"
-                
-                if !isempty(to_add)
-                    Status.report_business_started!(pkg_status, :add)
-                    start_time = time_ns()
-                    with_io_setup(notebook, iolistener) do
-                        println(iolistener.buffer, "\nAdding packages...")
+                    if !isempty(to_remove)
+                        Status.report_business_started!(pkg_status, :remove)
+                        # See later comment
+                        mkeys() = Set(filter(!is_stdlib, [m.name for m in values(PkgCompat.dependencies(notebook.nbpkg_ctx))]))
+                        old_manifest_keys = mkeys()
+
+                        Pkg.rm(notebook.nbpkg_ctx, [
+                            Pkg.PackageSpec(name=p)
+                            for p in to_remove
+                        ])
+
+                        notebook.nbpkg_install_time_ns = nothing # we lose our estimate of install time
+                        # We record the manifest before and after, to prevent recommending a reboot when nothing got removed from the manifest (e.g. when removing GR, but leaving Plots), or when only stdlibs got removed.
+                        new_manifest_keys = mkeys()
                         
-                        # We temporarily clear the "semver-compatible" [deps] entries, because Pkg already respects semver, unless it doesn't, in which case we don't want to force it.
-                        PkgCompat.clear_auto_compat_entries!(notebook.nbpkg_ctx)
-
-                        try
-                            for tier in [
-                                Pkg.PRESERVE_ALL,
-                                Pkg.PRESERVE_DIRECT,
-                                Pkg.PRESERVE_SEMVER,
-                                Pkg.PRESERVE_NONE,
-                            ]
-                                used_tier = tier
-
-                                try
-                                    Pkg.add(notebook.nbpkg_ctx, [
-                                        Pkg.PackageSpec(name=p)
-                                        for p in to_add
-                                    ]; preserve=used_tier)
-
-                                    break
-                                catch e
-                                    if used_tier == Pkg.PRESERVE_NONE
-                                        # give up
-                                        rethrow(e)
+                        # TODO: we might want to upgrade other packages now that constraints have loosened? Does this happen automatically?
+                        Status.report_business_finished!(pkg_status, :remove)
+                    end
+
+                    
+                    # TODO: instead of Pkg.PRESERVE_ALL, we actually want:
+                    # "Pkg.PRESERVE_DIRECT, but preserve exact verisons of Base.loaded_modules"
+                    
+                    if !isempty(to_add)
+                        Status.report_business_started!(pkg_status, :add)
+                        start_time = time_ns()
+                        with_io_setup(notebook, iolistener) do
+                            println(iolistener.buffer, "\nAdding packages...")
+                            
+                            # We temporarily clear the "semver-compatible" [deps] entries, because Pkg already respects semver, unless it doesn't, in which case we don't want to force it.
+                            PkgCompat.clear_auto_compat_entries!(notebook.nbpkg_ctx)
+
+                            try
+                                for tier in [
+                                    Pkg.PRESERVE_ALL,
+                                    Pkg.PRESERVE_DIRECT,
+                                    Pkg.PRESERVE_SEMVER,
+                                    Pkg.PRESERVE_NONE,
+                                ]
+                                    used_tier = tier
+
+                                    try
+                                        Pkg.add(notebook.nbpkg_ctx, [
+                                            Pkg.PackageSpec(name=p)
+                                            for p in to_add
+                                        ]; preserve=used_tier)
+
+                                        break
+                                    catch e
+                                        if used_tier == Pkg.PRESERVE_NONE
+                                            # give up
+                                            rethrow(e)
+                                        end
                                     end
                                 end
+                            finally
+                                PkgCompat.write_auto_compat_entries!(notebook.nbpkg_ctx)
                             end
-                        finally
-                            PkgCompat.write_auto_compat_entries!(notebook.nbpkg_ctx)
-                        end
 
-                        # Now that Pkg is set up, the notebook process will call `using Package`, which can take some time. We write this message to the io, to notify the user.
-                        println(iolistener.buffer, "\e[32m\e[1mLoading\e[22m\e[39m packages...")
+                            # Now that Pkg is set up, the notebook process will call `using Package`, which can take some time. We write this message to the io, to notify the user.
+                            println(iolistener.buffer, "\e[32m\e[1mLoading\e[22m\e[39m packages...")
+                        end
+                    
+                        notebook.nbpkg_install_time_ns = notebook.nbpkg_install_time_ns === nothing ? nothing : (notebook.nbpkg_install_time_ns + (time_ns() - start_time))
+                        Status.report_business_finished!(pkg_status, :add)
+                        @debug "PlutoPkg: done" notebook.path 
                     end
-                
-                    notebook.nbpkg_install_time_ns = notebook.nbpkg_install_time_ns === nothing ? nothing : (notebook.nbpkg_install_time_ns + (time_ns() - start_time))
-                    Status.report_business_finished!(pkg_status, :add)
-                    @debug "PlutoPkg: done" notebook.path 
-                end
 
-                should_instantiate_again = !notebook.nbpkg_ctx_instantiated || !isempty(to_add) || !isempty(to_remove)
-                
-                if should_instantiate_again
-                    Status.report_business!(pkg_status, :instantiate2) do
-                        instantiate(notebook, iolistener)
+                    should_instantiate_again = !notebook.nbpkg_ctx_instantiated || !isempty(to_add) || !isempty(to_remove)
+                    
+                    if should_instantiate_again
+                        Status.report_business!(pkg_status, :instantiate2) do
+                            instantiate(notebook, iolistener)
+                        end
                     end
-                end
 
-                stoplistening(iolistener)
-                Status.report_business_finished!(pkg_status)
-
-                return (
-                    did_something=👺 || (
-                        should_instantiate_initially || should_instantiate_again || (use_plutopkg_old != use_plutopkg_new)
-                    ),
-                    used_tier=used_tier,
-                    # changed_versions=Dict{String,Pair}(),
-                    restart_recommended=👺 || (
-                        (!isempty(to_remove) && old_manifest_keys != new_manifest_keys) ||
-                        used_tier != Pkg.PRESERVE_ALL
-                    ),
-                    restart_required=👺 || (
-                        used_tier ∈ [Pkg.PRESERVE_SEMVER, Pkg.PRESERVE_NONE]
-                    ),
-                )
+                    stoplistening(iolistener)
+                    Status.report_business_finished!(pkg_status)
+
+                    return (
+                        did_something=👺 || (
+                            should_instantiate_initially || should_instantiate_again || (use_plutopkg_old != use_plutopkg_new)
+                        ),
+                        used_tier=used_tier,
+                        # changed_versions=Dict{String,Pair}(),
+                        restart_recommended=👺 || (
+                            (!isempty(to_remove) && old_manifest_keys != new_manifest_keys) ||
+                            used_tier != Pkg.PRESERVE_ALL
+                        ),
+                        restart_required=👺 || (
+                            used_tier ∈ [Pkg.PRESERVE_SEMVER, Pkg.PRESERVE_NONE]
+                        ),
+                    )
+                end
             end
         end
     end
@@ -312,6 +316,7 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
 				for p in pkgs
 					notebook.nbpkg_terminal_outputs[p] = s
 				end
+                # TODO: this should be throttled/debounced?
                 update_nbpkg_cache!(notebook)
 				send_notebook_changes!(ClientRequest(; session, notebook))
 			end
@@ -419,7 +424,7 @@ function resolve(notebook::Notebook, iolistener::IOListener)
     startlistening(iolistener)
     with_io_setup(notebook, iolistener) do
         println(iolistener.buffer, "\nResolving...")
-        @debug "PlutoPkg: Instantiating" notebook.path 
+        @debug "PlutoPkg: Resolving" notebook.path 
         Pkg.resolve(notebook.nbpkg_ctx)
     end
 end
@@ -432,13 +437,13 @@ function with_auto_fixes(f::Function, notebook::Notebook)
     try
         f()
     catch e
-        @warn "Operation failed. Updating registries and trying again..." exception=(e, catch_backtrace())
+        @info "Operation failed. Updating registries and trying again..." exception=e
         
         PkgCompat.update_registries(; force=true)
         try
             f()
         catch e
-            @warn "Operation failed. Removing Manifest and trying again..." exception=(e, catch_backtrace())
+            @warn "Operation failed. Removing Manifest and trying again..." exception=e
             
             reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
             try
@@ -510,40 +515,42 @@ function update_nbpkg_core(
         end
 
         return withtoken(pkg_token) do
-            PkgCompat.refresh_registry_cache()
-            PkgCompat.clear_stdlib_compat_entries!(notebook.nbpkg_ctx)
+            withlogcapture(iolistener) do
+                PkgCompat.refresh_registry_cache()
+                PkgCompat.clear_stdlib_compat_entries!(notebook.nbpkg_ctx)
 
-            if !notebook.nbpkg_ctx_instantiated
-                with_auto_fixes(notebook) do
-                    instantiate(notebook, iolistener)
-                end
-            
-                with_auto_fixes(notebook) do
-                    resolve(notebook, iolistener)
+                if !notebook.nbpkg_ctx_instantiated
+                    with_auto_fixes(notebook) do
+                        instantiate(notebook, iolistener)
+                    end
+                
+                    with_auto_fixes(notebook) do
+                        resolve(notebook, iolistener)
+                    end
                 end
-            end
 
-            with_io_setup(notebook, iolistener) do
-                # We temporarily clear the "semver-compatible" [deps] entries, because it is difficult to update them after the update 🙈. TODO
-                PkgCompat.clear_auto_compat_entries!(notebook.nbpkg_ctx)
+                with_io_setup(notebook, iolistener) do
+                    # We temporarily clear the "semver-compatible" [deps] entries, because it is difficult to update them after the update 🙈. TODO
+                    PkgCompat.clear_auto_compat_entries!(notebook.nbpkg_ctx)
 
-                try
-                    ###
-                    Pkg.update(notebook.nbpkg_ctx; level=level)
-                    ###
-                finally
-                    PkgCompat.write_auto_compat_entries!(notebook.nbpkg_ctx)
+                    try
+                        ###
+                        Pkg.update(notebook.nbpkg_ctx; level=level)
+                        ###
+                    finally
+                        PkgCompat.write_auto_compat_entries!(notebook.nbpkg_ctx)
+                    end
                 end
-            end
 
-            stoplistening(iolistener)
+                stoplistening(iolistener)
 
-            🐧 = !PkgCompat.is_original(notebook.nbpkg_ctx)
-            (
-                did_something=🐧,
-                restart_recommended=🐧,
-                restart_required=🐧,
-            )
+                🐧 = !PkgCompat.is_original(notebook.nbpkg_ctx)
+                (
+                    did_something=🐧,
+                    restart_recommended=🐧,
+                    restart_required=🐧,
+                )
+            end
         end
     end
     (
@@ -650,6 +657,12 @@ function with_io_setup(f::Function, notebook::Notebook, iolistener::IOListener)
     end
 end
 
+withlogcapture(f::Function, iolistener::IOListener) = 
+    Logging.with_logger(f, LoggingExtras.TeeLogger(
+        Logging.current_logger(),
+        Logging.ConsoleLogger(IOContext(iolistener.buffer, :color => true), Logging.Info)
+    ))
+
 
 const is_interactive_defined = isdefined(Base, :is_interactive) && !Base.isconst(Base, :is_interactive)
 function withinteractive(f::Function, value::Bool)
diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index a79bded294..9516d48dde 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -370,7 +370,10 @@ function dependencies(ctx)
 			Pkg.dependencies(ctx.env)
 		end
 	catch e
-		if !occursin(r"expected.*exist.*manifest", sprint(showerror, e))
+		if !any(occursin(sprint(showerror, e)), (
+			r"expected.*exist.*manifest",
+			r"no method.*project_rel_path.*Nothing\)", # https://github.com/JuliaLang/Pkg.jl/issues/3404
+		))
 			@error """
 			Pkg error: you might need to use
 

From 78f7d9874347c939b781d14130d7bc2aad3f4a55 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 14 Mar 2023 14:51:47 +0100
Subject: [PATCH 603/821] Instantiate after update (#2505)

---
 src/packages/Packages.jl | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index bd7b8658ec..fad17bef7b 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -545,6 +545,14 @@ function update_nbpkg_core(
                 stoplistening(iolistener)
 
                 🐧 = !PkgCompat.is_original(notebook.nbpkg_ctx)
+                should_instantiate_again = !notebook.nbpkg_ctx_instantiated || 🐧
+                
+                if should_instantiate_again
+                    # Status.report_business!(pkg_status, :instantiate2) do
+                    instantiate(notebook, iolistener)
+                    # end
+                end
+
                 (
                     did_something=🐧,
                     restart_recommended=🐧,

From f3d8946dd2743e605418d73cead26e6fcd79d11f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 14 Mar 2023 14:56:03 +0100
Subject: [PATCH 604/821] Instantiate after auto fixed resolve (#2504)

---
 src/packages/Packages.jl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index fad17bef7b..f12655f763 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -446,6 +446,7 @@ function with_auto_fixes(f::Function, notebook::Notebook)
             @warn "Operation failed. Removing Manifest and trying again..." exception=e
             
             reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
+            notebook.nbpkg_ctx_instantiated = false
             try
                 f()
             catch e
@@ -453,6 +454,7 @@ function with_auto_fixes(f::Function, notebook::Notebook)
                 
                 reset_nbpkg!(notebook; keep_project=true, save=false, backup=false)
                 PkgCompat.clear_compat_entries!(notebook.nbpkg_ctx)
+                notebook.nbpkg_ctx_instantiated = false
                 
                 f()
             end

From 2b265caf7888ed1ff2caad1f4d12313a7b9fb3c5 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 30 Mar 2023 12:27:17 +0200
Subject: [PATCH 605/821] whitespace

---
 src/runner/PlutoRunner.jl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index f2f872b00e..0df26d2050 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -2356,7 +2356,7 @@ function Logging.shouldlog(logger::PlutoCellLogger, level, _module, _...)
     level = convert(Logging.LogLevel, level)
     (_module isa Module && is_pluto_workspace(_module)) ||
         level >= Logging.Info ||
-        level == Logging.LogLevel(-1) ||
+        level == progress_log_level ||
         level == stdout_log_level
 end
 
@@ -2414,6 +2414,7 @@ function _send_stdio_output!(output, loglevel)
 end
 
 const stdout_log_level = Logging.LogLevel(-555) # https://en.wikipedia.org/wiki/555_timer_IC
+const progress_log_level = Logging.LogLevel(-1) # https://github.com/JuliaLogging/ProgressLogging.jl/blob/0e7933005233722d6214b0debe3316c82b4d14a7/src/ProgressLogging.jl#L36
 function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogLevel=Logging.LogLevel(1))
     if !enabled
         return f()

From 2bf406865d67cf6e3ef1f2c2ed31859a1f4fecd2 Mon Sep 17 00:00:00 2001
From: tecosaur <git@tecosaur.net>
Date: Wed, 5 Apr 2023 21:43:11 +0800
Subject: [PATCH 606/821] Restyle frontmatter dialog to match rest of pluto
 (#2470)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/FrontmatterInput.js |  3 +-
 frontend/dark_color.css                 |  6 ++++
 frontend/editor.css                     | 37 ++++++++++++++++++++++---
 frontend/light_color.css                |  8 +++++-
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index 5af47b3499..3ca04e3d24 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -85,11 +85,12 @@ export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter })
                     <${Input} type=${field_type(key)} id=${id} value=${value} on_value=${fm_setter(key)} />
                     <button
                         class="deletefield"
+                        title="Delete field"
                         onClick=${() => {
                             set_frontmatter((fm) => Object.fromEntries(Object.entries(fm).filter(([k]) => k !== key)))
                         }}
                     >
-                        ⨯
+                        ✕
                     </button>
                 `
             })}
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index a43d151a63..f1c177b266 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -29,6 +29,12 @@
         --export-card-text-color: rgb(255 255 255 / 70%);
         --export-card-shadow-color: #0000001c;
 
+        /*Frontmatter styling*/
+        --frontmatter-button-bg-color: #554e4e;
+        --frontmatter-outline-color: rgb(255 248 235);
+        --frontmatter-input-bg-color: #2c2c2c;
+        --frontmatter-input-border-color: #757575;
+
         /*Pluto output styling */
         --pluto-schema-types-color: rgba(255, 255, 255, 0.6);
         --pluto-schema-types-border-color: rgba(255, 255, 255, 0.2);
diff --git a/frontend/editor.css b/frontend/editor.css
index 6671d77a62..be7fa9107e 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -3327,22 +3327,51 @@ pluto-cell.hooked_up pluto-output {
 .pluto-frontmatter {
     font-family: var(--system-ui-font-stack);
     width: min(31rem, 90vw);
-    color: var(--black);
-    background: var(--white);
+    color: var(--export-color);
+    background: var(--export-bg-color);
+    border-radius: 1em;
+    padding: 1em 1.5em;
 }
 
 .pluto-frontmatter button {
     cursor: pointer;
+    background-color: var(--frontmatter-button-bg-color);
+    border-radius: 0.5em;
+    border: 2px solid var(--frontmatter-button-bg-color);
+    font-weight: 500;
+}
+
+.pluto-frontmatter button:hover {
+    border-color: var(--frontmatter-input-border-color);
+}
+
+.pluto-frontmatter input {
+    background-color: var(--frontmatter-input-bg-color);
+    border-radius: 0.5em;
+    border: 2px solid var(--frontmatter-input-border-color);
+    padding: 0.3em 0.5em;
+}
+
+.pluto-frontmatter rbl-tag-input {
+    color: var(--black);
+}
+
+.pluto-frontmatter label {
+    text-transform: capitalize;
+    font-weight: 500;
 }
 
 .pluto-frontmatter .deletefield {
-    align-self: baseline;
+    color: var(--export-color);
+    background-color: transparent;
+    border-width: 0;
+    align-self: stretch;
+    margin-left: -1em;
 }
 
 .pluto-frontmatter .addentry {
     grid-column: 1/3;
     margin-top: 0.5em;
-    background-color: transparent;
 }
 
 .pluto-frontmatter .final {
diff --git a/frontend/light_color.css b/frontend/light_color.css
index e97bf2687d..5403dc3262 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -26,12 +26,18 @@
 
         /*Export styling*/
         --export-bg-color: rgb(60, 67, 101);
-        --export-color: rgba(255, 255, 255, 0.7);
+        --export-color: rgb(228, 228, 228);
         --export-card-bg-color: rgba(255, 255, 255, 0.8);
         --export-card-title-color: rgba(0, 0, 0, 0.7);
         --export-card-text-color: rgba(0, 0, 0, 0.5);
         --export-card-shadow-color: #00000029;
 
+        /*Frontmatter styling*/
+        --frontmatter-button-bg-color: white;
+        --frontmatter-outline-color: hsl(230, 14%, 11%);
+        --frontmatter-input-bg-color: #fbfbfb;
+        --frontmatter-input-border-color: hsl(207deg 24% 87%);
+
         /*Pluto output styling */
         --pluto-schema-types-color: rgba(0, 0, 0, 0.4);
         --pluto-schema-types-border-color: rgba(0, 0, 0, 0.2);

From 4bde0846791bb25ba7a79dd68c25fb1dc00e2d20 Mon Sep 17 00:00:00 2001
From: tecosaur <git@tecosaur.net>
Date: Wed, 5 Apr 2023 21:52:03 +0800
Subject: [PATCH 607/821] Improve print view styling (#2468)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/hide-ui.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/hide-ui.css b/frontend/hide-ui.css
index afcb5bf12c..8d25ce1cce 100644
--- a/frontend/hide-ui.css
+++ b/frontend/hide-ui.css
@@ -23,4 +23,8 @@ pluto-runarea,
     nav#undo_delete {
         display: none !important;
     }
+    pluto-input .cm-editor {
+        border-left: 1px solid var(--normal-cell-color);
+        border-radius: 4px !important;
+    }
 }

From 790ca6d71a802f4cfa251ca82aba9cae85e7393b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 5 Apr 2023 16:01:36 +0200
Subject: [PATCH 608/821] Hide server start and stop logs from HTTP.jl (#2516)

---
 Project.toml               | 2 +-
 src/webserver/WebServer.jl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Project.toml b/Project.toml
index 1562039d54..5035306d72 100644
--- a/Project.toml
+++ b/Project.toml
@@ -34,7 +34,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 [compat]
 Configurations = "0.15, 0.16, 0.17"
 FuzzyCompletions = "0.3, 0.4, 0.5"
-HTTP = "^1.0.2"
+HTTP = "^1.5.2"
 HypertextLiteral = "0.7, 0.8, 0.9"
 LoggingExtras = "0.4, 1"
 MIMEs = "0.1"
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index f8ea1b18fd..7a5ce229af 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -154,11 +154,11 @@ function run(session::ServerSession)
         end
         empty!(session.connected_clients)
         for nb in values(session.notebooks)
-            @asynclog SessionActions.shutdown(session, nb; keep_in_session = false, async = false, verbose = false)
+            @asynclog SessionActions.shutdown(session, nb; keep_in_session=false, async=false, verbose=false)
         end
     end
 
-    server = HTTP.listen!(hostIP, port; stream = true, server = serversocket, on_shutdown) do http::HTTP.Stream
+    server = HTTP.listen!(hostIP, port; stream=true, server=serversocket, on_shutdown, verbose=-1) do http::HTTP.Stream
         # messy messy code so that we can use the websocket on the same port as the HTTP server
         if HTTP.WebSockets.isupgrade(http.message)
             secret_required = let

From 1737e0d7e42e01f50bd1fda5992a5fa26daebfc1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 5 Apr 2023 16:02:34 +0200
Subject: [PATCH 609/821] =?UTF-8?q?=F0=9F=A6=86=20Fix=20#2416=20maybe=20by?=
 =?UTF-8?q?=20avoiding=20race=20condition=20(#2501)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/evaluation/Run.jl    |  2 +-
 src/webserver/Dynamic.jl | 43 ++++++++++++++++++++++++----------------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index ed272de5c0..035796a8e0 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -177,7 +177,7 @@ function run_reactive_core!(
         cell.running = true
         # Important to not use empty! here because AppendonlyMarker requires a new array identity.
         # Eventually we could even make AppendonlyArray to enforce this but idk if it's worth it. yadiyadi.
-        cell.logs = []
+        cell.logs = Vector{Dict{String,Any}}()
         send_notebook_changes_throttled()
 
         if any_interrupted || notebook.wants_to_interrupt || !will_run_code(notebook)
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 88fec7d1ce..70b8c26343 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -173,31 +173,40 @@ end
 For each connected client, we keep a copy of their current state. This way we know exactly which updates to send when the server-side state changes.
 """
 const current_state_for_clients = WeakKeyDict{ClientSession,Any}()
+const current_state_for_clients_lock = ReentrantLock()
 
 """
 Update the local state of all clients connected to this notebook.
 """
 function send_notebook_changes!(🙋::ClientRequest; commentary::Any=nothing, skip_send::Bool=false)
-    notebook_dict = notebook_to_js(🙋.notebook)
-    for (_, client) in 🙋.session.connected_clients
-        if client.connected_notebook !== nothing && client.connected_notebook.notebook_id == 🙋.notebook.notebook_id
-            current_dict = get(current_state_for_clients, client, :empty)
-            patches = Firebasey.diff(current_dict, notebook_dict)
-            patches_as_dicts::Array{Dict} = Firebasey._convert(Array{Dict}, patches)
-            current_state_for_clients[client] = deep_enough_copy(notebook_dict)
-
-            # Make sure we do send a confirmation to the client who made the request, even without changes
-            is_response = 🙋.initiator !== nothing && client == 🙋.initiator.client
-
-            if !skip_send && (!isempty(patches) || is_response)
-                response = Dict(
-                    :patches => patches_as_dicts,
-                    :response => is_response ? commentary : nothing
-                )
-                putclientupdates!(client, UpdateMessage(:notebook_diff, response, 🙋.notebook, nothing, 🙋.initiator))
+    outbox = Set{Tuple{ClientSession,UpdateMessage}}()
+    
+    lock(current_state_for_clients_lock) do
+        notebook_dict = notebook_to_js(🙋.notebook)
+        for (_, client) in 🙋.session.connected_clients
+            if client.connected_notebook !== nothing && client.connected_notebook.notebook_id == 🙋.notebook.notebook_id
+                current_dict = get(current_state_for_clients, client, :empty)
+                patches = Firebasey.diff(current_dict, notebook_dict)
+                patches_as_dicts::Array{Dict} = Firebasey._convert(Array{Dict}, patches)
+                current_state_for_clients[client] = deep_enough_copy(notebook_dict)
+
+                # Make sure we do send a confirmation to the client who made the request, even without changes
+                is_response = 🙋.initiator !== nothing && client == 🙋.initiator.client
+
+                if !skip_send && (!isempty(patches) || is_response)
+                    response = Dict(
+                        :patches => patches_as_dicts,
+                        :response => is_response ? commentary : nothing
+                    )
+                    push!(outbox, (client, UpdateMessage(:notebook_diff, response, 🙋.notebook, nothing, 🙋.initiator)))
+                end
             end
         end
     end
+    
+    for (client, msg) in outbox
+        putclientupdates!(client, msg)
+    end
     try_event_call(🙋.session, FileEditEvent(🙋.notebook))
 end
 

From 4d3b0edbe8cd240672b7d7627c7a601e7a778e0b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 5 Apr 2023 16:15:22 +0200
Subject: [PATCH 610/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 5035306d72..14dd4a2fe6 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.22"
+version = "0.19.23"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From c51ce80efb409b8e4ca25a73d7d07eff98441e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Wed, 5 Apr 2023 18:00:20 +0300
Subject: [PATCH 611/821] chore: bump preact version and pin esm.sh to v113
 (#2514)

---
 frontend/imports/Preact.js | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/frontend/imports/Preact.js b/frontend/imports/Preact.js
index 29d5f06b3d..36cc871a5d 100644
--- a/frontend/imports/Preact.js
+++ b/frontend/imports/Preact.js
@@ -1,14 +1,5 @@
 // @ts-nocheck
-import {
-    //
-    render,
-    Component,
-    h,
-    cloneElement,
-    createContext,
-    createRef,
-    hydrate,
-} from "https://esm.sh/v66/preact@10.6.6?target=es2020"
+import { render, Component, h, cloneElement, createContext, createRef, hydrate } from "https://esm.sh/preact@10.13.2?pin=v113&target=es2020"
 import {
     //
     useEffect,
@@ -19,9 +10,9 @@ import {
     useCallback,
     useContext,
     useErrorBoundary,
-} from "https://esm.sh/v66/preact@10.6.6/hooks?target=es2020"
+} from "https://esm.sh/preact@10.13.2/hooks?pin=v113&target=es2020"
 
-import htm from "https://esm.sh/v66/htm@3.1.0?target=es2020"
+import htm from "https://esm.sh/htm@3.1.1?pin=v113&target=es2020"
 
 const html = htm.bind(h)
 

From 2a8be39974e27372603c4800e1b92b5ba9458dbc Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 5 Apr 2023 17:56:21 +0200
Subject: [PATCH 612/821] Update featured_sources.js

---
 frontend/featured_sources.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/featured_sources.js b/frontend/featured_sources.js
index 6267e65efc..5acc0b97d9 100644
--- a/frontend/featured_sources.js
+++ b/frontend/featured_sources.js
@@ -2,8 +2,8 @@ export default {
     // check out https://github.com/JuliaPluto/pluto-developer-instructions/blob/main/How%20to%20update%20the%20featured%20notebooks.md to learn more
     sources: [
         {
-            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@v1/pluto_export.json",
-            integrity: "sha256-HjgcS33T86/pD8eXoNu8mzig0u9MQ/MJQ+YgZ+cLzkk=",
+            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@v2/pluto_export.json",
+            integrity: "sha256-fDkEwI4YcuoCcQPZQmafTwnHD0evKyq0dGLEL+XLjZA=",
         },
     ],
 }

From 62c7fb001e1ae728b18fd215b91e4884e9427c9a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 6 Apr 2023 12:26:33 +0200
Subject: [PATCH 613/821] tweak release notes template

---
 .github/workflows/TagBot.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/TagBot.yml b/.github/workflows/TagBot.yml
index a86d626b9c..d0c5b86382 100644
--- a/.github/workflows/TagBot.yml
+++ b/.github/workflows/TagBot.yml
@@ -23,17 +23,11 @@ jobs:
                   # See https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
                   token: ${{ secrets.PAT_TOKEN }}
                   changelog: |
-                    ## {{ package }} {{ version }}
-                    
-                    > Try this release in your browser! _(Available 30 minutes after the release)_
+                    > **Try this release in your browser!** _(Available 30 minutes after the release)_
                     > 
                     > <a href="https://binder.plutojl.org/{{ version }}/"><img alt="Binder logo" src="https://mybinder.org/badge_logo.svg"></a>
-
-                    **Generate your own binder links using [pluto-on-binder.glitch.me](https://pluto-on-binder.glitch.me/)!**
-
-                    {% if previous_release %}
-                    [Diff since {{ previous_release }}]({{ compare_url }})
-                    {% endif %}
+                    >
+                    > Generate your own binder links using [pluto-on-binder.glitch.me](https://pluto-on-binder.glitch.me/)!
 
                     {% if custom %}
                     {{ custom }}
@@ -64,3 +58,7 @@ jobs:
 
                     # Internal changes
                     *(TODO)*
+
+                    {% if previous_release %}
+                    [Diff since {{ previous_release }}]({{ compare_url }})
+                    {% endif %}

From f11d6e0b476625bc4d8277c554e41d80e9d13308 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 7 Apr 2023 20:56:09 +0200
Subject: [PATCH 614/821] Status tab: tweak initial planned state

---
 src/webserver/SessionActions.jl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 42ba4e976d..8355cf552d 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -79,9 +79,10 @@ function open(session::ServerSession, path::AbstractString;
     run_status = Status.report_business_planned!(notebook.status_tree, :run)
     if session.options.evaluation.run_notebook_on_load
         Status.report_business_planned!(run_status, :resolve_topology)
+        cell_status = Status.report_business_planned!(run_status, :evaluate)
         for (i,c) in enumerate(notebook.cells)
             c.queued = true
-            Status.report_business_planned!(run_status, Symbol(i))
+            Status.report_business_planned!(cell_status, Symbol(i))
         end
     end
 

From 8d63bde64771b4014b11034716c78c574b27c879 Mon Sep 17 00:00:00 2001
From: fonsp <fonsvdplas@gmail.com>
Date: Sun, 9 Apr 2023 09:49:23 +0000
Subject: [PATCH 615/821] Fix more esm.sh build version pins

Same as #2514
---
 frontend/common/Polyfill.js                     | 2 +-
 frontend/components/CellInput/lezer_template.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/common/Polyfill.js b/frontend/common/Polyfill.js
index 932b1e9eaa..693a47f076 100644
--- a/frontend/common/Polyfill.js
+++ b/frontend/common/Polyfill.js
@@ -28,6 +28,6 @@ if (Blob.prototype.arrayBuffer == null) {
 }
 
 //@ts-ignore
-import { polyfill as scroll_polyfill } from "https://esm.sh/seamless-scroll-polyfill@2.1.8/lib/polyfill.js"
+import { polyfill as scroll_polyfill } from "https://esm.sh/seamless-scroll-polyfill@2.1.8/lib/polyfill.js?pin=v113&target=es2020"
 
 scroll_polyfill()
diff --git a/frontend/components/CellInput/lezer_template.js b/frontend/components/CellInput/lezer_template.js
index 9be4f144d0..c034642452 100644
--- a/frontend/components/CellInput/lezer_template.js
+++ b/frontend/components/CellInput/lezer_template.js
@@ -2,7 +2,7 @@ import { julia_andrey, NodeProp, syntaxTree, Text } from "../../imports/Codemirr
 import lodash from "../../imports/lodash.js"
 
 // @ts-ignore
-import ManyKeysWeakMap from "https://cdn.esm.sh/v64/many-keys-weakmap@1.0.0/es2021/many-keys-weakmap.js"
+import ManyKeysWeakMap from "https://esm.sh/many-keys-weakmap@1.0.0?pin=v113&target=es2020"
 
 /**
  * @param {string} julia_code

From 7a0d441ac7f4fe8181888f89b0b905a00bae9ee6 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Mon, 10 Apr 2023 11:06:53 +0200
Subject: [PATCH 616/821] Handle more complex struct constructors (#2525)

See tests.
---
 src/analysis/ExpressionExplorer.jl | 6 ++++++
 test/ExpressionExplorer.jl         | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 87ab7aa3b5..a1c4a1f8fb 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -929,6 +929,12 @@ function explore_funcdef!(ex::Expr, scopestate::ScopeState)::Tuple{FunctionName,
         # and explore the function arguments
         return umapfoldl(a -> explore_funcdef!(a, scopestate), params_to_explore; init=(name, symstate))
     elseif ex.head == :(::) || ex.head == :kw || ex.head == :(=)
+        # Treat custom struct constructors as a local scope function
+        if ex.head == :(=) && is_function_assignment(ex)
+            symstate = explore!(ex, scopestate)
+            return Symbol[], symstate
+        end
+
         # account for unnamed params, like in f(::Example) = 1
         if ex.head == :(::) && length(ex.args) == 1
             symstate = explore!(ex.args[1], scopestate)
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index 15d8271605..505b7470ea 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -133,7 +133,10 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(:(struct a{A,B<:C{A}}; i::A; j::B end), [], [:a], [], [:a => ([:C], [], [], [])])
         @test testee(:(struct a{A,B<:C{<:A}} <: D{A,B}; i::A; j::B end), [], [:a], [], [:a => ([:C, :D], [], [], [])])
         @test testee(:(struct a{A,DD<:B.C{D.E{A}}} <: K.A{A} i::A; j::DD; k::C end), [], [:a], [], [:a => ([:B, :C, :D, :K], [], [], [])])
-        
+        @test testee(:(struct a; x; a(t::T) where {T} = new(t); end), [], [:a], [], [:a => ([], [], [[:new]], [])])
+        @test testee(:(struct a; x; y; a(t::T) where {T} = new(t, T); end), [], [:a], [], [:a => ([], [], [[:new]], [])])
+        @test testee(:(struct a; f() = a() end), [], [:a], [], [:a => ([], [], [], [])])
+
         @test testee(:(abstract type a <: b end), [], [:a], [], [:a => ([:b], [], [], [])])
         @test testee(:(abstract type a{T,S} end), [], [:a], [], [:a => ([], [], [], [])])
         @test testee(:(abstract type a{T} <: b end), [], [:a], [], [:a => ([:b], [], [], [])])

From 90d1866bd6b7910d2739e9557cc60636e4c2359e Mon Sep 17 00:00:00 2001
From: fonsp <fonsvdplas@gmail.com>
Date: Mon, 10 Apr 2023 14:04:43 +0000
Subject: [PATCH 617/821] Running an HTML export: Clear the Status of the
 process that generated the HTML

---
 frontend/common/RunLocal.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/common/RunLocal.js b/frontend/common/RunLocal.js
index 546c0f7d86..415e448e75 100644
--- a/frontend/common/RunLocal.js
+++ b/frontend/common/RunLocal.js
@@ -18,9 +18,11 @@ export const start_local = async ({ setStatePromise, connect, launch_params }) =
         if (launch_params.pluto_server_url == null || launch_params.notebookfile == null) throw Error("Invalid launch parameters for starting locally.")
 
         await setStatePromise(
-            immer((state) => {
+            immer((/** @type {import("../components/Editor.js").EditorState} */ state) => {
                 state.backend_launch_phase = BackendLaunchPhase.created
                 state.disable_ui = false
+                // Clear the Status of the process that generated the HTML
+                state.notebook.status_tree = null
             })
         )
 
@@ -60,7 +62,7 @@ export const start_local = async ({ setStatePromise, connect, launch_params }) =
         window.history.replaceState({}, "", edit_url)
 
         await setStatePromise(
-            immer((state) => {
+            immer((/** @type {import("../components/Editor.js").EditorState} */ state) => {
                 state.notebook.notebook_id = new_notebook_id
                 state.backend_launch_phase = BackendLaunchPhase.notebook_running
             })

From 5a309900ce807b891154856ddf8cbe0ee20a3b1c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 10 Apr 2023 16:55:22 +0200
Subject: [PATCH 618/821] Add binder progress and logs to status tab (#2523)

---
 frontend/common/Binder.js               | 45 ++++++++++++-----
 frontend/common/RunLocal.js             |  2 +-
 frontend/components/BottomRightPanel.js | 65 ++++++++++++++++++++++---
 frontend/components/Editor.js           |  5 ++
 frontend/components/ProcessTab.js       | 43 +++++++++++++---
 frontend/editor.js                      |  2 +-
 6 files changed, 134 insertions(+), 28 deletions(-)

diff --git a/frontend/common/Binder.js b/frontend/common/Binder.js
index fb45117c86..975652cfce 100644
--- a/frontend/common/Binder.js
+++ b/frontend/common/Binder.js
@@ -6,6 +6,7 @@ export const BackendLaunchPhase = {
     wait_for_user: 0,
     requesting: 0.4,
     created: 0.6,
+    responded: 0.7,
     notebook_running: 0.9,
     ready: 1.0,
 }
@@ -31,7 +32,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 export const trailingslash = (s) => (s.endsWith("/") ? s : s + "/")
 
-export const request_binder = (build_url) =>
+export const request_binder = (build_url, { on_log }) =>
     new Promise((resolve, reject) => {
         console.log("Starting binder connection to", build_url)
         try {
@@ -42,18 +43,23 @@ export const request_binder = (build_url) =>
                 reject(err)
             }
             let phase = null
+            let logs = ``
+            let report_log = (msg) => {
+                console.log("Binder: ", msg, ` at ${new Date().toLocaleTimeString()}`)
+
+                logs = `${logs}${msg}\n`
+                on_log(logs)
+            }
             es.onmessage = (evt) => {
                 let msg = JSON.parse(evt.data)
+
                 if (msg.phase && msg.phase !== phase) {
                     phase = msg.phase.toLowerCase()
-                    console.log("Binder subphase: " + phase)
-                    let status = phase
-                    if (status === "ready") {
-                        status = "server-ready"
-                    }
+
+                    report_log(`\n\n⏱️ Binder subphase: ${phase}\n`)
                 }
                 if (msg.message) {
-                    console.log("Binder message: " + msg.message)
+                    report_log(msg.message.replace(`] `, `]\n`))
                 }
                 switch (msg.phase) {
                     case "failed":
@@ -69,8 +75,6 @@ export const request_binder = (build_url) =>
                             binder_session_token: msg.token,
                         })
                         break
-                    default:
-                    // console.log(msg);
                 }
             }
         } catch (err) {
@@ -91,14 +95,23 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
         // view stats on https://stats.plutojl.org/
         count_stat(`binder-start`)
         await setStatePromise(
-            immer((state) => {
+            immer((/** @type {import("../components/Editor.js").EditorState} */ state) => {
                 state.backend_launch_phase = BackendLaunchPhase.requesting
                 state.disable_ui = false
+                // Clear the Status of the process that generated the HTML
+                state.notebook.status_tree = null
             })
         )
 
         /// PART 1: Creating a binder session..
-        const { binder_session_url, binder_session_token } = await request_binder(launch_params.binder_url.replace("mybinder.org/v2/", "mybinder.org/build/"))
+        const { binder_session_url, binder_session_token } = await request_binder(launch_params.binder_url.replace("mybinder.org/v2/", "mybinder.org/build/"), {
+            on_log: (logs) =>
+                setStatePromise(
+                    immer((/** @type {import("../components/Editor.js").EditorState} */ state) => {
+                        state.backend_launch_logs = logs
+                    })
+                ),
+        })
         const with_token = (u) => with_query_params(u, { token: binder_session_token })
 
         console.log("Binder URL:", with_token(binder_session_url))
@@ -109,16 +122,22 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
         }
 
         await setStatePromise(
-            immer((state) => {
+            immer((/** @type {import("../components/Editor.js").EditorState} */ state) => {
                 state.backend_launch_phase = BackendLaunchPhase.created
                 state.binder_session_url = binder_session_url
                 state.binder_session_token = binder_session_token
             })
         )
 
-        // fetch index to say hello
+        // fetch index to say hello to the pluto server. this ensures that the pluto server is running and it triggers JIT compiling some of the HTTP code.
         await fetch(with_token(binder_session_url))
 
+        await setStatePromise(
+            immer((/** @type {import("../components/Editor.js").EditorState} */ state) => {
+                state.backend_launch_phase = BackendLaunchPhase.responded
+            })
+        )
+
         /// PART 2: Using Pluto's REST API to open the notebook file. We either upload the notebook with a POST request, or we let the server open by giving it the filename/URL.
 
         let open_response = new Response()
diff --git a/frontend/common/RunLocal.js b/frontend/common/RunLocal.js
index 415e448e75..60a7dc4e4b 100644
--- a/frontend/common/RunLocal.js
+++ b/frontend/common/RunLocal.js
@@ -19,7 +19,7 @@ export const start_local = async ({ setStatePromise, connect, launch_params }) =
 
         await setStatePromise(
             immer((/** @type {import("../components/Editor.js").EditorState} */ state) => {
-                state.backend_launch_phase = BackendLaunchPhase.created
+                state.backend_launch_phase = BackendLaunchPhase.responded
                 state.disable_ui = false
                 // Clear the Status of the process that generated the HTML
                 state.notebook.status_tree = null
diff --git a/frontend/components/BottomRightPanel.js b/frontend/components/BottomRightPanel.js
index aa20f300fd..dab8e2d6d3 100644
--- a/frontend/components/BottomRightPanel.js
+++ b/frontend/components/BottomRightPanel.js
@@ -2,8 +2,9 @@ import { html, useState, useRef, useEffect, useMemo } from "../imports/Preact.js
 import { cl } from "../common/ClassTable.js"
 
 import { LiveDocsTab } from "./LiveDocsTab.js"
-import { is_finished, ProcessTab, total_done, total_tasks } from "./ProcessTab.js"
+import { is_finished, ProcessTab, total_done, total_tasks, useStatusItem } from "./ProcessTab.js"
 import { useMyClockIsAheadBy } from "../common/clock sync.js"
+import { BackendLaunchPhase } from "../common/Binder.js"
 
 /**
  * @typedef PanelTabName
@@ -18,9 +19,11 @@ export const open_bottom_right_panel = (/** @type {PanelTabName} */ tab) => wind
  * desired_doc_query: string?,
  * on_update_doc_query: (query: string?) => void,
  * connected: boolean,
+ * backend_launch_phase: number?,
+ * backend_launch_logs: string?,
  * }} props
  */
-export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, notebook, connected }) => {
+export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, notebook, connected, backend_launch_phase, backend_launch_logs }) => {
     let container_ref = useRef()
 
     const focus_docs_on_open_ref = useRef(false)
@@ -42,17 +45,19 @@ export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, noteboo
         return () => window.removeEventListener("open_bottom_right_panel", handler)
     }, [])
 
+    const status = useWithBackendStatus(notebook, backend_launch_phase)
+
     const [status_total, status_done] = useMemo(
         () =>
-            notebook.status_tree == null
+            status == null
                 ? [0, 0]
                 : [
                       // total_tasks minus 1, to exclude the notebook task itself
-                      total_tasks(notebook.status_tree) - 1,
+                      total_tasks(status) - 1,
                       // the notebook task should never be done, but lets be sure and subtract 1 if it is:
-                      total_done(notebook.status_tree) - (is_finished(notebook.status_tree) ? 1 : 0),
+                      total_done(status) - (is_finished(status) ? 1 : 0),
                   ],
-        [notebook.status_tree]
+        [status]
     )
 
     const busy = status_done < status_total
@@ -120,7 +125,12 @@ export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, noteboo
                           notebook=${notebook}
                       />`
                     : open_tab === "process"
-                    ? html`<${ProcessTab} notebook=${notebook} my_clock_is_ahead_by=${my_clock_is_ahead_by} />`
+                    ? html`<${ProcessTab}
+                          notebook=${notebook}
+                          backend_launch_logs=${backend_launch_logs}
+                          my_clock_is_ahead_by=${my_clock_is_ahead_by}
+                          status=${status}
+                      />`
                     : null}
             </pluto-helpbox>
         </aside>
@@ -143,3 +153,44 @@ const useDelayedTruth = (/** @type {boolean} */ x, /** @type {number} */ timeout
 
     return output
 }
+
+/**
+ *
+ * @param {import("./Editor.js").NotebookData} notebook
+ * @param {number?} backend_launch_phase
+ * @returns {import("./Editor.js").StatusEntryData?}
+ */
+const useWithBackendStatus = (notebook, backend_launch_phase) => {
+    const backend_launch = useBackendStatus(backend_launch_phase)
+
+    return backend_launch_phase == null
+        ? notebook.status_tree
+        : {
+              name: "notebook",
+              started_at: 0,
+              finished_at: null,
+              subtasks: {
+                  ...notebook.status_tree?.subtasks,
+                  backend_launch,
+              },
+          }
+}
+
+const useBackendStatus = (/** @type {number | null} */ backend_launch_phase) => {
+    let x = backend_launch_phase ?? -1
+
+    const subtasks = Object.fromEntries(
+        ["requesting", "created", "responded", "notebook_running"].map((key) => {
+            let val = BackendLaunchPhase[key]
+            let name = `backend_${key}`
+            return [name, useStatusItem(name, x >= val, x > val)]
+        })
+    )
+
+    return useStatusItem(
+        "backend_launch",
+        backend_launch_phase != null && backend_launch_phase > BackendLaunchPhase.wait_for_user,
+        backend_launch_phase === BackendLaunchPhase.ready,
+        subtasks
+    )
+}
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 9aadd86974..76388dfc03 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -142,6 +142,7 @@ const first_true_key = (obj) => {
  *   name: string,
  *   started_at: number?,
  *   finished_at: number?,
+ *   timing?: "remote" | "local",
  *   subtasks: Record<string,StatusEntryData>,
  * }}
  */
@@ -269,6 +270,7 @@ const url_logo_small = document.head.querySelector("link[rel='pluto-logo-small']
  * disable_ui: boolean,
  * static_preview: boolean,
  * backend_launch_phase: ?number,
+ * backend_launch_logs: ?string,
  * binder_session_url: ?string,
  * binder_session_token: ?string,
  * refresh_target: ?string,
@@ -311,6 +313,7 @@ export class Editor extends Component {
                 launch_params.notebookfile != null && (launch_params.binder_url != null || launch_params.pluto_server_url != null)
                     ? BackendLaunchPhase.wait_for_user
                     : null,
+            backend_launch_logs: null,
             binder_session_url: null,
             binder_session_token: null,
             refresh_target: null,
@@ -1557,6 +1560,8 @@ patch: ${JSON.stringify(
                         desired_doc_query=${this.state.desired_doc_query}
                         on_update_doc_query=${this.actions.set_doc_query}
                         connected=${this.state.connected}
+                        backend_launch_phase=${this.state.backend_launch_phase}
+                        backend_launch_logs=${this.state.backend_launch_logs}
                         notebook=${this.state.notebook}
                     />
                     <${Popup} 
diff --git a/frontend/components/ProcessTab.js b/frontend/components/ProcessTab.js
index fad12c5f1b..20c27d9295 100644
--- a/frontend/components/ProcessTab.js
+++ b/frontend/components/ProcessTab.js
@@ -1,4 +1,4 @@
-import { html, useEffect, useRef, useState } from "../imports/Preact.js"
+import { html, useEffect, useMemo, useRef, useState } from "../imports/Preact.js"
 
 import { cl } from "../common/ClassTable.js"
 import { prettytime, useMillisSinceTruthy } from "./RunArea.js"
@@ -7,14 +7,22 @@ import { PkgTerminalView } from "./PkgTerminalView.js"
 
 /**
  * @param {{
+ * status: import("./Editor.js").StatusEntryData,
  * notebook: import("./Editor.js").NotebookData,
+ * backend_launch_logs: string?,
  * my_clock_is_ahead_by: number,
  * }} props
  */
-export let ProcessTab = ({ notebook, my_clock_is_ahead_by }) => {
+export let ProcessTab = ({ status, notebook, backend_launch_logs, my_clock_is_ahead_by }) => {
     return html`
         <section>
-            <${StatusItem} status_tree=${notebook.status_tree} path=${[]} my_clock_is_ahead_by=${my_clock_is_ahead_by} nbpkg=${notebook.nbpkg} />
+            <${StatusItem}
+                status_tree=${status}
+                path=${[]}
+                my_clock_is_ahead_by=${my_clock_is_ahead_by}
+                nbpkg=${notebook.nbpkg}
+                backend_launch_logs=${backend_launch_logs}
+            />
         </section>
     `
 }
@@ -62,6 +70,12 @@ const descriptions = {
     evaluate: "Running code",
     registry_update: "Updating package registry",
     waiting_for_others: "Waiting for other notebooks to finish package operations",
+
+    backend_launch: "Connecting to backend",
+    backend_requesting: "Requesting a worker",
+    backend_created: "Starting Pluto server",
+    backend_responded: "Opening notebook file",
+    backend_notebook_running: "Switching to live editing",
 }
 
 export const friendly_name = (/** @type {string} */ task_name) => {
@@ -78,10 +92,12 @@ const to_ns = (x) => x * 1e9
  * path: string[],
  * my_clock_is_ahead_by: number,
  * nbpkg: import("./Editor.js").NotebookPkgData?,
+ * backend_launch_logs: string?,
  * }} props
  */
-const StatusItem = ({ status_tree, path, my_clock_is_ahead_by, nbpkg }) => {
+const StatusItem = ({ status_tree, path, my_clock_is_ahead_by, nbpkg, backend_launch_logs }) => {
     if (status_tree == null) return null
+
     const mystatus = path.reduce((entry, key) => entry.subtasks[key], status_tree)
     if (!mystatus) return null
 
@@ -97,7 +113,7 @@ const StatusItem = ({ status_tree, path, my_clock_is_ahead_by, nbpkg }) => {
     const local_busy_time = (useMillisSinceTruthy(busy) ?? 0) / 1000
     const mytime = Date.now() / 1000
 
-    const busy_time = Math.max(local_busy_time, mytime - my_clock_is_ahead_by - start)
+    const busy_time = Math.max(local_busy_time, mytime - start - (mystatus.timing === "local" ? 0 : my_clock_is_ahead_by))
 
     useEffect(() => {
         if (busy) {
@@ -137,6 +153,7 @@ const StatusItem = ({ status_tree, path, my_clock_is_ahead_by, nbpkg }) => {
                           my_clock_is_ahead_by=${my_clock_is_ahead_by}
                           path=${[...path, key]}
                           nbpkg=${nbpkg}
+                          backend_launch_logs=${backend_launch_logs}
                       />`
             )
 
@@ -187,7 +204,12 @@ const StatusItem = ({ status_tree, path, my_clock_is_ahead_by, nbpkg }) => {
                   <span class="status-name">${friendly_name(mystatus.name)}${inner_progress}</span>
                   <span class="status-time">${finished ? prettytime(to_ns(end - start)) : busy ? prettytime(to_ns(busy_time)) : null}</span>
               </div>
-              ${inner}${is_open && mystatus.name === "pkg" ? html`<${PkgTerminalView} value=${nbpkg?.terminal_outputs?.nbpkg_sync} />` : undefined}
+              ${inner}
+              ${is_open && mystatus.name === "pkg"
+                  ? html`<${PkgTerminalView} value=${nbpkg?.terminal_outputs?.nbpkg_sync} />`
+                  : is_open && mystatus.name === "backend_launch"
+                  ? html`<${PkgTerminalView} value=${backend_launch_logs} />`
+                  : undefined}
           </pl-status>`
 }
 
@@ -254,6 +276,15 @@ export const path_to_first_busy_business = (status) => {
     return []
 }
 
+/** @returns {import("./Editor.js").StatusEntryData} */
+export const useStatusItem = (/** @type {string} */ name, /** @type {boolean} */ started, /** @type {boolean} */ finished, subtasks = {}) => ({
+    name,
+    subtasks,
+    timing: "local",
+    started_at: useMemo(() => (started || finished ? Date.now() / 1000 : null), [started || finished]),
+    finished_at: useMemo(() => (finished ? Date.now() / 1000 : null), [finished]),
+})
+
 /** Like `useEffect`, but the handler function gets the previous deps value as argument. */
 const useEffectWithPrevious = (fn, deps) => {
     const ref = useRef(deps)
diff --git a/frontend/editor.js b/frontend/editor.js
index fa0c444ce6..c74face3df 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -94,7 +94,7 @@ export const empty_notebook_state = ({ notebook_id }) => ({
     published_objects: {},
     bonds: {},
     nbpkg: null,
-    status_tree: { name: "notebook", started_at: null, finished_at: null, subtasks: {} },
+    status_tree: null,
 })
 
 /**

From 78f7a4fc415adcd3fab76a893c91c0e41599427f Mon Sep 17 00:00:00 2001
From: fonsp <fonsvdplas@gmail.com>
Date: Mon, 10 Apr 2023 15:37:58 +0000
Subject: [PATCH 619/821] =?UTF-8?q?=F0=9F=A5=A6=20Fix=20#2454?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/webserver/Static.jl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index b3b0fd8112..8b1fb6d757 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -380,7 +380,7 @@ function http_router_for(session::ServerSession)
             notebook = notebook_from_uri(request)
             response = HTTP.Response(200, Pluto.pack(Pluto.notebook_to_js(notebook)))
             HTTP.setheader(response, "Content-Type" => "application/octet-stream")
-            HTTP.setheader(response, "Content-Disposition" => "inline; filename=\"$(without_pluto_file_extension(basename(notebook.path))).plutostate\"")
+            HTTP.setheader(response, "Content-Disposition" => "attachment; filename=\"$(without_pluto_file_extension(basename(notebook.path))).plutostate\"")
             response
         catch e
             return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
@@ -396,7 +396,7 @@ function http_router_for(session::ServerSession)
             notebook = notebook_from_uri(request)
             response = HTTP.Response(200, generate_html(notebook))
             HTTP.setheader(response, "Content-Type" => "text/html; charset=utf-8")
-            HTTP.setheader(response, "Content-Disposition" => "inline; filename=\"$(basename(notebook.path)).html\"")
+            HTTP.setheader(response, "Content-Disposition" => "attachment; filename=\"$(basename(notebook.path)).html\"")
             response
         catch e
             return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))

From 914cd2dfee3b08df2d35040d3256d08deaad5191 Mon Sep 17 00:00:00 2001
From: fonsp <fonsvdplas@gmail.com>
Date: Mon, 10 Apr 2023 15:39:54 +0000
Subject: [PATCH 620/821] Export file: asdf.html instead of asdf.jl.html

---
 src/webserver/Static.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index 8b1fb6d757..48a7f49bee 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -396,7 +396,7 @@ function http_router_for(session::ServerSession)
             notebook = notebook_from_uri(request)
             response = HTTP.Response(200, generate_html(notebook))
             HTTP.setheader(response, "Content-Type" => "text/html; charset=utf-8")
-            HTTP.setheader(response, "Content-Disposition" => "attachment; filename=\"$(basename(notebook.path)).html\"")
+            HTTP.setheader(response, "Content-Disposition" => "attachment; filename=\"$(without_pluto_file_extension(basename(notebook.path))).html\"")
             response
         catch e
             return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))

From 5b4af9112b6529caeb2ebbaa20a88063678719c9 Mon Sep 17 00:00:00 2001
From: fonsp <fonsvdplas@gmail.com>
Date: Mon, 10 Apr 2023 15:41:35 +0000
Subject: [PATCH 621/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 14dd4a2fe6..9cdea08b83 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.23"
+version = "0.19.24"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From e6a028f91c1e104eba81cd99c8fd5ee6553a750b Mon Sep 17 00:00:00 2001
From: fonsp <fonsvdplas@gmail.com>
Date: Mon, 10 Apr 2023 21:02:02 +0000
Subject: [PATCH 622/821] frontend test stability

---
 frontend/components/Editor.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 76388dfc03..51ad5e98be 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -678,8 +678,9 @@ export class Editor extends Component {
                                 const failing_path = String(exception).match(".*'(.*)'.*")?.[1].replace(/\//gi, ".") ?? exception
                                 const path_value = _.get(this.state.notebook, failing_path, "Not Found")
                                 console.log(String(exception).match(".*'(.*)'.*")?.[1].replace(/\//gi, ".") ?? exception, failing_path, typeof failing_path)
+                                const ignore = should_ignore_patch_error(failing_path)
 
-                                console.error(
+                                ;(ignore ? console.log : console.error)(
                                     `#######################**************************########################
 PlutoError: StateOutOfSync: Failed to apply patches.
 Please report this: https://github.com/fonsp/Pluto.jl/issues adding the info below:
@@ -694,7 +695,7 @@ patch: ${JSON.stringify(
                                     exception
                                 )
 
-                                if (should_ignore_patch_error(failing_path)) {
+                                if (ignore) {
                                     console.info("Safe to ignore this patch failure...")
                                 } else if (this.state.connected) {
                                     console.error("Trying to recover: Refetching notebook...")

From 4a7b01999a871bda494ecbc91a228f8ba1774b39 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 11 Apr 2023 08:52:41 +0200
Subject: [PATCH 623/821] =?UTF-8?q?=F0=9F=90=B0=20Fix=20#2527=20(#2528)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/PkgCompat.jl | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index 9516d48dde..bbede30293 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -444,7 +444,20 @@ function _modify_compat!(f!::Function, ctx::PkgContext)::PkgContext
 		Pkg.TOML.print(io, toml; sorted=true, by=(key -> (project_key_order(key), key)))
 	end)
 	
-	return load_ctx!(ctx)
+	return _update_project_hash!(load_ctx!(ctx))
+end
+
+# ✅ Internal API with fallback
+"Update the project hash in the manifest file (https://github.com/JuliaLang/Pkg.jl/pull/2815)"
+function _update_project_hash!(ctx::PkgContext)
+	VERSION >= v"1.8.0" && isfile(manifest_file(ctx)) && try
+		Pkg.Operations.record_project_hash(ctx.env)
+		Pkg.Types.write_manifest(ctx.env)
+	catch e
+		@info "Failed to update project hash." exception=(e,catch_backtrace())
+	end
+	
+	ctx
 end
 
 

From 75065513176e00b1e4b30d86df14d5e432deb622 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 11 Apr 2023 14:01:51 +0200
Subject: [PATCH 624/821] Julia 1.9: Ensure that precompile caches match by
 running `Pkg.precompile()` in an isolated Julia process (#2499)

---
 .github/workflows/Test.yml          |   2 +
 frontend/components/ProcessTab.js   |   5 ++
 src/Pluto.jl                        |   1 +
 src/packages/Packages.jl            |  69 +++++++++++++----
 src/packages/PkgCompat.jl           |  13 ++--
 src/packages/precompile_isolated.jl |  32 ++++++++
 test/Notebook.jl                    |   2 +-
 test/packages/Basic.jl              | 110 +++++++++++++++++++++-------
 8 files changed, 183 insertions(+), 51 deletions(-)
 create mode 100644 src/packages/precompile_isolated.jl

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 88053e98aa..537b4fd8f5 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -49,3 +49,5 @@ jobs:
 
             # 🚗
             - uses: julia-actions/julia-runtest@v1
+              with:
+                  coverage: false
diff --git a/frontend/components/ProcessTab.js b/frontend/components/ProcessTab.js
index 20c27d9295..56055d7eaa 100644
--- a/frontend/components/ProcessTab.js
+++ b/frontend/components/ProcessTab.js
@@ -45,6 +45,10 @@ resolve
 remove
 add
 instantiate
+instantiate1
+instantiate2
+instantiate3
+precompile
 
 run
 
@@ -66,6 +70,7 @@ const descriptions = {
     pkg: "Package management",
     instantiate1: "instantiate",
     instantiate2: "instantiate",
+    instantiate3: "instantiate",
     run: "Evaluating cells",
     evaluate: "Running code",
     registry_update: "Updating package registry",
diff --git a/src/Pluto.jl b/src/Pluto.jl
index f57a51da28..06e4e89c48 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -74,6 +74,7 @@ include("./analysis/MoreAnalysis.jl")
 include("./evaluation/WorkspaceManager.jl")
 include("./evaluation/MacroAnalysis.jl")
 include("./packages/IOListener.jl")
+include("./packages/precompile_isolated.jl")
 include("./packages/Packages.jl")
 include("./packages/PkgUtils.jl")
 include("./evaluation/Run.jl")
diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index f12655f763..4b14bb823d 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -4,6 +4,7 @@ import .PkgCompat
 import .PkgCompat: select, is_stdlib
 import Logging
 import LoggingExtras
+import .Configuration: CompilerOptions, _merge_notebook_compiler_options, _convert_to_flags
 
 const tiers = [
 	Pkg.PRESERVE_ALL,
@@ -60,6 +61,7 @@ function sync_nbpkg_core(
     on_terminal_output::Function=((args...) -> nothing), 
     cleanup::Ref{Function}=Ref{Function}(_default_cleanup),
     lag::Real=0,
+    compiler_options::CompilerOptions=CompilerOptions(),
 )
     pkg_status = Status.report_business_started!(notebook.status_tree, :pkg)
     Status.report_business_started!(pkg_status, :analysis)
@@ -138,27 +140,35 @@ function sync_nbpkg_core(
             
             return withtoken(pkg_token) do
                 withlogcapture(iolistener) do
-                    
-                    let
+
+                    let # Status stuff
                         isnothing(wait_business) || Status.report_business_finished!(wait_business)
                         
-                        notebook.nbpkg_ctx_instantiated || Status.report_business_planned!(pkg_status, :instantiate1)
-                        notebook.nbpkg_ctx_instantiated || Status.report_business_planned!(pkg_status, :resolve)
+                        if !notebook.nbpkg_ctx_instantiated
+                            Status.report_business_planned!(pkg_status, :instantiate1)
+                            Status.report_business_planned!(pkg_status, :resolve)
+                            Status.report_business_planned!(pkg_status, :precompile)
+                        end
+                        
                         isempty(removed) || Status.report_business_planned!(pkg_status, :remove)
                         isempty(added) || Status.report_business_planned!(pkg_status, :add)
                         if !isempty(added) || !isempty(removed)
                             Status.report_business_planned!(pkg_status, :instantiate2)
+                            Status.report_business_planned!(pkg_status, :precompile)
                         end
                     end
                     
-                    PkgCompat.refresh_registry_cache()
+                    should_precompile_later = false
                     
+                    PkgCompat.refresh_registry_cache()
                     PkgCompat.clear_stdlib_compat_entries!(notebook.nbpkg_ctx)
                     
                     
                     should_instantiate_initially = !notebook.nbpkg_ctx_instantiated
                     if should_instantiate_initially
                         
+                        should_precompile_later = true
+                        
                         # First, we instantiate. This will:
                         # - Verify that the Manifest can be parsed and is in the correct format (important for compat across Julia versions). If not, we will fix it by deleting the Manifest.
                         # - If no Manifest exists, resolve the environment and create one.
@@ -167,7 +177,7 @@ function sync_nbpkg_core(
                         # - Precompile all packages.                    
                         Status.report_business!(pkg_status, :instantiate1) do
                             with_auto_fixes(notebook) do
-                                instantiate(notebook, iolistener)
+                                _instantiate(notebook, iolistener)
                             end
                         end
                         
@@ -176,7 +186,7 @@ function sync_nbpkg_core(
                         # - If we are tracking local packages by path (] dev), their Project.tomls are reparsed and everything is updated.
                         Status.report_business!(pkg_status, :resolve) do
                             with_auto_fixes(notebook) do
-                                resolve(notebook, iolistener)
+                                _resolve(notebook, iolistener)
                             end
                         end
                     end
@@ -258,8 +268,15 @@ function sync_nbpkg_core(
                     should_instantiate_again = !notebook.nbpkg_ctx_instantiated || !isempty(to_add) || !isempty(to_remove)
                     
                     if should_instantiate_again
+                        should_precompile_later = true
                         Status.report_business!(pkg_status, :instantiate2) do
-                            instantiate(notebook, iolistener)
+                            _instantiate(notebook, iolistener)
+                        end
+                    end
+                    
+                    if should_precompile_later
+                        Status.report_business!(pkg_status, :precompile) do
+                            _precompile(notebook, iolistener, compiler_options)
                         end
                     end
 
@@ -326,7 +343,8 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
                 new_topology; 
                 on_terminal_output=iocallback, 
                 cleanup,
-                lag=session.options.server.simulated_pkg_lag
+                lag=session.options.server.simulated_pkg_lag,
+                compiler_options=_merge_notebook_compiler_options(notebook, session.options.compiler),
             )
 		end
 
@@ -390,7 +408,7 @@ function writebackup(notebook::Notebook)
 end
 
 
-function instantiate(notebook::Notebook, iolistener::IOListener)
+function _instantiate(notebook::Notebook, iolistener::IOListener)
     start_time = time_ns()
     with_io_setup(notebook, iolistener) do
         println(iolistener.buffer, "\nInstantiating...")
@@ -406,7 +424,7 @@ function instantiate(notebook::Notebook, iolistener::IOListener)
         
         try
             # instantiate without forcing registry update
-            PkgCompat.instantiate(notebook.nbpkg_ctx; update_registry=false)
+            PkgCompat.instantiate(notebook.nbpkg_ctx; update_registry=false, allow_autoprecomp=false)
         finally
             # reset the LOAD_PATH
             if LOAD_PATH[1] == env_dir
@@ -420,7 +438,22 @@ function instantiate(notebook::Notebook, iolistener::IOListener)
     notebook.nbpkg_ctx_instantiated = true
 end
 
-function resolve(notebook::Notebook, iolistener::IOListener)
+function _precompile(notebook::Notebook, iolistener::IOListener, compiler_options::CompilerOptions)
+    start_time = time_ns()
+    with_io_setup(notebook, iolistener) do
+        println(iolistener.buffer, "\nPrecompiling...")
+        @debug "PlutoPkg: Precompiling" notebook.path 
+        
+        env_dir = PkgCompat.env_dir(notebook.nbpkg_ctx)
+        precompile_isolated(env_dir; 
+            io=iolistener.buffer,
+            compiler_options,
+        )
+    end
+    notebook.nbpkg_install_time_ns = notebook.nbpkg_install_time_ns === nothing ? nothing : (notebook.nbpkg_install_time_ns + (time_ns() - start_time))
+end
+
+function _resolve(notebook::Notebook, iolistener::IOListener)
     startlistening(iolistener)
     with_io_setup(notebook, iolistener) do
         println(iolistener.buffer, "\nResolving...")
@@ -495,6 +528,7 @@ function update_nbpkg_core(
     level::Pkg.UpgradeLevel=Pkg.UPLEVEL_MAJOR, 
     on_terminal_output::Function=((args...) -> nothing),
     cleanup::Ref{Function}=Ref{Function}(default_cleanup),
+    compiler_options::CompilerOptions=CompilerOptions(),
 )
     if notebook.nbpkg_ctx !== nothing
         PkgCompat.mark_original!(notebook.nbpkg_ctx)
@@ -523,11 +557,11 @@ function update_nbpkg_core(
 
                 if !notebook.nbpkg_ctx_instantiated
                     with_auto_fixes(notebook) do
-                        instantiate(notebook, iolistener)
+                        _instantiate(notebook, iolistener)
                     end
                 
                     with_auto_fixes(notebook) do
-                        resolve(notebook, iolistener)
+                        _resolve(notebook, iolistener)
                     end
                 end
 
@@ -544,17 +578,19 @@ function update_nbpkg_core(
                     end
                 end
 
-                stoplistening(iolistener)
 
                 🐧 = !PkgCompat.is_original(notebook.nbpkg_ctx)
                 should_instantiate_again = !notebook.nbpkg_ctx_instantiated || 🐧
                 
                 if should_instantiate_again
                     # Status.report_business!(pkg_status, :instantiate2) do
-                    instantiate(notebook, iolistener)
+                    _instantiate(notebook, iolistener)
+                    _precompile(notebook, iolistener, compiler_options)
                     # end
                 end
 
+                stoplistening(iolistener)
+
                 (
                     did_something=🐧,
                     restart_recommended=🐧,
@@ -594,6 +630,7 @@ function update_nbpkg(session, notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.U
                 level, 
                 on_terminal_output=iocallback,
                 cleanup,
+                compiler_options=_merge_notebook_compiler_options(notebook, session.options.compiler),
             )
 		end
 
diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index bbede30293..b6e75bdb87 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -227,13 +227,12 @@ end
 # Instantiate
 ###
 
-# ⚠️✅ Internal API with fallback
-function instantiate(ctx; update_registry::Bool)
-	@static if hasmethod(Pkg.instantiate, Tuple{}, (:update_registry,))
-		Pkg.instantiate(ctx; update_registry)
-	else
-		Pkg.instantiate(ctx)
-	end
+# ⚠️ Internal API
+function instantiate(ctx; update_registry::Bool, allow_autoprecomp::Bool)
+	Pkg.instantiate(ctx; update_registry, allow_autoprecomp)
+	# Not sure how to make a fallback:
+	# - hasmethod cannot test for kwargs because instantiate takes kwargs... that are passed on somewhere else
+	# - can't catch for a CallError because the error is weird
 end
 
 
diff --git a/src/packages/precompile_isolated.jl b/src/packages/precompile_isolated.jl
new file mode 100644
index 0000000000..95f615351c
--- /dev/null
+++ b/src/packages/precompile_isolated.jl
@@ -0,0 +1,32 @@
+function precompile_isolated(
+    environment::String; 
+    compiler_options::Configuration.CompilerOptions=Configuration.CompilerOptions(),
+    io::IO,
+)
+    flags = Configuration._convert_to_flags(compiler_options)
+    
+    code = """
+    # import Pkg with safe load path
+    pushfirst!(LOAD_PATH, "@stdlib")
+    import Pkg
+    popfirst!(LOAD_PATH)
+    
+    out_stream = IOContext(stdout, :color => true)
+    
+    Pkg.activate($(repr(environment)); io=out_stream)
+    if VERSION >= v"1.8.0" # https://github.com/JuliaLang/Pkg.jl/pull/2816
+        Pkg.precompile(; already_instantiated=true, io=out_stream)
+    else
+        Pkg.precompile(; io=out_stream)
+    end
+    """
+
+    cmd = `$(Base.julia_cmd()[1]) $(flags) -e $(code)`
+
+    Base.run(pipeline(
+        cmd; stdout=io, #dont capture stderr because we want it to show in the server terminal when something goes wrong
+    ))
+    
+    # In the future we could allow interrupting the precompilation process (e.g. when the notebook is shut down)
+    # by running this code using Malt.jl
+end
diff --git a/test/Notebook.jl b/test/Notebook.jl
index 1fc4776502..8d4d83e531 100644
--- a/test/Notebook.jl
+++ b/test/Notebook.jl
@@ -1,6 +1,6 @@
 using Test
 import Pluto: Notebook, ServerSession, ClientSession, Cell, load_notebook, load_notebook_nobackup, save_notebook, WorkspaceManager, cutename, numbered_until_new, readwrite, without_pluto_file_extension, update_run!, get_metadata_no_default, is_disabled, create_cell_metadata, update_skipped_cells_dependency!
-import Pluto.WorkspaceManager: poll, WorkspaceManager
+import Pluto.WorkspaceManager
 import Random
 import Pkg
 import UUIDs: UUID
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index 5ad58bdf8b..bfc2549e57 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -2,7 +2,6 @@
 import Pkg
 using Test
 using Pluto.Configuration: CompilerOptions
-using Pluto.WorkspaceManager: _merge_notebook_compiler_options, poll
 import Pluto: update_save_run!, update_run!, WorkspaceManager, ClientSession, ServerSession, Notebook, Cell, project_relative_path, SessionActions, load_notebook
 import Pluto.PkgUtils
 import Pluto.PkgCompat
@@ -597,32 +596,6 @@ import Distributed
 
     end
 
-    # @test false
-
-    # @testset "File format" begin
-    #     notebook = Notebook([
-    #         Cell("import PlutoPkgTestA"), # cell 1
-    #         Cell("PlutoPkgTestA.MY_VERSION |> Text"),
-    #         Cell("import PlutoPkgTestB"), # cell 3
-    #         Cell("PlutoPkgTestB.MY_VERSION |> Text"),
-    #         Cell("import PlutoPkgTestC"), # cell 5
-    #         Cell("PlutoPkgTestC.MY_VERSION |> Text"),
-    #         Cell("import PlutoPkgTestD"), # cell 7
-    #         Cell("PlutoPkgTestD.MY_VERSION |> Text"),
-    #         Cell("import PlutoPkgTestE"), # cell 9
-    #         Cell("PlutoPkgTestE.MY_VERSION |> Text"),
-    #         Cell("eval(:(import DataFrames))")
-    #     ])
-
-    #     file1 = tempname()
-    #     notebook.path = file1
-
-    #     save_notebook()
-
-
-    #     save_notebook
-    # end
-    
     @testset "Race conditions" begin
         🍭 = ServerSession()
         lag = 0.2
@@ -673,7 +646,90 @@ import Distributed
 
         WorkspaceManager.unmake_workspace((🍭, notebook))
     end
+    
+    @testset "Precompilation" begin
+        compilation_dir = joinpath(DEPOT_PATH[1], "compiled", "v$(VERSION.major).$(VERSION.minor)")
+        @assert isdir(compilation_dir)
+        compilation_dir_testA = joinpath(compilation_dir, "PlutoPkgTestA")
+        precomp_entries() = readdir(mkpath(compilation_dir_testA))
+        
+        # clear cache
+        isdir(compilation_dir_testA) && rm(compilation_dir_testA; recursive=true)
+        @test precomp_entries() == []
 
+        @testset "Match compiler options: $(match)" for match in [true, false]
+            
+            before_sync = precomp_entries()
+            
+            🍭 = ServerSession()
+            # make compiler settings of the worker (not) match the server settings
+            let
+                # you can find out which settings are relevant for cache validation by running JULIA_DEBUG="loading" julia and then missing a cache. Example output on julia1.9.0-rc1:
+                # ┌ Debug: Rejecting cache file /Applications/Julia-1.9.0-beta4 ARM.app/Contents/Resources/julia/share/julia/compiled/v1.9/SuiteSparse_jll/ME9At_bvckq.ji for  [top-level] since the flags are mismatched
+                # │   current session: use_pkgimages = true, debug_level = 1, check_bounds = 0, inline = true, opt_level = 2
+                # │   cache file:      use_pkgimages = true, debug_level = 1, check_bounds = 1, inline = true, opt_level = 2
+                # └ @ Base loading.jl:2668
+                flip = !match
+                if VERSION >= v"1.9.0-aaa"
+                    🍭.options.compiler.pkgimages = (flip ⊻ Base.JLOptions().use_pkgimages == 1) ? "yes" : "no"
+                end
+                🍭.options.compiler.check_bounds = (flip ⊻ Base.JLOptions().check_bounds == 1) ? "yes" : "no"
+                🍭.options.compiler.inline = (flip ⊻ Base.JLOptions().can_inline == 1) ? "yes" : "no"
+                🍭.options.compiler.optimize = match ? Base.JLOptions().opt_level : 3 - Base.JLOptions().opt_level
+                # cant set the debug level but whatevs
+            end
+            
+
+            notebook = Notebook([
+                # An import for Pluto to recognize, but don't actually run it. When you run an import, Julia will precompile the package if necessary, which would skew our results.
+                Cell("false && import PlutoPkgTestA"),
+            ])
+
+            @test !notebook.nbpkg_ctx_instantiated
+            update_save_run!(🍭, notebook, notebook.cells)
+            @test notebook.nbpkg_ctx_instantiated
+            
+            after_sync = precomp_entries()
+            
+            # syncing should have called Pkg.precompile(), which should have generated new precompile caches. 
+            # If `match == false`, then this is the second run, and the precompile caches should be different. 
+            # These new caches use the same filename (weird...), EXCEPT when the pkgimages flag changed, then you get a new filename.
+            if match == true || VERSION >= v"1.9.0-aaa"
+                @test before_sync != after_sync
+                @test length(before_sync) < length(after_sync)
+            end
+            
+            
+            
+            # Now actually run the import.
+            setcode!(notebook.cells[1], """begin
+            ENV["JULIA_DEBUG"] = "loading"
+            
+            PlutoRunner.Logging.shouldlog(logger::PlutoRunner.PlutoCellLogger, level, _module, _...) = true # https://github.com/fonsp/Pluto.jl/issues/2487
+            
+            import PlutoPkgTestA
+            end""")
+            update_save_run!(🍭, notebook, notebook.cells[1])
+            @test noerror(notebook.cells[1])
+            
+            after_run = precomp_entries()
+            
+
+            # There should be a log message about loading the cache.
+            VERSION >= v"1.8.0-aaa" && @test any(notebook.cells[1].logs) do log
+                occursin(r"Loading.*cache"i, log["msg"][1])
+            end
+            # There should NOT be a log message about rejecting the cache.
+            @test !any(notebook.cells[1].logs) do log
+                occursin(r"reject.*cache"i, log["msg"][1])
+            end
+            
+            # Running the import should not have triggered additional precompilation, everything should have been precompiled during Pkg.precompile() (in sync_nbpkg).
+            @test after_sync == after_run
+            
+            WorkspaceManager.unmake_workspace((🍭, notebook))
+        end
+    end
 
     Pkg.Registry.rm(pluto_test_registry_spec)
     # Pkg.Registry.add("General")

From 85f3765954ceeda3f8812dacc081b59495b60ae3 Mon Sep 17 00:00:00 2001
From: fonsp <fonsvdplas@gmail.com>
Date: Tue, 11 Apr 2023 12:34:35 +0000
Subject: [PATCH 625/821] simulated_lag: also for outgoing WS messages

---
 src/webserver/PutUpdates.jl | 5 +++++
 src/webserver/Session.jl    | 5 +++--
 src/webserver/WebServer.jl  | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/webserver/PutUpdates.jl b/src/webserver/PutUpdates.jl
index 2fd44f074b..9149abe4a5 100644
--- a/src/webserver/PutUpdates.jl
+++ b/src/webserver/PutUpdates.jl
@@ -89,6 +89,11 @@ function flushclient(client::ClientSession)
         try
             if client.stream !== nothing
                 if is_stream_open(client.stream)
+                    let
+                        lag = client.simulated_lag
+                        (lag > 0) && sleep(lag * (0.5 + rand())) # sleep(0) would yield to the process manager which we dont want
+                    end
+
                     send_message(client.stream, next_to_send)
                 else
                     put!(flushtoken)
diff --git a/src/webserver/Session.jl b/src/webserver/Session.jl
index 013a92c615..c7dfb2a240 100644
--- a/src/webserver/Session.jl
+++ b/src/webserver/Session.jl
@@ -10,10 +10,11 @@ mutable struct ClientSession
     stream::Any
     connected_notebook::Union{Notebook,Nothing}
     pendingupdates::Channel
+    simulated_lag::Float64
 end
 
-ClientSession(id::Symbol, stream) = let
-    ClientSession(id, stream, nothing, Channel(1024))
+ClientSession(id::Symbol, stream, simulated_lag=0.0) = let
+    ClientSession(id, stream, nothing, Channel(1024), simulated_lag)
 end
 
 "A combination of _client ID_ and a _request ID_. The front-end generates a unqique ID for every request that it sends. The back-end (the stuff you are currently reading) can respond to a specific request. In that case, the response does not go through the normal message handlers in the front-end, but it flies directly to the place where the message was sent. (It resolves the promise returned by `send(...)`.)"
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 7a5ce229af..cfcaa28f8b 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -365,7 +365,7 @@ end
 function process_ws_message(session::ServerSession, parentbody::Dict, clientstream)
     client_id = Symbol(parentbody["client_id"])
     client = get!(session.connected_clients, client_id ) do 
-        ClientSession(client_id, clientstream)
+        ClientSession(client_id, clientstream, session.options.server.simulated_lag)
     end
     client.stream = clientstream # it might change when the same client reconnects
 

From 7626482b5da56f5ab16764ec217683da26ae0a7c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 11 Apr 2023 16:42:10 +0200
Subject: [PATCH 626/821] fix windows julia 1.9.0 test maybe

---
 test/packages/Basic.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index bfc2549e57..50f06253ce 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -654,7 +654,7 @@ import Distributed
         precomp_entries() = readdir(mkpath(compilation_dir_testA))
         
         # clear cache
-        isdir(compilation_dir_testA) && rm(compilation_dir_testA; recursive=true)
+        isdir(compilation_dir_testA) && rm(compilation_dir_testA; force=true, recursive=true)
         @test precomp_entries() == []
 
         @testset "Match compiler options: $(match)" for match in [true, false]

From c9ac544dbbd3fdbc3aabaf89ea911101f42a1026 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 11 Apr 2023 16:43:28 +0200
Subject: [PATCH 627/821] =?UTF-8?q?=F0=9F=8E=A1=20Fancyprint=20Pkg=20logs?=
 =?UTF-8?q?=20(#2500)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/ANSIEmulation.jl       | 577 ++++++++++++++++++++++++++++
 src/packages/IOListener.jl          |  25 +-
 src/packages/Packages.jl            |  11 +-
 src/packages/PkgCompat.jl           |   4 +
 src/packages/precompile_isolated.jl |   4 +
 5 files changed, 614 insertions(+), 7 deletions(-)
 create mode 100644 src/packages/ANSIEmulation.jl

diff --git a/src/packages/ANSIEmulation.jl b/src/packages/ANSIEmulation.jl
new file mode 100644
index 0000000000..25ae199295
--- /dev/null
+++ b/src/packages/ANSIEmulation.jl
@@ -0,0 +1,577 @@
+### A Pluto.jl notebook ###
+# v0.19.24
+
+using Markdown
+using InteractiveUtils
+
+# ╔═╡ 6f1cb799-21b7-459a-a7c5-6c42b1376b11
+# ╠═╡ skip_as_script = true
+#=╠═╡
+using BenchmarkTools: @benchmark
+  ╠═╡ =#
+
+# ╔═╡ 98ac036d-1a37-457c-b89d-8e954ab6f039
+# ╠═╡ skip_as_script = true
+#=╠═╡
+using PlutoUI: Slider
+  ╠═╡ =#
+
+# ╔═╡ e665ae4e-bf4e-11ed-330a-f3670dd00a95
+# ╠═╡ skip_as_script = true
+#=╠═╡
+str = read(download("https://raw.githubusercontent.com/fonsp/disorganised-mess/main/ansidemo.txt"), String)
+  ╠═╡ =#
+
+# ╔═╡ 032a10cc-8b2b-4e85-bac4-b9623b91d016
+# ╠═╡ disabled = true
+# ╠═╡ skip_as_script = true
+#=╠═╡
+str = "\nInstantiating...\n\e[32m\e[1m  No Changes\e[22m\e[39m to `/private/var/folders/v_/fhpj9jn151d4p9c2fdw2gv780000gn/T/jl_DivOhV/Project.toml`\n\e[32m\e[1m  No Changes\e[22m\e[39m to `/private/var/folders/v_/fhpj9jn151d4p9c2fdw2gv780000gn/T/jl_DivOhV/Manifest.toml`\n\e[?25l\e[?25h\e[2K\nResolving...\n\e[32m\e[1m  No Changes\e[22m\e[39m to `/private/var/folders/v_/fhpj9jn151d4p9c2fdw2gv780000gn/T/jl_DivOhV/Project.toml`\n\e[32m\e[1m  No Changes\e[22m\e[39m to `/private/var/folders/v_/fhpj9jn151d4p9c2fdw2gv780000gn/T/jl_DivOhV/Manifest.toml`\n\e[?25l\e[?25h\e[2K"
+  ╠═╡ =#
+
+# ╔═╡ 209f221c-be89-4976-b712-2b9214c3291c
+#=╠═╡
+Text(str)
+  ╠═╡ =#
+
+# ╔═╡ dff16b61-7fa6-4702-95a6-a0d2913c3070
+#=╠═╡
+collect(str)
+  ╠═╡ =#
+
+# ╔═╡ b6fe176d-cfbe-4aac-ad46-3345b0acbb74
+#=╠═╡
+length(str)
+  ╠═╡ =#
+
+# ╔═╡ c952da01-ba67-4a49-99df-c61939ba81be
+# ESC[H	moves cursor to home position (0, 0)
+# ESC[{line};{column}H
+# ESC[{line};{column}f	moves cursor to line #, column #
+# ESC[#A	moves cursor up # lines
+# ESC[#B	moves cursor down # lines
+# ESC[#C	moves cursor right # columns
+# ESC[#D	moves cursor left # columns
+# ESC[#E	moves cursor to beginning of next line, # lines down
+# ESC[#F	moves cursor to beginning of previous line, # lines up
+# ESC[#G	moves cursor to column #
+# ESC[6n	request cursor position (reports as ESC[#;#R)
+# ESC M	moves cursor one line up, scrolling if needed
+# ESC 7	save cursor position (DEC)
+# ESC 8	restores the cursor to the last saved position (DEC)
+# ESC[s	save cursor position (SCO)
+# ESC[u	restores the cursor to the last saved position (SCO)
+
+# ╔═╡ f661240f-4950-4be0-a2b2-98ed77f6e4a2
+const stoppers = ('H', 'f', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'n', 's', 'u', 'J', 'K', 'm', 'l', 'h', 'S')
+
+# ╔═╡ af48f80f-345d-4d90-9cf1-b8be9004a53d
+Base.@kwdef mutable struct ANSITerminalState
+	lines::Dict{Int,Vector{Char}}=Dict{Int,Vector{Char}}()
+	col::Int=1
+	row::Int=1
+end
+
+# ╔═╡ f54f7282-87fd-4f05-8f8a-220d83186e9a
+getline(state::ANSITerminalState) = get!(state.lines, state.row) do
+	Char[]
+end
+
+# ╔═╡ 0a4587f7-55b2-4621-89e8-a9492d32bc09
+#=╠═╡
+@benchmark ncodeunits(str)
+  ╠═╡ =#
+
+# ╔═╡ 84a457d4-1e3c-4797-aa94-a7ca9ce628e4
+"""
+Update the `ANSITerminalState` with new data from a TTY stream.
+"""
+function consume!(state::ANSITerminalState, str::AbstractString)
+	ind = 0
+
+	L = ncodeunits(str)
+	
+	while ind < L
+		ind = nextind(str, ind)
+		if ind > L
+			break
+		end
+		
+		c = str[ind]
+		if c === '\n'
+			state.col = 1
+			state.row += 1
+			
+		elseif c === '\r'
+			state.col = 1
+
+		elseif c === '\e'
+			# ANSI control character
+			# see https://en.wikipedia.org/wiki/ANSI_escape_code for descriptions of these.
+
+			ind += 1
+			# ignoring this character, it should be a '['
+
+			"will contain the characters between ] and the stopper character"
+			buffer_vec = Char[]
+
+			# keep reading until we have the stopper character
+			local stopper = '\0'
+			while ind <= L - 1
+				ind += 1
+				next_c = str[ind]
+				if next_c ∈ stoppers
+					stopper = next_c
+					break
+				end
+				push!(buffer_vec, next_c)
+			end
+
+
+			# @info "Escape sequence read" stopper buffer
+
+
+			if stopper === 'l' || stopper === 'h'
+				# ignored
+			elseif stopper === '\0'
+				# this means that no stop was found, ignoring...
+
+			elseif stopper === 'K'# && buffer == "2"
+				# @assert buffer_vec == ['2']
+		
+				line = getline(state)
+				line .= ' '
+			elseif stopper === 'A'
+				state.row = max(1, state.row - parse(Int, String(buffer_vec)))
+				
+			elseif stopper === 'G'
+				state.col = parse(Int, String(buffer_vec))
+				
+			elseif stopper === 'J'# && buffer == "0"
+				# @assert buffer_vec == ['0']
+
+				# clear the remainder of this line
+				resize!(getline(state), state.col - 1)
+				# and clear all rows below
+				for row in state.row+1 : maximum(keys(state.lines))
+					delete!(state.lines, row)
+				end
+
+			elseif stopper === 'm'
+				# keep it in the output because we use ansiup to handle colors in the frontend
+				line = getline(state)
+				push!(line, '\e', '[')
+				append!(line, buffer_vec)
+				push!(line, stopper)
+
+				state.col += 3 + length(buffer_vec)
+				
+			elseif stopper === 'S'
+				diff = isempty(buffer_vec) ? 1 : parse(Int, String(buffer_vec))
+				state.row += diff
+				
+			else
+				@warn "Unrecogized escape sequence" stopper String(buffer_vec)
+			end
+
+		else
+			# no escape character, just a regular char
+			line = getline(state)
+
+			while length(line) < state.col
+				push!(line, ' ')
+			end
+			line[state.col] = c
+			state.col += 1
+		end
+	end
+end
+
+# ╔═╡ 2c02ca66-e3fe-479a-b3f1-13ea0850f3d7
+function consume_safe!(state::ANSITerminalState, str::AbstractString)
+	try
+		consume!(state, str)
+	catch e
+		@debug "ANSI escape sequence glitch" exception=(e,catch_backtrace())
+		line = getline(state)
+		append!(line, codeunits(str))
+		state.row += ncodeunits(str)
+	end
+end
+
+# ╔═╡ 6a8f71f5-7113-4074-8009-14eea11cc958
+#=╠═╡
+@bind L Slider(1:length(str))
+  ╠═╡ =#
+
+# ╔═╡ f9232436-618c-401f-9d18-f9f8f1f04a77
+function build_str(state::ANSITerminalState)
+	d = state.lines
+	join(
+		(String(get(() -> Char[], d, i)) for i in 1:maximum(keys(d))), "\n"
+	)
+end
+
+# ╔═╡ a1ebfaf3-dadb-40dc-95c5-ae8a9d6de1ec
+# ╠═╡ skip_as_script = true
+#=╠═╡
+function solve(str::AbstractString)
+	state = ANSITerminalState()
+	consume_safe!(state, str)
+	build_str(state)
+end
+  ╠═╡ =#
+
+# ╔═╡ 6dc56641-7d0d-4bd7-a1ef-22e373908207
+#=╠═╡
+@benchmark solve($str) seconds=1
+  ╠═╡ =#
+
+# ╔═╡ 48c686f9-722f-4d84-ac9d-9b11c934370c
+#=╠═╡
+solve(str) |> Text
+  ╠═╡ =#
+
+# ╔═╡ ee9a24d4-7a9f-4024-8100-f7ce4ef436cb
+#=╠═╡
+collect(str) => collect(solve(str))
+  ╠═╡ =#
+
+# ╔═╡ 2453d8e0-ca26-4033-a272-c5c51fc8d16d
+#=╠═╡
+solve(SubString(str, 1, nextind(str, 0, L))) |> Text
+  ╠═╡ =#
+
+# ╔═╡ 535f471d-a049-4d74-aa52-9be86e2d4352
+#=╠═╡
+let
+
+	state = ANSITerminalState()
+
+	mid = nextind(str, 0, L ÷ 2)
+	top = nextind(str, 0, L)
+
+	consume!(state, SubString(str, 1, mid))
+	consume!(state, SubString(str, nextind(str, mid), top))
+
+	build_str(state) |> Text
+end
+  ╠═╡ =#
+
+# ╔═╡ 195a8e3c-427f-487f-9c7c-d31ce374de81
+# ╠═╡ skip_as_script = true
+#=╠═╡
+ANSITerminalState(
+	lines=Dict(3 => Char['a', 't'], 1 => ['c'])
+) |> build_str |> Text
+  ╠═╡ =#
+
+# ╔═╡ 00000000-0000-0000-0000-000000000001
+PLUTO_PROJECT_TOML_CONTENTS = """
+[deps]
+BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
+PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
+
+[compat]
+BenchmarkTools = "~1.3.2"
+PlutoUI = "~0.7.50"
+"""
+
+# ╔═╡ 00000000-0000-0000-0000-000000000002
+PLUTO_MANIFEST_TOML_CONTENTS = """
+# This file is machine-generated - editing it directly is not advised
+
+julia_version = "1.9.0-rc2"
+manifest_format = "2.0"
+project_hash = "ce886088241d89ce6a9168ebf44701e0c6f4421f"
+
+[[deps.AbstractPlutoDingetjes]]
+deps = ["Pkg"]
+git-tree-sha1 = "8eaf9f1b4921132a4cff3f36a1d9ba923b14a481"
+uuid = "6e696c72-6542-2067-7265-42206c756150"
+version = "1.1.4"
+
+[[deps.ArgTools]]
+uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
+version = "1.1.1"
+
+[[deps.Artifacts]]
+uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+
+[[deps.Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+
+[[deps.BenchmarkTools]]
+deps = ["JSON", "Logging", "Printf", "Profile", "Statistics", "UUIDs"]
+git-tree-sha1 = "d9a9701b899b30332bbcb3e1679c41cce81fb0e8"
+uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
+version = "1.3.2"
+
+[[deps.ColorTypes]]
+deps = ["FixedPointNumbers", "Random"]
+git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4"
+uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
+version = "0.11.4"
+
+[[deps.CompilerSupportLibraries_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
+version = "1.0.2+0"
+
+[[deps.Dates]]
+deps = ["Printf"]
+uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
+
+[[deps.Downloads]]
+deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
+uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
+version = "1.6.0"
+
+[[deps.FileWatching]]
+uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
+
+[[deps.FixedPointNumbers]]
+deps = ["Statistics"]
+git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc"
+uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
+version = "0.8.4"
+
+[[deps.Hyperscript]]
+deps = ["Test"]
+git-tree-sha1 = "8d511d5b81240fc8e6802386302675bdf47737b9"
+uuid = "47d2ed2b-36de-50cf-bf87-49c2cf4b8b91"
+version = "0.0.4"
+
+[[deps.HypertextLiteral]]
+deps = ["Tricks"]
+git-tree-sha1 = "c47c5fa4c5308f27ccaac35504858d8914e102f9"
+uuid = "ac1192a8-f4b3-4bfe-ba22-af5b92cd3ab2"
+version = "0.9.4"
+
+[[deps.IOCapture]]
+deps = ["Logging", "Random"]
+git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a"
+uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89"
+version = "0.2.2"
+
+[[deps.InteractiveUtils]]
+deps = ["Markdown"]
+uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+
+[[deps.JSON]]
+deps = ["Dates", "Mmap", "Parsers", "Unicode"]
+git-tree-sha1 = "3c837543ddb02250ef42f4738347454f95079d4e"
+uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
+version = "0.21.3"
+
+[[deps.LibCURL]]
+deps = ["LibCURL_jll", "MozillaCACerts_jll"]
+uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
+version = "0.6.3"
+
+[[deps.LibCURL_jll]]
+deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
+uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
+version = "7.84.0+0"
+
+[[deps.LibGit2]]
+deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
+uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
+
+[[deps.LibSSH2_jll]]
+deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
+uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
+version = "1.10.2+0"
+
+[[deps.Libdl]]
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
+[[deps.LinearAlgebra]]
+deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"]
+uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+
+[[deps.Logging]]
+uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
+
+[[deps.MIMEs]]
+git-tree-sha1 = "65f28ad4b594aebe22157d6fac869786a255b7eb"
+uuid = "6c6e2e6c-3030-632d-7369-2d6c69616d65"
+version = "0.1.4"
+
+[[deps.Markdown]]
+deps = ["Base64"]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+
+[[deps.MbedTLS_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
+version = "2.28.2+0"
+
+[[deps.Mmap]]
+uuid = "a63ad114-7e13-5084-954f-fe012c677804"
+
+[[deps.MozillaCACerts_jll]]
+uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
+version = "2022.10.11"
+
+[[deps.NetworkOptions]]
+uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
+version = "1.2.0"
+
+[[deps.OpenBLAS_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
+uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
+version = "0.3.21+4"
+
+[[deps.Parsers]]
+deps = ["Dates", "SnoopPrecompile"]
+git-tree-sha1 = "478ac6c952fddd4399e71d4779797c538d0ff2bf"
+uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
+version = "2.5.8"
+
+[[deps.Pkg]]
+deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
+uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+version = "1.9.0"
+
+[[deps.PlutoUI]]
+deps = ["AbstractPlutoDingetjes", "Base64", "ColorTypes", "Dates", "FixedPointNumbers", "Hyperscript", "HypertextLiteral", "IOCapture", "InteractiveUtils", "JSON", "Logging", "MIMEs", "Markdown", "Random", "Reexport", "URIs", "UUIDs"]
+git-tree-sha1 = "5bb5129fdd62a2bbbe17c2756932259acf467386"
+uuid = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
+version = "0.7.50"
+
+[[deps.Preferences]]
+deps = ["TOML"]
+git-tree-sha1 = "47e5f437cc0e7ef2ce8406ce1e7e24d44915f88d"
+uuid = "21216c6a-2e73-6563-6e65-726566657250"
+version = "1.3.0"
+
+[[deps.Printf]]
+deps = ["Unicode"]
+uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[[deps.Profile]]
+deps = ["Printf"]
+uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"
+
+[[deps.REPL]]
+deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
+uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+
+[[deps.Random]]
+deps = ["SHA", "Serialization"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[deps.Reexport]]
+git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b"
+uuid = "189a3867-3050-52da-a836-e630ba90ab69"
+version = "1.2.2"
+
+[[deps.SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+version = "0.7.0"
+
+[[deps.Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[deps.SnoopPrecompile]]
+deps = ["Preferences"]
+git-tree-sha1 = "e760a70afdcd461cf01a575947738d359234665c"
+uuid = "66db9d55-30c0-4569-8b51-7e840670fc0c"
+version = "1.0.3"
+
+[[deps.Sockets]]
+uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
+
+[[deps.SparseArrays]]
+deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"]
+uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[[deps.Statistics]]
+deps = ["LinearAlgebra", "SparseArrays"]
+uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+version = "1.9.0"
+
+[[deps.SuiteSparse_jll]]
+deps = ["Artifacts", "Libdl", "Pkg", "libblastrampoline_jll"]
+uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
+version = "5.10.1+6"
+
+[[deps.TOML]]
+deps = ["Dates"]
+uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
+version = "1.0.3"
+
+[[deps.Tar]]
+deps = ["ArgTools", "SHA"]
+uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
+version = "1.10.0"
+
+[[deps.Test]]
+deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
+uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[[deps.Tricks]]
+git-tree-sha1 = "6bac775f2d42a611cdfcd1fb217ee719630c4175"
+uuid = "410a4b4d-49e4-4fbc-ab6d-cb71b17b3775"
+version = "0.1.6"
+
+[[deps.URIs]]
+git-tree-sha1 = "074f993b0ca030848b897beff716d93aca60f06a"
+uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
+version = "1.4.2"
+
+[[deps.UUIDs]]
+deps = ["Random", "SHA"]
+uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
+[[deps.Unicode]]
+uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
+
+[[deps.Zlib_jll]]
+deps = ["Libdl"]
+uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
+version = "1.2.13+0"
+
+[[deps.libblastrampoline_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
+version = "5.4.0+0"
+
+[[deps.nghttp2_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
+version = "1.48.0+0"
+
+[[deps.p7zip_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
+version = "17.4.0+0"
+"""
+
+# ╔═╡ Cell order:
+# ╠═e665ae4e-bf4e-11ed-330a-f3670dd00a95
+# ╠═032a10cc-8b2b-4e85-bac4-b9623b91d016
+# ╠═209f221c-be89-4976-b712-2b9214c3291c
+# ╠═dff16b61-7fa6-4702-95a6-a0d2913c3070
+# ╠═b6fe176d-cfbe-4aac-ad46-3345b0acbb74
+# ╠═c952da01-ba67-4a49-99df-c61939ba81be
+# ╠═f661240f-4950-4be0-a2b2-98ed77f6e4a2
+# ╠═af48f80f-345d-4d90-9cf1-b8be9004a53d
+# ╠═f54f7282-87fd-4f05-8f8a-220d83186e9a
+# ╠═0a4587f7-55b2-4621-89e8-a9492d32bc09
+# ╠═2c02ca66-e3fe-479a-b3f1-13ea0850f3d7
+# ╠═84a457d4-1e3c-4797-aa94-a7ca9ce628e4
+# ╠═a1ebfaf3-dadb-40dc-95c5-ae8a9d6de1ec
+# ╠═6dc56641-7d0d-4bd7-a1ef-22e373908207
+# ╠═6f1cb799-21b7-459a-a7c5-6c42b1376b11
+# ╠═48c686f9-722f-4d84-ac9d-9b11c934370c
+# ╠═ee9a24d4-7a9f-4024-8100-f7ce4ef436cb
+# ╠═2453d8e0-ca26-4033-a272-c5c51fc8d16d
+# ╠═535f471d-a049-4d74-aa52-9be86e2d4352
+# ╠═98ac036d-1a37-457c-b89d-8e954ab6f039
+# ╠═6a8f71f5-7113-4074-8009-14eea11cc958
+# ╠═f9232436-618c-401f-9d18-f9f8f1f04a77
+# ╠═195a8e3c-427f-487f-9c7c-d31ce374de81
+# ╟─00000000-0000-0000-0000-000000000001
+# ╟─00000000-0000-0000-0000-000000000002
diff --git a/src/packages/IOListener.jl b/src/packages/IOListener.jl
index 1de8d18c12..f1dab23982 100644
--- a/src/packages/IOListener.jl
+++ b/src/packages/IOListener.jl
@@ -1,20 +1,37 @@
 
+module ANSIEmulation include("./ANSIEmulation.jl") end
+
+
 "A polling system to watch for writes to an IOBuffer. Up-to-date content will be passed as string to the `callback` function."
 Base.@kwdef struct IOListener
     callback::Function
-    buffer::IOBuffer=IOBuffer()
     interval::Real=1.0/60
     running::Ref{Bool}=Ref(false)
-    last_size::Ref{Int}=Ref(-1)
+
+    buffer::IOBuffer=IOBuffer()
+    last_size::Ref{Int}=Ref(0)
+    ansi_state::ANSIEmulation.ANSITerminalState=ANSIEmulation.ANSITerminalState()
 end
+
 function trigger(listener::IOListener)
+    old_size = listener.last_size[]
     new_size = listener.buffer.size
-    if new_size > listener.last_size[]
+    if new_size > old_size
+        # @debug "making string"
+        s = String(@view listener.buffer.data[old_size+1:new_size])
+        # @debug "making ansi"
+        ANSIEmulation.consume_safe!(
+            listener.ansi_state, 
+            s
+        )
+        # @debug "building string" s listener.ansi_state
+        new_contents = ANSIEmulation.build_str(listener.ansi_state)
+
         listener.last_size[] = new_size
-        new_contents = String(listener.buffer.data[1:new_size])
         listener.callback(new_contents)
     end
 end
+
 function startlistening(listener::IOListener)
     if !listener.running[]
         listener.running[] = true
diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index 4b14bb823d..f7ff3ea335 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -333,8 +333,12 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
 				for p in pkgs
 					notebook.nbpkg_terminal_outputs[p] = s
 				end
-                # TODO: this should be throttled/debounced?
+                # incoming IO is a good sign that something might have changed, so we update the cache.
                 update_nbpkg_cache!(notebook)
+                
+                # This is throttled "automatically":
+                # If io is coming in very fast, then it won't build up a queue of updates for the client. That's because `send_notebook_changes!` is a blocking call, including the websocket transfer. So this `iocallback` function will only return when the last message has been sent.
+                # The nice thing is that IOCallback is not actually implemented as a callback when IO comes in, but it is an async loop that sleeps, maybe calls iocallback with the latest buffer content, and repeats. So a blocking iocallback avoids overflowing the queue.
 				send_notebook_changes!(ClientRequest(; session, notebook))
 			end
 			sync_nbpkg_core(
@@ -373,7 +377,8 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
 		PlutoPkg: Failed to add/remove packages! Resetting package environment...
 		""" PLUTO_VERSION VERSION old_packages new_packages exception=(e, bt)
 		# TODO: send to user
-
+        showerror(stderr, e, bt)
+        
 		error_text = sprint(showerror, e, bt)
 		for p in notebook.nbpkg_busy_packages
             old = get(notebook.nbpkg_terminal_outputs, p, "")
@@ -697,7 +702,7 @@ end
 
 function with_io_setup(f::Function, notebook::Notebook, iolistener::IOListener)
     startlistening(iolistener)
-    PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true)) do
+    PkgCompat.withio(notebook.nbpkg_ctx, IOContext(iolistener.buffer, :color => true, :sneaky_enable_tty => true)) do
         withinteractive(false) do
             f()
         end
diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index b6e75bdb87..250b275359 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -156,6 +156,10 @@ function withio(f::Function, ctx::PkgContext, io::IO)
     end
 end
 
+# I'm a pirate harrr 🏴‍☠️
+@static if isdefined(Pkg, :can_fancyprint)
+	Pkg.can_fancyprint(io::IOContext{IOBuffer}) = get(io, :sneaky_enable_tty, false) === true
+end
 
 ###
 # REGISTRIES
diff --git a/src/packages/precompile_isolated.jl b/src/packages/precompile_isolated.jl
index 95f615351c..b1619181ce 100644
--- a/src/packages/precompile_isolated.jl
+++ b/src/packages/precompile_isolated.jl
@@ -12,6 +12,10 @@ function precompile_isolated(
     popfirst!(LOAD_PATH)
     
     out_stream = IOContext(stdout, :color => true)
+    # I'm a pirate harrr 🏴‍☠️
+    @static if isdefined(Pkg, :can_fancyprint)
+        Pkg.can_fancyprint(io::IO) = true
+    end
     
     Pkg.activate($(repr(environment)); io=out_stream)
     if VERSION >= v"1.8.0" # https://github.com/JuliaLang/Pkg.jl/pull/2816

From 57a50d2efa312faab8de5b1fcebf89b96f51264a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 18 Apr 2023 13:05:16 +0200
Subject: [PATCH 628/821] =?UTF-8?q?=F0=9F=94=94=20Notify=20when=20all=20ce?=
 =?UTF-8?q?lls=20completed=20(#2531)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/BottomRightPanel.js |  2 +-
 frontend/components/Editor.js           |  2 +-
 frontend/components/NotifyWhenDone.js   | 84 +++++++++++++++++++++++++
 frontend/components/ProcessTab.js       |  2 +
 frontend/dark_color.css                 |  1 +
 frontend/editor.css                     | 57 +++++++++++++++--
 frontend/light_color.css                |  1 +
 7 files changed, 142 insertions(+), 7 deletions(-)
 create mode 100644 frontend/components/NotifyWhenDone.js

diff --git a/frontend/components/BottomRightPanel.js b/frontend/components/BottomRightPanel.js
index dab8e2d6d3..51ef149e8d 100644
--- a/frontend/components/BottomRightPanel.js
+++ b/frontend/components/BottomRightPanel.js
@@ -137,7 +137,7 @@ export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, noteboo
     `
 }
 
-const useDelayedTruth = (/** @type {boolean} */ x, /** @type {number} */ timeout) => {
+export const useDelayedTruth = (/** @type {boolean} */ x, /** @type {number} */ timeout) => {
     const [output, set_output] = useState(false)
 
     useEffect(() => {
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 51ad5e98be..b4dfa977d2 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -249,7 +249,7 @@ const first_true_key = (obj) => {
  */
 
 const url_logo_big = document.head.querySelector("link[rel='pluto-logo-big']")?.getAttribute("href") ?? ""
-const url_logo_small = document.head.querySelector("link[rel='pluto-logo-small']")?.getAttribute("href") ?? ""
+export const url_logo_small = document.head.querySelector("link[rel='pluto-logo-small']")?.getAttribute("href") ?? ""
 
 /**
  * @typedef EditorProps
diff --git a/frontend/components/NotifyWhenDone.js b/frontend/components/NotifyWhenDone.js
new file mode 100644
index 0000000000..b05b25fe07
--- /dev/null
+++ b/frontend/components/NotifyWhenDone.js
@@ -0,0 +1,84 @@
+import { html, useEffect, useState } from "../imports/Preact.js"
+
+import { cl } from "../common/ClassTable.js"
+import { is_finished, total_done } from "./ProcessTab.js"
+import { useDelayedTruth } from "./BottomRightPanel.js"
+import { url_logo_small } from "./Editor.js"
+
+/**
+ * @param {{
+ * status: import("./Editor.js").StatusEntryData,
+ * }} props
+ */
+export let NotifyWhenDone = ({ status }) => {
+    const all_done = Object.values(status.subtasks).every(is_finished)
+
+    const [enabled, setEnabled] = useState(false)
+
+    useEffect(() => {
+        if (enabled && all_done) {
+            console.log("all done")
+
+            /** @type {Notification?} */
+            let notification = null
+
+            let timeouthandler = setTimeout(() => {
+                setEnabled(false)
+                let count = total_done(status)
+                notification = new Notification("Pluto: notebook ready", {
+                    tag: "notebook ready",
+                    body: `✓ All ${count} steps completed`,
+                    lang: "en-US",
+                    dir: "ltr",
+                    icon: url_logo_small,
+                })
+                notification.onclick = (e) => {
+                    parent.focus()
+                    window.focus()
+                    notification?.close()
+                }
+            }, 3000)
+
+            const vishandler = () => {
+                if (document.visibilityState === "visible") {
+                    notification?.close()
+                }
+            }
+            document.addEventListener("visibilitychange", vishandler)
+            document.body.addEventListener("click", vishandler)
+
+            return () => {
+                notification?.close()
+
+                clearTimeout(timeouthandler)
+                document.removeEventListener("visibilitychange", vishandler)
+                document.body.removeEventListener("click", vishandler)
+            }
+        }
+    }, [all_done])
+
+    const visible = useDelayedTruth(!all_done, 2500) || enabled
+
+    return html`
+        <div class=${cl({ visible, "notify-when-done": true })}>
+            <label
+                >${"Notify when done"}
+                <input
+                    type="checkbox"
+                    checked=${enabled}
+                    disabled=${!visible}
+                    onInput=${(e) => {
+                        if (e.target.checked) {
+                            Notification.requestPermission().then((r) => {
+                                console.log(r)
+                                setEnabled(r === "granted")
+                                e.target.checked = r === "granted"
+                            })
+                        } else {
+                            setEnabled(false)
+                        }
+                    }}
+            /></label>
+        </div>
+    `
+}
diff --git a/frontend/components/ProcessTab.js b/frontend/components/ProcessTab.js
index 56055d7eaa..b9785023ca 100644
--- a/frontend/components/ProcessTab.js
+++ b/frontend/components/ProcessTab.js
@@ -4,6 +4,7 @@ import { cl } from "../common/ClassTable.js"
 import { prettytime, useMillisSinceTruthy } from "./RunArea.js"
 import { DiscreteProgressBar } from "./DiscreteProgressBar.js"
 import { PkgTerminalView } from "./PkgTerminalView.js"
+import { NotifyWhenDone } from "./NotifyWhenDone.js"
 
 /**
  * @param {{
@@ -23,6 +24,7 @@ export let ProcessTab = ({ status, notebook, backend_launch_logs, my_clock_is_ah
                 nbpkg=${notebook.nbpkg}
                 backend_launch_logs=${backend_launch_logs}
             />
+            <${NotifyWhenDone} status=${status} />
         </section>
     `
 }
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index f1c177b266..a01a1e90fa 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -158,6 +158,7 @@
         --process-busy: #ffcd70;
         --process-finished: hsl(126deg 30% 60%);
         --process-undefined: rgb(151, 151, 151);
+        --process-notify-bg: hsl(0 0% 21%);
 
         /*footer*/
         --footer-color: #cacaca;
diff --git a/frontend/editor.css b/frontend/editor.css
index be7fa9107e..099e191bbb 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2044,6 +2044,8 @@ pluto-helpbox > section {
     height: 100%;
     overflow: auto;
     padding: 10px;
+    display: flex;
+    flex-direction: column;
 }
 
 pluto-helpbox > header {
@@ -2384,16 +2386,12 @@ pl-status {
     display: flex;
     flex-direction: column;
     border-radius: 0.2em;
-    /* margin: 0.3em; */
     --indent: 0.7rem;
     margin-left: var(--indent);
     border-left: 3px solid transparent;
     margin-top: 0.4em;
     overflow: hidden;
-    /* background: var(--status-color); */
-    /* transition: max-height 1s linear; */
-    /* max-height: 30px; */
-    flex: 1 0 auto;
+    flex: 0 0 auto;
 }
 
 pl-status::before {
@@ -2529,6 +2527,55 @@ pl-status pkg-terminal {
     margin-left: var(--indent);
 }
 
+pluto-helpbox.helpbox-process > section {
+    padding-bottom: 3.6rem; /* to make space for the notification toggle */
+}
+
+.notify-when-done {
+    position: absolute;
+    bottom: 0.3em;
+    right: 0;
+    left: 0;
+
+    font-family: var(--system-ui-font-stack);
+    font-weight: bold;
+    font-size: 0.8rem;
+    transition: opacity 0.2s;
+    display: flex;
+    justify-content: center;
+    opacity: 0;
+    user-select: none;
+}
+
+.notify-when-done.visible {
+    opacity: 1;
+}
+
+.notify-when-done.visible label {
+    cursor: pointer;
+}
+
+.notify-when-done label {
+    display: flex;
+    align-items: center;
+    background: var(--process-notify-bg);
+    padding: 0.3em 0.6em;
+    border-radius: 1000px;
+    box-shadow: 0px 3px 5px #0000003b;
+}
+
+.notify-when-done label::before {
+    content: "";
+    display: inline-block;
+    width: 1em;
+    height: 1em;
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/notifications-outline.svg");
+    background-size: contain;
+    filter: var(--image-filters);
+    margin-bottom: -0.2em;
+    margin-right: 0.3em;
+}
+
 /* FOOTER */
 
 footer {
diff --git a/frontend/light_color.css b/frontend/light_color.css
index 5403dc3262..6685329f48 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -161,6 +161,7 @@
         --process-busy: #ffcd70;
         --process-finished: hsl(126deg 30% 60%);
         --process-undefined: rgb(151, 151, 151);
+        --process-notify-bg: hsl(44.86deg 50% 94%);
 
         /*footer*/
         --footer-color: #333333;

From f1e893126df71749c3bdbae9ff6fdae066b1fe02 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 18 Apr 2023 13:24:56 +0200
Subject: [PATCH 629/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 9cdea08b83..97098f7476 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.24"
+version = "0.19.25"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From b72ae9bf4c9c023f7f930daab8103bac6950a144 Mon Sep 17 00:00:00 2001
From: Rik Huijzer <rikhuijzer@pm.me>
Date: Tue, 25 Apr 2023 08:51:13 +0200
Subject: [PATCH 630/821] Switch to `PrecompileTools.jl` (#2534)

---
 Project.toml           | 4 ++--
 src/precompile.jl      | 4 ++--
 test/packages/Basic.jl | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Project.toml b/Project.toml
index 97098f7476..29c146fc70 100644
--- a/Project.toml
+++ b/Project.toml
@@ -21,10 +21,10 @@ Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 MsgPack = "99f44e22-a591-53d1-9472-aa23ef4bd671"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 PrecompileSignatures = "91cefc8d-f054-46dc-8f8c-26e11d7c5411"
+PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 RegistryInstances = "2792f1a3-b283-48e8-9a74-f99dce5104f3"
 RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
-SnoopPrecompile = "66db9d55-30c0-4569-8b51-7e840670fc0c"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
@@ -40,9 +40,9 @@ LoggingExtras = "0.4, 1"
 MIMEs = "0.1"
 MsgPack = "1.1"
 PrecompileSignatures = "3"
+PrecompileTools = "1"
 RegistryInstances = "0.1"
 RelocatableFolders = "0.1, 0.2, 0.3, 1"
-SnoopPrecompile = "1"
 Tables = "1"
 URIs = "1.3"
 julia = "^1.6"
diff --git a/src/precompile.jl b/src/precompile.jl
index c64c834dd1..69ad276bf9 100644
--- a/src/precompile.jl
+++ b/src/precompile.jl
@@ -1,8 +1,8 @@
-using SnoopPrecompile: SnoopPrecompile
+using PrecompileTools: PrecompileTools
 
 const __TEST_NOTEBOOK_ID = uuid1()
 
-SnoopPrecompile.@precompile_all_calls begin
+PrecompileTools.@compile_workload begin
     let
         channel = Channel{Any}(10)
         Pluto.PlutoRunner.setup_plutologger(
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index 50f06253ce..6a8af7e9f5 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -654,7 +654,11 @@ import Distributed
         precomp_entries() = readdir(mkpath(compilation_dir_testA))
         
         # clear cache
-        isdir(compilation_dir_testA) && rm(compilation_dir_testA; force=true, recursive=true)
+        let
+            # sleep workaround for julia issue 34700.
+            sleep(3)
+            isdir(compilation_dir_testA) && rm(compilation_dir_testA; force=true, recursive=true)
+        end
         @test precomp_entries() == []
 
         @testset "Match compiler options: $(match)" for match in [true, false]

From e7d5d2c1eaa5b19d0c23ca193de466ebae5abc08 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Apr 2023 11:13:25 +0200
Subject: [PATCH 631/821] Upgrade codemirror to 26 April 2023 (#2540)

---
 frontend/imports/CodemirrorPlutoSetup.d.ts | 557 ++++++++++++++++++++-
 frontend/imports/CodemirrorPlutoSetup.js   |   2 +-
 2 files changed, 540 insertions(+), 19 deletions(-)

diff --git a/frontend/imports/CodemirrorPlutoSetup.d.ts b/frontend/imports/CodemirrorPlutoSetup.d.ts
index 6919393ed4..4e298e6d9d 100644
--- a/frontend/imports/CodemirrorPlutoSetup.d.ts
+++ b/frontend/imports/CodemirrorPlutoSetup.d.ts
@@ -1865,6 +1865,17 @@ declare type Attrs = {
     [name: string]: string;
 };
 
+/**
+Basic rectangle type.
+*/
+interface Rect {
+    readonly left: number;
+    readonly right: number;
+    readonly top: number;
+    readonly bottom: number;
+}
+declare type ScrollStrategy = "nearest" | "start" | "end" | "center";
+
 interface MarkDecorationSpec {
     /**
     Whether the mark covers its start and end position or not. This
@@ -2013,7 +2024,7 @@ declare abstract class WidgetType {
     couldn't (in which case the widget will be redrawn). The default
     implementation just returns false.
     */
-    updateDOM(dom: HTMLElement): boolean;
+    updateDOM(dom: HTMLElement, view: EditorView): boolean;
     /**
     The estimated height this widget will have, to be used when
     estimating the height of content that hasn't been drawn. May
@@ -2028,6 +2039,14 @@ declare abstract class WidgetType {
     */
     ignoreEvent(event: Event): boolean;
     /**
+    Override the way screen coordinates for positions at/in the
+    widget are found. `pos` will be the offset into the widget, and
+    `side` the side of the position that is being queried—less than
+    zero for before, greater than zero for after, and zero for
+    directly at that position.
+    */
+    coordsAt(dom: HTMLElement, pos: number, side: number): Rect | null;
+    /**
     This is called when the an instance of the widget is removed
     from the editor view.
     */
@@ -2130,17 +2149,6 @@ declare abstract class Decoration extends RangeValue {
     static none: DecorationSet;
 }
 
-/**
-Basic rectangle type.
-*/
-interface Rect {
-    readonly left: number;
-    readonly right: number;
-    readonly top: number;
-    readonly bottom: number;
-}
-declare type ScrollStrategy = "nearest" | "start" | "end" | "center";
-
 /**
 Command functions are used in key bindings and other types of user
 actions. Given an editor view, they check whether their effect can
@@ -2841,6 +2849,11 @@ declare class EditorView {
     */
     static inputHandler: Facet<(view: EditorView, from: number, to: number, text: string) => boolean, readonly ((view: EditorView, from: number, to: number, text: string) => boolean)[]>;
     /**
+    This facet can be used to provide functions that create effects
+    to be dispatched when the editor's focus state changes.
+    */
+    static focusChangeEffect: Facet<(state: EditorState, focusing: boolean) => StateEffect<any> | null, readonly ((state: EditorState, focusing: boolean) => StateEffect<any> | null)[]>;
+    /**
     By default, the editor assumes all its content has the same
     [text direction](https://codemirror.net/6/docs/ref/#view.Direction). Configure this with a `true`
     value to make it read the text direction of every (rendered)
@@ -3216,99 +3229,458 @@ Create a line number gutter extension.
 */
 declare function lineNumbers(config?: LineNumberConfig): Extension;
 
+/**
+Highlighting tags are markers that denote a highlighting category.
+They are [associated](#highlight.styleTags) with parts of a syntax
+tree by a language mode, and then mapped to an actual CSS style by
+a [highlighter](#highlight.Highlighter).
+
+Because syntax tree node types and highlight styles have to be
+able to talk the same language, CodeMirror uses a mostly _closed_
+[vocabulary](#highlight.tags) of syntax tags (as opposed to
+traditional open string-based systems, which make it hard for
+highlighting themes to cover all the tokens produced by the
+various languages).
+
+It _is_ possible to [define](#highlight.Tag^define) your own
+highlighting tags for system-internal use (where you control both
+the language package and the highlighter), but such tags will not
+be picked up by regular highlighters (though you can derive them
+from standard tags to allow highlighters to fall back to those).
+*/
 declare class Tag {
+    /**
+    The set of this tag and all its parent tags, starting with
+    this one itself and sorted in order of decreasing specificity.
+    */
     readonly set: Tag[];
+    /**
+    Define a new tag. If `parent` is given, the tag is treated as a
+    sub-tag of that parent, and
+    [highlighters](#highlight.tagHighlighter) that don't mention
+    this tag will try to fall back to the parent tag (or grandparent
+    tag, etc).
+    */
     static define(parent?: Tag): Tag;
+    /**
+    Define a tag _modifier_, which is a function that, given a tag,
+    will return a tag that is a subtag of the original. Applying the
+    same modifier to a twice tag will return the same value (`m1(t1)
+    == m1(t1)`) and applying multiple modifiers will, regardless or
+    order, produce the same tag (`m1(m2(t1)) == m2(m1(t1))`).
+    
+    When multiple modifiers are applied to a given base tag, each
+    smaller set of modifiers is registered as a parent, so that for
+    example `m1(m2(m3(t1)))` is a subtype of `m1(m2(t1))`,
+    `m1(m3(t1)`, and so on.
+    */
     static defineModifier(): (tag: Tag) => Tag;
 }
+/**
+A highlighter defines a mapping from highlighting tags and
+language scopes to CSS class names. They are usually defined via
+[`tagHighlighter`](#highlight.tagHighlighter) or some wrapper
+around that, but it is also possible to implement them from
+scratch.
+*/
 interface Highlighter {
+    /**
+    Get the set of classes that should be applied to the given set
+    of highlighting tags, or null if this highlighter doesn't assign
+    a style to the tags.
+    */
     style(tags: readonly Tag[]): string | null;
+    /**
+    When given, the highlighter will only be applied to trees on
+    whose [top](#common.NodeType.isTop) node this predicate returns
+    true.
+    */
     scope?(node: NodeType): boolean;
 }
+/**
+The default set of highlighting [tags](#highlight.Tag).
+
+This collection is heavily biased towards programming languages,
+and necessarily incomplete. A full ontology of syntactic
+constructs would fill a stack of books, and be impractical to
+write themes for. So try to make do with this set. If all else
+fails, [open an
+issue](https://github.com/codemirror/codemirror.next) to propose a
+new tag, or [define](#highlight.Tag^define) a local custom tag for
+your use case.
+
+Note that it is not obligatory to always attach the most specific
+tag possible to an element—if your grammar can't easily
+distinguish a certain type of element (such as a local variable),
+it is okay to style it as its more general variant (a variable).
+
+For tags that extend some parent tag, the documentation links to
+the parent.
+*/
 declare const tags: {
+    /**
+    A comment.
+    */
     comment: Tag;
+    /**
+    A line [comment](#highlight.tags.comment).
+    */
     lineComment: Tag;
+    /**
+    A block [comment](#highlight.tags.comment).
+    */
     blockComment: Tag;
+    /**
+    A documentation [comment](#highlight.tags.comment).
+    */
     docComment: Tag;
+    /**
+    Any kind of identifier.
+    */
     name: Tag;
+    /**
+    The [name](#highlight.tags.name) of a variable.
+    */
     variableName: Tag;
+    /**
+    A type [name](#highlight.tags.name).
+    */
     typeName: Tag;
+    /**
+    A tag name (subtag of [`typeName`](#highlight.tags.typeName)).
+    */
     tagName: Tag;
+    /**
+    A property or field [name](#highlight.tags.name).
+    */
     propertyName: Tag;
+    /**
+    An attribute name (subtag of [`propertyName`](#highlight.tags.propertyName)).
+    */
     attributeName: Tag;
+    /**
+    The [name](#highlight.tags.name) of a class.
+    */
     className: Tag;
+    /**
+    A label [name](#highlight.tags.name).
+    */
     labelName: Tag;
+    /**
+    A namespace [name](#highlight.tags.name).
+    */
     namespace: Tag;
+    /**
+    The [name](#highlight.tags.name) of a macro.
+    */
     macroName: Tag;
+    /**
+    A literal value.
+    */
     literal: Tag;
+    /**
+    A string [literal](#highlight.tags.literal).
+    */
     string: Tag;
+    /**
+    A documentation [string](#highlight.tags.string).
+    */
     docString: Tag;
+    /**
+    A character literal (subtag of [string](#highlight.tags.string)).
+    */
     character: Tag;
+    /**
+    An attribute value (subtag of [string](#highlight.tags.string)).
+    */
     attributeValue: Tag;
+    /**
+    A number [literal](#highlight.tags.literal).
+    */
     number: Tag;
+    /**
+    An integer [number](#highlight.tags.number) literal.
+    */
     integer: Tag;
+    /**
+    A floating-point [number](#highlight.tags.number) literal.
+    */
     float: Tag;
+    /**
+    A boolean [literal](#highlight.tags.literal).
+    */
     bool: Tag;
+    /**
+    Regular expression [literal](#highlight.tags.literal).
+    */
     regexp: Tag;
+    /**
+    An escape [literal](#highlight.tags.literal), for example a
+    backslash escape in a string.
+    */
     escape: Tag;
+    /**
+    A color [literal](#highlight.tags.literal).
+    */
     color: Tag;
+    /**
+    A URL [literal](#highlight.tags.literal).
+    */
     url: Tag;
+    /**
+    A language keyword.
+    */
     keyword: Tag;
+    /**
+    The [keyword](#highlight.tags.keyword) for the self or this
+    object.
+    */
     self: Tag;
+    /**
+    The [keyword](#highlight.tags.keyword) for null.
+    */
     null: Tag;
+    /**
+    A [keyword](#highlight.tags.keyword) denoting some atomic value.
+    */
     atom: Tag;
+    /**
+    A [keyword](#highlight.tags.keyword) that represents a unit.
+    */
     unit: Tag;
+    /**
+    A modifier [keyword](#highlight.tags.keyword).
+    */
     modifier: Tag;
+    /**
+    A [keyword](#highlight.tags.keyword) that acts as an operator.
+    */
     operatorKeyword: Tag;
+    /**
+    A control-flow related [keyword](#highlight.tags.keyword).
+    */
     controlKeyword: Tag;
+    /**
+    A [keyword](#highlight.tags.keyword) that defines something.
+    */
     definitionKeyword: Tag;
+    /**
+    A [keyword](#highlight.tags.keyword) related to defining or
+    interfacing with modules.
+    */
     moduleKeyword: Tag;
+    /**
+    An operator.
+    */
     operator: Tag;
+    /**
+    An [operator](#highlight.tags.operator) that dereferences something.
+    */
     derefOperator: Tag;
+    /**
+    Arithmetic-related [operator](#highlight.tags.operator).
+    */
     arithmeticOperator: Tag;
+    /**
+    Logical [operator](#highlight.tags.operator).
+    */
     logicOperator: Tag;
+    /**
+    Bit [operator](#highlight.tags.operator).
+    */
     bitwiseOperator: Tag;
+    /**
+    Comparison [operator](#highlight.tags.operator).
+    */
     compareOperator: Tag;
+    /**
+    [Operator](#highlight.tags.operator) that updates its operand.
+    */
     updateOperator: Tag;
+    /**
+    [Operator](#highlight.tags.operator) that defines something.
+    */
     definitionOperator: Tag;
+    /**
+    Type-related [operator](#highlight.tags.operator).
+    */
     typeOperator: Tag;
+    /**
+    Control-flow [operator](#highlight.tags.operator).
+    */
     controlOperator: Tag;
+    /**
+    Program or markup punctuation.
+    */
     punctuation: Tag;
+    /**
+    [Punctuation](#highlight.tags.punctuation) that separates
+    things.
+    */
     separator: Tag;
+    /**
+    Bracket-style [punctuation](#highlight.tags.punctuation).
+    */
     bracket: Tag;
+    /**
+    Angle [brackets](#highlight.tags.bracket) (usually `<` and `>`
+    tokens).
+    */
     angleBracket: Tag;
+    /**
+    Square [brackets](#highlight.tags.bracket) (usually `[` and `]`
+    tokens).
+    */
     squareBracket: Tag;
+    /**
+    Parentheses (usually `(` and `)` tokens). Subtag of
+    [bracket](#highlight.tags.bracket).
+    */
     paren: Tag;
+    /**
+    Braces (usually `{` and `}` tokens). Subtag of
+    [bracket](#highlight.tags.bracket).
+    */
     brace: Tag;
+    /**
+    Content, for example plain text in XML or markup documents.
+    */
     content: Tag;
+    /**
+    [Content](#highlight.tags.content) that represents a heading.
+    */
     heading: Tag;
+    /**
+    A level 1 [heading](#highlight.tags.heading).
+    */
     heading1: Tag;
+    /**
+    A level 2 [heading](#highlight.tags.heading).
+    */
     heading2: Tag;
+    /**
+    A level 3 [heading](#highlight.tags.heading).
+    */
     heading3: Tag;
+    /**
+    A level 4 [heading](#highlight.tags.heading).
+    */
     heading4: Tag;
+    /**
+    A level 5 [heading](#highlight.tags.heading).
+    */
     heading5: Tag;
+    /**
+    A level 6 [heading](#highlight.tags.heading).
+    */
     heading6: Tag;
+    /**
+    A prose separator (such as a horizontal rule).
+    */
     contentSeparator: Tag;
+    /**
+    [Content](#highlight.tags.content) that represents a list.
+    */
     list: Tag;
+    /**
+    [Content](#highlight.tags.content) that represents a quote.
+    */
     quote: Tag;
+    /**
+    [Content](#highlight.tags.content) that is emphasized.
+    */
     emphasis: Tag;
+    /**
+    [Content](#highlight.tags.content) that is styled strong.
+    */
     strong: Tag;
+    /**
+    [Content](#highlight.tags.content) that is part of a link.
+    */
     link: Tag;
+    /**
+    [Content](#highlight.tags.content) that is styled as code or
+    monospace.
+    */
     monospace: Tag;
+    /**
+    [Content](#highlight.tags.content) that has a strike-through
+    style.
+    */
     strikethrough: Tag;
+    /**
+    Inserted text in a change-tracking format.
+    */
     inserted: Tag;
+    /**
+    Deleted text.
+    */
     deleted: Tag;
+    /**
+    Changed text.
+    */
     changed: Tag;
+    /**
+    An invalid or unsyntactic element.
+    */
     invalid: Tag;
+    /**
+    Metadata or meta-instruction.
+    */
     meta: Tag;
+    /**
+    [Metadata](#highlight.tags.meta) that applies to the entire
+    document.
+    */
     documentMeta: Tag;
+    /**
+    [Metadata](#highlight.tags.meta) that annotates or adds
+    attributes to a given syntactic element.
+    */
     annotation: Tag;
+    /**
+    Processing instruction or preprocessor directive. Subtag of
+    [meta](#highlight.tags.meta).
+    */
     processingInstruction: Tag;
+    /**
+    [Modifier](#highlight.Tag^defineModifier) that indicates that a
+    given element is being defined. Expected to be used with the
+    various [name](#highlight.tags.name) tags.
+    */
     definition: (tag: Tag) => Tag;
+    /**
+    [Modifier](#highlight.Tag^defineModifier) that indicates that
+    something is constant. Mostly expected to be used with
+    [variable names](#highlight.tags.variableName).
+    */
     constant: (tag: Tag) => Tag;
+    /**
+    [Modifier](#highlight.Tag^defineModifier) used to indicate that
+    a [variable](#highlight.tags.variableName) or [property
+    name](#highlight.tags.propertyName) is being called or defined
+    as a function.
+    */
     function: (tag: Tag) => Tag;
+    /**
+    [Modifier](#highlight.Tag^defineModifier) that can be applied to
+    [names](#highlight.tags.name) to indicate that they belong to
+    the language's standard environment.
+    */
     standard: (tag: Tag) => Tag;
+    /**
+    [Modifier](#highlight.Tag^defineModifier) that indicates a given
+    [names](#highlight.tags.name) is local to some scope.
+    */
     local: (tag: Tag) => Tag;
+    /**
+    A generic variant [modifier](#highlight.Tag^defineModifier) that
+    can be used to tag language-specific alternative variants of
+    some common tag. It is recommended for themes to define special
+    forms of at least the [string](#highlight.tags.string) and
+    [variable name](#highlight.tags.variableName) tags, since those
+    come up a lot.
+    */
     special: (tag: Tag) => Tag;
 };
 
@@ -3561,9 +3933,9 @@ declare class LanguageDescription {
     static matchLanguageName(descs: readonly LanguageDescription[], name: string, fuzzy?: boolean): LanguageDescription | null;
 }
 /**
-Facet for overriding the unit by which indentation happens.
-Should be a string consisting either entirely of spaces or
-entirely of tabs. When not set, this defaults to 2 spaces.
+Facet for overriding the unit by which indentation happens. Should
+be a string consisting either entirely of the same whitespace
+character. When not set, this defaults to 2 spaces.
 */
 declare const indentUnit: Facet<string, string>;
 /**
@@ -3844,7 +4216,7 @@ The default keymap. Includes all bindings from
 - Shift-Alt-ArrowUp: [`copyLineUp`](https://codemirror.net/6/docs/ref/#commands.copyLineUp)
 - Shift-Alt-ArrowDown: [`copyLineDown`](https://codemirror.net/6/docs/ref/#commands.copyLineDown)
 - Escape: [`simplifySelection`](https://codemirror.net/6/docs/ref/#commands.simplifySelection)
-- Ctrl-Enter (Comd-Enter on macOS): [`insertBlankLine`](https://codemirror.net/6/docs/ref/#commands.insertBlankLine)
+- Ctrl-Enter (Cmd-Enter on macOS): [`insertBlankLine`](https://codemirror.net/6/docs/ref/#commands.insertBlankLine)
 - Alt-l (Ctrl-l on macOS): [`selectLine`](https://codemirror.net/6/docs/ref/#commands.selectLine)
 - Ctrl-i (Cmd-i on macOS): [`selectParentSyntax`](https://codemirror.net/6/docs/ref/#commands.selectParentSyntax)
 - Ctrl-[ (Cmd-[ on macOS): [`indentLess`](https://codemirror.net/6/docs/ref/#commands.indentLess)
@@ -3933,6 +4305,19 @@ interface CompletionConfig {
         position: number;
     }[];
     /**
+    By default, [info](https://codemirror.net/6/docs/ref/#autocomplet.Completion.info) tooltips are
+    placed to the side of the selected. This option can be used to
+    override that. It will be given rectangles for the list of
+    completions, the selected option, the info element, and the
+    availble [tooltip space](https://codemirror.net/6/docs/ref/#view.tooltips^config.tooltipSpace),
+    and should return style and/or class strings for the info
+    element.
+    */
+    positionInfo?: (view: EditorView, list: Rect, option: Rect, info: Rect, space: Rect) => {
+        style?: string;
+        class?: string;
+    };
+    /**
     The comparison function to use when sorting completions with the same
     match score. Defaults to using
     [`localeCompare`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/localeCompare).
@@ -3997,6 +4382,39 @@ interface Completion {
     down the list, a positive number moves it up.
     */
     boost?: number;
+    /**
+    Can be used to divide the completion list into sections.
+    Completions in a given section (matched by name) will be grouped
+    together, with a heading above them. Options without section
+    will appear above all sections. A string value is equivalent to
+    a `{name}` object.
+    */
+    section?: string | CompletionSection;
+}
+/**
+Object used to describe a completion
+[section](https://codemirror.net/6/docs/ref/#autocomplete.Completion.section). It is recommended to
+create a shared object used by all the completions in a given
+section.
+*/
+interface CompletionSection {
+    /**
+    The name of the section. If no `render` method is present, this
+    will be displayed above the options.
+    */
+    name: string;
+    /**
+    An optional function that renders the section header. Since the
+    headers are shown inside a list, you should make sure the
+    resulting element has a `display: list-item` style.
+    */
+    header?: (section: CompletionSection) => HTMLElement;
+    /**
+    By default, sections are ordered alphabetically by name. To
+    specify an explicit order, `rank` can be used. Sections with a
+    lower rank will be shown above sections with a higher rank.
+    */
+    rank?: number;
 }
 /**
 An instance of this is passed to completion source functions.
@@ -4192,7 +4610,7 @@ interpreted as indicating a placeholder.
 declare function snippet(template: string): (editor: {
     state: EditorState;
     dispatch: (tr: Transaction) => void;
-}, _completion: Completion, from: number, to: number) => void;
+}, completion: Completion, from: number, to: number) => void;
 /**
 A command that clears the active snippet, if any.
 */
@@ -4347,6 +4765,7 @@ type index_d_Completion = Completion;
 type index_d_CompletionContext = CompletionContext;
 declare const index_d_CompletionContext: typeof CompletionContext;
 type index_d_CompletionResult = CompletionResult;
+type index_d_CompletionSection = CompletionSection;
 type index_d_CompletionSource = CompletionSource;
 declare const index_d_acceptCompletion: typeof acceptCompletion;
 declare const index_d_autocompletion: typeof autocompletion;
@@ -4381,6 +4800,7 @@ declare namespace index_d {
     index_d_Completion as Completion,
     index_d_CompletionContext as CompletionContext,
     index_d_CompletionResult as CompletionResult,
+    index_d_CompletionSection as CompletionSection,
     index_d_CompletionSource as CompletionSource,
     index_d_acceptCompletion as acceptCompletion,
     index_d_autocompletion as autocompletion,
@@ -4697,6 +5117,101 @@ declare function html(config?: {
     nestedAttributes?: NestedAttr[];
 }): LanguageSupport;
 
+/**
+Describes a problem or hint for a piece of code.
+*/
+interface Diagnostic {
+    /**
+    The start position of the relevant text.
+    */
+    from: number;
+    /**
+    The end position. May be equal to `from`, though actually
+    covering text is preferable.
+    */
+    to: number;
+    /**
+    The severity of the problem. This will influence how it is
+    displayed.
+    */
+    severity: "info" | "warning" | "error";
+    /**
+    An optional source string indicating where the diagnostic is
+    coming from. You can put the name of your linter here, if
+    applicable.
+    */
+    source?: string;
+    /**
+    The message associated with this diagnostic.
+    */
+    message: string;
+    /**
+    An optional custom rendering function that displays the message
+    as a DOM node.
+    */
+    renderMessage?: () => Node;
+    /**
+    An optional array of actions that can be taken on this
+    diagnostic.
+    */
+    actions?: readonly Action[];
+}
+/**
+An action associated with a diagnostic.
+*/
+interface Action {
+    /**
+    The label to show to the user. Should be relatively short.
+    */
+    name: string;
+    /**
+    The function to call when the user activates this action. Is
+    given the diagnostic's _current_ position, which may have
+    changed since the creation of the diagnostic, due to editing.
+    */
+    apply: (view: EditorView, from: number, to: number) => void;
+}
+declare type DiagnosticFilter = (diagnostics: readonly Diagnostic[]) => Diagnostic[];
+interface LintConfig {
+    /**
+    Time to wait (in milliseconds) after a change before running
+    the linter. Defaults to 750ms.
+    */
+    delay?: number;
+    /**
+    Optional predicate that can be used to indicate when diagnostics
+    need to be recomputed. Linting is always re-done on document
+    changes.
+    */
+    needsRefresh?: null | ((update: ViewUpdate) => boolean);
+    /**
+    Optional filter to determine which diagnostics produce markers
+    in the content.
+    */
+    markerFilter?: null | DiagnosticFilter;
+    /**
+    Filter applied to a set of diagnostics shown in a tooltip. No
+    tooltip will appear if the empty set is returned.
+    */
+    tooltipFilter?: null | DiagnosticFilter;
+}
+/**
+Returns a transaction spec which updates the current set of
+diagnostics, and enables the lint extension if if wasn't already
+active.
+*/
+declare function setDiagnostics(state: EditorState, diagnostics: readonly Diagnostic[]): TransactionSpec;
+/**
+The type of a function that produces diagnostics.
+*/
+declare type LintSource = (view: EditorView) => readonly Diagnostic[] | Promise<readonly Diagnostic[]>;
+/**
+Given a diagnostic source, this function returns an extension that
+enables linting with that source. It will be called whenever the
+editor is idle (after its content changed).
+*/
+declare function linter(source: LintSource, config?: LintConfig): Extension;
+
 /**
 A language provider based on the [Lezer JavaScript
 parser](https://github.com/lezer-parser/javascript), extended with
@@ -4832,6 +5347,12 @@ interface SQLConfig {
     */
     tables?: readonly Completion[];
     /**
+    Similar to `tables`, if you want to provide completion objects
+    for your schemas rather than using the generated ones, pass them
+    here.
+    */
+    schemas?: readonly Completion[];
+    /**
     When given, columns from the named table can be completed
     directly at the top level.
     */
@@ -4893,4 +5414,4 @@ Create an instance of the collaborative editing plugin.
 */
 declare function collab(config?: CollabConfig): Extension;
 
-export { Annotation, Compartment, Decoration, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, Text, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index_d as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, completionKeymap, css, cssLanguage, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, keymap, lineNumbers, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, rectangularSelection, searchKeymap, selectNextOccurrence, sql, syntaxHighlighting, syntaxTree, syntaxTreeAvailable, tags };
+export { Annotation, Compartment, Decoration, Diagnostic, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, Text, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index_d as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, completionKeymap, css, cssLanguage, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, keymap, lineNumbers, linter, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, rectangularSelection, searchKeymap, selectNextOccurrence, setDiagnostics, sql, syntaxHighlighting, syntaxTree, syntaxTreeAvailable, tags };
diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index ce8c635152..b88a18c12d 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -60,7 +60,7 @@ import {
     cssLanguage,
     selectNextOccurrence,
     //@ts-ignore
-} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.28.4/dist/index.es.min.js"
+} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@1234.0.0/dist/index.es.min.js"
 
 export {
     EditorState,

From e7d519d797e1fefff113860225c9a53c964922e7 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Apr 2023 11:13:47 +0200
Subject: [PATCH 632/821] FunctionNameSignaturePair: store hash of canonalized
 head (#2539)

---
 src/analysis/ExpressionExplorer.jl | 13 +++++++++----
 src/notebook/Notebook.jl           |  1 -
 test/MethodSignatures.jl           |  2 +-
 test/helpers.jl                    |  4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index a1c4a1f8fb..50b773d969 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -12,13 +12,18 @@ import Base: union, union!, ==, push!
 
 const FunctionName = Vector{Symbol}
 
+"""
+For an expression like `function Base.sqrt(x::Int)::Int x; end`, it has the following fields:
+- `name::FunctionName`: the name, `[:Base, :sqrt]`
+- `signature_hash::UInt`: a `UInt` that is unique for the type signature of the method declaration, ignoring argument names. In the example, this is equals `hash(ExpressionExplorer.canonalize( :(Base.sqrt(x::Int)::Int) ))`, see [`canonalize`](@ref) for more details.
+"""
 struct FunctionNameSignaturePair
     name::FunctionName
-    canonicalized_head::Any
+    signature_hash::UInt
 end
 
-Base.:(==)(a::FunctionNameSignaturePair, b::FunctionNameSignaturePair) = a.name == b.name && a.canonicalized_head == b.canonicalized_head
-Base.hash(a::FunctionNameSignaturePair, h::UInt) = hash(a.name, hash(a.canonicalized_head, h))
+Base.:(==)(a::FunctionNameSignaturePair, b::FunctionNameSignaturePair) = a.name == b.name && a.signature_hash == b.signature_hash
+Base.hash(a::FunctionNameSignaturePair, h::UInt) = hash(a.name, hash(a.signature_hash, h))
 
 "SymbolsState trickles _down_ the ASTree: it carries referenced and defined variables from endpoints down to the root."
 Base.@kwdef mutable struct SymbolsState
@@ -578,7 +583,7 @@ function explore_function_macro!(ex::Expr, scopestate::ScopeState)
     end
 
     union!(innersymstate, explore!(Expr(:block, ex.args[2:end]...), innerscopestate))
-    funcnamesig = FunctionNameSignaturePair(funcname, canonalize(funcroot))
+    funcnamesig = FunctionNameSignaturePair(funcname, hash(canonalize(funcroot)))
 
     if will_assign_global(funcname, scopestate)
         symstate.funcdefs[funcnamesig] = innersymstate
diff --git a/src/notebook/Notebook.jl b/src/notebook/Notebook.jl
index 712152cc4f..f7b2dbaea8 100644
--- a/src/notebook/Notebook.jl
+++ b/src/notebook/Notebook.jl
@@ -1,5 +1,4 @@
 import UUIDs: UUID, uuid1
-import .ExpressionExplorer: SymbolsState, FunctionNameSignaturePair, FunctionName
 import .Configuration
 import .PkgCompat: PkgCompat, PkgContext
 import Pkg
diff --git a/test/MethodSignatures.jl b/test/MethodSignatures.jl
index e0c1619da7..8e57cba45b 100644
--- a/test/MethodSignatures.jl
+++ b/test/MethodSignatures.jl
@@ -1,6 +1,6 @@
 using Test
 
-import Pluto.ExpressionExplorer: SymbolsState, compute_symbolreferences, FunctionNameSignaturePair
+import Pluto.ExpressionExplorer: compute_symbolreferences
 
 @testset "Method signatures" begin
 
diff --git a/test/helpers.jl b/test/helpers.jl
index f536eb037b..c61217a08b 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -83,7 +83,7 @@ function testee(expr::Any, expected_references, expected_definitions, expected_f
     result.funcdefs = let
         newfuncdefs = Dict{FunctionNameSignaturePair,SymbolsState}()
         for (k, v) in result.funcdefs
-            union!(newfuncdefs, Dict(FunctionNameSignaturePair(new_name.(k.name), "hello") => v))
+            union!(newfuncdefs, Dict(FunctionNameSignaturePair(new_name.(k.name), hash("hello")) => v))
         end
         newfuncdefs
     end
@@ -120,7 +120,7 @@ function easy_symstate(expected_references, expected_definitions, expected_funcc
     new_expected_funcdefs = map(expected_funcdefs) do (k, v)
         new_k = k isa Symbol ? [k] : k
         new_v = v isa SymbolsState ? v : easy_symstate(v...)
-        return FunctionNameSignaturePair(new_k, "hello") => new_v
+        return FunctionNameSignaturePair(new_k, hash("hello")) => new_v
     end |> Dict
 
     new_expected_macrocalls = array_to_set(expected_macrocalls)

From d5c20bf39cfc1c0237a921f2b8e545c6ff1712c2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Apr 2023 20:39:32 +0200
Subject: [PATCH 633/821] Fix autocomplete on binder and featured notebooks
 (#2544)

---
 frontend/common/PlutoConnection.js            |  2 +-
 frontend/components/CellInput.js              | 18 +++++++++++----
 .../components/CellInput/pkg_bubble_plugin.js |  4 ++--
 .../CellInput/pluto_autocomplete.js           | 22 ++++++++++++-------
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/frontend/common/PlutoConnection.js b/frontend/common/PlutoConnection.js
index 9a60f8ba41..b4c336a04d 100644
--- a/frontend/common/PlutoConnection.js
+++ b/frontend/common/PlutoConnection.js
@@ -409,7 +409,7 @@ export const create_pluto_connection = async ({
                         // Ping faster than timeout?
                         setTimeout(ping, 28 * 1000)
                     })
-                    .catch()
+                    .catch(() => undefined)
             }
             ping()
 
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index b1d63f08b8..e3a57c6421 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -64,6 +64,7 @@ import { commentKeymap } from "./CellInput/comment_mixed_parsers.js"
 import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
 import { mod_d_command } from "./CellInput/mod_d_command.js"
 import { open_bottom_right_panel } from "./BottomRightPanel.js"
+import { timeout_promise } from "../common/PlutoConnection.js"
 
 export const ENABLE_CM_MIXED_PARSER = window.localStorage.getItem("ENABLE_CM_MIXED_PARSER") === "true"
 
@@ -383,6 +384,9 @@ export const CellInput = ({
         set_error(null)
         throw to_throw
     }
+    const notebook_id_ref = useRef(notebook_id)
+    notebook_id_ref.current = notebook_id
+
     const newcm_ref = useRef(/** @type {EditorView?} */ (null))
     const dom_node_ref = useRef(/** @type {HTMLElement?} */ (null))
     const remote_code_ref = useRef(/** @type {string?} */ (null))
@@ -596,7 +600,7 @@ export const CellInput = ({
                     // TODO Use https://codemirror.net/6/docs/ref/#state.Prec when added to pluto-codemirror-setup
                     prevent_holding_a_key_from_doing_things_across_cells,
 
-                    pkgBubblePlugin({ pluto_actions, notebook_id }),
+                    pkgBubblePlugin({ pluto_actions, notebook_id_ref }),
                     ScopeStateField,
                     syntaxHighlighting(pluto_syntax_colors),
                     syntaxHighlighting(pluto_syntax_colors_html),
@@ -641,8 +645,8 @@ export const CellInput = ({
                         },
                     }),
                     pluto_paste_plugin({
-                        pluto_actions: pluto_actions,
-                        cell_id: cell_id,
+                        pluto_actions,
+                        cell_id,
                     }),
                     // Update live docs when in a cell that starts with `?`
                     EditorView.updateListener.of((update) => {
@@ -671,7 +675,13 @@ export const CellInput = ({
                     go_to_definition_plugin,
                     pluto_autocomplete({
                         request_autocomplete: async ({ text }) => {
-                            let { message } = await pluto_actions.send("complete", { query: text }, { notebook_id: notebook_id })
+                            let response = await timeout_promise(
+                                pluto_actions.send("complete", { query: text }, { notebook_id: notebook_id_ref.current }),
+                                5000
+                            ).catch(console.warn)
+                            if (!response) return null
+
+                            let { message } = response
                             return {
                                 start: utf8index_to_ut16index(text, message.start),
                                 stop: utf8index_to_ut16index(text, message.stop),
diff --git a/frontend/components/CellInput/pkg_bubble_plugin.js b/frontend/components/CellInput/pkg_bubble_plugin.js
index 57699013ce..05d66455bc 100644
--- a/frontend/components/CellInput/pkg_bubble_plugin.js
+++ b/frontend/components/CellInput/pkg_bubble_plugin.js
@@ -247,11 +247,11 @@ export const NotebookpackagesFacet = Facet.define({
     compare: _.isEqual,
 })
 
-export const pkgBubblePlugin = ({ pluto_actions, notebook_id }) =>
+export const pkgBubblePlugin = ({ pluto_actions, notebook_id_ref }) =>
     ViewPlugin.fromClass(
         class {
             update_decos(view) {
-                const ds = pkg_decorations(view, { pluto_actions, notebook_id, nbpkg: view.state.facet(NotebookpackagesFacet) })
+                const ds = pkg_decorations(view, { pluto_actions, notebook_id: notebook_id_ref.current, nbpkg: view.state.facet(NotebookpackagesFacet) })
                 this.decorations = ds
             }
 
diff --git a/frontend/components/CellInput/pluto_autocomplete.js b/frontend/components/CellInput/pluto_autocomplete.js
index a7b3828c53..2130d6a484 100644
--- a/frontend/components/CellInput/pluto_autocomplete.js
+++ b/frontend/components/CellInput/pluto_autocomplete.js
@@ -161,7 +161,10 @@ function match_string_complete(ctx) {
 /** Use the completion results from the Julia server to create CM completion objects, but only for path completions (TODO: broken) and latex completions. */
 let julia_special_completions_to_cm = (/** @type {PlutoRequestAutocomplete} */ request_autocomplete) => async (ctx) => {
     let to_complete = ctx.state.sliceDoc(0, ctx.pos)
-    let { start, stop, results } = await request_autocomplete({ text: to_complete })
+
+    let found = await request_autocomplete({ text: to_complete })
+    if (!found) return null
+    let { start, stop, results } = found
 
     let should_apply_unicode_completion = !match_string_complete(ctx)
 
@@ -216,7 +219,9 @@ const julia_code_completions_to_cm = (/** @type {PlutoRequestAutocomplete} */ re
         to_complete = to_complete.slice(0, is_symbol_completion.from + 1) + to_complete.slice(is_symbol_completion.from + 2)
     }
 
-    let { start, stop, results } = await request_autocomplete({ text: to_complete })
+    let found = await request_autocomplete({ text: to_complete })
+    if (!found) return null
+    let { start, stop, results } = found
 
     if (is_symbol_completion) {
         // If this is a symbol completion thing, we need to add the `:` back in by moving the end a bit furher
@@ -345,7 +350,7 @@ const local_variables_completion = (ctx) => {
  * @type {{ start: number, stop: number, results: Array<[string, (string | null), boolean, boolean, (string | null), (string | null)]> }}
  *
  * @typedef PlutoRequestAutocomplete
- * @type {(options: { text: string }) => Promise<PlutoAutocompleteResults>}
+ * @type {(options: { text: string }) => Promise<PlutoAutocompleteResults?>}
  */
 
 /**
@@ -365,12 +370,13 @@ export let pluto_autocomplete = ({ request_autocomplete, on_update_doc_query })
      **/
     let memoize_last_request_autocomplete = async (options) => {
         if (_.isEqual(options, last_query)) {
-            return await last_result
-        } else {
-            last_query = options
-            last_result = request_autocomplete(options)
-            return await last_result
+            let result = await last_result
+            if (result != null) return result
         }
+
+        last_query = options
+        last_result = request_autocomplete(options)
+        return await last_result
     }
 
     return [

From 3c1371f67fe6e5032ee6568f932fa0d7ca7cb4df Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Apr 2023 21:32:19 +0200
Subject: [PATCH 634/821] Support binder when serving HTML export from
 localhost

---
 frontend/common/Binder.js | 66 +++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/frontend/common/Binder.js b/frontend/common/Binder.js
index 975652cfce..dee8a749f3 100644
--- a/frontend/common/Binder.js
+++ b/frontend/common/Binder.js
@@ -140,34 +140,46 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
 
         /// PART 2: Using Pluto's REST API to open the notebook file. We either upload the notebook with a POST request, or we let the server open by giving it the filename/URL.
 
-        let open_response = new Response()
-
-        if (launch_params.notebookfile.startsWith("data:")) {
-            open_response = await fetch(
-                with_token(
-                    with_query_params(new URL("notebookupload", binder_session_url), {
-                        name: new URLSearchParams(window.location.search).get("name"),
-                    })
-                ),
-                {
-                    method: "POST",
-                    body: await (await fetch(new Request(launch_params.notebookfile, { integrity: launch_params.notebookfile_integrity }))).arrayBuffer(),
-                }
-            )
-        } else {
-            for (const [p1, p2] of [
-                ["path", launch_params.notebookfile],
-                ["url", new URL(launch_params.notebookfile, window.location.href).href],
-            ]) {
-                const open_url = with_query_params(new URL("open", binder_session_url), { [p1]: p2 })
-
-                console.log(`open ${p1}:`, open_url)
-                open_response = await fetch(with_token(open_url), {
-                    method: "POST",
+        let download_locally_and_upload = async () => {
+            const upload_url = with_token(
+                with_query_params(new URL("notebookupload", binder_session_url), {
+                    name: new URLSearchParams(window.location.search).get("name"),
                 })
-                if (open_response.ok) {
-                    break
-                }
+            )
+            console.log(`downloading locally and uploading `, upload_url, launch_params.notebookfile)
+
+            return fetch(upload_url, {
+                method: "POST",
+                body: await (await fetch(new Request(launch_params.notebookfile, { integrity: launch_params.notebookfile_integrity }))).arrayBuffer(),
+            })
+        }
+
+        let open_remotely = async (p1, p2) => {
+            const open_url = with_query_params(new URL("open", binder_session_url), { [p1]: p2 })
+
+            console.log(`open ${p1}:`, open_url)
+            return fetch(with_token(open_url), {
+                method: "POST",
+            })
+        }
+        let open_remotely_fn = (p1, p2) => () => open_remotely(p1, p2)
+
+        let methods_to_try = launch_params.notebookfile.startsWith("data:")
+            ? [download_locally_and_upload]
+            : [
+                  //
+                  open_remotely_fn("path", launch_params.notebookfile),
+                  //
+                  open_remotely_fn("url", new URL(launch_params.notebookfile, window.location.href).href),
+                  //
+                  download_locally_and_upload,
+              ]
+
+        let open_response = new Response()
+        for (let method of methods_to_try) {
+            open_response = await method()
+            if (open_response.ok) {
+                break
             }
         }
 

From e7a74671c62ce0b47f7a7f8c7b0bead98b8c48da Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Apr 2023 21:33:18 +0200
Subject: [PATCH 635/821] CSS tweaks

---
 frontend/binder.css     | 1 +
 frontend/dark_color.css | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/binder.css b/frontend/binder.css
index 56d400a161..48fe14cbef 100644
--- a/frontend/binder.css
+++ b/frontend/binder.css
@@ -102,6 +102,7 @@ body.wiggle_binder .edit_or_run > button {
     font-style: normal;
     color: black;
     font-weight: 900;
+    height: 2.2em;
 }
 
 .edit_or_run > button {
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index a01a1e90fa..3249d19803 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -162,7 +162,7 @@
 
         /*footer*/
         --footer-color: #cacaca;
-        --footer-bg-color: rgb(38, 39, 44);
+        --footer-bg-color: var(--header-bg-color);
         --footer-atag-color: rgb(114, 161, 223);
         --footer-input-border-color: #6c6c6c;
         --footer-filepicker-button-color: black;

From 90cf1be8887f85adc169887bee9242d0ba41ef4d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 26 Apr 2023 21:42:44 +0200
Subject: [PATCH 636/821] =?UTF-8?q?Change=20=F0=9F=94=BA=F0=9F=94=B4?=
 =?UTF-8?q?=F0=9F=9F=A5=20button=20to=20share=20icon=20(#2545)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/editor.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 099e191bbb..09493920a7 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -704,7 +704,7 @@ nav#at_the_top button.start_stop_recording.stop span {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/stop-circle-outline.svg");
 }
 nav#at_the_top button.toggle_export span {
-    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/shapes-outline.svg");
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/share-outline.svg");
     filter: var(--image-filters);
 }
 aside#export button.toggle_export span {

From a30c0f33a59830f06fa8aa63c682fd2a8a81c129 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 2 May 2023 13:39:58 +0200
Subject: [PATCH 637/821] Fix "0 cells deleted" in static HTML

---
 frontend/components/UndoDelete.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/UndoDelete.js b/frontend/components/UndoDelete.js
index 5da10f367b..88840353de 100644
--- a/frontend/components/UndoDelete.js
+++ b/frontend/components/UndoDelete.js
@@ -7,7 +7,7 @@ export const UndoDelete = ({ recently_deleted, on_click }) => {
     const [hidden, set_hidden] = useState(true)
 
     useEffect(() => {
-        if (recently_deleted != null) {
+        if (recently_deleted != null && recently_deleted.length > 0) {
             set_hidden(false)
             const interval = setTimeout(() => {
                 set_hidden(true)

From 36d1ca12045d1c1b9663108615d4c64ef27a2bf1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 3 May 2023 16:21:13 +0200
Subject: [PATCH 638/821] Revert "Upgrade codemirror to 26 April 2023 (#2540)"

This reverts commit e7d5d2c1eaa5b19d0c23ca193de466ebae5abc08.
---
 frontend/imports/CodemirrorPlutoSetup.d.ts | 557 +--------------------
 frontend/imports/CodemirrorPlutoSetup.js   |   2 +-
 2 files changed, 19 insertions(+), 540 deletions(-)

diff --git a/frontend/imports/CodemirrorPlutoSetup.d.ts b/frontend/imports/CodemirrorPlutoSetup.d.ts
index 4e298e6d9d..6919393ed4 100644
--- a/frontend/imports/CodemirrorPlutoSetup.d.ts
+++ b/frontend/imports/CodemirrorPlutoSetup.d.ts
@@ -1865,17 +1865,6 @@ declare type Attrs = {
     [name: string]: string;
 };
 
-/**
-Basic rectangle type.
-*/
-interface Rect {
-    readonly left: number;
-    readonly right: number;
-    readonly top: number;
-    readonly bottom: number;
-}
-declare type ScrollStrategy = "nearest" | "start" | "end" | "center";
-
 interface MarkDecorationSpec {
     /**
     Whether the mark covers its start and end position or not. This
@@ -2024,7 +2013,7 @@ declare abstract class WidgetType {
     couldn't (in which case the widget will be redrawn). The default
     implementation just returns false.
     */
-    updateDOM(dom: HTMLElement, view: EditorView): boolean;
+    updateDOM(dom: HTMLElement): boolean;
     /**
     The estimated height this widget will have, to be used when
     estimating the height of content that hasn't been drawn. May
@@ -2039,14 +2028,6 @@ declare abstract class WidgetType {
     */
     ignoreEvent(event: Event): boolean;
     /**
-    Override the way screen coordinates for positions at/in the
-    widget are found. `pos` will be the offset into the widget, and
-    `side` the side of the position that is being queried—less than
-    zero for before, greater than zero for after, and zero for
-    directly at that position.
-    */
-    coordsAt(dom: HTMLElement, pos: number, side: number): Rect | null;
-    /**
     This is called when the an instance of the widget is removed
     from the editor view.
     */
@@ -2149,6 +2130,17 @@ declare abstract class Decoration extends RangeValue {
     static none: DecorationSet;
 }
 
+/**
+Basic rectangle type.
+*/
+interface Rect {
+    readonly left: number;
+    readonly right: number;
+    readonly top: number;
+    readonly bottom: number;
+}
+declare type ScrollStrategy = "nearest" | "start" | "end" | "center";
+
 /**
 Command functions are used in key bindings and other types of user
 actions. Given an editor view, they check whether their effect can
@@ -2849,11 +2841,6 @@ declare class EditorView {
     */
     static inputHandler: Facet<(view: EditorView, from: number, to: number, text: string) => boolean, readonly ((view: EditorView, from: number, to: number, text: string) => boolean)[]>;
     /**
-    This facet can be used to provide functions that create effects
-    to be dispatched when the editor's focus state changes.
-    */
-    static focusChangeEffect: Facet<(state: EditorState, focusing: boolean) => StateEffect<any> | null, readonly ((state: EditorState, focusing: boolean) => StateEffect<any> | null)[]>;
-    /**
     By default, the editor assumes all its content has the same
     [text direction](https://codemirror.net/6/docs/ref/#view.Direction). Configure this with a `true`
     value to make it read the text direction of every (rendered)
@@ -3229,458 +3216,99 @@ Create a line number gutter extension.
 */
 declare function lineNumbers(config?: LineNumberConfig): Extension;
 
-/**
-Highlighting tags are markers that denote a highlighting category.
-They are [associated](#highlight.styleTags) with parts of a syntax
-tree by a language mode, and then mapped to an actual CSS style by
-a [highlighter](#highlight.Highlighter).
-
-Because syntax tree node types and highlight styles have to be
-able to talk the same language, CodeMirror uses a mostly _closed_
-[vocabulary](#highlight.tags) of syntax tags (as opposed to
-traditional open string-based systems, which make it hard for
-highlighting themes to cover all the tokens produced by the
-various languages).
-
-It _is_ possible to [define](#highlight.Tag^define) your own
-highlighting tags for system-internal use (where you control both
-the language package and the highlighter), but such tags will not
-be picked up by regular highlighters (though you can derive them
-from standard tags to allow highlighters to fall back to those).
-*/
 declare class Tag {
-    /**
-    The set of this tag and all its parent tags, starting with
-    this one itself and sorted in order of decreasing specificity.
-    */
     readonly set: Tag[];
-    /**
-    Define a new tag. If `parent` is given, the tag is treated as a
-    sub-tag of that parent, and
-    [highlighters](#highlight.tagHighlighter) that don't mention
-    this tag will try to fall back to the parent tag (or grandparent
-    tag, etc).
-    */
     static define(parent?: Tag): Tag;
-    /**
-    Define a tag _modifier_, which is a function that, given a tag,
-    will return a tag that is a subtag of the original. Applying the
-    same modifier to a twice tag will return the same value (`m1(t1)
-    == m1(t1)`) and applying multiple modifiers will, regardless or
-    order, produce the same tag (`m1(m2(t1)) == m2(m1(t1))`).
-    
-    When multiple modifiers are applied to a given base tag, each
-    smaller set of modifiers is registered as a parent, so that for
-    example `m1(m2(m3(t1)))` is a subtype of `m1(m2(t1))`,
-    `m1(m3(t1)`, and so on.
-    */
     static defineModifier(): (tag: Tag) => Tag;
 }
-/**
-A highlighter defines a mapping from highlighting tags and
-language scopes to CSS class names. They are usually defined via
-[`tagHighlighter`](#highlight.tagHighlighter) or some wrapper
-around that, but it is also possible to implement them from
-scratch.
-*/
 interface Highlighter {
-    /**
-    Get the set of classes that should be applied to the given set
-    of highlighting tags, or null if this highlighter doesn't assign
-    a style to the tags.
-    */
     style(tags: readonly Tag[]): string | null;
-    /**
-    When given, the highlighter will only be applied to trees on
-    whose [top](#common.NodeType.isTop) node this predicate returns
-    true.
-    */
     scope?(node: NodeType): boolean;
 }
-/**
-The default set of highlighting [tags](#highlight.Tag).
-
-This collection is heavily biased towards programming languages,
-and necessarily incomplete. A full ontology of syntactic
-constructs would fill a stack of books, and be impractical to
-write themes for. So try to make do with this set. If all else
-fails, [open an
-issue](https://github.com/codemirror/codemirror.next) to propose a
-new tag, or [define](#highlight.Tag^define) a local custom tag for
-your use case.
-
-Note that it is not obligatory to always attach the most specific
-tag possible to an element—if your grammar can't easily
-distinguish a certain type of element (such as a local variable),
-it is okay to style it as its more general variant (a variable).
-
-For tags that extend some parent tag, the documentation links to
-the parent.
-*/
 declare const tags: {
-    /**
-    A comment.
-    */
     comment: Tag;
-    /**
-    A line [comment](#highlight.tags.comment).
-    */
     lineComment: Tag;
-    /**
-    A block [comment](#highlight.tags.comment).
-    */
     blockComment: Tag;
-    /**
-    A documentation [comment](#highlight.tags.comment).
-    */
     docComment: Tag;
-    /**
-    Any kind of identifier.
-    */
     name: Tag;
-    /**
-    The [name](#highlight.tags.name) of a variable.
-    */
     variableName: Tag;
-    /**
-    A type [name](#highlight.tags.name).
-    */
     typeName: Tag;
-    /**
-    A tag name (subtag of [`typeName`](#highlight.tags.typeName)).
-    */
     tagName: Tag;
-    /**
-    A property or field [name](#highlight.tags.name).
-    */
     propertyName: Tag;
-    /**
-    An attribute name (subtag of [`propertyName`](#highlight.tags.propertyName)).
-    */
     attributeName: Tag;
-    /**
-    The [name](#highlight.tags.name) of a class.
-    */
     className: Tag;
-    /**
-    A label [name](#highlight.tags.name).
-    */
     labelName: Tag;
-    /**
-    A namespace [name](#highlight.tags.name).
-    */
     namespace: Tag;
-    /**
-    The [name](#highlight.tags.name) of a macro.
-    */
     macroName: Tag;
-    /**
-    A literal value.
-    */
     literal: Tag;
-    /**
-    A string [literal](#highlight.tags.literal).
-    */
     string: Tag;
-    /**
-    A documentation [string](#highlight.tags.string).
-    */
     docString: Tag;
-    /**
-    A character literal (subtag of [string](#highlight.tags.string)).
-    */
     character: Tag;
-    /**
-    An attribute value (subtag of [string](#highlight.tags.string)).
-    */
     attributeValue: Tag;
-    /**
-    A number [literal](#highlight.tags.literal).
-    */
     number: Tag;
-    /**
-    An integer [number](#highlight.tags.number) literal.
-    */
     integer: Tag;
-    /**
-    A floating-point [number](#highlight.tags.number) literal.
-    */
     float: Tag;
-    /**
-    A boolean [literal](#highlight.tags.literal).
-    */
     bool: Tag;
-    /**
-    Regular expression [literal](#highlight.tags.literal).
-    */
     regexp: Tag;
-    /**
-    An escape [literal](#highlight.tags.literal), for example a
-    backslash escape in a string.
-    */
     escape: Tag;
-    /**
-    A color [literal](#highlight.tags.literal).
-    */
     color: Tag;
-    /**
-    A URL [literal](#highlight.tags.literal).
-    */
     url: Tag;
-    /**
-    A language keyword.
-    */
     keyword: Tag;
-    /**
-    The [keyword](#highlight.tags.keyword) for the self or this
-    object.
-    */
     self: Tag;
-    /**
-    The [keyword](#highlight.tags.keyword) for null.
-    */
     null: Tag;
-    /**
-    A [keyword](#highlight.tags.keyword) denoting some atomic value.
-    */
     atom: Tag;
-    /**
-    A [keyword](#highlight.tags.keyword) that represents a unit.
-    */
     unit: Tag;
-    /**
-    A modifier [keyword](#highlight.tags.keyword).
-    */
     modifier: Tag;
-    /**
-    A [keyword](#highlight.tags.keyword) that acts as an operator.
-    */
     operatorKeyword: Tag;
-    /**
-    A control-flow related [keyword](#highlight.tags.keyword).
-    */
     controlKeyword: Tag;
-    /**
-    A [keyword](#highlight.tags.keyword) that defines something.
-    */
     definitionKeyword: Tag;
-    /**
-    A [keyword](#highlight.tags.keyword) related to defining or
-    interfacing with modules.
-    */
     moduleKeyword: Tag;
-    /**
-    An operator.
-    */
     operator: Tag;
-    /**
-    An [operator](#highlight.tags.operator) that dereferences something.
-    */
     derefOperator: Tag;
-    /**
-    Arithmetic-related [operator](#highlight.tags.operator).
-    */
     arithmeticOperator: Tag;
-    /**
-    Logical [operator](#highlight.tags.operator).
-    */
     logicOperator: Tag;
-    /**
-    Bit [operator](#highlight.tags.operator).
-    */
     bitwiseOperator: Tag;
-    /**
-    Comparison [operator](#highlight.tags.operator).
-    */
     compareOperator: Tag;
-    /**
-    [Operator](#highlight.tags.operator) that updates its operand.
-    */
     updateOperator: Tag;
-    /**
-    [Operator](#highlight.tags.operator) that defines something.
-    */
     definitionOperator: Tag;
-    /**
-    Type-related [operator](#highlight.tags.operator).
-    */
     typeOperator: Tag;
-    /**
-    Control-flow [operator](#highlight.tags.operator).
-    */
     controlOperator: Tag;
-    /**
-    Program or markup punctuation.
-    */
     punctuation: Tag;
-    /**
-    [Punctuation](#highlight.tags.punctuation) that separates
-    things.
-    */
     separator: Tag;
-    /**
-    Bracket-style [punctuation](#highlight.tags.punctuation).
-    */
     bracket: Tag;
-    /**
-    Angle [brackets](#highlight.tags.bracket) (usually `<` and `>`
-    tokens).
-    */
     angleBracket: Tag;
-    /**
-    Square [brackets](#highlight.tags.bracket) (usually `[` and `]`
-    tokens).
-    */
     squareBracket: Tag;
-    /**
-    Parentheses (usually `(` and `)` tokens). Subtag of
-    [bracket](#highlight.tags.bracket).
-    */
     paren: Tag;
-    /**
-    Braces (usually `{` and `}` tokens). Subtag of
-    [bracket](#highlight.tags.bracket).
-    */
     brace: Tag;
-    /**
-    Content, for example plain text in XML or markup documents.
-    */
     content: Tag;
-    /**
-    [Content](#highlight.tags.content) that represents a heading.
-    */
     heading: Tag;
-    /**
-    A level 1 [heading](#highlight.tags.heading).
-    */
     heading1: Tag;
-    /**
-    A level 2 [heading](#highlight.tags.heading).
-    */
     heading2: Tag;
-    /**
-    A level 3 [heading](#highlight.tags.heading).
-    */
     heading3: Tag;
-    /**
-    A level 4 [heading](#highlight.tags.heading).
-    */
     heading4: Tag;
-    /**
-    A level 5 [heading](#highlight.tags.heading).
-    */
     heading5: Tag;
-    /**
-    A level 6 [heading](#highlight.tags.heading).
-    */
     heading6: Tag;
-    /**
-    A prose separator (such as a horizontal rule).
-    */
     contentSeparator: Tag;
-    /**
-    [Content](#highlight.tags.content) that represents a list.
-    */
     list: Tag;
-    /**
-    [Content](#highlight.tags.content) that represents a quote.
-    */
     quote: Tag;
-    /**
-    [Content](#highlight.tags.content) that is emphasized.
-    */
     emphasis: Tag;
-    /**
-    [Content](#highlight.tags.content) that is styled strong.
-    */
     strong: Tag;
-    /**
-    [Content](#highlight.tags.content) that is part of a link.
-    */
     link: Tag;
-    /**
-    [Content](#highlight.tags.content) that is styled as code or
-    monospace.
-    */
     monospace: Tag;
-    /**
-    [Content](#highlight.tags.content) that has a strike-through
-    style.
-    */
     strikethrough: Tag;
-    /**
-    Inserted text in a change-tracking format.
-    */
     inserted: Tag;
-    /**
-    Deleted text.
-    */
     deleted: Tag;
-    /**
-    Changed text.
-    */
     changed: Tag;
-    /**
-    An invalid or unsyntactic element.
-    */
     invalid: Tag;
-    /**
-    Metadata or meta-instruction.
-    */
     meta: Tag;
-    /**
-    [Metadata](#highlight.tags.meta) that applies to the entire
-    document.
-    */
     documentMeta: Tag;
-    /**
-    [Metadata](#highlight.tags.meta) that annotates or adds
-    attributes to a given syntactic element.
-    */
     annotation: Tag;
-    /**
-    Processing instruction or preprocessor directive. Subtag of
-    [meta](#highlight.tags.meta).
-    */
     processingInstruction: Tag;
-    /**
-    [Modifier](#highlight.Tag^defineModifier) that indicates that a
-    given element is being defined. Expected to be used with the
-    various [name](#highlight.tags.name) tags.
-    */
     definition: (tag: Tag) => Tag;
-    /**
-    [Modifier](#highlight.Tag^defineModifier) that indicates that
-    something is constant. Mostly expected to be used with
-    [variable names](#highlight.tags.variableName).
-    */
     constant: (tag: Tag) => Tag;
-    /**
-    [Modifier](#highlight.Tag^defineModifier) used to indicate that
-    a [variable](#highlight.tags.variableName) or [property
-    name](#highlight.tags.propertyName) is being called or defined
-    as a function.
-    */
     function: (tag: Tag) => Tag;
-    /**
-    [Modifier](#highlight.Tag^defineModifier) that can be applied to
-    [names](#highlight.tags.name) to indicate that they belong to
-    the language's standard environment.
-    */
     standard: (tag: Tag) => Tag;
-    /**
-    [Modifier](#highlight.Tag^defineModifier) that indicates a given
-    [names](#highlight.tags.name) is local to some scope.
-    */
     local: (tag: Tag) => Tag;
-    /**
-    A generic variant [modifier](#highlight.Tag^defineModifier) that
-    can be used to tag language-specific alternative variants of
-    some common tag. It is recommended for themes to define special
-    forms of at least the [string](#highlight.tags.string) and
-    [variable name](#highlight.tags.variableName) tags, since those
-    come up a lot.
-    */
     special: (tag: Tag) => Tag;
 };
 
@@ -3933,9 +3561,9 @@ declare class LanguageDescription {
     static matchLanguageName(descs: readonly LanguageDescription[], name: string, fuzzy?: boolean): LanguageDescription | null;
 }
 /**
-Facet for overriding the unit by which indentation happens. Should
-be a string consisting either entirely of the same whitespace
-character. When not set, this defaults to 2 spaces.
+Facet for overriding the unit by which indentation happens.
+Should be a string consisting either entirely of spaces or
+entirely of tabs. When not set, this defaults to 2 spaces.
 */
 declare const indentUnit: Facet<string, string>;
 /**
@@ -4216,7 +3844,7 @@ The default keymap. Includes all bindings from
 - Shift-Alt-ArrowUp: [`copyLineUp`](https://codemirror.net/6/docs/ref/#commands.copyLineUp)
 - Shift-Alt-ArrowDown: [`copyLineDown`](https://codemirror.net/6/docs/ref/#commands.copyLineDown)
 - Escape: [`simplifySelection`](https://codemirror.net/6/docs/ref/#commands.simplifySelection)
-- Ctrl-Enter (Cmd-Enter on macOS): [`insertBlankLine`](https://codemirror.net/6/docs/ref/#commands.insertBlankLine)
+- Ctrl-Enter (Comd-Enter on macOS): [`insertBlankLine`](https://codemirror.net/6/docs/ref/#commands.insertBlankLine)
 - Alt-l (Ctrl-l on macOS): [`selectLine`](https://codemirror.net/6/docs/ref/#commands.selectLine)
 - Ctrl-i (Cmd-i on macOS): [`selectParentSyntax`](https://codemirror.net/6/docs/ref/#commands.selectParentSyntax)
 - Ctrl-[ (Cmd-[ on macOS): [`indentLess`](https://codemirror.net/6/docs/ref/#commands.indentLess)
@@ -4305,19 +3933,6 @@ interface CompletionConfig {
         position: number;
     }[];
     /**
-    By default, [info](https://codemirror.net/6/docs/ref/#autocomplet.Completion.info) tooltips are
-    placed to the side of the selected. This option can be used to
-    override that. It will be given rectangles for the list of
-    completions, the selected option, the info element, and the
-    availble [tooltip space](https://codemirror.net/6/docs/ref/#view.tooltips^config.tooltipSpace),
-    and should return style and/or class strings for the info
-    element.
-    */
-    positionInfo?: (view: EditorView, list: Rect, option: Rect, info: Rect, space: Rect) => {
-        style?: string;
-        class?: string;
-    };
-    /**
     The comparison function to use when sorting completions with the same
     match score. Defaults to using
     [`localeCompare`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/localeCompare).
@@ -4382,39 +3997,6 @@ interface Completion {
     down the list, a positive number moves it up.
     */
     boost?: number;
-    /**
-    Can be used to divide the completion list into sections.
-    Completions in a given section (matched by name) will be grouped
-    together, with a heading above them. Options without section
-    will appear above all sections. A string value is equivalent to
-    a `{name}` object.
-    */
-    section?: string | CompletionSection;
-}
-/**
-Object used to describe a completion
-[section](https://codemirror.net/6/docs/ref/#autocomplete.Completion.section). It is recommended to
-create a shared object used by all the completions in a given
-section.
-*/
-interface CompletionSection {
-    /**
-    The name of the section. If no `render` method is present, this
-    will be displayed above the options.
-    */
-    name: string;
-    /**
-    An optional function that renders the section header. Since the
-    headers are shown inside a list, you should make sure the
-    resulting element has a `display: list-item` style.
-    */
-    header?: (section: CompletionSection) => HTMLElement;
-    /**
-    By default, sections are ordered alphabetically by name. To
-    specify an explicit order, `rank` can be used. Sections with a
-    lower rank will be shown above sections with a higher rank.
-    */
-    rank?: number;
 }
 /**
 An instance of this is passed to completion source functions.
@@ -4610,7 +4192,7 @@ interpreted as indicating a placeholder.
 declare function snippet(template: string): (editor: {
     state: EditorState;
     dispatch: (tr: Transaction) => void;
-}, completion: Completion, from: number, to: number) => void;
+}, _completion: Completion, from: number, to: number) => void;
 /**
 A command that clears the active snippet, if any.
 */
@@ -4765,7 +4347,6 @@ type index_d_Completion = Completion;
 type index_d_CompletionContext = CompletionContext;
 declare const index_d_CompletionContext: typeof CompletionContext;
 type index_d_CompletionResult = CompletionResult;
-type index_d_CompletionSection = CompletionSection;
 type index_d_CompletionSource = CompletionSource;
 declare const index_d_acceptCompletion: typeof acceptCompletion;
 declare const index_d_autocompletion: typeof autocompletion;
@@ -4800,7 +4381,6 @@ declare namespace index_d {
     index_d_Completion as Completion,
     index_d_CompletionContext as CompletionContext,
     index_d_CompletionResult as CompletionResult,
-    index_d_CompletionSection as CompletionSection,
     index_d_CompletionSource as CompletionSource,
     index_d_acceptCompletion as acceptCompletion,
     index_d_autocompletion as autocompletion,
@@ -5117,101 +4697,6 @@ declare function html(config?: {
     nestedAttributes?: NestedAttr[];
 }): LanguageSupport;
 
-/**
-Describes a problem or hint for a piece of code.
-*/
-interface Diagnostic {
-    /**
-    The start position of the relevant text.
-    */
-    from: number;
-    /**
-    The end position. May be equal to `from`, though actually
-    covering text is preferable.
-    */
-    to: number;
-    /**
-    The severity of the problem. This will influence how it is
-    displayed.
-    */
-    severity: "info" | "warning" | "error";
-    /**
-    An optional source string indicating where the diagnostic is
-    coming from. You can put the name of your linter here, if
-    applicable.
-    */
-    source?: string;
-    /**
-    The message associated with this diagnostic.
-    */
-    message: string;
-    /**
-    An optional custom rendering function that displays the message
-    as a DOM node.
-    */
-    renderMessage?: () => Node;
-    /**
-    An optional array of actions that can be taken on this
-    diagnostic.
-    */
-    actions?: readonly Action[];
-}
-/**
-An action associated with a diagnostic.
-*/
-interface Action {
-    /**
-    The label to show to the user. Should be relatively short.
-    */
-    name: string;
-    /**
-    The function to call when the user activates this action. Is
-    given the diagnostic's _current_ position, which may have
-    changed since the creation of the diagnostic, due to editing.
-    */
-    apply: (view: EditorView, from: number, to: number) => void;
-}
-declare type DiagnosticFilter = (diagnostics: readonly Diagnostic[]) => Diagnostic[];
-interface LintConfig {
-    /**
-    Time to wait (in milliseconds) after a change before running
-    the linter. Defaults to 750ms.
-    */
-    delay?: number;
-    /**
-    Optional predicate that can be used to indicate when diagnostics
-    need to be recomputed. Linting is always re-done on document
-    changes.
-    */
-    needsRefresh?: null | ((update: ViewUpdate) => boolean);
-    /**
-    Optional filter to determine which diagnostics produce markers
-    in the content.
-    */
-    markerFilter?: null | DiagnosticFilter;
-    /**
-    Filter applied to a set of diagnostics shown in a tooltip. No
-    tooltip will appear if the empty set is returned.
-    */
-    tooltipFilter?: null | DiagnosticFilter;
-}
-/**
-Returns a transaction spec which updates the current set of
-diagnostics, and enables the lint extension if if wasn't already
-active.
-*/
-declare function setDiagnostics(state: EditorState, diagnostics: readonly Diagnostic[]): TransactionSpec;
-/**
-The type of a function that produces diagnostics.
-*/
-declare type LintSource = (view: EditorView) => readonly Diagnostic[] | Promise<readonly Diagnostic[]>;
-/**
-Given a diagnostic source, this function returns an extension that
-enables linting with that source. It will be called whenever the
-editor is idle (after its content changed).
-*/
-declare function linter(source: LintSource, config?: LintConfig): Extension;
-
 /**
 A language provider based on the [Lezer JavaScript
 parser](https://github.com/lezer-parser/javascript), extended with
@@ -5347,12 +4832,6 @@ interface SQLConfig {
     */
     tables?: readonly Completion[];
     /**
-    Similar to `tables`, if you want to provide completion objects
-    for your schemas rather than using the generated ones, pass them
-    here.
-    */
-    schemas?: readonly Completion[];
-    /**
     When given, columns from the named table can be completed
     directly at the top level.
     */
@@ -5414,4 +4893,4 @@ Create an instance of the collaborative editing plugin.
 */
 declare function collab(config?: CollabConfig): Extension;
 
-export { Annotation, Compartment, Decoration, Diagnostic, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, Text, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index_d as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, completionKeymap, css, cssLanguage, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, keymap, lineNumbers, linter, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, rectangularSelection, searchKeymap, selectNextOccurrence, setDiagnostics, sql, syntaxHighlighting, syntaxTree, syntaxTreeAvailable, tags };
+export { Annotation, Compartment, Decoration, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, Text, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index_d as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, completionKeymap, css, cssLanguage, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, keymap, lineNumbers, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, rectangularSelection, searchKeymap, selectNextOccurrence, sql, syntaxHighlighting, syntaxTree, syntaxTreeAvailable, tags };
diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index b88a18c12d..ce8c635152 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -60,7 +60,7 @@ import {
     cssLanguage,
     selectNextOccurrence,
     //@ts-ignore
-} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@1234.0.0/dist/index.es.min.js"
+} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.28.4/dist/index.es.min.js"
 
 export {
     EditorState,

From 6fb1870f8d50150d6afe2a9a461e719cc623ea4c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 15 May 2023 14:13:54 +0200
Subject: [PATCH 639/821] Update Dynamic.jl

---
 src/webserver/Dynamic.jl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 70b8c26343..71d29f189f 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -156,7 +156,6 @@ function notebook_to_js(notebook::Notebook)
                 "enabled" => ctx !== nothing,
                 "restart_recommended_msg" => notebook.nbpkg_restart_recommended_msg,
                 "restart_required_msg" => notebook.nbpkg_restart_required_msg,
-                # TODO: cache this
                 "installed_versions" => ctx === nothing ? Dict{String,String}() : notebook.nbpkg_installed_versions_cache,
                 "terminal_outputs" => notebook.nbpkg_terminal_outputs,
                 "install_time_ns" => notebook.nbpkg_install_time_ns,

From e23ca94db0ba79987f54512ec66e9687505038fe Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 15 May 2023 20:52:09 +0200
Subject: [PATCH 640/821] JS base64: 20% performance increase (#2561)

---
 frontend/common/PlutoHash.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/common/PlutoHash.js b/frontend/common/PlutoHash.js
index e1baef501b..8c71325735 100644
--- a/frontend/common/PlutoHash.js
+++ b/frontend/common/PlutoHash.js
@@ -10,7 +10,7 @@ export const base64_arraybuffer = async (/** @type {BufferSource} */ data) => {
         reader.readAsDataURL(new Blob([data]))
     })
 
-    return base64url.split(",", 2)[1]
+    return base64url.substring(base64url.indexOf(',')+1)
 }
 
 /** Encode a buffer using the `base64url` encoding, which uses URL-safe special characters, see https://en.wikipedia.org/wiki/Base64#Variants_summary_table */

From d31d7a417bbdcb5633b80f4c423bec7d94ef7a26 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 15 May 2023 20:53:30 +0200
Subject: [PATCH 641/821] Test Julia 1.9.0

---
 .github/workflows/Test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 537b4fd8f5..37e73f3784 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -34,7 +34,7 @@ jobs:
             fail-fast: false
             matrix:
                 # We test quite a lot of versions because we do some OS and version specific things unfortunately
-                julia-version: ["1.6", "1.7", "1.8", "~1.9.0-0"] #, "nightly"]
+                julia-version: ["1.6", "1.7", "1.8", "1.9"] #, "nightly"]
                 os: [ubuntu-latest, macOS-latest, windows-latest]
 
         steps:

From 8edd75b1e76599ab0bf69f75e634d9762502e431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Mon, 15 May 2023 22:07:38 +0300
Subject: [PATCH 642/821] add `pretty_stackcall(::Base.StackFrame, ::Module and
 ::Method)` for Julia 1.10 (#2560)

---
 src/runner/PlutoRunner.jl | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 0df26d2050..5e3b49e81f 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1096,6 +1096,14 @@ function pretty_stackcall(frame::Base.StackFrame, linfo::Core.MethodInstance)
     end
 end
 
+function pretty_stackcall(frame::Base.StackFrame, linfo::Method)
+    sprint(Base.show_tuple_as_call, linfo.name, linfo.sig)
+end
+
+function pretty_stackcall(frame::Base.StackFrame, linfo::Module)
+    sprint(Base.show, linfo)
+end
+
 "Return a `(String, Any)` tuple containing function output as the second entry."
 function show_richest_withreturned(context::IOContext, @nospecialize(args))
     buffer = IOBuffer(; sizehint=0)

From 4bc50bd5142e1b621c1748ba09193e045a37585f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 15 May 2023 21:40:51 +0200
Subject: [PATCH 643/821] css tweak

---
 frontend/editor.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 09493920a7..61c9e8fded 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -247,7 +247,7 @@ pluto-output pre > code {
 }
 
 pluto-output.rich_output code {
-    padding: 3px;
+    padding: 0.18em;
     border-radius: 8px;
     background-color: var(--pluto-output-bg-color);
 }

From e2e0006fb401fee55a323126f0b27a5376631b54 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 17 May 2023 16:51:22 +0200
Subject: [PATCH 644/821] minor refactor to use http middleware and improve
 docs

---
 src/Configuration.jl            |   2 +-
 src/Pluto.jl                    |   2 +
 src/webserver/Authentication.jl | 116 ++++++++++
 src/webserver/Router.jl         | 240 ++++++++++++++++++++
 src/webserver/Static.jl         | 375 +-------------------------------
 src/webserver/WebServer.jl      |   4 +-
 6 files changed, 374 insertions(+), 365 deletions(-)
 create mode 100644 src/webserver/Authentication.jl
 create mode 100644 src/webserver/Router.jl

diff --git a/src/Configuration.jl b/src/Configuration.jl
index 353458b023..95236fa6b4 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -83,7 +83,7 @@ The HTTP server options. See [`SecurityOptions`](@ref) for additional settings.
 - `injected_javascript_data_url::String = "$INJECTED_JAVASCRIPT_DATA_URL_DEFAULT"` (internal) Optional javascript injectables to the front-end. Can be used to customize the editor, but this API is not meant for general use yet.
 - `on_event::Function = $ON_EVENT_DEFAULT`
 - `root_url::Union{Nothing,String} = $ROOT_URL_DEFAULT` This setting is used to specify the root URL of the Pluto server, but this setting is *only* used to customize the launch message (*"Go to http://localhost:1234/ in your browser"*). You can probably ignore this and use `base_url` instead.
-- `base_url::String = "$BASE_URL_DEFAULT"` This setting is used to specify the base URL at which the Pluto server will receive requests, it should start be a valid path starting and ending with a '/'.
+- `base_url::String = "$BASE_URL_DEFAULT"` This (advanced) setting is used to specify a subpath at which the Pluto server will run, it should be a path starting and ending with a '/'. E.g. with `base_url = "/hello/world/"`, the server will run at `http://localhost:1234/hello/world/`, and you edit a notebook at `http://localhost:1234/hello/world/edit?id=...`.
 """
 @option mutable struct ServerOptions
     root_url::Union{Nothing,String} = ROOT_URL_DEFAULT
diff --git a/src/Pluto.jl b/src/Pluto.jl
index 06e4e89c48..2cb0eee2ad 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -84,6 +84,8 @@ module DownloadCool include("./webserver/data_url.jl") end
 include("./webserver/MsgPack.jl")
 include("./webserver/SessionActions.jl")
 include("./webserver/Static.jl")
+include("./webserver/Authentication.jl")
+include("./webserver/Router.jl")
 include("./webserver/Dynamic.jl")
 include("./webserver/REPLTools.jl")
 include("./webserver/WebServer.jl")
diff --git a/src/webserver/Authentication.jl b/src/webserver/Authentication.jl
new file mode 100644
index 0000000000..f74b4b7d68
--- /dev/null
+++ b/src/webserver/Authentication.jl
@@ -0,0 +1,116 @@
+
+"""
+Return whether the `request` was authenticated in one of two ways:
+1. the session's `secret` was included in the URL as a search parameter, or
+2. the session's `secret` was included in a cookie.
+"""
+function is_authenticated(session::ServerSession, request::HTTP.Request)
+    (
+        secret_in_url = try
+            uri = HTTP.URI(request.target)
+            query = HTTP.queryparams(uri)
+            get(query, "secret", "") == session.secret
+        catch e
+            @warn "Failed to authenticate request using URL" exception = (e, catch_backtrace())
+            false
+        end
+    ) || (
+        secret_in_cookie = try
+            cookies = HTTP.cookies(request)
+            any(cookies) do cookie
+                cookie.name == "secret" && cookie.value == session.secret
+            end
+        catch e
+            @warn "Failed to authenticate request using cookies" exception = (e, catch_backtrace())
+            false
+        end
+    )
+    # that ) || ( kind of looks like Krabs from spongebob
+end
+
+# Function to log the url with secret on the Julia CLI when a request comes to the server without the secret. Executes at most once every 5 seconds
+const log_secret_throttled = simple_leading_throttle(5) do session::ServerSession, request::HTTP.Request
+    host = HTTP.header(request, "Host")
+    target = request.target
+    url = Text(string(HTTP.URI(HTTP.URI("http://$host/"); query=Dict("secret" => session.secret))))
+    @info("No longer authenticated? Visit this URL to continue:", url)
+end
+
+
+function add_set_secret_cookie!(session::ServerSession, response::HTTP.Response)
+    HTTP.setheader(response, "Set-Cookie" => "secret=$(session.secret); SameSite=Strict; HttpOnly")
+    response
+end
+
+# too many layers i know
+"""
+Generate a middleware (i.e. a function `HTTP.Handler -> HTTP.Handler`) that stores the `session` in every `request`'s context.
+"""
+function create_session_context_middleware(session::ServerSession)
+    function session_context_middleware(handler::Function)::Function
+        function(request::HTTP.Request)
+            request.context[:pluto_session] = session
+            handler(request)
+        end
+    end
+end
+
+
+session_from_context(request::HTTP.Request) = request.context[:pluto_session]::ServerSession
+
+
+function auth_required(session::ServerSession, request::HTTP.Request)
+    path = HTTP.URI(request.target).path
+    ext = splitext(path)[2]
+    security = session.options.security
+
+    if path ∈ ("/ping", "/possible_binder_token_please") || ext ∈ (".ico", ".js", ".css", ".png", ".gif", ".svg", ".ico", ".woff2", ".woff", ".ttf", ".eot", ".otf", ".json", ".map")
+        false
+    elseif path ∈ ("", "/")
+        # / does not need security.require_secret_for_open_links, because this is how we handle the configuration where:
+        #    require_secret_for_open_links == true
+        #    require_secret_for_access == false
+        # 
+        # This means that access to all 'risky' endpoints is restricted to authenticated requests (to prevent CSRF), but we allow an unauthenticated request to visit the `/` page and acquire the cookie (see `add_set_secret_cookie!`).
+        # 
+        # (By default, `require_secret_for_access` (and `require_secret_for_open_links`) is `true`.)
+        security.require_secret_for_access
+    else
+        security.require_secret_for_access || 
+        security.require_secret_for_open_links
+    end
+end
+
+
+"""
+    auth_middleware(f::HTTP.Handler) -> HTTP.Handler
+
+Returns an `HTTP.Handler` (i.e. a function `HTTP.Request → HTTP.Response`) which does three things:
+1. Check whether the request is authenticated (by calling `is_authenticated`), if not, return a 403 error.
+2. Call your `f(request)` to create the response message.
+3. Add a `Set-Cookie` header to the response with the session's `secret`.
+
+This is for HTTP requests, the authentication mechanism for WebSockets is separate.
+"""
+function auth_middleware(handler)
+    return function (request::HTTP.Request)
+        session = session_from_context(request)
+        required = auth_required(session, request)
+        
+        if !required || is_authenticated(session, request)
+            response = handler(request)
+            if !required
+                filter!(p -> p[1] != "Access-Control-Allow-Origin", response.headers)
+                HTTP.setheader(response, "Access-Control-Allow-Origin" => "*")
+            end
+            
+            if HTTP.URI(request.target).path ∈ ("", "/")
+                add_set_secret_cookie!(session, response)
+            end
+            response
+        else
+            log_secret_throttled(session, request)
+            error_response(403, "Not yet authenticated", "<b>Open the link that was printed in the terminal where you launched Pluto.</b> It includes a <em>secret</em>, which is needed to access this server.<br><br>If you are running the server yourself and want to change this configuration, have a look at the keyword arguments to <em>Pluto.run</em>. <br><br>Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a> if you did not expect it!")
+        end
+    end
+end
diff --git a/src/webserver/Router.jl b/src/webserver/Router.jl
new file mode 100644
index 0000000000..a3cca00625
--- /dev/null
+++ b/src/webserver/Router.jl
@@ -0,0 +1,240 @@
+
+function http_router_for(session::ServerSession)
+    router = HTTP.Router(default_404)
+    security = session.options.security
+    
+    function create_serve_onefile(path)
+        return request::HTTP.Request -> asset_response(normpath(path))
+    end
+    
+    HTTP.register!(router, "GET", "/", create_serve_onefile(project_relative_path(frontend_directory(), "index.html")))
+    HTTP.register!(router, "GET", "/edit", create_serve_onefile(project_relative_path(frontend_directory(), "editor.html")))
+
+    HTTP.register!(router, "GET", "/ping", r -> HTTP.Response(200, "OK!"))
+    HTTP.register!(router, "GET", "/possible_binder_token_please", r -> session.binder_token === nothing ? HTTP.Response(200,"") : HTTP.Response(200, session.binder_token))
+    
+    function try_launch_notebook_response(action::Function, path_or_url::AbstractString; title="", advice="", home_url="./", as_redirect=true, action_kwargs...)
+        try
+            nb = action(session, path_or_url; action_kwargs...)
+            notebook_response(nb; home_url, as_redirect)
+        catch e
+            if e isa SessionActions.NotebookIsRunningException
+                notebook_response(e.notebook; home_url, as_redirect)
+            else
+                error_response(500, title, advice, sprint(showerror, e, stacktrace(catch_backtrace())))
+            end
+        end
+    end
+
+    function serve_newfile(request::HTTP.Request)
+        notebook_response(SessionActions.new(session); as_redirect=(request.method == "GET"))
+    end
+    HTTP.register!(router, "GET", "/new", serve_newfile)
+    HTTP.register!(router, "POST", "/new", serve_newfile)
+
+    # This is not in Dynamic.jl because of bookmarks, how HTML works,
+    # real loading bars and the rest; Same for CustomLaunchEvent
+    function serve_openfile(request::HTTP.Request)
+        try
+            uri = HTTP.URI(request.target)
+            query = HTTP.queryparams(uri)
+            as_sample = haskey(query, "as_sample")
+            if haskey(query, "path")
+                path = tamepath(maybe_convert_path_to_wsl(query["path"]))
+                if isfile(path)
+                    return try_launch_notebook_response(
+                        SessionActions.open, path; 
+                        as_redirect=(request.method == "GET"), 
+                        as_sample, 
+                        title="Failed to load notebook", 
+                        advice="The file <code>$(htmlesc(path))</code> could not be loaded. Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!",
+                    )
+                else
+                    return error_response(404, "Can't find a file here", "Please check whether <code>$(htmlesc(path))</code> exists.")
+                end
+            elseif haskey(query, "url")
+                url = query["url"]
+                return try_launch_notebook_response(
+                    SessionActions.open_url, url;
+                    as_redirect=(request.method == "GET"), 
+                    as_sample, 
+                    title="Failed to load notebook", 
+                    advice="The notebook from <code>$(htmlesc(url))</code> could not be loaded. Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
+                )
+            else
+                # You can ask Pluto to handle CustomLaunch events
+                # and do some magic with how you open files.
+                # You are responsible to keep this up to date.
+                # See Events.jl for types and explanation
+                #
+                maybe_notebook_response = try_event_call(session, CustomLaunchEvent(query, request, try_launch_notebook_response))
+                isnothing(maybe_notebook_response) && return error("Empty request")
+                return maybe_notebook_response
+            end
+        catch e
+            return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
+        end
+    end
+
+    HTTP.register!(router, "GET", "/open", serve_openfile)
+    HTTP.register!(router, "POST", "/open", serve_openfile)
+
+
+    # normally shutdown is done through Dynamic.jl, with the exception of shutdowns made from the desktop app
+    function serve_shutdown(request::HTTP.Request)
+        notebook = notebook_from_uri(request)
+        SessionActions.shutdown(session, notebook)
+        return HTTP.Response(200)
+    end
+
+    HTTP.register!(router, "GET", "/shutdown", serve_shutdown)
+    HTTP.register!(router, "POST", "/shutdown", serve_shutdown)
+
+
+    # used in desktop app
+    # looks like `/move?id=<notebook-id>&newpath=<new-notebook-path>``
+    function serve_move(request::HTTP.Request)
+        uri = HTTP.URI(request.target)        
+        query = HTTP.queryparams(uri)
+
+        notebook = notebook_from_uri(request)
+        newpath = query["newpath"]
+        
+        try
+            SessionActions.move(session, notebook, newpath)
+            HTTP.Response(200, notebook.path)
+        catch e
+            error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
+        end
+    end
+
+    HTTP.register!(router, "GET", "/move", serve_move)
+    HTTP.register!(router, "POST", "/move", serve_move)
+
+
+    function serve_notebooklist(request::HTTP.Request)
+        return HTTP.Response(200, pack(Dict(k => v.path for (k, v) in session.notebooks)))
+    end
+
+    HTTP.register!(router, "GET", "/notebooklist", serve_notebooklist)
+
+    
+    function serve_sample(request::HTTP.Request)
+        uri = HTTP.URI(request.target)
+        sample_filename = split(HTTP.unescapeuri(uri.path), "sample/")[2]
+        sample_path = project_relative_path("sample", sample_filename)
+        
+        try_launch_notebook_response(
+            SessionActions.open, sample_path; 
+            as_redirect=(request.method == "GET"), 
+            home_url="../", 
+            as_sample=true, 
+            title="Failed to load sample", 
+            advice="Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
+        )
+    end
+    HTTP.register!(router, "GET", "/sample/*", serve_sample)
+    HTTP.register!(router, "POST","/sample/*", serve_sample)
+
+    notebook_from_uri(request) = let
+        uri = HTTP.URI(request.target)        
+        query = HTTP.queryparams(uri)
+        id = UUID(query["id"])
+        session.notebooks[id]
+    end
+    function serve_notebookfile(request::HTTP.Request)
+        try
+            notebook = notebook_from_uri(request)
+            response = HTTP.Response(200, sprint(save_notebook, notebook))
+            HTTP.setheader(response, "Content-Type" => "text/julia; charset=utf-8")
+            HTTP.setheader(response, "Content-Disposition" => "inline; filename=\"$(basename(notebook.path))\"")
+            response
+        catch e
+            return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
+        end
+    end
+    HTTP.register!(router, "GET", "/notebookfile", serve_notebookfile)
+
+    function serve_statefile(request::HTTP.Request)
+        try
+            notebook = notebook_from_uri(request)
+            response = HTTP.Response(200, Pluto.pack(Pluto.notebook_to_js(notebook)))
+            HTTP.setheader(response, "Content-Type" => "application/octet-stream")
+            HTTP.setheader(response, "Content-Disposition" => "attachment; filename=\"$(without_pluto_file_extension(basename(notebook.path))).plutostate\"")
+            response
+        catch e
+            return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
+        end
+    end
+    HTTP.register!(router, "GET", "/statefile", serve_statefile)
+
+    function serve_notebookexport(request::HTTP.Request)
+        try
+            notebook = notebook_from_uri(request)
+            response = HTTP.Response(200, generate_html(notebook))
+            HTTP.setheader(response, "Content-Type" => "text/html; charset=utf-8")
+            HTTP.setheader(response, "Content-Disposition" => "attachment; filename=\"$(without_pluto_file_extension(basename(notebook.path))).html\"")
+            response
+        catch e
+            return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
+        end
+    end
+    HTTP.register!(router, "GET", "/notebookexport", serve_notebookexport)
+    
+    function serve_notebookupload(request::HTTP.Request)
+        uri = HTTP.URI(request.target)
+        query = HTTP.queryparams(uri)
+        
+        save_path = SessionActions.save_upload(request.body; filename_base=get(query, "name", nothing))
+        
+        try_launch_notebook_response(
+            SessionActions.open,
+            save_path;
+            as_redirect=false,
+            as_sample=false,
+            clear_frontmatter=!isnothing(get(query, "clear_frontmatter", nothing)),
+            title="Failed to load notebook",
+            advice="The contents could not be read as a Pluto notebook file. When copying contents from somewhere else, make sure that you copy the entire notebook file.  You can also <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
+        )
+    end
+    HTTP.register!(router, "POST", "/notebookupload", serve_notebookupload)
+    
+    function serve_asset(request::HTTP.Request)
+        uri = HTTP.URI(request.target)
+        filepath = project_relative_path(frontend_directory(), relpath(HTTP.unescapeuri(uri.path), "/"))
+        asset_response(filepath; cacheable=should_cache(filepath))
+    end
+    HTTP.register!(router, "GET", "/**", serve_asset)
+
+    HTTP.register!(router, "GET", "/favicon.ico", create_serve_onefile(project_relative_path(frontend_directory(allow_bundled=false), "img", "favicon.ico")))
+
+    return scoped_router(session.options.server.base_url, router)
+end
+
+
+
+"""
+    scoped_router(base_url::String, base_router::HTTP.Router)::HTTP.Router
+
+Returns a new `HTTP.Router` which delegates all requests to `base_router` but with requests trimmed
+so that they seem like they arrived at `/**` instead of `/\$base_url/**`.
+"""
+function scoped_router(base_url, base_router)
+    base_url == "/" && return base_router
+
+    @assert startswith(base_url, '/') "base_url \"$base_url\" should start with a '/'"
+    @assert endswith(base_url, '/')  "base_url \"$base_url\" should end with a '/'"
+    @assert !occursin('*', base_url) "'*' not allowed in base_url \"$base_url\" "
+
+    function handler(request)
+        request.target = request.target[length(base_url):end]
+        return base_router(request)
+    end
+
+    router = HTTP.Router(base_router._404, base_router._405)
+    HTTP.register!(router, base_url * "**", handler)
+    HTTP.register!(router, base_url, handler)
+
+    return router
+end
+
diff --git a/src/webserver/Static.jl b/src/webserver/Static.jl
index 48a7f49bee..76a29f8081 100644
--- a/src/webserver/Static.jl
+++ b/src/webserver/Static.jl
@@ -4,22 +4,6 @@ import UUIDs: UUID
 import Pkg
 import MIMEs
 
-const found_is_pluto_dev = Ref{Union{Nothing,Bool}}(nothing)
-function is_pluto_dev()
-    if found_is_pluto_dev[] !== nothing
-        return found_is_pluto_dev[]
-    end
-    found_is_pluto_dev[] = try
-        deps = Pkg.dependencies()
-
-        p_index = findfirst(p -> p.name == "Pluto", deps)
-        p = deps[p_index]
-
-        p.is_tracking_path
-    catch
-        false
-    end
-end
 
 function frontend_directory(; allow_bundled::Bool=true)
     if allow_bundled && isdir(project_relative_path("frontend-dist")) && (get(ENV, "JULIA_PLUTO_FORCE_BUNDLED", "nein") == "ja" || !is_pluto_dev())
@@ -34,8 +18,6 @@ function should_cache(path::String)
     endswith(dir, "frontend-dist") && occursin(r"\.[0-9a-f]{8}\.", filename)
 end
 
-# Serve everything from `/frontend`, and create HTTP endpoints to open notebooks.
-
 const day = let 
     second = 1
     hour = 60second
@@ -90,353 +72,20 @@ function notebook_response(notebook; home_url="./", as_redirect=true)
     end
 end
 
-"""
-Return whether the `request` was authenticated in one of two ways:
-1. the session's `secret` was included in the URL as a search parameter, or
-2. the session's `secret` was included in a cookie.
-"""
-function is_authenticated(session::ServerSession, request::HTTP.Request)
-    (
-        secret_in_url = try
-            uri = HTTP.URI(request.target)
-            query = HTTP.queryparams(uri)
-            get(query, "secret", "") == session.secret
-        catch e
-            @warn "Failed to authenticate request using URL" exception = (e, catch_backtrace())
-            false
-        end
-    ) || (
-        secret_in_cookie = try
-            cookies = HTTP.cookies(request)
-            any(cookies) do cookie
-                cookie.name == "secret" && cookie.value == session.secret
-            end
-        catch e
-            @warn "Failed to authenticate request using cookies" exception = (e, catch_backtrace())
-            false
-        end
-    )
-    # that ) || ( kind of looks like Krabs from spongebob
-end
-
-"""
-    scoped_router(base_url::String, base_router::HTTP.Router)::HTTP.Router
-
-Returns a new `HTTP.Router` which delegates all requests to `base_router` but with requests trimmed
-so that they seem like they arrived at `/**` instead of `/\$base_url/**`.
-"""
-function scoped_router(base_url, base_router)
-    @assert startswith(base_url, '/') "base_url \"$base_url\" should start with a '/'"
-    @assert endswith(base_url, '/')  "base_url \"$base_url\" should end with a '/'"
-    @assert !occursin('*', base_url) "'*' not allowed in base_url \"$base_url\" "
-
-    function handler(request)
-        request.target = request.target[length(base_url):end]
-        return base_router(request)
-    end
-
-    router = HTTP.Router(base_router._404, base_router._405)
-    HTTP.register!(router, base_url * "**", handler)
-    HTTP.register!(router, base_url, handler)
-
-    return router
-end
-
-# Function to print the url with secret on the Julia CLI when a request comes to the server without the secret. Executes at most once every 5 seconds
-print_secret_throttled = simple_leading_throttle(5) do session::ServerSession, request::HTTP.Request
-    host = HTTP.header(request, "Host")
-    target = request.target
-    url = Text(string(HTTP.URI(HTTP.URI("http://$host/"); query=Dict("secret" => session.secret))))
-    @info("No longer authenticated? Visit this URL to continue:", url)
-end
-
-function http_router_for(session::ServerSession)
-    router = HTTP.Router(default_404)
-    security = session.options.security
-
-    function add_set_secret_cookie!(response::HTTP.Response)
-        HTTP.setheader(response, "Set-Cookie" => "secret=$(session.secret); SameSite=Strict; HttpOnly")
-        response
-    end
-
-    """
-        with_authentication(f::Function)
-    
-    Returns a function `HTTP.Request → HTTP.Response` which does three things:
-    1. Check whether the request is authenticated (by calling `is_authenticated`), if not, return a 403 error.
-    2. Call your `f(request)` to create the response message.
-    3. Add a `Set-Cookie` header to the response with the session's `secret`.
-    """
-    function with_authentication(f::Function; required::Bool)::Function
-        return function (request::HTTP.Request)
-            if !required || is_authenticated(session, request)
-                response = f(request)
-                add_set_secret_cookie!(response)
-                if !required
-                    filter!(p -> p[1] != "Access-Control-Allow-Origin", response.headers)
-                    HTTP.setheader(response, "Access-Control-Allow-Origin" => "*")
-                end
-                response
-            else
-                print_secret_throttled(session, request)
-                error_response(403, "Not yet authenticated", "<b>Open the link that was printed in the terminal where you launched Pluto.</b> It includes a <em>secret</em>, which is needed to access this server.<br><br>If you are running the server yourself and want to change this configuration, have a look at the keyword arguments to <em>Pluto.run</em>. <br><br>Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a> if you did not expect it!")
-            end
-        end
-    end
-    
-    function create_serve_onefile(path)
-        return request::HTTP.Request -> asset_response(normpath(path))
-    end
-    
-    # / does not need security.require_secret_for_open_links
-    # because this is how we handle the case:
-    #    require_secret_for_open_links == true
-    #    require_secret_for_access == false
-    # Access to all 'risky' endpoints is still restricted to requests that have the secret cookie, but visiting `/` is allowed, and it will set the cookie. From then on the security situation is identical to 
-    #    secret_for_access == true
-    HTTP.register!(router, "GET", "/", with_authentication(
-        create_serve_onefile(project_relative_path(frontend_directory(), "index.html"));
-        required=security.require_secret_for_access
-        ))
-    HTTP.register!(router, "GET", "/edit", with_authentication(
-        create_serve_onefile(project_relative_path(frontend_directory(), "editor.html"));
-        required=security.require_secret_for_access || 
-        security.require_secret_for_open_links,
-    ))
-    # the /edit page also uses with_authentication, but this is not how access to notebooks is secured: this is done by requiring the WS connection to be authenticated.
-    # we still use it for /edit to do the cookie stuff, and show a more helpful error, instead of the WS never connecting.
-    
-    HTTP.register!(router, "GET", "/ping", r -> HTTP.Response(200, "OK!"))
-    HTTP.register!(router, "GET", "/possible_binder_token_please", r -> session.binder_token === nothing ? HTTP.Response(200,"") : HTTP.Response(200, session.binder_token))
-    
-    function try_launch_notebook_response(action::Function, path_or_url::AbstractString; title="", advice="", home_url="./", as_redirect=true, action_kwargs...)
-        try
-            nb = action(session, path_or_url; action_kwargs...)
-            notebook_response(nb; home_url, as_redirect)
-        catch e
-            if e isa SessionActions.NotebookIsRunningException
-                notebook_response(e.notebook; home_url, as_redirect)
-            else
-                error_response(500, title, advice, sprint(showerror, e, stacktrace(catch_backtrace())))
-            end
-        end
-    end
-
-    serve_newfile = with_authentication(;
-        required=security.require_secret_for_access || 
-        security.require_secret_for_open_links
-    ) do request::HTTP.Request
-        notebook_response(SessionActions.new(session); as_redirect=(request.method == "GET"))
-    end
-    HTTP.register!(router, "GET", "/new", serve_newfile)
-    HTTP.register!(router, "POST", "/new", serve_newfile)
-
-    # This is not in Dynamic.jl because of bookmarks, how HTML works,
-    # real loading bars and the rest; Same for CustomLaunchEvent
-    serve_openfile = with_authentication(;
-        required=security.require_secret_for_access || 
-        security.require_secret_for_open_links
-    ) do request::HTTP.Request
-        try
-            uri = HTTP.URI(request.target)
-            query = HTTP.queryparams(uri)
-            as_sample = haskey(query, "as_sample")
-            if haskey(query, "path")
-                path = tamepath(maybe_convert_path_to_wsl(query["path"]))
-                if isfile(path)
-                    return try_launch_notebook_response(
-                        SessionActions.open, path; 
-                        as_redirect=(request.method == "GET"), 
-                        as_sample, 
-                        title="Failed to load notebook", 
-                        advice="The file <code>$(htmlesc(path))</code> could not be loaded. Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!",
-                    )
-                else
-                    return error_response(404, "Can't find a file here", "Please check whether <code>$(htmlesc(path))</code> exists.")
-                end
-            elseif haskey(query, "url")
-                url = query["url"]
-                return try_launch_notebook_response(
-                    SessionActions.open_url, url;
-                    as_redirect=(request.method == "GET"), 
-                    as_sample, 
-                    title="Failed to load notebook", 
-                    advice="The notebook from <code>$(htmlesc(url))</code> could not be loaded. Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
-                )
-            else
-                # You can ask Pluto to handle CustomLaunch events
-                # and do some magic with how you open files.
-                # You are responsible to keep this up to date.
-                # See Events.jl for types and explanation
-                #
-                maybe_notebook_response = try_event_call(session, CustomLaunchEvent(query, request, try_launch_notebook_response))
-                isnothing(maybe_notebook_response) && return error("Empty request")
-                return maybe_notebook_response
-            end
-        catch e
-            return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
-        end
-    end
-
-    HTTP.register!(router, "GET", "/open", serve_openfile)
-    HTTP.register!(router, "POST", "/open", serve_openfile)
-
-
-    # normally shutdown is done through Dynamic.jl, with the exception of shutdowns made from the desktop app
-    serve_shutdown = with_authentication(;
-        required=security.require_secret_for_access || 
-        security.require_secret_for_open_links
-    ) do request::HTTP.Request
-        notebook = notebook_from_uri(request)
-        SessionActions.shutdown(session, notebook)
-        return HTTP.Response(200)
-    end
-
-    HTTP.register!(router, "GET", "/shutdown", serve_shutdown)
-    HTTP.register!(router, "POST", "/shutdown", serve_shutdown)
-
-
-    # used in desktop app
-    # looks like `/move?id=<notebook-id>&newpath=<new-notebook-path>``
-    serve_move = with_authentication(;
-        required=security.require_secret_for_access || 
-        security.require_secret_for_open_links
-    ) do request::HTTP.Request
-        uri = HTTP.URI(request.target)        
-        query = HTTP.queryparams(uri)
-
-        notebook = notebook_from_uri(request)
-        newpath = query["newpath"]
-        
-        try
-            SessionActions.move(session, notebook, newpath)
-            HTTP.Response(200, notebook.path)
-        catch e
-            error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
-        end
-    end
-
-    HTTP.register!(router, "GET", "/move", serve_move)
-    HTTP.register!(router, "POST", "/move", serve_move)
-
-
-    serve_notebooklist = with_authentication(;
-        required=security.require_secret_for_access || 
-        security.require_secret_for_open_links
-    ) do request::HTTP.Request
-        return HTTP.Response(200, pack(Dict(k => v.path for (k, v) in session.notebooks)))
-    end
-
-    HTTP.register!(router, "GET", "/notebooklist", serve_notebooklist)
-
-    
-    serve_sample = with_authentication(;
-        required=security.require_secret_for_access || 
-        security.require_secret_for_open_links
-    ) do request::HTTP.Request
-        uri = HTTP.URI(request.target)
-        sample_filename = split(HTTP.unescapeuri(uri.path), "sample/")[2]
-        sample_path = project_relative_path("sample", sample_filename)
-        
-        try_launch_notebook_response(
-            SessionActions.open, sample_path; 
-            as_redirect=(request.method == "GET"), 
-            home_url="../", 
-            as_sample=true, 
-            title="Failed to load sample", 
-            advice="Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
-        )
-    end
-    HTTP.register!(router, "GET", "/sample/*", serve_sample)
-    HTTP.register!(router, "POST","/sample/*", serve_sample)
-
-    notebook_from_uri(request) = let
-        uri = HTTP.URI(request.target)        
-        query = HTTP.queryparams(uri)
-        id = UUID(query["id"])
-        session.notebooks[id]
-    end
-    serve_notebookfile = with_authentication(; 
-        required=security.require_secret_for_access || 
-        security.require_secret_for_open_links
-    ) do request::HTTP.Request
-        try
-            notebook = notebook_from_uri(request)
-            response = HTTP.Response(200, sprint(save_notebook, notebook))
-            HTTP.setheader(response, "Content-Type" => "text/julia; charset=utf-8")
-            HTTP.setheader(response, "Content-Disposition" => "inline; filename=\"$(basename(notebook.path))\"")
-            response
-        catch e
-            return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
-        end
-    end
-    HTTP.register!(router, "GET", "/notebookfile", serve_notebookfile)
-
-    serve_statefile = with_authentication(; 
-        required=security.require_secret_for_access || 
-        security.require_secret_for_open_links
-    ) do request::HTTP.Request
-        try
-            notebook = notebook_from_uri(request)
-            response = HTTP.Response(200, Pluto.pack(Pluto.notebook_to_js(notebook)))
-            HTTP.setheader(response, "Content-Type" => "application/octet-stream")
-            HTTP.setheader(response, "Content-Disposition" => "attachment; filename=\"$(without_pluto_file_extension(basename(notebook.path))).plutostate\"")
-            response
-        catch e
-            return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
-        end
+const found_is_pluto_dev = Ref{Union{Nothing,Bool}}(nothing)
+function is_pluto_dev()
+    if found_is_pluto_dev[] !== nothing
+        return found_is_pluto_dev[]
     end
-    HTTP.register!(router, "GET", "/statefile", serve_statefile)
+    found_is_pluto_dev[] = try
+        deps = Pkg.dependencies()
 
-    serve_notebookexport = with_authentication(; 
-        required=security.require_secret_for_access || 
-        security.require_secret_for_open_links
-    ) do request::HTTP.Request
-        try
-            notebook = notebook_from_uri(request)
-            response = HTTP.Response(200, generate_html(notebook))
-            HTTP.setheader(response, "Content-Type" => "text/html; charset=utf-8")
-            HTTP.setheader(response, "Content-Disposition" => "attachment; filename=\"$(without_pluto_file_extension(basename(notebook.path))).html\"")
-            response
-        catch e
-            return error_response(400, "Bad query", "Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!", sprint(showerror, e, stacktrace(catch_backtrace())))
-        end
-    end
-    HTTP.register!(router, "GET", "/notebookexport", serve_notebookexport)
-    
-    serve_notebookupload = with_authentication(; 
-        required=security.require_secret_for_access || 
-        security.require_secret_for_open_links
-    ) do request::HTTP.Request
-        uri = HTTP.URI(request.target)
-        query = HTTP.queryparams(uri)
-        
-        save_path = SessionActions.save_upload(request.body; filename_base=get(query, "name", nothing))
-        
-        try_launch_notebook_response(
-            SessionActions.open,
-            save_path;
-            as_redirect=false,
-            as_sample=false,
-            clear_frontmatter=!isnothing(get(query, "clear_frontmatter", nothing)),
-            title="Failed to load notebook",
-            advice="The contents could not be read as a Pluto notebook file. When copying contents from somewhere else, make sure that you copy the entire notebook file.  You can also <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
-        )
-    end
-    HTTP.register!(router, "POST", "/notebookupload", serve_notebookupload)
-    
-    function serve_asset(request::HTTP.Request)
-        uri = HTTP.URI(request.target)
-        filepath = project_relative_path(frontend_directory(), relpath(HTTP.unescapeuri(uri.path), "/"))
-        asset_response(filepath; cacheable=should_cache(filepath))
-    end
-    HTTP.register!(router, "GET", "/**", serve_asset)
-    HTTP.register!(router, "GET", "/favicon.ico", create_serve_onefile(project_relative_path(frontend_directory(allow_bundled=false), "img", "favicon.ico")))
+        p_index = findfirst(p -> p.name == "Pluto", deps)
+        p = deps[p_index]
 
-    base_url = session.options.server.base_url
-    if base_url != "/"
-        return scoped_router(base_url, router)
+        p.is_tracking_path
+    catch
+        false
     end
-
-    return router
 end
+
diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index cfcaa28f8b..fbdff63f5a 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -133,6 +133,8 @@ function run(session::ServerSession)
     end
 
     pluto_router = http_router_for(session)
+    store_session_middleware = create_session_context_middleware(session)
+    app = pluto_router |> auth_middleware |> store_session_middleware
 
     notebook_at_startup = session.options.server.notebook
     open_notebook!(session, notebook_at_startup)
@@ -246,7 +248,7 @@ function run(session::ServerSession)
                 session.binder_token = params["token"]
             end
 
-            response_body = pluto_router(request)
+            response_body = app(request)
 
             request.response::HTTP.Response = response_body
             request.response.request = request

From 725fe51a38d82da748b69c227113e0819c6fa0ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Wed, 17 May 2023 17:56:14 +0300
Subject: [PATCH 645/821] fix: ensure recent browser without eval (#2566)

---
 frontend/warn_old_browsers.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/warn_old_browsers.js b/frontend/warn_old_browsers.js
index 2210694be7..cce168f5bf 100644
--- a/frontend/warn_old_browsers.js
+++ b/frontend/warn_old_browsers.js
@@ -3,9 +3,12 @@ function ismodern() {
         // See: https://kangax.github.io/compat-table/es2016plus/
 
         // 2020 check:
-        return eval("let {a, ...r} = {a:1,b:1}; r?.a != r.b; 1 ?? 2")
+        // return eval("let {a, ...r} = {a:1,b:1}; r?.a != r.b; 1 ?? 2")
         // 2021 check:
         // return eval("let {a, ...r} = {a:1,b:1}; r?.a != r.b; 1 ?? 2; a ||= false")
+        // 2021 check (Chrome 85+, Firefox 77+, Safari 13.1+)
+        // Please check with macs
+        return Boolean(String.prototype.replaceAll)
     } catch (ex) {
         return false
     }

From f691a9095cc1cf054d4b2f85bd42b48814e104ed Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 17 May 2023 17:14:30 +0200
Subject: [PATCH 646/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 29c146fc70..9d4bb599ef 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.25"
+version = "0.19.26"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From a23d47732f2073fb55e7411bff9a2205b765d3c4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 17 May 2023 18:07:25 +0200
Subject: [PATCH 647/821] ci tweaks

---
 .github/workflows/Bundle.yml    | 2 +-
 test/frontend/helpers/common.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Bundle.yml b/.github/workflows/Bundle.yml
index 665ead2577..ff2c46bcec 100644
--- a/.github/workflows/Bundle.yml
+++ b/.github/workflows/Bundle.yml
@@ -13,7 +13,7 @@ on:
             - release
 
 concurrency:
-    group: bundle
+    group: bundle-${{ github.ref }}
     cancel-in-progress: false
 
 jobs:
diff --git a/test/frontend/helpers/common.js b/test/frontend/helpers/common.js
index 49f894c06f..572d03e33b 100644
--- a/test/frontend/helpers/common.js
+++ b/test/frontend/helpers/common.js
@@ -198,7 +198,7 @@ export const createPage = async (browser) => {
     page.on("request", (request) => {
       if(blocked_domains.some(domain => request.url().includes(domain))) {
         if(!hide_warning(request.url()))
-          console.error(`Blocking request to ${request.url()}`)
+          console.info(`Blocking request to ${request.url()}`)
         request.abort();
       } else {
         request.continue();

From 20515dd46678a49ca90e042fcfa3eab1e5c8e162 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 23 May 2023 10:02:18 +0000
Subject: [PATCH 648/821] Fix #2567

After this change, an authenticated request, which requires auth (like /open) will set the secret cookie. This means that if a first request is authenticated with a URL param, then the second request will be authenticated using the cookie
---
 src/webserver/Authentication.jl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/webserver/Authentication.jl b/src/webserver/Authentication.jl
index f74b4b7d68..45644703d5 100644
--- a/src/webserver/Authentication.jl
+++ b/src/webserver/Authentication.jl
@@ -103,8 +103,7 @@ function auth_middleware(handler)
                 filter!(p -> p[1] != "Access-Control-Allow-Origin", response.headers)
                 HTTP.setheader(response, "Access-Control-Allow-Origin" => "*")
             end
-            
-            if HTTP.URI(request.target).path ∈ ("", "/")
+            if required || HTTP.URI(request.target).path ∈ ("", "/")
                 add_set_secret_cookie!(session, response)
             end
             response

From 4d9596bfa6ce01559154687da76fa5945608c9b9 Mon Sep 17 00:00:00 2001
From: Connor Burns <connor@plutojl.org>
Date: Wed, 24 May 2023 12:24:49 -0600
Subject: [PATCH 649/821] Page parameter `pluto_server_url` overrides default
 WebSocket address (#2570)

---
 frontend/components/Editor.js          | 6 +++---
 frontend/components/welcome/Welcome.js | 4 +++-
 frontend/index.js                      | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index b4dfa977d2..e6f4a95c81 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -4,7 +4,7 @@ import immer, { applyPatches, produceWithPatches } from "../imports/immer.js"
 import _ from "../imports/lodash.js"
 
 import { empty_notebook_state, set_disable_ui_css } from "../editor.js"
-import { create_pluto_connection } from "../common/PlutoConnection.js"
+import { create_pluto_connection, ws_address_from_base } from "../common/PlutoConnection.js"
 import { init_feedback } from "../common/Feedback.js"
 import { serialize_cells, deserialize_cells, detect_deserializer } from "../common/Serialization.js"
 
@@ -851,7 +851,7 @@ patch: ${JSON.stringify(
         /** @type {import('../common/PlutoConnection').PlutoConnection} */
         this.client = /** @type {import('../common/PlutoConnection').PlutoConnection} */ ({})
 
-        this.connect = (ws_address = undefined) =>
+        this.connect = (/** @type {string | undefined} */ ws_address = undefined) =>
             create_pluto_connection({
                 ws_address: ws_address,
                 on_unrequested_update: on_update,
@@ -1301,7 +1301,7 @@ patch: ${JSON.stringify(
                 count_stat(`article-view`)
             }
         } else {
-            this.connect()
+            this.connect(this.props.launch_params.pluto_server_url ? ws_address_from_base(this.props.launch_params.pluto_server_url) : undefined)
         }
     }
 
diff --git a/frontend/components/welcome/Welcome.js b/frontend/components/welcome/Welcome.js
index f52fc7aeb3..aca858f838 100644
--- a/frontend/components/welcome/Welcome.js
+++ b/frontend/components/welcome/Welcome.js
@@ -2,7 +2,7 @@ import _ from "../../imports/lodash.js"
 import { html, useEffect, useState, useRef } from "../../imports/Preact.js"
 import * as preact from "../../imports/Preact.js"
 
-import { create_pluto_connection } from "../../common/PlutoConnection.js"
+import { create_pluto_connection, ws_address_from_base } from "../../common/PlutoConnection.js"
 import { new_update_message } from "../../common/NewUpdateMessage.js"
 import { Open } from "./Open.js"
 import { Recent } from "./Recent.js"
@@ -26,6 +26,7 @@ import default_featured_sources from "../../featured_sources.js"
 /**
  * @typedef LaunchParameters
  * @type {{
+ * pluto_server_url: string?,
  * featured_direct_html_links: boolean,
  * featured_sources: import("./Featured.js").FeaturedSource[]?,
  * featured_source_url?: string,
@@ -67,6 +68,7 @@ export const Welcome = ({ launch_params }) => {
             on_unrequested_update: on_update,
             on_connection_status: on_connection_status,
             on_reconnect: () => true,
+            ws_address: launch_params.pluto_server_url ? ws_address_from_base(launch_params.pluto_server_url) : undefined,
         })
         client_promise.then(async (client) => {
             Object.assign(client_ref.current, client)
diff --git a/frontend/index.js b/frontend/index.js
index 1c918a2115..fc485b3e05 100644
--- a/frontend/index.js
+++ b/frontend/index.js
@@ -22,6 +22,9 @@ const launch_params = {
     featured_source_url: url_params.get("featured_source_url") ?? window.pluto_featured_source_url,
     //@ts-ignore
     featured_source_integrity: url_params.get("featured_source_integrity") ?? window.pluto_featured_source_integrity,
+
+    //@ts-ignore
+    pluto_server_url: url_params.get("pluto_server_url") ?? window.pluto_server_url,
 }
 
 console.log("Launch parameters: ", launch_params)

From 9d7e050bdbbd07958d7fe1e252968649a25bc37f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 5 Jun 2023 16:35:33 +0200
Subject: [PATCH 650/821] css tweak

---
 frontend/editor.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/editor.css b/frontend/editor.css
index 61c9e8fded..3d15fa28c4 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -452,6 +452,11 @@ pluto-output mjx-assistive-mml {
     height: 1px;
 }
 
+/* Avoid scrollbar in cells that contain just a h3 element, like the h3 headers in https://computationalthinking.mit.edu/Fall22/images_abstractions/transformations_and_autodiff/ */
+.raw-html-wrapper > div.markdown {
+    overflow: hidden;
+}
+
 /* HEADER */
 
 header#pluto-nav {

From 280827087ff89be6fb8fdd28cb75d4e21d4b257e Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Tue, 27 Jun 2023 22:24:46 +0200
Subject: [PATCH 651/821] Pin typescript to 5.0.4 in workflow (#2590)

---
 .github/workflows/TypeScriptCheck.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/TypeScriptCheck.yml b/.github/workflows/TypeScriptCheck.yml
index d4830bc6c8..bf8b115bc2 100644
--- a/.github/workflows/TypeScriptCheck.yml
+++ b/.github/workflows/TypeScriptCheck.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           node-version: "18.x"
 
-      - run: npm install typescript -g
+      - run: npm install typescript@5.0.4 -g
       
       - run: npm install
         working-directory: frontend

From 1e3ee42592dfe4bd39ce9401b6e79c4011a06b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Wed, 12 Jul 2023 19:20:08 +0300
Subject: [PATCH 652/821] fix: cryptic error on some sysimage builds on Julia
 1.8.5 (#2600)

---
 src/webserver/Dynamic.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 71d29f189f..8fcfe2a21d 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -186,7 +186,7 @@ function send_notebook_changes!(🙋::ClientRequest; commentary::Any=nothing, sk
             if client.connected_notebook !== nothing && client.connected_notebook.notebook_id == 🙋.notebook.notebook_id
                 current_dict = get(current_state_for_clients, client, :empty)
                 patches = Firebasey.diff(current_dict, notebook_dict)
-                patches_as_dicts::Array{Dict} = Firebasey._convert(Array{Dict}, patches)
+                patches_as_dicts = Firebasey._convert(Vector{Dict}, patches)
                 current_state_for_clients[client] = deep_enough_copy(notebook_dict)
 
                 # Make sure we do send a confirmation to the client who made the request, even without changes

From fe236a0a4698f9d4dfb0e238693c6004a4419604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?=
 =?UTF-8?q?=CF=82=20=CE=93=CE=B5=CF=89=CF=81=CE=B3=CE=B1=CE=BA=CF=8C=CF=80?=
 =?UTF-8?q?=CE=BF=CF=85=CE=BB=CE=BF=CF=82?= <pankgeorg@gmail.com>
Date: Wed, 12 Jul 2023 19:23:37 +0300
Subject: [PATCH 653/821] Update Project.toml (#2603)

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 9d4bb599ef..7c7f655297 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.26"
+version = "0.19.27"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From a5c322775a765dcdbe5e27584ae16d10149aba29 Mon Sep 17 00:00:00 2001
From: Connor Burns <ctrekker4@gmail.com>
Date: Sun, 16 Jul 2023 11:17:32 -0600
Subject: [PATCH 654/821] =?UTF-8?q?=F0=9F=9A=A6Slider=20server=20running?=
 =?UTF-8?q?=20status=20(#2601)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/common/SliderServerClient.js | 47 ++++++++++++++++++++++++++-
 frontend/components/Editor.js         |  5 +++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/frontend/common/SliderServerClient.js b/frontend/common/SliderServerClient.js
index 49e64ffb19..e2a8933619 100644
--- a/frontend/common/SliderServerClient.js
+++ b/frontend/common/SliderServerClient.js
@@ -8,6 +8,23 @@ const assert_response_ok = (/** @type {Response} */ r) => (r.ok ? r : Promise.re
 
 const actions_to_keep = ["get_published_object"]
 
+const get_start = (graph, v) => Object.values(graph).find((node) => Object.keys(node.downstream_cells_map).includes(v))?.cell_id
+const get_starts = (graph, vars) => new Set([...vars].map((v) => get_start(graph, v)))
+const recursive_dependencies = (graph, starts) => {
+    const deps = new Set(starts)
+    const ends = [...starts]
+    while (ends.length > 0) {
+        const node = ends.splice(0, 1)[0]
+        _.flatten(Object.values(graph[node].downstream_cells_map)).forEach((child) => {
+            if (!deps.has(child)) {
+                ends.push(child)
+                deps.add(child)
+            }
+        })
+    }
+    return deps
+}
+
 export const nothing_actions = ({ actions }) =>
     Object.fromEntries(
         Object.entries(actions).map(([k, v]) => [
@@ -23,6 +40,12 @@ export const nothing_actions = ({ actions }) =>
     )
 
 export const slider_server_actions = ({ setStatePromise, launch_params, actions, get_original_state, get_current_state, apply_notebook_patches }) => {
+    setStatePromise(
+        immer((state) => {
+            state.slider_server.connecting = true
+        })
+    )
+
     const notebookfile_hash = fetch(new Request(launch_params.notebookfile, { integrity: launch_params.notebookfile_integrity }))
         .then(assert_response_ok)
         .then((r) => r.arrayBuffer())
@@ -36,7 +59,15 @@ export const slider_server_actions = ({ setStatePromise, launch_params, actions,
         .then((r) => r.arrayBuffer())
         .then((b) => unpack(new Uint8Array(b)))
 
-    bond_connections.then((x) => console.log("Bond connections:", x))
+    bond_connections.then((x) => {
+        console.log("Bond connections:", x)
+        setStatePromise(
+            immer((state) => {
+                state.slider_server.connecting = false
+                state.slider_server.interactive = Object.keys(x).length > 0
+            })
+        )
+    })
 
     const mybonds = {}
     const bonds_to_set = {
@@ -47,6 +78,16 @@ export const slider_server_actions = ({ setStatePromise, launch_params, actions,
         const hash = await notebookfile_hash
         const graph = await bond_connections
 
+        // compute dependencies and update cell running statuses
+        const dep_graph = get_current_state().cell_dependencies
+        const starts = get_starts(dep_graph, bonds_to_set.current)
+        const running_cells = [...recursive_dependencies(dep_graph, starts)]
+        await setStatePromise(
+            immer((state) => {
+                running_cells.forEach((cell_id) => (state.notebook.cell_results[cell_id][starts.has(cell_id) ? "running" : "queued"] = true))
+            })
+        )
+
         if (bonds_to_set.current.size > 0) {
             const to_send = new Set(bonds_to_set.current)
             bonds_to_set.current.forEach((varname) => (graph[varname] ?? []).forEach((x) => to_send.add(x)))
@@ -88,6 +129,10 @@ export const slider_server_actions = ({ setStatePromise, launch_params, actions,
                         ids_of_cells_that_ran.forEach((id) => {
                             state.cell_results[id] = original.cell_results[id]
                         })
+                        running_cells.forEach((id) => {
+                            state.cell_results[id].queued = false
+                            state.cell_results[id].running = false
+                        })
                     })(get_current_state())
                 )
             } catch (e) {
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index e6f4a95c81..85288ab561 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -336,6 +336,11 @@ export class Editor extends Component {
 
             is_recording: false,
             recording_waiting_to_start: false,
+
+            slider_server: {
+                connecting: false,
+                interactive: false,
+            },
         }
 
         this.setStatePromise = (fn) => new Promise((r) => this.setState(fn, r))

From f76efd431f3739d8cbb37362bb9ae2b187c9a060 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Sun, 16 Jul 2023 19:18:37 +0200
Subject: [PATCH 655/821] ExEx: Track function calls in assignment lhs. (#2604)

---
 src/analysis/ExpressionExplorer.jl | 13 +++++++------
 test/ExpressionExplorer.jl         | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 50b773d969..1fd4b5837c 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -146,7 +146,7 @@ function get_assignees(ex::Expr)::FunctionName
             # e.g. (x, y) in the ex (x, y) = (1, 23)
             args = ex.args
         end
-        union!(Symbol[], Iterators.map(get_assignees, args)...)
+        mapfoldl(get_assignees, union!, args; init=Symbol[])
         # filter(s->s isa Symbol, ex.args)
     elseif ex.head == :(::)
         # TODO: type is referenced
@@ -156,7 +156,7 @@ function get_assignees(ex::Expr)::FunctionName
     elseif ex.head == :...
         # Handles splat assignments. e.g. _, y... = 1:5
         args = ex.args
-        union!(Symbol[], Iterators.map(get_assignees, args)...)
+        mapfoldl(get_assignees, union!, args; init=Symbol[])
     else
         @warn "unknown use of `=`. Assignee is unrecognised." ex
         Symbol[]
@@ -373,12 +373,13 @@ function explore_assignment!(ex::Expr, scopestate::ScopeState)::SymbolsState
     global_assignees = get_global_assignees(assignees, scopestate)
 
     # If we are _not_ assigning a global variable, then this symbol hides any global definition with that name
-    push!(scopestate.hiddenglobals, setdiff(assignees, global_assignees)...)
+    union!(scopestate.hiddenglobals, setdiff(assignees, global_assignees))
     assigneesymstate = explore!(ex.args[1], scopestate)
 
-    push!(scopestate.hiddenglobals, global_assignees...)
-    push!(symstate.assignments, global_assignees...)
-    push!(symstate.references, setdiff(assigneesymstate.references, global_assignees)...)
+    union!(scopestate.hiddenglobals, global_assignees)
+    union!(symstate.assignments, global_assignees)
+    union!(symstate.references, setdiff(assigneesymstate.references, global_assignees))
+    union!(symstate.funccalls, filter!(call -> length(call) != 1 || only(call) ∉ global_assignees, assigneesymstate.funccalls))
     filter!(!all_underscores, symstate.references)  # Never record _ as a reference
 
     return symstate
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index 505b7470ea..afe010c1ff 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -165,6 +165,9 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(:(x = let a = 1; a += b end), [:b], [:x], [:+], [])
         @test testee(:(_ = a + 1), [:a], [], [:+], [])
         @test testee(:(a = _ + 1), [], [:a], [:+], [])
+
+        @test testee(:(f()[] = 1), [], [], [:f], [])
+        @test testee(:(x[f()] = 1), [:x], [], [:f], [])
     end
     @testset "Multiple assignments" begin
         # Note that using the shorthand syntax :(a = 1, b = 2) to create an expression
@@ -206,6 +209,18 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(quote
             a, b... = 0:5
         end, [],[:a, :b], [[:(:)]], [])
+        @test testee(quote
+            a[x], x = 1, 2
+        end, [:a], [:x], [], [])
+        @test testee(quote
+            x, a[x] = 1, 2
+        end, [:a], [:x], [], [])
+        @test testee(quote
+            f, a[f()] = g
+        end, [:g, :a], [:f], [], [])
+        @test testee(quote
+            a[f()], f = g
+        end, [:g, :a], [:f], [], [])
         @test testee(quote (; a, b) = x end, [:x], [:a, :b], [], [])
         @test testee(quote a = (b, c) end, [:b, :c], [:a], [], [])
 

From c569adf679810ca09e20810a43ffb26f1855afba Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 17 Jul 2023 10:19:08 +0200
Subject: [PATCH 656/821] =?UTF-8?q?=F0=9F=92=81=F0=9F=93=A9=20Support=20pu?=
 =?UTF-8?q?blish=5Fto=5Fjs=20inside=20logs=20(#2607)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Cell.js        |  4 ++-
 src/evaluation/WorkspaceManager.jl |  4 +++
 src/runner/PlutoRunner.jl          | 50 ++++++++++++++++++++----------
 src/webserver/Dynamic.jl           |  2 +-
 test/Dynamic.jl                    |  8 +++--
 5 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index ea30b29e07..247740152a 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -311,7 +311,9 @@ export const Cell = ({
                 set_cm_highlighted_line=${set_cm_highlighted_line}
                 onerror=${remount}
             />
-            ${show_logs ? html`<${Logs} logs=${Object.values(logs)} line_heights=${line_heights} set_cm_highlighted_line=${set_cm_highlighted_line} />` : null}
+            ${show_logs && cell_api_ready
+                ? html`<${Logs} logs=${Object.values(logs)} line_heights=${line_heights} set_cm_highlighted_line=${set_cm_highlighted_line} />`
+                : null}
             <${RunArea}
                 cell_id=${cell_id}
                 running_disabled=${running_disabled}
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 9412903f4a..55fb090655 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -229,6 +229,10 @@ function start_relaying_logs((session, notebook)::SN, log_channel::Distributed.R
 
             @assert !isnothing(display_cell)
 
+            # this handles the use of published_to_js inside logs: objects that were newly published during the rendering of the log args.
+            merge!(display_cell.published_objects, next_log["new_published_objects"])
+            delete!(next_log, "new_published_objects")
+
             push!(display_cell.logs, next_log)
             Pluto.@asynclog update_throttled()
         catch e
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 5e3b49e81f..8ff95058ac 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -2125,28 +2125,26 @@ end"""
 """
 const currently_running_cell_id = Ref{UUID}(uuid4())
 
-function _publish(x, id_start)::String
-    assertpackable(x)
-    
-    id = string(notebook_id[], "/", currently_running_cell_id[], "/", id_start)
-    d = get!(Dict{String,Any}, cell_published_objects, currently_running_cell_id[])
+function _publish(x, id_start, cell_id)::String
+    id = "$(notebook_id[])/$cell_id/$id_start"
+    d = get!(Dict{String,Any}, cell_published_objects, cell_id)
     d[id] = x
     return id
 end
 
-_publish(x) = _publish(x, objectid2str(x))
-
 # TODO? Possibly move this to it's own package, with fallback that actually msgpack?
 # ..... Ideally we'd make this require `await` on the javascript side too...
 Base.@kwdef struct PublishedToJavascript
-    published_id
+    published_object
+    published_id_start
     cell_id
 end
 function Base.show(io::IO, ::MIME"text/javascript", published::PublishedToJavascript)
-    if published.cell_id != currently_running_cell_id[]
-        error("Showing result from PlutoRunner.publish_to_js() in a cell different from where it was created, not (yet?) supported.")
-    end
-    write(io, "/* See the documentation for PlutoRunner.publish_to_js */ getPublishedObject(\"$(published.published_id)\")")
+    id = _publish(published.published_object, published.published_id_start, published.cell_id)
+    # if published.cell_id != currently_running_cell_id[]
+    #     error("Showing result from PlutoRunner.publish_to_js() in a cell different from where it was created, not (yet?) supported.")
+    # end
+    write(io, "/* See the documentation for PlutoRunner.publish_to_js */ getPublishedObject(\"$(id)\")")
 end
 Base.show(io::IO, ::MIME"text/plain", published::PublishedToJavascript) = show(io, MIME("text/javascript"), published)    
 Base.show(io::IO, published::PublishedToJavascript) = show(io, MIME("text/javascript"), published)    
@@ -2179,9 +2177,13 @@ let
 end
 ```
 """
-function publish_to_js(args...)
+publish_to_js(x) = publish_to_js(x, objectid2str(x))
+
+function publish_to_js(x, id_start)
+    assertpackable(x)
     PublishedToJavascript(
-        published_id=_publish(args...),
+        published_object=x,
+        published_id_start=id_start,
         cell_id=currently_running_cell_id[],
     )
 end
@@ -2387,18 +2389,32 @@ function Logging.handle_message(pl::PlutoCellLogger, level, msg, _module, group,
     end
 
     try
-
         yield()
 
+        po() = get(cell_published_objects, pl.cell_id, Dict{String,Any}())
+        before_published_object_keys = collect(keys(po()))
+
+        # Render the log arguments:
+        msg_formatted = format_output_default(msg isa AbstractString ? Text(msg) : msg)
+        kwargs_formatted = Tuple{String,Any}[(string(k), format_log_value(v)) for (k, v) in kwargs if k != :maxlog]
+
+        after_published_object_keys = collect(keys(po()))
+        new_published_object_keys = setdiff(after_published_object_keys, before_published_object_keys)
+
+        # (Running `put!(pl.log_channel, x)` will send `x` to the pluto server. See `start_relaying_logs` for the receiving end.)
         put!(pl.log_channel, Dict{String,Any}(
             "level" => string(level),
-            "msg" => format_output_default(msg isa AbstractString ? Text(msg) : msg),
+            "msg" => msg_formatted,
+            # This is a dictionary containing all published objects that were published during the rendering of the log arguments (we cannot track which objects were published during the execution of the log statement itself i think...)
+            "new_published_objects" => Dict{String,Any}(
+                key => po()[key] for key in new_published_object_keys
+            ),
             "group" => string(group),
             "id" => string(id),
             "file" => string(file),
             "cell_id" => pl.cell_id,
             "line" => line isa Union{Int32,Int64} ? line : nothing,
-            "kwargs" => Tuple{String,Any}[(string(k), format_log_value(v)) for (k, v) in kwargs if k != :maxlog],
+            "kwargs" => kwargs_formatted,
         ))
 
         yield()
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 8fcfe2a21d..60e3677510 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -133,7 +133,7 @@ function notebook_to_js(notebook::Notebook)
                 "cell_id" => cell.cell_id,
                 "depends_on_disabled_cells" => cell.depends_on_disabled_cells,
                 "output" => FirebaseyUtils.ImmutableMarker(cell.output),
-                "published_object_keys" => keys(cell.published_objects),
+                "published_object_keys" => collect(keys(cell.published_objects)),
                 "queued" => cell.queued,
                 "running" => cell.running,
                 "errored" => cell.errored,
diff --git a/test/Dynamic.jl b/test/Dynamic.jl
index ed0e3e12c8..f833933ff6 100644
--- a/test/Dynamic.jl
+++ b/test/Dynamic.jl
@@ -194,17 +194,19 @@ end
     @testset "PlutoRunner API" begin
         🍭 = ServerSession()
         🍭.options.evaluation.workspace_use_distributed = true
+        
+        cid = uuid1()
 
         notebook = Notebook([
             Cell("PlutoRunner.notebook_id[] |> Text"),
-            Cell("""
+            Cell(cid, """
             let
                 # not actually public API but we test it anyways
                 a = PlutoRunner._publish(Dict(
                     "hello" => "world",
                     "xx" => UInt8[6,7,8],
-                ))
-                b = PlutoRunner._publish("cool")
+                ), "aaa", Base.UUID("$cid"))
+                b = PlutoRunner._publish("cool", "bbb", Base.UUID("$cid"))
                 Text((a, b))
             end
             """),

From 3958cf5133c1371a559ed5f76ca955dad2bb1a48 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 17 Jul 2023 15:56:13 +0200
Subject: [PATCH 657/821] Fix #2398

---
 frontend/common/PlutoConnection.js | 14 +++++---------
 frontend/components/Editor.js      | 27 +++++++++++++++++++++++++--
 frontend/components/Popup.js       | 11 ++++++++---
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/frontend/common/PlutoConnection.js b/frontend/common/PlutoConnection.js
index b4c336a04d..4e6fa5660a 100644
--- a/frontend/common/PlutoConnection.js
+++ b/frontend/common/PlutoConnection.js
@@ -265,7 +265,7 @@ const default_ws_address = () => ws_address_from_base(window.location.href)
  * @param {{
  *  on_unrequested_update: (message: PlutoMessage, by_me: boolean) => void,
  *  on_reconnect: () => boolean,
- *  on_connection_status: (connection_status: boolean) => void,
+ *  on_connection_status: (connection_status: boolean, hopeless: boolean) => void,
  *  connect_metadata?: Object,
  *  ws_address?: String,
  * }} options
@@ -364,7 +364,7 @@ export const create_pluto_connection = async ({
                     on_unrequested_update(update, by_me)
                 },
                 on_socket_close: async () => {
-                    on_connection_status(false)
+                    on_connection_status(false, false)
 
                     console.log(`Starting new websocket`, new Date().toLocaleTimeString())
                     await Promises.delay(reconnect_after_close_delay)
@@ -373,7 +373,7 @@ export const create_pluto_connection = async ({
                     console.log(`Starting state sync`, new Date().toLocaleTimeString())
                     const accept = on_reconnect()
                     console.log(`State sync ${accept ? "" : "not "}successful`, new Date().toLocaleTimeString())
-                    on_connection_status(accept)
+                    on_connection_status(accept, false)
                     if (!accept) {
                         alert("Connection out of sync 😥\n\nRefresh the page to continue")
                     }
@@ -394,14 +394,10 @@ export const create_pluto_connection = async ({
             console.log("Client object: ", client)
 
             if (connect_metadata.notebook_id != null && !u.message.notebook_exists) {
-                // https://github.com/fonsp/Pluto.jl/issues/55
-                if (confirm("A new server was started - this notebook session is no longer running.\n\nWould you like to go back to the main menu?")) {
-                    window.location.href = "./"
-                }
-                on_connection_status(false)
+                on_connection_status(false, true)
                 return {}
             }
-            on_connection_status(true)
+            on_connection_status(true, false)
 
             const ping = () => {
                 send("ping", {}, {})
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 85288ab561..5134297b64 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -18,7 +18,7 @@ import { RecentlyDisabledInfo, UndoDelete } from "./UndoDelete.js"
 import { SlideControls } from "./SlideControls.js"
 import { Scroller } from "./Scroller.js"
 import { ExportBanner } from "./ExportBanner.js"
-import { Popup } from "./Popup.js"
+import { open_pluto_popup, Popup } from "./Popup.js"
 
 import { slice_utf8, length_utf8 } from "../common/UnicodeTools.js"
 import { has_ctrl_or_cmd_pressed, ctrl_or_cmd_name, is_mac_keyboard, in_textarea_or_input } from "../common/KeyboardShortcuts.js"
@@ -840,7 +840,30 @@ patch: ${JSON.stringify(
             setTimeout(init_feedback, 2 * 1000) // 2 seconds - load feedback a little later for snappier UI
         }
 
-        const on_connection_status = (val) => this.setState({ connected: val })
+        const on_connection_status = (val, hopeless) => {
+            this.setState({ connected: val })
+            if (hopeless) {
+                // https://github.com/fonsp/Pluto.jl/issues/55
+                // https://github.com/fonsp/Pluto.jl/issues/2398
+                open_pluto_popup({
+                    type: "info",
+                    source_element: null,
+                    body: html`<p>A new server was started - this notebook session is no longer running.</p>
+                        <p>Would you like to go back to the main menu?</p>
+                        <br />
+                        <a href="./">Go back</a>
+                        <br />
+                        <a
+                            href="#"
+                            onClick=${(e) => {
+                                e.preventDefault()
+                                window.dispatchEvent(new CustomEvent("close pluto popup"))
+                            }}
+                            >Stay here</a
+                        >`,
+                })
+            }
+        }
 
         const on_reconnect = () => {
             console.warn("Reconnected! Checking states")
diff --git a/frontend/components/Popup.js b/frontend/components/Popup.js
index 8e7a59e533..fae1c99e1a 100644
--- a/frontend/components/Popup.js
+++ b/frontend/components/Popup.js
@@ -48,10 +48,15 @@ export const Popup = ({ notebook, disable_input }) => {
         const el = e.detail.source_element
         recent_source_element_ref.current = el
 
-        const elb = el.getBoundingClientRect()
-        const bodyb = document.body.getBoundingClientRect()
+        if (el == null) {
+            pos_ref.current = `top: 20%; left: 50%; transform: translate(-50%, -50%); position: fixed;`
+        } else {
+            const elb = el.getBoundingClientRect()
+            const bodyb = document.body.getBoundingClientRect()
+
+            pos_ref.current = `top: ${0.5 * (elb.top + elb.bottom) - bodyb.top}px; left: min(max(0px,100vw - 251px - 30px), ${elb.right - bodyb.left}px);`
+        }
 
-        pos_ref.current = `top: ${0.5 * (elb.top + elb.bottom) - bodyb.top}px; left: min(max(0px,100vw - 251px - 30px), ${elb.right - bodyb.left}px);`
         set_recent_event(e.detail)
     }
 

From 2cc4e4468186e2cdf417249d08c46a5e65fd19b6 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 17 Jul 2023 15:56:19 +0200
Subject: [PATCH 658/821] css tweak

---
 frontend/editor.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/editor.css b/frontend/editor.css
index 3d15fa28c4..52bddb302b 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2327,6 +2327,7 @@ pluto-helpbox.hidden > section {
 }
 .helpbox-docs > section h1 {
     font-size: 1.3rem;
+    overflow-wrap: anywhere;
 }
 .helpbox-docs > section pre {
     padding: 0.7rem 0.5rem;

From 7f1f27e650d29182986c573f9761d1cb8b98b57a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 17 Jul 2023 16:56:01 +0200
Subject: [PATCH 659/821] Experimental JS API for getting/setting cell metadata
 (#2612)

---
 frontend/components/CellOutput.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 4335ea485b..ff4188cf36 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -382,6 +382,21 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
                                         delete notebook.metadata[key]
                                     }),
 
+                                ...(cell == null
+                                    ? {}
+                                    : {
+                                          getCellMetadataExperimental: (key, { cell_id = null } = {}) =>
+                                              pluto_actions.get_notebook()?.cell_inputs?.[cell_id ?? cell.id]?.metadata[key],
+                                          setCellMetadataExperimental: (key, value, { cell_id = null } = {}) =>
+                                              pluto_actions.update_notebook((notebook) => {
+                                                  notebook.cell_inputs[cell_id ?? cell.id].metadata[key] = value
+                                              }),
+                                          deleteCellMetadataExperimental: (key, { cell_id = null } = {}) =>
+                                              pluto_actions.update_notebook((notebook) => {
+                                                  delete notebook.cell_inputs[cell_id ?? cell.id].metadata[key]
+                                              }),
+                                      }),
+
                                 ...observablehq_for_cells,
                             },
                             code,

From c80464d018ebe4ee230fac9b1619c4b3aab39cb8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 17 Jul 2023 16:57:27 +0200
Subject: [PATCH 660/821] Experimental JS API for getting/setting cell metadata
 (#2612)


From 0071ec12b0d98c05335159fe45da69808d354bb8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 17 Jul 2023 18:01:04 +0200
Subject: [PATCH 661/821] popup: warn type

---
 frontend/components/Editor.js | 2 +-
 frontend/components/Popup.js  | 5 +++--
 frontend/editor.css           | 5 +++++
 frontend/light_color.css      | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 5134297b64..50f4326a71 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -846,7 +846,7 @@ patch: ${JSON.stringify(
                 // https://github.com/fonsp/Pluto.jl/issues/55
                 // https://github.com/fonsp/Pluto.jl/issues/2398
                 open_pluto_popup({
-                    type: "info",
+                    type: "warn",
                     source_element: null,
                     body: html`<p>A new server was started - this notebook session is no longer running.</p>
                         <p>Would you like to go back to the main menu?</p>
diff --git a/frontend/components/Popup.js b/frontend/components/Popup.js
index fae1c99e1a..16d3491ac2 100644
--- a/frontend/components/Popup.js
+++ b/frontend/components/Popup.js
@@ -26,7 +26,7 @@ export const help_circle_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/
 
 /**
  * @typedef MiscPopupDetails
- * @property {string} type
+ * @property {"info" | "warn"} type
  * @property {import("../imports/Preact.js").ReactElement} body
  * @property {HTMLElement?} source_element
  */
@@ -95,6 +95,7 @@ export const Popup = ({ notebook, disable_input }) => {
     return html`<pluto-popup
         class=${cl({
             visible: recent_event != null,
+            [type ?? ""]: type != null,
         })}
         style="${pos_ref.current}"
     >
@@ -105,7 +106,7 @@ export const Popup = ({ notebook, disable_input }) => {
                   recent_event=${recent_event}
                   clear_recent_event=${() => set_recent_event(null)}
               />`
-            : type === "info"
+            : type === "info" || type === "warn"
             ? html`<div>${recent_event?.body}</div>`
             : null}
     </pluto-popup>`
diff --git a/frontend/editor.css b/frontend/editor.css
index 52bddb302b..d2cbba88e3 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1810,6 +1810,11 @@ pluto-popup > * {
     position: absolute;
 }
 
+pluto-popup.warn > * {
+    background: var(--pluto-logs-warn-color);
+    border-color: var(--pluto-logs-warn-accent-color);
+}
+
 pluto-popup code.auto_disabled_variable {
     font-family: var(--julia-mono-font-stack);
     font-size: 0.8rem;
diff --git a/frontend/light_color.css b/frontend/light_color.css
index 6685329f48..0f7e2ce49f 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -111,7 +111,7 @@
 
         /*saveall container*/
         --overlay-button-bg: #ffffff;
-        --overlay-button-border: #f3f2f2;
+        --overlay-button-border: hsl(0 4% 91% / 1);
         --overlay-button-border-save: #f3f2f2;
 
         /*input_context_menu*/

From 9c052d39d47055444bc03a48abadc9134a27e951 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 17 Jul 2023 18:23:47 +0200
Subject: [PATCH 662/821] =?UTF-8?q?=F0=9F=90=9D=20Fix=20#2518?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/CellInput.js | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index e3a57c6421..9133b305a2 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -631,17 +631,23 @@ export const CellInput = ({
                     // Remove selection on blur
                     EditorView.domEventHandlers({
                         blur: (event, view) => {
-                            // collapse the selection into a single point
-                            view.dispatch({
-                                selection: {
-                                    anchor: view.state.selection.main.head,
-                                },
-                                scrollIntoView: false,
-                            })
-                            // and blur the DOM again (because the previous transaction might have re-focused it)
-                            view.contentDOM.blur()
-
-                            set_cm_forced_focus(null)
+                            // it turns out that this condition is true *exactly* if and only if the blur event was triggered by blurring the window
+                            let caused_by_window_blur = document.activeElement === view.contentDOM
+
+                            if (!caused_by_window_blur) {
+                                // then it's caused by focusing something other than this cell in the editor.
+                                // in this case, we want to collapse the selection into a single point, for aesthetic reasons.
+                                view.dispatch({
+                                    selection: {
+                                        anchor: view.state.selection.main.head,
+                                    },
+                                    scrollIntoView: false,
+                                })
+                                // and blur the DOM again (because the previous transaction might have re-focused it)
+                                view.contentDOM.blur()
+
+                                set_cm_forced_focus(null)
+                            }
                         },
                     }),
                     pluto_paste_plugin({

From 48337a589895839869ad8d1ebcf7bf80f4f2cce1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 20 Jul 2023 21:03:49 +0200
Subject: [PATCH 663/821] frontmatter editor: remove autocapitalizationr

---
 frontend/editor.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index d2cbba88e3..c573b7c38c 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -3415,7 +3415,6 @@ pluto-cell.hooked_up pluto-output {
 }
 
 .pluto-frontmatter label {
-    text-transform: capitalize;
     font-weight: 500;
 }
 

From 5dc359dd7883c585eb89b213e6538eaa25f9ecee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Jul 2023 21:34:12 +0200
Subject: [PATCH 664/821] Bump word-wrap from 1.2.3 to 1.2.4 in
 /frontend-bundler (#2617)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend-bundler/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index ee443a186a..56b24cf5b2 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -6874,9 +6874,9 @@
             }
         },
         "node_modules/word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+            "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -11986,9 +11986,9 @@
             }
         },
         "word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+            "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA=="
         },
         "wrap-ansi": {
             "version": "7.0.0",

From 56541139902dda3890d5b0130a8ec04c35efbdad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Jul 2023 21:34:59 +0200
Subject: [PATCH 665/821] Bump terser from 5.9.0 to 5.14.2 in /frontend-bundler
 (#2220)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend-bundler/package-lock.json | 142 ++++++++++++++++++++++++-----
 1 file changed, 121 insertions(+), 21 deletions(-)

diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index 56b24cf5b2..7fdd990813 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -385,6 +385,58 @@
                 "node": ">=6.9.0"
             }
         },
+        "node_modules/@jridgewell/gen-mapping": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+            "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+            "dependencies": {
+                "@jridgewell/set-array": "^1.0.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/resolve-uri": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+            "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/set-array": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+            "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/source-map": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+            "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.0",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            }
+        },
+        "node_modules/@jridgewell/sourcemap-codec": {
+            "version": "1.4.14",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+            "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+        },
+        "node_modules/@jridgewell/trace-mapping": {
+            "version": "0.3.14",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
+            "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
+            "dependencies": {
+                "@jridgewell/resolve-uri": "^3.0.3",
+                "@jridgewell/sourcemap-codec": "^1.4.10"
+            }
+        },
         "node_modules/@lezer/common": {
             "version": "0.15.12",
             "resolved": "https://registry.npmjs.org/@lezer/common/-/common-0.15.12.tgz",
@@ -6427,12 +6479,13 @@
             }
         },
         "node_modules/terser": {
-            "version": "5.9.0",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
-            "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
+            "version": "5.14.2",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
+            "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
             "dependencies": {
+                "@jridgewell/source-map": "^0.3.2",
+                "acorn": "^8.5.0",
                 "commander": "^2.20.0",
-                "source-map": "~0.7.2",
                 "source-map-support": "~0.5.20"
             },
             "bin": {
@@ -6442,19 +6495,22 @@
                 "node": ">=10"
             }
         },
+        "node_modules/terser/node_modules/acorn": {
+            "version": "8.7.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+            "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
         "node_modules/terser/node_modules/commander": {
             "version": "2.20.3",
             "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
             "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
         },
-        "node_modules/terser/node_modules/source-map": {
-            "version": "0.7.3",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-            "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-            "engines": {
-                "node": ">= 8"
-            }
-        },
         "node_modules/timers-browserify": {
             "version": "2.0.12",
             "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
@@ -7304,6 +7360,49 @@
                 "to-fast-properties": "^2.0.0"
             }
         },
+        "@jridgewell/gen-mapping": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+            "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+            "requires": {
+                "@jridgewell/set-array": "^1.0.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            }
+        },
+        "@jridgewell/resolve-uri": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+            "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
+        },
+        "@jridgewell/set-array": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+            "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
+        },
+        "@jridgewell/source-map": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+            "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+            "requires": {
+                "@jridgewell/gen-mapping": "^0.3.0",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            }
+        },
+        "@jridgewell/sourcemap-codec": {
+            "version": "1.4.14",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+            "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+        },
+        "@jridgewell/trace-mapping": {
+            "version": "0.3.14",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
+            "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
+            "requires": {
+                "@jridgewell/resolve-uri": "^3.0.3",
+                "@jridgewell/sourcemap-codec": "^1.4.10"
+            }
+        },
         "@lezer/common": {
             "version": "0.15.12",
             "resolved": "https://registry.npmjs.org/@lezer/common/-/common-0.15.12.tgz",
@@ -11618,24 +11717,25 @@
             "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="
         },
         "terser": {
-            "version": "5.9.0",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
-            "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
+            "version": "5.14.2",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
+            "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
             "requires": {
+                "@jridgewell/source-map": "^0.3.2",
+                "acorn": "^8.5.0",
                 "commander": "^2.20.0",
-                "source-map": "~0.7.2",
                 "source-map-support": "~0.5.20"
             },
             "dependencies": {
+                "acorn": {
+                    "version": "8.7.1",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+                    "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="
+                },
                 "commander": {
                     "version": "2.20.3",
                     "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
                     "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-                },
-                "source-map": {
-                    "version": "0.7.3",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-                    "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
                 }
             }
         },

From ff88e45cb07e9b7ef1b5182040b0a7f7f8b42bea Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Thu, 20 Jul 2023 12:36:01 -0700
Subject: [PATCH 666/821] Update the folded state when reloading from file
 (#2602)

Co-authored-by: Tor Erlend Fjelde <11074788+torfjelde@users.noreply.github.com>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 src/evaluation/Run.jl  | 18 ++++++++++--------
 test/ReloadFromFile.jl | 13 ++++++++-----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 035796a8e0..b9eb7679f9 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -524,6 +524,7 @@ function notebook_differences(from::Notebook, to::Notebook)
 			end
 		end,
 		
+		folded_changed = any(from_cells[id].code_folded != to_cells[id].code_folded for id in keys(from_cells) if haskey(to_cells, id)),
 		order_changed = from.cell_order != to.cell_order,
 		nbpkg_changed = !is_nbpkg_equal(from.nbpkg_ctx, to.nbpkg_ctx),
 	)
@@ -555,16 +556,17 @@ function update_from_file(session::ServerSession, notebook::Notebook; kwargs...)
 	# @show added removed changed
 	
 	cells_changed = !(isempty(added) && isempty(removed) && isempty(changed))
+	folded_changed = d.folded_changed
 	order_changed = d.order_changed
 	nbpkg_changed = d.nbpkg_changed
 		
-	something_changed = cells_changed || order_changed || (include_nbpg && nbpkg_changed)
-	
+	something_changed = cells_changed || folded_changed || order_changed || (include_nbpg && nbpkg_changed)
+
 	if something_changed
 		@info "Reloading notebook from file and applying changes!"
 		notebook.last_hot_reload_time = time()
 	end
-
+	
 	for c in added
 		notebook.cells_dict[c] = just_loaded.cells_dict[c]
 	end
@@ -579,10 +581,10 @@ function update_from_file(session::ServerSession, notebook::Notebook; kwargs...)
 	for c in keys(notebook.cells_dict) ∩ keys(just_loaded.cells_dict)
 		notebook.cells_dict[c].code_folded = just_loaded.cells_dict[c].code_folded
 	end
-	
+
 	notebook.cell_order = just_loaded.cell_order
 	notebook.metadata = just_loaded.metadata
-	
+
 	if include_nbpg && nbpkg_changed
 		@info "nbpkgs not equal" (notebook.nbpkg_ctx isa Nothing) (just_loaded.nbpkg_ctx isa Nothing)
 		
@@ -599,11 +601,11 @@ function update_from_file(session::ServerSession, notebook::Notebook; kwargs...)
 		end
 		notebook.nbpkg_restart_required_msg = "Yes, because the file was changed externally and the embedded Pkg changed."
 	end
-	
+
 	if something_changed
-		update_save_run!(session, notebook, Cell[notebook.cells_dict[c] for c in union(added, changed)]; kwargs...) # this will also update nbpkg
+		update_save_run!(session, notebook, Cell[notebook.cells_dict[c] for c in union(added, changed)]; kwargs...) # this will also update nbpkg if needed
 	end
-	
+
 	return true
 end
 
diff --git a/test/ReloadFromFile.jl b/test/ReloadFromFile.jl
index 01bf9358ca..7cc6b9aac4 100644
--- a/test/ReloadFromFile.jl
+++ b/test/ReloadFromFile.jl
@@ -101,14 +101,14 @@ end
     sleep(timeout_between_tests)
     
     file4 = read(notebook.path, String)
+    last_hot_reload_time4 = notebook.last_hot_reload_time
     notebook.cells[3].code_folded = true
     save_notebook(notebook)
     sleep(timeout_between_tests)
     
     file5 = read(notebook.path, String)
-    @assert file4 != file5
-    
-    @assert notebook.cells[3].code_folded
+    @test file4 != file5
+    @test notebook.cells[3].code_folded
     write(notebook.path, file4)
     
     
@@ -119,7 +119,10 @@ end
     # cell folded, but cell should not re-run
     @assert original_rand_output == notebook.cells[3].output.body
 
-    
+    @assert poll(10) do
+        last_hot_reload_time5 = notebook.last_hot_reload_time
+        last_hot_reload_time5 != last_hot_reload_time4
+    end
         
     ###
     sleep(timeout_between_tests)
@@ -160,4 +163,4 @@ end
     @assert notebook.nbpkg_restart_required_msg !== nothing
 end
 @test true
-end
\ No newline at end of file
+end

From 532587dde06a3953a1090e1d6490524111c7f422 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Jul 2023 21:37:52 +0200
Subject: [PATCH 667/821] Bump word-wrap from 1.2.3 to 1.2.4 in /test/frontend
 (#2616)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/frontend/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/frontend/package-lock.json b/test/frontend/package-lock.json
index df0fc81029..27f3b646a0 100644
--- a/test/frontend/package-lock.json
+++ b/test/frontend/package-lock.json
@@ -9077,9 +9077,9 @@
       "dev": true
     },
     "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -16124,9 +16124,9 @@
       "dev": true
     },
     "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
       "dev": true
     },
     "wrap-ansi": {

From c8f80f47ec751d37fc5a3a4de79ff7d58505d478 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Jul 2023 21:38:11 +0200
Subject: [PATCH 668/821] Bump semver from 5.7.1 to 5.7.2 in /frontend-bundler
 (#2599)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend-bundler/package-lock.json | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index 7fdd990813..a9b30f6cff 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -76,9 +76,9 @@
             }
         },
         "node_modules/@babel/core/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -114,9 +114,9 @@
             }
         },
         "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -6148,9 +6148,9 @@
             }
         },
         "node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+            "version": "5.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+            "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
             "bin": {
                 "semver": "bin/semver"
             }
@@ -7135,9 +7135,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -7163,9 +7163,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -11463,9 +11463,9 @@
             }
         },
         "semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+            "version": "5.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+            "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
         },
         "serve-handler": {
             "version": "6.1.5",

From c5dbeb14a655c66f6b8a650684f7bc4c6cfc2387 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Jul 2023 21:38:43 +0200
Subject: [PATCH 669/821] Bump tough-cookie from 4.0.0 to 4.1.3 in
 /test/frontend (#2597)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/frontend/package-lock.json | 74 ++++++++++++++++++++++++++-------
 1 file changed, 60 insertions(+), 14 deletions(-)

diff --git a/test/frontend/package-lock.json b/test/frontend/package-lock.json
index 27f3b646a0..9f056296f2 100644
--- a/test/frontend/package-lock.json
+++ b/test/frontend/package-lock.json
@@ -7320,6 +7320,12 @@
         }
       }
     },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
     "node_modules/react-is": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -7519,6 +7525,12 @@
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true
     },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
     "node_modules/resolve": {
       "version": "1.22.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
@@ -8724,14 +8736,15 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "dev": true,
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
-        "universalify": "^0.1.2"
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
       },
       "engines": {
         "node": ">=6"
@@ -8866,9 +8879,9 @@
       }
     },
     "node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
       "dev": true,
       "engines": {
         "node": ">= 4.0.0"
@@ -8929,6 +8942,16 @@
       "deprecated": "Please see https://github.com/lydell/urix#deprecated",
       "dev": true
     },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "node_modules/use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -14716,6 +14739,12 @@
         }
       }
     },
+    "querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
     "react-is": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -14879,6 +14908,12 @@
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true
     },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
     "resolve": {
       "version": "1.22.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
@@ -15842,14 +15877,15 @@
       }
     },
     "tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "dev": true,
       "requires": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
-        "universalify": "^0.1.2"
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
       }
     },
     "tr46": {
@@ -15950,9 +15986,9 @@
       }
     },
     "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
       "dev": true
     },
     "unset-value": {
@@ -16001,6 +16037,16 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
+    "url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",

From 1d2c3038032108fff3a9c565eaa84609f1e75b4e Mon Sep 17 00:00:00 2001
From: Alberto Mengali <disberd@gmail.com>
Date: Thu, 20 Jul 2023 22:58:48 +0200
Subject: [PATCH 670/821] Make `published_to_js` (now `publish_to_js`) official
 API through AbstractPlutoDingetjes.jl (v2) (#2608)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 src/runner/PlutoRunner.jl                  | 109 ++++++++++-----------
 test/Dynamic.jl                            |  72 +++++++++++---
 test/frontend/__tests__/published_to_js.js |  58 +++++++++++
 test/frontend/fixtures/published_to_js.jl  |  50 ++++++++++
 4 files changed, 216 insertions(+), 73 deletions(-)
 create mode 100644 test/frontend/__tests__/published_to_js.js
 create mode 100644 test/frontend/fixtures/published_to_js.jl

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 8ff95058ac..6916596b7a 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -908,7 +908,13 @@ function formatted_result_of(
     output_formatted = if (!ends_with_semicolon || errored)
         logger = get!(() -> PlutoCellLogger(notebook_id, cell_id), pluto_cell_loggers, cell_id)
         with_logger_and_io_to_logs(logger; capture_stdout, stdio_loglevel=stdout_log_level) do
-            format_output(ans; context=IOContext(default_iocontext, :extra_items=>extra_items, :module => workspace))
+            format_output(ans; context=IOContext(
+            default_iocontext, 
+            :extra_items=>extra_items, 
+            :module => workspace,
+            :pluto_notebook_id => notebook_id,
+            :pluto_cell_id => cell_id,
+        ))
         end
     else
         ("", MIME"text/plain"())
@@ -972,6 +978,7 @@ const default_iocontext = IOContext(devnull,
     :displaysize => (18, 88), 
     :is_pluto => true, 
     :pluto_supported_integration_features => supported_integration_features,
+    :pluto_published_to_js => (io, x) -> core_published_to_js(io, x),
 )
 
 const default_stdout_iocontext = IOContext(devnull, 
@@ -1494,17 +1501,29 @@ const integrations = Integration[
         id = Base.PkgId(Base.UUID(reinterpret(UInt128, codeunits("Paul Berg Berlin")) |> first), "AbstractPlutoDingetjes"),
         code = quote
             @assert v"1.0.0" <= AbstractPlutoDingetjes.MY_VERSION < v"2.0.0"
-            initial_value_getter_ref[] = AbstractPlutoDingetjes.Bonds.initial_value
-            transform_value_ref[] = AbstractPlutoDingetjes.Bonds.transform_value
-            possible_bond_values_ref[] = AbstractPlutoDingetjes.Bonds.possible_values
-
-            push!(supported_integration_features,
+            
+            supported!(xs...) = push!(supported_integration_features, xs...)
+            
+            # don't need feature checks for these because they existed in every version of AbstractPlutoDingetjes:
+            supported!(
                 AbstractPlutoDingetjes,
                 AbstractPlutoDingetjes.Bonds,
                 AbstractPlutoDingetjes.Bonds.initial_value,
                 AbstractPlutoDingetjes.Bonds.transform_value,
                 AbstractPlutoDingetjes.Bonds.possible_values,
             )
+            initial_value_getter_ref[] = AbstractPlutoDingetjes.Bonds.initial_value
+            transform_value_ref[] = AbstractPlutoDingetjes.Bonds.transform_value
+            possible_bond_values_ref[] = AbstractPlutoDingetjes.Bonds.possible_values
+            
+            # feature checks because these were added in a later release of AbstractPlutoDingetjes
+            if isdefined(AbstractPlutoDingetjes, :Display)
+                supported!(AbstractPlutoDingetjes.Display)
+                if isdefined(AbstractPlutoDingetjes.Display, :published_to_js)
+                    supported!(AbstractPlutoDingetjes.Display.published_to_js)
+                end
+            end
+
         end,
     ),
     Integration(
@@ -2125,74 +2144,48 @@ end"""
 """
 const currently_running_cell_id = Ref{UUID}(uuid4())
 
-function _publish(x, id_start, cell_id)::String
-    id = "$(notebook_id[])/$cell_id/$id_start"
-    d = get!(Dict{String,Any}, cell_published_objects, cell_id)
+function core_published_to_js(io, x)
+    assertpackable(x)
+
+    id_start = objectid2str(x)
+    
+    _notebook_id = get(io, :pluto_notebook_id, notebook_id[])::UUID
+    _cell_id = get(io, :pluto_cell_id, currently_running_cell_id[])::UUID
+    
+    # The unique identifier of this object
+    id = "$_notebook_id/$id_start"
+    
+    d = get!(Dict{String,Any}, cell_published_objects, _cell_id)
     d[id] = x
-    return id
+    
+    write(io, "/* See the documentation for AbstractPlutoDingetjes.Display.published_to_js */ getPublishedObject(\"$(id)\")")
+    
+    return nothing
 end
 
-# TODO? Possibly move this to it's own package, with fallback that actually msgpack?
-# ..... Ideally we'd make this require `await` on the javascript side too...
-Base.@kwdef struct PublishedToJavascript
+# TODO: This is the deprecated old function. Remove me at some point.
+struct PublishedToJavascript
     published_object
-    published_id_start
-    cell_id
 end
 function Base.show(io::IO, ::MIME"text/javascript", published::PublishedToJavascript)
-    id = _publish(published.published_object, published.published_id_start, published.cell_id)
-    # if published.cell_id != currently_running_cell_id[]
-    #     error("Showing result from PlutoRunner.publish_to_js() in a cell different from where it was created, not (yet?) supported.")
-    # end
-    write(io, "/* See the documentation for PlutoRunner.publish_to_js */ getPublishedObject(\"$(id)\")")
+    core_published_to_js(io, published.published_object)
 end
 Base.show(io::IO, ::MIME"text/plain", published::PublishedToJavascript) = show(io, MIME("text/javascript"), published)    
 Base.show(io::IO, published::PublishedToJavascript) = show(io, MIME("text/javascript"), published)    
 
-"""
-    publish_to_js(x)
-
-Make the object `x` available to the JS runtime of this cell. The returned string is a JS command that, when executed in this cell's output, gives the object.
-
-!!! warning
-
-    This function is not yet public API, it will become public in the next weeks. Only use for experiments.
-
-# Example
-```julia
-let
-    x = Dict(
-        "data" => rand(Float64, 20),
-        "name" => "juliette",
-    )
-
-    HTML("\""
-    <script>
-    // we interpolate into JavaScript:
-    const x = \$(PlutoRunner.publish_to_js(x))
-
-    console.log(x.name, x.data)
-    </script>
-    "\"")
-end
-```
-"""
-publish_to_js(x) = publish_to_js(x, objectid2str(x))
+# TODO: This is the deprecated old function. Remove me at some point.
+function publish_to_js(x)
+    @warn "Deprecated, use `AbstractPlutoDingetjes.Display.published_to_js(x)` instead of `PlutoRunner.publish_to_js(x)`."
 
-function publish_to_js(x, id_start)
     assertpackable(x)
-    PublishedToJavascript(
-        published_object=x,
-        published_id_start=id_start,
-        cell_id=currently_running_cell_id[],
-    )
+    PublishedToJavascript(x)
 end
 
 const Packable = Union{Nothing,Missing,String,Symbol,Int64,Int32,Int16,Int8,UInt64,UInt32,UInt16,UInt8,Float32,Float64,Bool,MIME,UUID,DateTime}
-assertpackable(::Packable) = true
+assertpackable(::Packable) = nothing
 assertpackable(t::Any) = throw(ArgumentError("Only simple objects can be shared with JS, like vectors and dictionaries. $(string(typeof(t))) is not compatible."))
-assertpackable(::Vector{<:Packable}) = true
-assertpackable(::Dict{<:Packable,<:Packable}) = true
+assertpackable(::Vector{<:Packable}) = nothing
+assertpackable(::Dict{<:Packable,<:Packable}) = nothing
 assertpackable(x::Vector) = foreach(assertpackable, x)
 assertpackable(d::Dict) = let
     foreach(assertpackable, keys(d))
diff --git a/test/Dynamic.jl b/test/Dynamic.jl
index f833933ff6..669017f640 100644
--- a/test/Dynamic.jl
+++ b/test/Dynamic.jl
@@ -199,20 +199,45 @@ end
 
         notebook = Notebook([
             Cell("PlutoRunner.notebook_id[] |> Text"),
+            # These cells tests `core_published_to_js`, which is the function used by the official API (`AbtractPlutoDingetjes.Display.published_to_js`).
             Cell(cid, """
-            let
-                # not actually public API but we test it anyways
-                a = PlutoRunner._publish(Dict(
+            begin
+                
+                a = Dict(
                     "hello" => "world",
                     "xx" => UInt8[6,7,8],
-                ), "aaa", Base.UUID("$cid"))
-                b = PlutoRunner._publish("cool", "bbb", Base.UUID("$cid"))
-                Text((a, b))
+                )
+                b = "cool"
+                
+                struct ZZZ
+                    x
+                    y
+                end
+                
+                function Base.show(io::IO, ::MIME"text/html", z::ZZZ)
+                    write(io, "<script>\n")
+                    PlutoRunner.core_published_to_js(io, z.x)
+                    PlutoRunner.core_published_to_js(io, z.y)
+                    write(io, "\n</script>")
+                end
+                
+                ZZZ(a, b)
+            end
+            """),
+            Cell("""
+            begin
+                struct ABC
+                    x
+                end
+                ZZZ(
+                    123, 
+                    Dict("a" => 234, "b" => ABC(4)),
+                )
             end
             """),
-            Cell("3"),
+            # This is the deprecated API:
             Cell("PlutoRunner.publish_to_js(Ref(4))"),
-            Cell("PlutoRunner.publish_to_js((ref=4,))"),
+            Cell("PlutoRunner.publish_to_js((ref=5,))"),
             Cell("x = Dict(:a => 6)"),
             Cell("PlutoRunner.publish_to_js(x)"),
         ])
@@ -220,11 +245,17 @@ end
         update_save_run!(🍭, notebook, notebook.cells)
         @test notebook.cells[1].output.body == notebook.notebook_id |> string
 
-        @test !notebook.cells[2].errored
-        a, b = Meta.parse(notebook.cells[2].output.body) |> eval
+        @test notebook.cells[2] |> noerror
+        @test notebook.cells[2].output.mime isa MIME"text/html"
+
+        ab1, ab2 = keys(notebook.cells[2].published_objects)
+        @test occursin(ab1, notebook.cells[2].output.body)
+        @test occursin(ab2, notebook.cells[2].output.body)
+        
+        ab() = sort(collect(keys(notebook.cells[2].published_objects)); by=(s -> findfirst(s, notebook.cells[2].output.body) |> first))
+        a, b = ab()
+        
         p = notebook.cells[2].published_objects
-        @test sort(collect(keys(p))) == sort([a,b])
-        @test isempty(notebook.cells[3].published_objects)
 
         @test p[a] == Dict(
             "hello" => "world",
@@ -236,18 +267,29 @@ end
         old_pb = p[b]
         update_save_run!(🍭, notebook, notebook.cells)
         p = notebook.cells[2].published_objects
-        a, b = Meta.parse(notebook.cells[2].output.body) |> eval
+        a, b = ab()
         @test p[a] == old_pa
         @test p[b] == old_pb
         
         @test !isempty(notebook.cells[2].published_objects)
         
+        # display should have failed
+        @test only(values(notebook.cells[3].published_objects)) == 123
+        msg = notebook.cells[3].output.body[:msg]
+        @test occursin("Failed to show value", msg)
+        @test occursin("ABC is not compatible", msg)
+        
+        
+        
         setcode!(notebook.cells[2], "2")
         update_save_run!(🍭, notebook, notebook.cells)
         @test isempty(notebook.cells[2].published_objects)
-
+        @test isempty(notebook.cells[2].published_objects)
+        
+        
+        
         @test notebook.cells[4].errored
-        @test !notebook.cells[5].errored
+        @test notebook.cells[5] |> noerror
         @test !isempty(notebook.cells[5].published_objects)
         
         
diff --git a/test/frontend/__tests__/published_to_js.js b/test/frontend/__tests__/published_to_js.js
new file mode 100644
index 0000000000..348b3cd6bf
--- /dev/null
+++ b/test/frontend/__tests__/published_to_js.js
@@ -0,0 +1,58 @@
+import puppeteer from "puppeteer"
+import { lastElement, saveScreenshot, getTestScreenshotPath, createPage } from "../helpers/common"
+import {
+    getCellIds,
+    importNotebook,
+    waitForCellOutput,
+    getPlutoUrl,
+    prewarmPluto,
+    writeSingleLineInPlutoInput,
+    waitForNoUpdateOngoing,
+    shutdownCurrentNotebook,
+    setupPlutoBrowser,
+} from "../helpers/pluto"
+
+describe("published_to_js", () => {
+    /**
+     * Launch a shared browser instance for all tests.
+     * I don't use jest-puppeteer because it takes away a lot of control and works buggy for me,
+     * so I need to manually create the shared browser.
+     * @type {puppeteer.Browser}
+     */
+    let browser = null
+    /** @type {puppeteer.Page} */
+    let page = null
+    beforeAll(async () => {
+        browser = await setupPlutoBrowser()
+    })
+    beforeEach(async () => {
+        page = await createPage(browser)
+        await page.goto(getPlutoUrl(), { waitUntil: "networkidle0" })
+    })
+    afterEach(async () => {
+        await saveScreenshot(page)
+        await shutdownCurrentNotebook(page)
+        await page.close()
+        page = null
+    })
+    afterAll(async () => {
+        await browser.close()
+        browser = null
+    })
+
+    it("Should correctly show published_to_js in cell output, and in logs", async () => {
+        await importNotebook(page, "published_to_js.jl")
+        await waitForNoUpdateOngoing(page, { polling: 100 })
+        let output_of_published = await page.evaluate(() => {
+            return document.querySelector("#to_cell_output")?.textContent
+        })
+        expect(output_of_published).toBe("[1,2,3] MAGIC!")
+
+        // The log content is not shown, so #to_cell_log does not exist
+        let log_of_published = await page.evaluate(() => {
+            return document.querySelector("#to_cell_log")?.textContent
+        })
+        // This test is currently broken, due to https://github.com/fonsp/Pluto.jl/issues/2092
+        // expect(log_of_published).toBe("[4,5,6] MAGIC!")
+    })
+})
diff --git a/test/frontend/fixtures/published_to_js.jl b/test/frontend/fixtures/published_to_js.jl
new file mode 100644
index 0000000000..1e8356e57c
--- /dev/null
+++ b/test/frontend/fixtures/published_to_js.jl
@@ -0,0 +1,50 @@
+### A Pluto.jl notebook ###
+# v0.19.27
+
+using Markdown
+using InteractiveUtils
+
+# ╔═╡ 2d69377e-23f8-11ee-116b-fb6a8f328528
+begin
+	using Pkg
+	Pkg.activate(temp=true)
+	# the latest versions of these packages:
+	Pkg.add(url="https://github.com/JuliaPluto/AbstractPlutoDingetjes.jl", rev="main")
+	Pkg.add("HypertextLiteral")
+end
+
+# ╔═╡ 2ea26a4b-2d1e-4bcb-8b7b-cace79f7926a
+begin
+	using AbstractPlutoDingetjes.Display: published_to_js
+	using HypertextLiteral
+end
+
+# ╔═╡ 043829fc-af3a-40b9-bb4f-f848ab50eb25
+a = [1,2,3];
+
+# ╔═╡ 2f4609fd-7361-4048-985a-2cc74bb25606
+@htl """
+<script>
+const a = JSON.stringify($(published_to_js(a))) + " MAGIC!"
+return html`<div id='to_cell_output'>\${a}</div>`
+</script>
+"""
+
+# ╔═╡ 28eba9fd-0416-49b8-966e-03a381c19ca7
+b = [4,5,6];
+
+# ╔═╡ 0a4e8a19-6d43-4161-bb8c-1ebf8f8f68ba
+@info @htl """
+<script>
+const a = JSON.stringify($(published_to_js(b))) + " MAGIC!"
+return html`<div id='to_cell_log'>\${a}</div>`
+</script>
+"""
+
+# ╔═╡ Cell order:
+# ╠═2d69377e-23f8-11ee-116b-fb6a8f328528
+# ╠═2ea26a4b-2d1e-4bcb-8b7b-cace79f7926a
+# ╠═043829fc-af3a-40b9-bb4f-f848ab50eb25
+# ╠═2f4609fd-7361-4048-985a-2cc74bb25606
+# ╠═28eba9fd-0416-49b8-966e-03a381c19ca7
+# ╠═0a4e8a19-6d43-4161-bb8c-1ebf8f8f68ba

From f297b127214ea7790b344b5c7687a21044c6323f Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Sun, 13 Aug 2023 11:52:29 +0200
Subject: [PATCH 671/821] Test Julia 1.10 (#2626)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Test Julia 1.10

* Disable Forward compat test 🤔

* Bump Symbolics to v5.5.1 in MacroAnalysis test
---
 .github/workflows/Test.yml |  2 +-
 test/MacroAnalysis.jl      |  6 +--
 test/packages/Basic.jl     | 76 +++++++++++++++++++-------------------
 3 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 37e73f3784..ecf12bbf1f 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -34,7 +34,7 @@ jobs:
             fail-fast: false
             matrix:
                 # We test quite a lot of versions because we do some OS and version specific things unfortunately
-                julia-version: ["1.6", "1.7", "1.8", "1.9"] #, "nightly"]
+                julia-version: ["1.6", "1.7", "1.8", "1.9", "nightly"]
                 os: [ubuntu-latest, macOS-latest, windows-latest]
 
         steps:
diff --git a/test/MacroAnalysis.jl b/test/MacroAnalysis.jl
index 171f9e8ce0..4c54571674 100644
--- a/test/MacroAnalysis.jl
+++ b/test/MacroAnalysis.jl
@@ -624,7 +624,7 @@ import Memoize: @memoize
 
     @testset "Package macro 2" begin
         🍭.options.evaluation.workspace_use_distributed = true
-        
+
         notebook = Notebook([
             Cell("z = x^2 + y"),
             Cell("@variables x y"),
@@ -632,7 +632,7 @@ import Memoize: @memoize
             begin
                 import Pkg
                 Pkg.activate(mktempdir())
-                Pkg.add(Pkg.PackageSpec(name="Symbolics", version="1"))
+                Pkg.add(Pkg.PackageSpec(name="Symbolics", version="5.5.1"))
                 import Symbolics: @variables
             end
             """),
@@ -648,7 +648,7 @@ import Memoize: @memoize
 
         @test cell(1) |> noerror
         @test cell(2) |> noerror
-        @test cell(2) |> noerror
+        @test cell(3) |> noerror
 
         update_run!(🍭, notebook, notebook.cells)
 
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index 6a8af7e9f5..773be1ec71 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -446,50 +446,52 @@ import Distributed
         WorkspaceManager.unmake_workspace((🍭, notebook))
     end
 
-    @testset "File format -- Forwards compat" begin
-        # Using Distributed, we will create a new Julia process in which we install Pluto 0.14.7 (before PlutoPkg). We run the new notebook file on the old Pluto.
-        p = Distributed.addprocs(1) |> first
-
-        @test post_pkg_notebook isa String
-
-        Distributed.remotecall_eval(Main, p, quote
-            path = tempname()
-            write(path, $(post_pkg_notebook))
-            import Pkg
-            # optimization:
-            if isdefined(Pkg, :UPDATED_REGISTRY_THIS_SESSION)
-                Pkg.UPDATED_REGISTRY_THIS_SESSION[] = true
-            end
+    @static if VERSION ≤ v"1.9"
+        @testset "File format -- Forwards compat" begin
+            # Using Distributed, we will create a new Julia process in which we install Pluto 0.14.7 (before PlutoPkg). We run the new notebook file on the old Pluto.
+            p = Distributed.addprocs(1) |> first
+
+            @test post_pkg_notebook isa String
+
+            Distributed.remotecall_eval(Main, p, quote
+                path = tempname()
+                write(path, $(post_pkg_notebook))
+                import Pkg
+                # optimization:
+                if isdefined(Pkg, :UPDATED_REGISTRY_THIS_SESSION)
+                    Pkg.UPDATED_REGISTRY_THIS_SESSION[] = true
+                end
 
-            Pkg.activate(mktempdir())
-            Pkg.add(Pkg.PackageSpec(;name="Pluto",version=v"0.14.7"))
-            import Pluto
-            @assert Pluto.PLUTO_VERSION == v"0.14.7"
+                Pkg.activate(mktempdir())
+                Pkg.add(Pkg.PackageSpec(;name="Pluto",version=v"0.14.7"))
+                import Pluto
+                @assert Pluto.PLUTO_VERSION == v"0.14.7"
 
-            s = Pluto.ServerSession()
-            s.options.evaluation.workspace_use_distributed = false
+                s = Pluto.ServerSession()
+                s.options.evaluation.workspace_use_distributed = false
 
-            nb = Pluto.SessionActions.open(s, path; run_async=false)
+                nb = Pluto.SessionActions.open(s, path; run_async=false)
 
-            nothing
-        end)
+                nothing
+            end)
 
-        # Cells that use Example will error because the package is not installed.
+            # Cells that use Example will error because the package is not installed.
 
-        # @test Distributed.remotecall_eval(Main, p, quote
-        #     nb.cells[1].errored == false
-        # end)
-        @test Distributed.remotecall_eval(Main, p, quote
-            nb.cells[2].errored == false
-        end)
-        # @test Distributed.remotecall_eval(Main, p, quote
-        #     nb.cells[3].errored == false
-        # end)
-        # @test Distributed.remotecall_eval(Main, p, quote
-        #     nb.cells[3].output.body == "25"
-        # end)
+            # @test Distributed.remotecall_eval(Main, p, quote
+            #     nb.cells[1].errored == false
+            # end)
+            @test Distributed.remotecall_eval(Main, p, quote
+                nb.cells[2].errored == false
+            end)
+            # @test Distributed.remotecall_eval(Main, p, quote
+            #     nb.cells[3].errored == false
+            # end)
+            # @test Distributed.remotecall_eval(Main, p, quote
+            #     nb.cells[3].output.body == "25"
+            # end)
 
-        Distributed.rmprocs([p])
+            Distributed.rmprocs([p])
+        end
     end
 
     @testset "PkgUtils -- reset" begin

From bfd7830925bd8932d1b83eee94218e8b66aed8fc Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Thu, 24 Aug 2023 20:01:30 +0200
Subject: [PATCH 672/821] integrate JuliaSyntax.jl (#2526)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* integrate JuliaSyntax.jl

* Delete test_bed.jl

* improve display

* update Parse.jl

* Move code to PlutoRunner

* Add tests

* No stacktrace for syntax error in <=1.9

* Update TypeScriptCheck.yml

* Update CodemirrorPlutoSetup.d.ts

* Update React.jl

* Update is_just_text.jl

* Update TypeScriptCheck.yml

* Fixes for the codemirror update

* Update TypeScriptCheck.yml

* Disable Forward compat test 🤔

* Set `z-index` for pluto-runarea to 19 (pluto-input.cm-editor.z-index - 1)

* Change Docs test to adapt to nightly

* tighten is_just_text
---
 frontend/components/Cell.js                   | 101 ++--
 frontend/components/CellInput.js              |  23 +-
 .../components/CellInput/highlight_line.js    |  58 ++
 .../CellInput/pluto_autocomplete.js           |   6 +-
 frontend/components/CellOutput.js             |   5 +-
 frontend/components/ErrorMessage.js           |  59 +-
 frontend/editor.css                           |  14 +-
 frontend/imports/CodemirrorPlutoSetup.d.ts    | 557 +++++++++++++++++-
 frontend/imports/CodemirrorPlutoSetup.js      |   6 +-
 src/analysis/ExpressionExplorer.jl            |   1 +
 src/analysis/Parse.jl                         |  11 +-
 src/analysis/is_just_text.jl                  |  18 +-
 src/runner/PlutoRunner.jl                     | 172 +++++-
 test/Dynamic.jl                               |   2 +-
 test/ExpressionExplorer.jl                    |  14 +
 test/React.jl                                 |  24 +
 test/packages/Basic.jl                        |  20 +-
 17 files changed, 1011 insertions(+), 80 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 247740152a..b43b843ae2 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -135,7 +135,31 @@ export const Cell = ({
     const remount = useMemo(() => () => setKey(key + 1))
     // cm_forced_focus is null, except when a line needs to be highlighted because it is part of a stack trace
     const [cm_forced_focus, set_cm_forced_focus] = useState(/** @type{any} */ (null))
+    const [cm_highlighted_range, set_cm_highlighted_range] = useState(null)
     const [cm_highlighted_line, set_cm_highlighted_line] = useState(null)
+    const [cm_diagnostics, set_cm_diagnostics] = useState([])
+
+    useEffect(() => {
+        const diagnosticListener = (e) => {
+            if (e.detail.cell_id === cell_id) {
+                set_cm_diagnostics(e.detail.diagnostics)
+            }
+        }
+        window.addEventListener("cell_diagnostics", diagnosticListener)
+        return () => window.removeEventListener("cell_diagnostics", diagnosticListener)
+    }, [cell_id])
+
+    useEffect(() => {
+        const highlightRangeListener = (e) => {
+            if (e.detail.cell_id == cell_id && e.detail.from != null && e.detail.to != null) {
+                set_cm_highlighted_range({ from: e.detail.from, to: e.detail.to })
+            } else {
+                set_cm_highlighted_range(null)
+            }
+        }
+        window.addEventListener("cell_highlight_range", highlightRangeListener)
+        return () => window.removeEventListener("cell_highlight_range", highlightRangeListener)
+    }, [cell_id])
 
     useEffect(() => {
         const focusListener = (e) => {
@@ -248,21 +272,21 @@ export const Cell = ({
             key=${cell_key}
             ref=${node_ref}
             class=${cl({
-                queued: queued || (waiting_to_run && is_process_ready),
-                running,
-                activate_animation,
-                errored,
-                selected,
-                code_differs: class_code_differs,
-                code_folded: class_code_folded,
-                skip_as_script,
-                running_disabled,
-                depends_on_disabled_cells,
-                depends_on_skipped_cells,
-                show_input,
-                shrunk: Object.values(logs).length > 0,
-                hooked_up: output?.has_pluto_hook_features ?? false,
-            })}
+        queued: queued || (waiting_to_run && is_process_ready),
+        running,
+        activate_animation,
+        errored,
+        selected,
+        code_differs: class_code_differs,
+        code_folded: class_code_folded,
+        skip_as_script,
+        running_disabled,
+        depends_on_disabled_cells,
+        depends_on_skipped_cells,
+        show_input,
+        shrunk: Object.values(logs).length > 0,
+        hooked_up: output?.has_pluto_hook_features ?? false,
+    })}
             id=${cell_id}
         >
             ${variables.map((name) => html`<span id=${encodeURI(name)} />`)}
@@ -274,14 +298,14 @@ export const Cell = ({
             <pluto-trafficlight></pluto-trafficlight>
             <button
                 onClick=${() => {
-                    pluto_actions.add_remote_cell(cell_id, "before")
-                }}
+            pluto_actions.add_remote_cell(cell_id, "before")
+        }}
                 class="add_cell before"
                 title="Add cell"
             >
                 <span></span>
             </button>
-            ${cell_api_ready ? html`<${CellOutput} errored=${errored} ...${output} cell_id=${cell_id} />` : html``}
+        ${cell_api_ready ? html`<${CellOutput} errored=${errored} ...${output} cell_id=${cell_id} />` : html``}
             <${CellInput}
                 local_code=${cell_input_local?.code ?? code}
                 remote_code=${code}
@@ -308,7 +332,8 @@ export const Cell = ({
                 set_show_logs=${set_show_logs}
                 set_cell_disabled=${set_cell_disabled}
                 cm_highlighted_line=${cm_highlighted_line}
-                set_cm_highlighted_line=${set_cm_highlighted_line}
+                cm_highlighted_range=${cm_highlighted_range}
+                cm_diagnostics=${cm_diagnostics}
                 onerror=${remount}
             />
             ${show_logs && cell_api_ready
@@ -320,8 +345,8 @@ export const Cell = ({
                 depends_on_disabled_cells=${depends_on_disabled_cells}
                 on_run=${on_run}
                 on_interrupt=${() => {
-                    pluto_actions.interrupt_remote(cell_id)
-                }}
+            pluto_actions.interrupt_remote(cell_id)
+        }}
                 set_cell_disabled=${set_cell_disabled}
                 runtime=${runtime}
                 running=${running}
@@ -331,42 +356,42 @@ export const Cell = ({
             />
             <button
                 onClick=${() => {
-                    pluto_actions.add_remote_cell(cell_id, "after")
-                }}
+            pluto_actions.add_remote_cell(cell_id, "after")
+        }}
                 class="add_cell after"
                 title="Add cell"
             >
                 <span></span>
             </button>
             ${skip_as_script
-                ? html`<div
+            ? html`<div
                       class="skip_as_script_marker"
                       title=${`This cell is directly flagged as disabled in file. Click to know more!`}
                       onClick=${(e) => {
-                          open_pluto_popup({
-                              type: "info",
-                              source_element: e.target,
-                              body: html`This cell is currently stored in the notebook file as a Julia <em>comment</em>, instead of <em>code</em>.<br />
+                    open_pluto_popup({
+                        type: "info",
+                        source_element: e.target,
+                        body: html`This cell is currently stored in the notebook file as a Julia <em>comment</em>, instead of <em>code</em>.<br />
                                   This way, it will not run when the notebook runs as a script outside of Pluto.<br />
                                   Use the context menu to enable it again`,
-                          })
-                      }}
+                    })
+                }}
                   ></div>`
-                : depends_on_skipped_cells
+            : depends_on_skipped_cells
                 ? html`<div
                       class="depends_on_skipped_marker"
                       title=${`This cell is indirectly flagged as disabled in file. Click to know more!`}
                       onClick=${(e) => {
-                          open_pluto_popup({
-                              type: "info",
-                              source_element: e.target,
-                              body: html`This cell is currently stored in the notebook file as a Julia <em>comment</em>, instead of <em>code</em>.<br />
+                        open_pluto_popup({
+                            type: "info",
+                            source_element: e.target,
+                            body: html`This cell is currently stored in the notebook file as a Julia <em>comment</em>, instead of <em>code</em>.<br />
                                   This way, it will not run when the notebook runs as a script outside of Pluto.<br />
                                   An upstream cell is <b> indirectly</b> <em>disabling in file</em> this one; enable
                                   <span onClick=${skip_as_script_jump} style="cursor: pointer; text-decoration: underline"> the upstream one</span> to affect
                                   this cell.`,
-                          })
-                      }}
+                        })
+                    }}
                   ></div>`
                 : null}
         </pluto-cell>
@@ -388,7 +413,7 @@ export const IsolatedCell = ({ cell_input: { cell_id, metadata }, cell_result: {
     return html`
         <pluto-cell ref=${node_ref} id=${cell_id} class=${hidden ? "hidden-cell" : "isolated-cell"}>
             ${cell_api_ready ? html`<${CellOutput} ...${output} cell_id=${cell_id} />` : html``}
-            ${show_logs ? html`<${Logs} logs=${Object.values(logs)} line_heights=${[15]} set_cm_highlighted_line=${() => {}} />` : null}
+            ${show_logs ? html`<${Logs} logs=${Object.values(logs)} line_heights=${[15]} set_cm_highlighted_line=${() => { }} />` : null}
         </pluto-cell>
     `
 }
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 9133b305a2..33cdb5e2e8 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -48,6 +48,7 @@ import {
     pythonLanguage,
     syntaxHighlighting,
     cssLanguage,
+    setDiagnostics,
 } from "../imports/CodemirrorPlutoSetup.js"
 
 import { markdown, html as htmlLang, javascript, sqlLang, python, julia_mixed } from "./CellInput/mixedParsers.js"
@@ -59,7 +60,7 @@ import { cell_movement_plugin, prevent_holding_a_key_from_doing_things_across_ce
 import { pluto_paste_plugin } from "./CellInput/pluto_paste_plugin.js"
 import { bracketMatching } from "./CellInput/block_matcher_plugin.js"
 import { cl } from "../common/ClassTable.js"
-import { HighlightLineFacet, highlightLinePlugin } from "./CellInput/highlight_line.js"
+import { HighlightLineFacet, HighlightRangeFacet, highlightLinePlugin, highlightRangePlugin } from "./CellInput/highlight_line.js"
 import { commentKeymap } from "./CellInput/comment_mixed_parsers.js"
 import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
 import { mod_d_command } from "./CellInput/mod_d_command.js"
@@ -373,8 +374,10 @@ export const CellInput = ({
     set_show_logs,
     set_cell_disabled,
     cm_highlighted_line,
+    cm_highlighted_range,
     metadata,
     global_definition_locations,
+    cm_diagnostics,
 }) => {
     let pluto_actions = useContext(PlutoActionsContext)
     const { disabled: running_disabled, skip_as_script } = metadata
@@ -384,6 +387,7 @@ export const CellInput = ({
         set_error(null)
         throw to_throw
     }
+
     const notebook_id_ref = useRef(notebook_id)
     notebook_id_ref.current = notebook_id
 
@@ -394,6 +398,7 @@ export const CellInput = ({
     let nbpkg_compartment = useCompartment(newcm_ref, NotebookpackagesFacet.of(nbpkg))
     let global_definitions_compartment = useCompartment(newcm_ref, GlobalDefinitionsFacet.of(global_definition_locations))
     let highlighted_line_compartment = useCompartment(newcm_ref, HighlightLineFacet.of(cm_highlighted_line))
+    let highlighted_range_compartment = useCompartment(newcm_ref, HighlightRangeFacet.of(cm_highlighted_range))
     let editable_compartment = useCompartment(newcm_ref, EditorState.readOnly.of(disable_input))
 
     let on_change_compartment = useCompartment(
@@ -589,9 +594,11 @@ export const CellInput = ({
                     // Compartments coming from react state/props
                     nbpkg_compartment,
                     highlighted_line_compartment,
+                    highlighted_range_compartment,
                     global_definitions_compartment,
                     editable_compartment,
                     highlightLinePlugin(),
+                    highlightRangePlugin(),
 
                     // This is waaaay in front of the keys it is supposed to override,
                     // Which is necessary because it needs to run before *any* keymap,
@@ -713,6 +720,12 @@ export const CellInput = ({
                     // Wowww this has been enabled for some time now... wonder if there are issues about this yet ;) - DRAL
                     awesome_line_wrapping,
 
+                    // Reset diagnostics on change
+                    EditorView.updateListener.of((update) => {
+                        if (!update.docChanged) return
+                        update.view.dispatch(setDiagnostics(update.state, []))
+                    }),
+
                     on_change_compartment,
 
                     // This is my weird-ass extension that checks the AST and shows you where
@@ -778,6 +791,14 @@ export const CellInput = ({
         }
     }, [])
 
+    useEffect(() => {
+        if (newcm_ref.current == null) return
+        const cm = newcm_ref.current
+        const diagnostics = cm_diagnostics
+
+        cm.dispatch(setDiagnostics(cm.state, diagnostics))
+    }, [cm_diagnostics])
+
     // Effect to apply "remote_code" to the cell when it changes...
     // ideally this won't be necessary as we'll have actual multiplayer,
     // or something to tell the user that the cell is out of sync.
diff --git a/frontend/components/CellInput/highlight_line.js b/frontend/components/CellInput/highlight_line.js
index f66346f878..d5938350d4 100644
--- a/frontend/components/CellInput/highlight_line.js
+++ b/frontend/components/CellInput/highlight_line.js
@@ -4,6 +4,10 @@ const highlighted_line = Decoration.line({
     attributes: { class: "cm-highlighted-line" },
 })
 
+const highlighted_range = Decoration.mark({
+    attributes: { class: "cm-highlighted-range" },
+})
+
 /**
  * @param {EditorView} view
  */
@@ -17,6 +21,22 @@ function create_line_decorations(view) {
     return Decoration.set([highlighted_line.range(line.from, line.from)])
 }
 
+/**
+ * @param {EditorView} view
+ */
+function create_range_decorations(view) {
+    let range = view.state.facet(HighlightRangeFacet)
+    if (range == null) {
+        return Decoration.set([])
+    }
+    let { from, to } = range
+    if (from < 0 || from == to) {
+        return Decoration.set([])
+    }
+
+    return Decoration.set([highlighted_range.range(from, to)])
+}
+
 /**
  * @type Facet<number?, number?>
  */
@@ -25,6 +45,14 @@ export const HighlightLineFacet = Facet.define({
     compare: (a, b) => a === b,
 })
 
+/**
+ * @type Facet<{from: number, to: number}?, {from: number, to: number}?>
+ */
+export const HighlightRangeFacet = Facet.define({
+    combine: (values) => values[0],
+    compare: (a, b) => a === b,
+})
+
 export const highlightLinePlugin = () =>
     ViewPlugin.fromClass(
         class {
@@ -53,3 +81,33 @@ export const highlightLinePlugin = () =>
             decorations: (v) => v.decorations,
         }
     )
+
+
+export const highlightRangePlugin = () =>
+    ViewPlugin.fromClass(
+        class {
+            updateDecos(view) {
+                this.decorations = create_range_decorations(view)
+            }
+
+            /**
+             * @param {EditorView} view
+             */
+            constructor(view) {
+                this.decorations = Decoration.set([])
+                this.updateDecos(view)
+            }
+
+            /**
+             * @param {ViewUpdate} update
+             */
+            update(update) {
+                if (update.docChanged || update.state.facet(HighlightRangeFacet) !== update.startState.facet(HighlightRangeFacet)) {
+                    this.updateDecos(update.view)
+                }
+            }
+        },
+        {
+            decorations: (v) => v.decorations,
+        }
+    )
diff --git a/frontend/components/CellInput/pluto_autocomplete.js b/frontend/components/CellInput/pluto_autocomplete.js
index 2130d6a484..94885157fc 100644
--- a/frontend/components/CellInput/pluto_autocomplete.js
+++ b/frontend/components/CellInput/pluto_autocomplete.js
@@ -131,7 +131,11 @@ let update_docs_from_autocomplete_selection = (on_update_doc_query) => {
         // The nice thing about this is that we can use the resulting state from the transaction,
         // without updating the actual state of the editor.
         let result_transaction = update.state.update({
-            changes: { from: selected_option.source.from, to: selected_option.source.to, insert: text_to_apply },
+            changes: {
+                from: selected_option.source.from,
+                to: Math.min(selected_option.source.to, update.state.doc.length),
+                insert: text_to_apply,
+            },
         })
 
         // So we can use `get_selected_doc_from_state` on our virtual state
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index ff4188cf36..8eb7b4943a 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -1,6 +1,6 @@
 import { html, Component, useRef, useLayoutEffect, useContext } from "../imports/Preact.js"
 
-import { ErrorMessage } from "./ErrorMessage.js"
+import { ErrorMessage, ParseError } from "./ErrorMessage.js"
 import { TreeView, TableView, DivElement } from "./TreeView.js"
 
 import {
@@ -148,6 +148,9 @@ export const OutputBody = ({ mime, body, cell_id, persist_js_state = false, last
         case "application/vnd.pluto.table+object":
             return html`<${TableView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} />`
             break
+        case "application/vnd.pluto.parseerror+object":
+            return html`<div><${ParseError} cell_id=${cell_id} ...${body} /></div>`
+            break
         case "application/vnd.pluto.stacktrace+object":
             return html`<div><${ErrorMessage} cell_id=${cell_id} ...${body} /></div>`
             break
diff --git a/frontend/components/ErrorMessage.js b/frontend/components/ErrorMessage.js
index 173243ee9b..60e83a1515 100644
--- a/frontend/components/ErrorMessage.js
+++ b/frontend/components/ErrorMessage.js
@@ -1,5 +1,8 @@
 import { PlutoActionsContext } from "../common/PlutoContext.js"
-import { html, useContext, useState } from "../imports/Preact.js"
+import { EditorState, EditorView, julia_andrey, lineNumbers, syntaxHighlighting } from "../imports/CodemirrorPlutoSetup.js"
+import { html, useContext, useEffect, useLayoutEffect, useRef, useState } from "../imports/Preact.js"
+import { pluto_syntax_colors } from "./CellInput.js"
+import { Editor } from "./Editor.js"
 
 const StackFrameFilename = ({ frame, cell_id }) => {
     const sep_index = frame.file.indexOf("#==#")
@@ -38,6 +41,43 @@ const Funccall = ({ frame }) => {
 
 const insert_commas_and_and = (/** @type {any[]} */ xs) => xs.flatMap((x, i) => (i === xs.length - 1 ? [x] : i === xs.length - 2 ? [x, " and "] : [x, ", "]))
 
+export const ParseError = ({ cell_id, diagnostics }) => {
+    useEffect(() => {
+        window.dispatchEvent(
+            new CustomEvent("cell_diagnostics", {
+                detail: {
+                    cell_id,
+                    diagnostics,
+                },
+            })
+        )
+        return () => window.dispatchEvent(new CustomEvent("cell_diagnostics", { detail: { cell_id, diagnostics: [] } }))
+    }, [diagnostics])
+
+    return html`
+        <jlerror>
+            <header><p>Syntax error</p></header>
+            <section>
+              <ol>
+                  ${diagnostics.map(
+                    ({ message, from, to, line }) =>
+                        html`<li onmouseenter=${() => // NOTE: this could be moved move to `StackFrameFilename`
+                                window.dispatchEvent(new CustomEvent("cell_highlight_range", { detail: { cell_id, from, to }}))
+                        }
+                        onmouseleave=${() =>
+                                window.dispatchEvent(new CustomEvent("cell_highlight_range", { detail: { cell_id, from: null, to: null }}))
+                        }
+                      >
+                            ${message}<span>@</span>
+                            <${StackFrameFilename} frame=${{file: "#==#" + cell_id, line}} cell_id=${cell_id} />
+                        </li>`)
+                    }
+              </ol>
+            </section>
+        </jlerror>
+    `;
+}
+
 export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
     let pluto_actions = useContext(PlutoActionsContext)
     const default_rewriter = {
@@ -62,9 +102,9 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
                         <a
                             href="#"
                             onClick=${(e) => {
-                                e.preventDefault()
-                                pluto_actions.split_remote_cell(cell_id, boundaries, true)
-                            }}
+                            e.preventDefault()
+                            pluto_actions.split_remote_cell(cell_id, boundaries, true)
+                        }}
                             >Split this cell into ${boundaries.length} cells</a
                         >, or
                     </p>`
@@ -137,6 +177,11 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
                     }
                 }),
         },
+        {
+            pattern: /^syntax: (.*)$/,
+            display: default_rewriter.display,
+            show_stacktrace: () => false,
+        },
         {
             pattern: /^UndefVarError: (.*) not defined\.?$/,
             display: (/** @type{string} */ x) => {
@@ -183,14 +228,14 @@ export const ErrorMessage = ({ msg, stacktrace, cell_id }) => {
             : html`<section>
                   <ol>
                       ${stacktrace.map(
-                          (frame) =>
-                              html`<li>
+                (frame) =>
+                    html`<li>
                                   <${Funccall} frame=${frame} />
                                   <span>@</span>
                                   <${StackFrameFilename} frame=${frame} cell_id=${cell_id} />
                                   ${frame.inlined ? html`<span>[inlined]</span>` : null}
                               </li>`
-                      )}
+            )}
                   </ol>
               </section>`}
     </jlerror>`
diff --git a/frontend/editor.css b/frontend/editor.css
index c573b7c38c..73964d87d5 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1232,6 +1232,7 @@ pluto-input .cm-editor .cm-line {
     transition: background-color 0.15s ease-in-out;
 }
 
+pluto-input .cm-editor span.cm-highlighted-range,
 pluto-input .cm-editor .cm-line.cm-highlighted-line {
     background-color: #bdbdbd68;
     border-radius: 3px;
@@ -1934,6 +1935,9 @@ pluto-runarea {
     border-bottom-left-radius: 5px;
     border-bottom-right-radius: 5px;
     border-top: none;
+    /* One less than z-index for pluto-input .cm-editor.
+       Otherwise it gets on top of the tooltips */
+    z-index: 19;
 }
 
 pluto-runarea > span {
@@ -3048,6 +3052,12 @@ button.floating_back_button {
     border-radius: 4px;
 }
 
+.cm-tooltip-lint {
+    font-family: "JuliaMono";
+    font-size: 0.75rem;
+    z-index: 100;
+}
+
 .cm-tooltip-autocomplete {
     max-height: calc(20 * 16px);
     box-sizing: content-box;
@@ -3185,10 +3195,10 @@ pluto-input .cm-editor .cm-content {
     padding: 2px 0px;
 }
 
-.cm-editor .cm-selectionBackground {
+.cm-editor .cm-scroller > .cm-selectionLayer .cm-selectionBackground {
     background: var(--cm-selection-background-blurred);
 }
-.cm-editor.cm-focused .cm-selectionBackground {
+.cm-editor.cm-focused .cm-scroller > .cm-selectionLayer .cm-selectionBackground {
     background: var(--cm-selection-background);
 }
 
diff --git a/frontend/imports/CodemirrorPlutoSetup.d.ts b/frontend/imports/CodemirrorPlutoSetup.d.ts
index 6919393ed4..4e298e6d9d 100644
--- a/frontend/imports/CodemirrorPlutoSetup.d.ts
+++ b/frontend/imports/CodemirrorPlutoSetup.d.ts
@@ -1865,6 +1865,17 @@ declare type Attrs = {
     [name: string]: string;
 };
 
+/**
+Basic rectangle type.
+*/
+interface Rect {
+    readonly left: number;
+    readonly right: number;
+    readonly top: number;
+    readonly bottom: number;
+}
+declare type ScrollStrategy = "nearest" | "start" | "end" | "center";
+
 interface MarkDecorationSpec {
     /**
     Whether the mark covers its start and end position or not. This
@@ -2013,7 +2024,7 @@ declare abstract class WidgetType {
     couldn't (in which case the widget will be redrawn). The default
     implementation just returns false.
     */
-    updateDOM(dom: HTMLElement): boolean;
+    updateDOM(dom: HTMLElement, view: EditorView): boolean;
     /**
     The estimated height this widget will have, to be used when
     estimating the height of content that hasn't been drawn. May
@@ -2028,6 +2039,14 @@ declare abstract class WidgetType {
     */
     ignoreEvent(event: Event): boolean;
     /**
+    Override the way screen coordinates for positions at/in the
+    widget are found. `pos` will be the offset into the widget, and
+    `side` the side of the position that is being queried—less than
+    zero for before, greater than zero for after, and zero for
+    directly at that position.
+    */
+    coordsAt(dom: HTMLElement, pos: number, side: number): Rect | null;
+    /**
     This is called when the an instance of the widget is removed
     from the editor view.
     */
@@ -2130,17 +2149,6 @@ declare abstract class Decoration extends RangeValue {
     static none: DecorationSet;
 }
 
-/**
-Basic rectangle type.
-*/
-interface Rect {
-    readonly left: number;
-    readonly right: number;
-    readonly top: number;
-    readonly bottom: number;
-}
-declare type ScrollStrategy = "nearest" | "start" | "end" | "center";
-
 /**
 Command functions are used in key bindings and other types of user
 actions. Given an editor view, they check whether their effect can
@@ -2841,6 +2849,11 @@ declare class EditorView {
     */
     static inputHandler: Facet<(view: EditorView, from: number, to: number, text: string) => boolean, readonly ((view: EditorView, from: number, to: number, text: string) => boolean)[]>;
     /**
+    This facet can be used to provide functions that create effects
+    to be dispatched when the editor's focus state changes.
+    */
+    static focusChangeEffect: Facet<(state: EditorState, focusing: boolean) => StateEffect<any> | null, readonly ((state: EditorState, focusing: boolean) => StateEffect<any> | null)[]>;
+    /**
     By default, the editor assumes all its content has the same
     [text direction](https://codemirror.net/6/docs/ref/#view.Direction). Configure this with a `true`
     value to make it read the text direction of every (rendered)
@@ -3216,99 +3229,458 @@ Create a line number gutter extension.
 */
 declare function lineNumbers(config?: LineNumberConfig): Extension;
 
+/**
+Highlighting tags are markers that denote a highlighting category.
+They are [associated](#highlight.styleTags) with parts of a syntax
+tree by a language mode, and then mapped to an actual CSS style by
+a [highlighter](#highlight.Highlighter).
+
+Because syntax tree node types and highlight styles have to be
+able to talk the same language, CodeMirror uses a mostly _closed_
+[vocabulary](#highlight.tags) of syntax tags (as opposed to
+traditional open string-based systems, which make it hard for
+highlighting themes to cover all the tokens produced by the
+various languages).
+
+It _is_ possible to [define](#highlight.Tag^define) your own
+highlighting tags for system-internal use (where you control both
+the language package and the highlighter), but such tags will not
+be picked up by regular highlighters (though you can derive them
+from standard tags to allow highlighters to fall back to those).
+*/
 declare class Tag {
+    /**
+    The set of this tag and all its parent tags, starting with
+    this one itself and sorted in order of decreasing specificity.
+    */
     readonly set: Tag[];
+    /**
+    Define a new tag. If `parent` is given, the tag is treated as a
+    sub-tag of that parent, and
+    [highlighters](#highlight.tagHighlighter) that don't mention
+    this tag will try to fall back to the parent tag (or grandparent
+    tag, etc).
+    */
     static define(parent?: Tag): Tag;
+    /**
+    Define a tag _modifier_, which is a function that, given a tag,
+    will return a tag that is a subtag of the original. Applying the
+    same modifier to a twice tag will return the same value (`m1(t1)
+    == m1(t1)`) and applying multiple modifiers will, regardless or
+    order, produce the same tag (`m1(m2(t1)) == m2(m1(t1))`).
+    
+    When multiple modifiers are applied to a given base tag, each
+    smaller set of modifiers is registered as a parent, so that for
+    example `m1(m2(m3(t1)))` is a subtype of `m1(m2(t1))`,
+    `m1(m3(t1)`, and so on.
+    */
     static defineModifier(): (tag: Tag) => Tag;
 }
+/**
+A highlighter defines a mapping from highlighting tags and
+language scopes to CSS class names. They are usually defined via
+[`tagHighlighter`](#highlight.tagHighlighter) or some wrapper
+around that, but it is also possible to implement them from
+scratch.
+*/
 interface Highlighter {
+    /**
+    Get the set of classes that should be applied to the given set
+    of highlighting tags, or null if this highlighter doesn't assign
+    a style to the tags.
+    */
     style(tags: readonly Tag[]): string | null;
+    /**
+    When given, the highlighter will only be applied to trees on
+    whose [top](#common.NodeType.isTop) node this predicate returns
+    true.
+    */
     scope?(node: NodeType): boolean;
 }
+/**
+The default set of highlighting [tags](#highlight.Tag).
+
+This collection is heavily biased towards programming languages,
+and necessarily incomplete. A full ontology of syntactic
+constructs would fill a stack of books, and be impractical to
+write themes for. So try to make do with this set. If all else
+fails, [open an
+issue](https://github.com/codemirror/codemirror.next) to propose a
+new tag, or [define](#highlight.Tag^define) a local custom tag for
+your use case.
+
+Note that it is not obligatory to always attach the most specific
+tag possible to an element—if your grammar can't easily
+distinguish a certain type of element (such as a local variable),
+it is okay to style it as its more general variant (a variable).
+
+For tags that extend some parent tag, the documentation links to
+the parent.
+*/
 declare const tags: {
+    /**
+    A comment.
+    */
     comment: Tag;
+    /**
+    A line [comment](#highlight.tags.comment).
+    */
     lineComment: Tag;
+    /**
+    A block [comment](#highlight.tags.comment).
+    */
     blockComment: Tag;
+    /**
+    A documentation [comment](#highlight.tags.comment).
+    */
     docComment: Tag;
+    /**
+    Any kind of identifier.
+    */
     name: Tag;
+    /**
+    The [name](#highlight.tags.name) of a variable.
+    */
     variableName: Tag;
+    /**
+    A type [name](#highlight.tags.name).
+    */
     typeName: Tag;
+    /**
+    A tag name (subtag of [`typeName`](#highlight.tags.typeName)).
+    */
     tagName: Tag;
+    /**
+    A property or field [name](#highlight.tags.name).
+    */
     propertyName: Tag;
+    /**
+    An attribute name (subtag of [`propertyName`](#highlight.tags.propertyName)).
+    */
     attributeName: Tag;
+    /**
+    The [name](#highlight.tags.name) of a class.
+    */
     className: Tag;
+    /**
+    A label [name](#highlight.tags.name).
+    */
     labelName: Tag;
+    /**
+    A namespace [name](#highlight.tags.name).
+    */
     namespace: Tag;
+    /**
+    The [name](#highlight.tags.name) of a macro.
+    */
     macroName: Tag;
+    /**
+    A literal value.
+    */
     literal: Tag;
+    /**
+    A string [literal](#highlight.tags.literal).
+    */
     string: Tag;
+    /**
+    A documentation [string](#highlight.tags.string).
+    */
     docString: Tag;
+    /**
+    A character literal (subtag of [string](#highlight.tags.string)).
+    */
     character: Tag;
+    /**
+    An attribute value (subtag of [string](#highlight.tags.string)).
+    */
     attributeValue: Tag;
+    /**
+    A number [literal](#highlight.tags.literal).
+    */
     number: Tag;
+    /**
+    An integer [number](#highlight.tags.number) literal.
+    */
     integer: Tag;
+    /**
+    A floating-point [number](#highlight.tags.number) literal.
+    */
     float: Tag;
+    /**
+    A boolean [literal](#highlight.tags.literal).
+    */
     bool: Tag;
+    /**
+    Regular expression [literal](#highlight.tags.literal).
+    */
     regexp: Tag;
+    /**
+    An escape [literal](#highlight.tags.literal), for example a
+    backslash escape in a string.
+    */
     escape: Tag;
+    /**
+    A color [literal](#highlight.tags.literal).
+    */
     color: Tag;
+    /**
+    A URL [literal](#highlight.tags.literal).
+    */
     url: Tag;
+    /**
+    A language keyword.
+    */
     keyword: Tag;
+    /**
+    The [keyword](#highlight.tags.keyword) for the self or this
+    object.
+    */
     self: Tag;
+    /**
+    The [keyword](#highlight.tags.keyword) for null.
+    */
     null: Tag;
+    /**
+    A [keyword](#highlight.tags.keyword) denoting some atomic value.
+    */
     atom: Tag;
+    /**
+    A [keyword](#highlight.tags.keyword) that represents a unit.
+    */
     unit: Tag;
+    /**
+    A modifier [keyword](#highlight.tags.keyword).
+    */
     modifier: Tag;
+    /**
+    A [keyword](#highlight.tags.keyword) that acts as an operator.
+    */
     operatorKeyword: Tag;
+    /**
+    A control-flow related [keyword](#highlight.tags.keyword).
+    */
     controlKeyword: Tag;
+    /**
+    A [keyword](#highlight.tags.keyword) that defines something.
+    */
     definitionKeyword: Tag;
+    /**
+    A [keyword](#highlight.tags.keyword) related to defining or
+    interfacing with modules.
+    */
     moduleKeyword: Tag;
+    /**
+    An operator.
+    */
     operator: Tag;
+    /**
+    An [operator](#highlight.tags.operator) that dereferences something.
+    */
     derefOperator: Tag;
+    /**
+    Arithmetic-related [operator](#highlight.tags.operator).
+    */
     arithmeticOperator: Tag;
+    /**
+    Logical [operator](#highlight.tags.operator).
+    */
     logicOperator: Tag;
+    /**
+    Bit [operator](#highlight.tags.operator).
+    */
     bitwiseOperator: Tag;
+    /**
+    Comparison [operator](#highlight.tags.operator).
+    */
     compareOperator: Tag;
+    /**
+    [Operator](#highlight.tags.operator) that updates its operand.
+    */
     updateOperator: Tag;
+    /**
+    [Operator](#highlight.tags.operator) that defines something.
+    */
     definitionOperator: Tag;
+    /**
+    Type-related [operator](#highlight.tags.operator).
+    */
     typeOperator: Tag;
+    /**
+    Control-flow [operator](#highlight.tags.operator).
+    */
     controlOperator: Tag;
+    /**
+    Program or markup punctuation.
+    */
     punctuation: Tag;
+    /**
+    [Punctuation](#highlight.tags.punctuation) that separates
+    things.
+    */
     separator: Tag;
+    /**
+    Bracket-style [punctuation](#highlight.tags.punctuation).
+    */
     bracket: Tag;
+    /**
+    Angle [brackets](#highlight.tags.bracket) (usually `<` and `>`
+    tokens).
+    */
     angleBracket: Tag;
+    /**
+    Square [brackets](#highlight.tags.bracket) (usually `[` and `]`
+    tokens).
+    */
     squareBracket: Tag;
+    /**
+    Parentheses (usually `(` and `)` tokens). Subtag of
+    [bracket](#highlight.tags.bracket).
+    */
     paren: Tag;
+    /**
+    Braces (usually `{` and `}` tokens). Subtag of
+    [bracket](#highlight.tags.bracket).
+    */
     brace: Tag;
+    /**
+    Content, for example plain text in XML or markup documents.
+    */
     content: Tag;
+    /**
+    [Content](#highlight.tags.content) that represents a heading.
+    */
     heading: Tag;
+    /**
+    A level 1 [heading](#highlight.tags.heading).
+    */
     heading1: Tag;
+    /**
+    A level 2 [heading](#highlight.tags.heading).
+    */
     heading2: Tag;
+    /**
+    A level 3 [heading](#highlight.tags.heading).
+    */
     heading3: Tag;
+    /**
+    A level 4 [heading](#highlight.tags.heading).
+    */
     heading4: Tag;
+    /**
+    A level 5 [heading](#highlight.tags.heading).
+    */
     heading5: Tag;
+    /**
+    A level 6 [heading](#highlight.tags.heading).
+    */
     heading6: Tag;
+    /**
+    A prose separator (such as a horizontal rule).
+    */
     contentSeparator: Tag;
+    /**
+    [Content](#highlight.tags.content) that represents a list.
+    */
     list: Tag;
+    /**
+    [Content](#highlight.tags.content) that represents a quote.
+    */
     quote: Tag;
+    /**
+    [Content](#highlight.tags.content) that is emphasized.
+    */
     emphasis: Tag;
+    /**
+    [Content](#highlight.tags.content) that is styled strong.
+    */
     strong: Tag;
+    /**
+    [Content](#highlight.tags.content) that is part of a link.
+    */
     link: Tag;
+    /**
+    [Content](#highlight.tags.content) that is styled as code or
+    monospace.
+    */
     monospace: Tag;
+    /**
+    [Content](#highlight.tags.content) that has a strike-through
+    style.
+    */
     strikethrough: Tag;
+    /**
+    Inserted text in a change-tracking format.
+    */
     inserted: Tag;
+    /**
+    Deleted text.
+    */
     deleted: Tag;
+    /**
+    Changed text.
+    */
     changed: Tag;
+    /**
+    An invalid or unsyntactic element.
+    */
     invalid: Tag;
+    /**
+    Metadata or meta-instruction.
+    */
     meta: Tag;
+    /**
+    [Metadata](#highlight.tags.meta) that applies to the entire
+    document.
+    */
     documentMeta: Tag;
+    /**
+    [Metadata](#highlight.tags.meta) that annotates or adds
+    attributes to a given syntactic element.
+    */
     annotation: Tag;
+    /**
+    Processing instruction or preprocessor directive. Subtag of
+    [meta](#highlight.tags.meta).
+    */
     processingInstruction: Tag;
+    /**
+    [Modifier](#highlight.Tag^defineModifier) that indicates that a
+    given element is being defined. Expected to be used with the
+    various [name](#highlight.tags.name) tags.
+    */
     definition: (tag: Tag) => Tag;
+    /**
+    [Modifier](#highlight.Tag^defineModifier) that indicates that
+    something is constant. Mostly expected to be used with
+    [variable names](#highlight.tags.variableName).
+    */
     constant: (tag: Tag) => Tag;
+    /**
+    [Modifier](#highlight.Tag^defineModifier) used to indicate that
+    a [variable](#highlight.tags.variableName) or [property
+    name](#highlight.tags.propertyName) is being called or defined
+    as a function.
+    */
     function: (tag: Tag) => Tag;
+    /**
+    [Modifier](#highlight.Tag^defineModifier) that can be applied to
+    [names](#highlight.tags.name) to indicate that they belong to
+    the language's standard environment.
+    */
     standard: (tag: Tag) => Tag;
+    /**
+    [Modifier](#highlight.Tag^defineModifier) that indicates a given
+    [names](#highlight.tags.name) is local to some scope.
+    */
     local: (tag: Tag) => Tag;
+    /**
+    A generic variant [modifier](#highlight.Tag^defineModifier) that
+    can be used to tag language-specific alternative variants of
+    some common tag. It is recommended for themes to define special
+    forms of at least the [string](#highlight.tags.string) and
+    [variable name](#highlight.tags.variableName) tags, since those
+    come up a lot.
+    */
     special: (tag: Tag) => Tag;
 };
 
@@ -3561,9 +3933,9 @@ declare class LanguageDescription {
     static matchLanguageName(descs: readonly LanguageDescription[], name: string, fuzzy?: boolean): LanguageDescription | null;
 }
 /**
-Facet for overriding the unit by which indentation happens.
-Should be a string consisting either entirely of spaces or
-entirely of tabs. When not set, this defaults to 2 spaces.
+Facet for overriding the unit by which indentation happens. Should
+be a string consisting either entirely of the same whitespace
+character. When not set, this defaults to 2 spaces.
 */
 declare const indentUnit: Facet<string, string>;
 /**
@@ -3844,7 +4216,7 @@ The default keymap. Includes all bindings from
 - Shift-Alt-ArrowUp: [`copyLineUp`](https://codemirror.net/6/docs/ref/#commands.copyLineUp)
 - Shift-Alt-ArrowDown: [`copyLineDown`](https://codemirror.net/6/docs/ref/#commands.copyLineDown)
 - Escape: [`simplifySelection`](https://codemirror.net/6/docs/ref/#commands.simplifySelection)
-- Ctrl-Enter (Comd-Enter on macOS): [`insertBlankLine`](https://codemirror.net/6/docs/ref/#commands.insertBlankLine)
+- Ctrl-Enter (Cmd-Enter on macOS): [`insertBlankLine`](https://codemirror.net/6/docs/ref/#commands.insertBlankLine)
 - Alt-l (Ctrl-l on macOS): [`selectLine`](https://codemirror.net/6/docs/ref/#commands.selectLine)
 - Ctrl-i (Cmd-i on macOS): [`selectParentSyntax`](https://codemirror.net/6/docs/ref/#commands.selectParentSyntax)
 - Ctrl-[ (Cmd-[ on macOS): [`indentLess`](https://codemirror.net/6/docs/ref/#commands.indentLess)
@@ -3933,6 +4305,19 @@ interface CompletionConfig {
         position: number;
     }[];
     /**
+    By default, [info](https://codemirror.net/6/docs/ref/#autocomplet.Completion.info) tooltips are
+    placed to the side of the selected. This option can be used to
+    override that. It will be given rectangles for the list of
+    completions, the selected option, the info element, and the
+    availble [tooltip space](https://codemirror.net/6/docs/ref/#view.tooltips^config.tooltipSpace),
+    and should return style and/or class strings for the info
+    element.
+    */
+    positionInfo?: (view: EditorView, list: Rect, option: Rect, info: Rect, space: Rect) => {
+        style?: string;
+        class?: string;
+    };
+    /**
     The comparison function to use when sorting completions with the same
     match score. Defaults to using
     [`localeCompare`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/localeCompare).
@@ -3997,6 +4382,39 @@ interface Completion {
     down the list, a positive number moves it up.
     */
     boost?: number;
+    /**
+    Can be used to divide the completion list into sections.
+    Completions in a given section (matched by name) will be grouped
+    together, with a heading above them. Options without section
+    will appear above all sections. A string value is equivalent to
+    a `{name}` object.
+    */
+    section?: string | CompletionSection;
+}
+/**
+Object used to describe a completion
+[section](https://codemirror.net/6/docs/ref/#autocomplete.Completion.section). It is recommended to
+create a shared object used by all the completions in a given
+section.
+*/
+interface CompletionSection {
+    /**
+    The name of the section. If no `render` method is present, this
+    will be displayed above the options.
+    */
+    name: string;
+    /**
+    An optional function that renders the section header. Since the
+    headers are shown inside a list, you should make sure the
+    resulting element has a `display: list-item` style.
+    */
+    header?: (section: CompletionSection) => HTMLElement;
+    /**
+    By default, sections are ordered alphabetically by name. To
+    specify an explicit order, `rank` can be used. Sections with a
+    lower rank will be shown above sections with a higher rank.
+    */
+    rank?: number;
 }
 /**
 An instance of this is passed to completion source functions.
@@ -4192,7 +4610,7 @@ interpreted as indicating a placeholder.
 declare function snippet(template: string): (editor: {
     state: EditorState;
     dispatch: (tr: Transaction) => void;
-}, _completion: Completion, from: number, to: number) => void;
+}, completion: Completion, from: number, to: number) => void;
 /**
 A command that clears the active snippet, if any.
 */
@@ -4347,6 +4765,7 @@ type index_d_Completion = Completion;
 type index_d_CompletionContext = CompletionContext;
 declare const index_d_CompletionContext: typeof CompletionContext;
 type index_d_CompletionResult = CompletionResult;
+type index_d_CompletionSection = CompletionSection;
 type index_d_CompletionSource = CompletionSource;
 declare const index_d_acceptCompletion: typeof acceptCompletion;
 declare const index_d_autocompletion: typeof autocompletion;
@@ -4381,6 +4800,7 @@ declare namespace index_d {
     index_d_Completion as Completion,
     index_d_CompletionContext as CompletionContext,
     index_d_CompletionResult as CompletionResult,
+    index_d_CompletionSection as CompletionSection,
     index_d_CompletionSource as CompletionSource,
     index_d_acceptCompletion as acceptCompletion,
     index_d_autocompletion as autocompletion,
@@ -4697,6 +5117,101 @@ declare function html(config?: {
     nestedAttributes?: NestedAttr[];
 }): LanguageSupport;
 
+/**
+Describes a problem or hint for a piece of code.
+*/
+interface Diagnostic {
+    /**
+    The start position of the relevant text.
+    */
+    from: number;
+    /**
+    The end position. May be equal to `from`, though actually
+    covering text is preferable.
+    */
+    to: number;
+    /**
+    The severity of the problem. This will influence how it is
+    displayed.
+    */
+    severity: "info" | "warning" | "error";
+    /**
+    An optional source string indicating where the diagnostic is
+    coming from. You can put the name of your linter here, if
+    applicable.
+    */
+    source?: string;
+    /**
+    The message associated with this diagnostic.
+    */
+    message: string;
+    /**
+    An optional custom rendering function that displays the message
+    as a DOM node.
+    */
+    renderMessage?: () => Node;
+    /**
+    An optional array of actions that can be taken on this
+    diagnostic.
+    */
+    actions?: readonly Action[];
+}
+/**
+An action associated with a diagnostic.
+*/
+interface Action {
+    /**
+    The label to show to the user. Should be relatively short.
+    */
+    name: string;
+    /**
+    The function to call when the user activates this action. Is
+    given the diagnostic's _current_ position, which may have
+    changed since the creation of the diagnostic, due to editing.
+    */
+    apply: (view: EditorView, from: number, to: number) => void;
+}
+declare type DiagnosticFilter = (diagnostics: readonly Diagnostic[]) => Diagnostic[];
+interface LintConfig {
+    /**
+    Time to wait (in milliseconds) after a change before running
+    the linter. Defaults to 750ms.
+    */
+    delay?: number;
+    /**
+    Optional predicate that can be used to indicate when diagnostics
+    need to be recomputed. Linting is always re-done on document
+    changes.
+    */
+    needsRefresh?: null | ((update: ViewUpdate) => boolean);
+    /**
+    Optional filter to determine which diagnostics produce markers
+    in the content.
+    */
+    markerFilter?: null | DiagnosticFilter;
+    /**
+    Filter applied to a set of diagnostics shown in a tooltip. No
+    tooltip will appear if the empty set is returned.
+    */
+    tooltipFilter?: null | DiagnosticFilter;
+}
+/**
+Returns a transaction spec which updates the current set of
+diagnostics, and enables the lint extension if if wasn't already
+active.
+*/
+declare function setDiagnostics(state: EditorState, diagnostics: readonly Diagnostic[]): TransactionSpec;
+/**
+The type of a function that produces diagnostics.
+*/
+declare type LintSource = (view: EditorView) => readonly Diagnostic[] | Promise<readonly Diagnostic[]>;
+/**
+Given a diagnostic source, this function returns an extension that
+enables linting with that source. It will be called whenever the
+editor is idle (after its content changed).
+*/
+declare function linter(source: LintSource, config?: LintConfig): Extension;
+
 /**
 A language provider based on the [Lezer JavaScript
 parser](https://github.com/lezer-parser/javascript), extended with
@@ -4832,6 +5347,12 @@ interface SQLConfig {
     */
     tables?: readonly Completion[];
     /**
+    Similar to `tables`, if you want to provide completion objects
+    for your schemas rather than using the generated ones, pass them
+    here.
+    */
+    schemas?: readonly Completion[];
+    /**
     When given, columns from the named table can be completed
     directly at the top level.
     */
@@ -4893,4 +5414,4 @@ Create an instance of the collaborative editing plugin.
 */
 declare function collab(config?: CollabConfig): Extension;
 
-export { Annotation, Compartment, Decoration, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, Text, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index_d as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, completionKeymap, css, cssLanguage, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, keymap, lineNumbers, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, rectangularSelection, searchKeymap, selectNextOccurrence, sql, syntaxHighlighting, syntaxTree, syntaxTreeAvailable, tags };
+export { Annotation, Compartment, Decoration, Diagnostic, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, Text, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index_d as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, completionKeymap, css, cssLanguage, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, keymap, lineNumbers, linter, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, rectangularSelection, searchKeymap, selectNextOccurrence, setDiagnostics, sql, syntaxHighlighting, syntaxTree, syntaxTreeAvailable, tags };
diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index ce8c635152..da54f20909 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -59,10 +59,14 @@ import {
     css,
     cssLanguage,
     selectNextOccurrence,
+    linter,
+    setDiagnostics,
     //@ts-ignore
-} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@0.28.4/dist/index.es.min.js"
+} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@1234.0.0/dist/index.es.min.js"
 
 export {
+    linter,
+    setDiagnostics,
     EditorState,
     EditorSelection,
     Compartment,
diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 1fd4b5837c..67edc5c82a 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -1348,6 +1348,7 @@ function can_be_function_wrapped(x::Expr)
        x.head === :using ||
        x.head === :import ||
        x.head === :module ||
+       x.head === :incomplete ||
        # Only bail on named functions, but anonymous functions (args[1].head == :tuple) are fine.
        # TODO Named functions INSIDE other functions should be fine too
        (x.head === :function && !Meta.isexpr(x.args[1], :tuple)) ||
diff --git a/src/analysis/Parse.jl b/src/analysis/Parse.jl
index 200b5faf4b..b3ac5162d5 100644
--- a/src/analysis/Parse.jl
+++ b/src/analysis/Parse.jl
@@ -1,4 +1,5 @@
 import .ExpressionExplorer
+import Markdown
 
 "Generate a file name to be given to the parser (will show up in stack traces)."
 pluto_filename(notebook::Notebook, cell::Cell)::String = notebook.path * "#==#" * string(cell.cell_id)
@@ -19,7 +20,7 @@ function parse_custom(notebook::Notebook, cell::Cell)::Expr
     raw = if can_insert_filename
         filename = pluto_filename(notebook, cell)
         ex = Base.parse_input_line(cell.code, filename=filename)
-        if (ex isa Expr) && (ex.head == :toplevel)
+        if Meta.isexpr(ex, :toplevel)
             # if there is more than one expression:
             if count(a -> !(a isa LineNumberNode), ex.args) > 1
                 Expr(:error, "extra token after end of expression\n\nBoundaries: $(expression_boundaries(cell.code))")
@@ -100,12 +101,14 @@ Make some small adjustments to the `expr` to make it work nicely inside a timed,
 3. If `expr` is a `:(=)` expression with a curly assignment, wrap it in a `:const` to allow execution - see https://github.com/fonsp/Pluto.jl/issues/517
 """
 function preprocess_expr(expr::Expr)
-    if expr.head == :toplevel
+    if expr.head === :toplevel
 		Expr(:block, expr.args...)
-    elseif expr.head == :module
+    elseif expr.head === :module
         Expr(:toplevel, expr)
-    elseif expr.head == :(=) && (expr.args[1] isa Expr && expr.args[1].head == :curly)
+    elseif expr.head === :(=) && (expr.args[1] isa Expr && expr.args[1].head == :curly)
         Expr(:const, expr)
+    elseif expr.head === :incomplete
+        Expr(:call, :(PlutoRunner.throw_syntax_error), expr.args...)
     else
         expr
     end
diff --git a/src/analysis/is_just_text.jl b/src/analysis/is_just_text.jl
index f4402a6b2a..38339f68af 100644
--- a/src/analysis/is_just_text.jl
+++ b/src/analysis/is_just_text.jl
@@ -1,12 +1,22 @@
-const md_and_friends = [Symbol("@md_str"), Symbol("@html_str"), :getindex]
+const md_and_friends = [
+	# Text
+	Symbol("@md_str"),
+	Symbol("@html_str"),
+	:getindex,
+]
 
 """Does the cell only contain md"..." and html"..."?
 
 This is used to run these cells first."""
 function is_just_text(topology::NotebookTopology, cell::Cell)::Bool
 	# https://github.com/fonsp/Pluto.jl/issues/209
-	isempty(topology.nodes[cell].definitions) && isempty(topology.nodes[cell].funcdefs_with_signatures) && 
-		topology.nodes[cell].references ⊆ md_and_friends &&
+        node = topology.nodes[cell]
+	((isempty(node.definitions) &&
+		isempty(node.funcdefs_with_signatures) &&
+		node.references ⊆ md_and_friends) ||
+	 (length(node.references) == 2 &&
+		:PlutoRunner in node.references &&
+		Symbol("PlutoRunner.throw_syntax_error") in node.references)) &&
 		no_loops(ExpressionExplorer.maybe_macroexpand(topology.codes[cell].parsedcode; recursive=true))
 end
 
@@ -24,4 +34,4 @@ function no_loops(ex::Expr)
 	end
 end
 
-no_loops(x) = true
\ No newline at end of file
+no_loops(x) = true
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 6916596b7a..bbd1800e00 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -273,7 +273,7 @@ function try_macroexpand(mod::Module, notebook_id::UUID, cell_id::UUID, expr; ca
     pop!(cell_expanded_exprs, cell_id, nothing)
 
     # Remove toplevel block, as that screws with the computer and everything
-    expr_not_toplevel = if expr.head == :toplevel || expr.head == :block
+    expr_not_toplevel = if Meta.isexpr(expr, (:toplevel, :block))
         Expr(:block, expr.args...)
     else
         @warn "try_macroexpand expression not :toplevel or :block" expr
@@ -1030,7 +1030,177 @@ format_output(::Nothing; context=default_iocontext) = ("", MIME"text/plain"())
 "Downstream packages can set this to false to obtain unprettified stack traces."
 const PRETTY_STACKTRACES = Ref(true)
 
+# @codemirror/lint has only three levels
+function convert_julia_syntax_level(level)
+    level == :error   ? "error" :
+    level == :warning ? "warning" : "info"
+end
+
+"""
+    map_byte_range_to_utf16_codepoints(s::String, start_byte::Int, end_byte::Int)::Tuple{Int,Int}
+
+Taken from `Base.transcode(::Type{UInt16}, src::Vector{UInt8})`
+but without line constraints. It also does not support invalid
+UTF-8 encoding which `String` should never be anyway.
+
+This maps the given raw byte range `(start_byte, end_byte)` range to UTF-16 codepoints indices.
+
+The resulting range can then be used by code-mirror on the frontend, quoting from the code-mirror docs:
+
+> Character positions are counted from zero, and count each line break and UTF-16 code unit as one unit.
+
+Examples:
+```julia
+                                           123
+                                             vv
+julia> map_byte_range_to_utf16_codepoints("abc", 2, 3)
+(2, 3)
+
+                                           1122
+                                           v   v
+julia> map_byte_range_to_utf16_codepoints("🍕🍕", 1, 8)
+(1, 4)
+
+                                           11233
+                                           v  v
+julia> map_byte_range_to_utf16_codepoints("🍕c🍕", 1, 5)
+(1, 3)
+```
+"""
+function map_byte_range_to_utf16_codepoints(s, start_byte, end_byte)
+    invalid_utf8() = error("invalid UTF-8 string")
+    codeunit(s) == UInt8 || invalid_utf8()
+
+    i, n = 1, ncodeunits(s)
+    u16 = 0
+
+    from, to = -1, -1
+    a = codeunit(s, 1)
+    while true
+        if i == start_byte
+            from = u16
+        end
+        if i == end_byte
+            to = u16
+            break
+        end
+        if i < n && -64 <= a % Int8 <= -12 # multi-byte character
+            i += 1
+            b = codeunit(s, i)
+            if -64 <= (b % Int8) || a == 0xf4 && 0x8f < b
+                # invalid UTF-8 (non-continuation of too-high code point)
+                invalid_utf8()
+            elseif a < 0xe0 # 2-byte UTF-8
+                if i == start_byte
+                    from = u16
+                end
+                if i == end_byte
+                    to = u16
+                    break
+                end
+            elseif i < n # 3/4-byte character
+                i += 1
+                c = codeunit(s, i)
+                if -64 <= (c % Int8) # invalid UTF-8 (non-continuation)
+                    invalid_utf8()
+                elseif a < 0xf0 # 3-byte UTF-8
+                    if i == start_byte
+                        from = u16
+                    end
+                    if i == end_byte
+                        to = u16
+                        break
+                    end
+                elseif i < n
+                    i += 1
+                    d = codeunit(s, i)
+                    if -64 <= (d % Int8) # invalid UTF-8 (non-continuation)
+                        invalid_utf8()
+                    elseif a == 0xf0 && b < 0x90 # overlong encoding
+                        invalid_utf8()
+                    else # 4-byte UTF-8 && 2 codeunits UTF-16
+                        u16 += 1
+                        if i == start_byte
+                            from = u16
+                        end
+                        if i == end_byte
+                            to = u16
+                            break
+                        end
+                    end
+                else # too short
+                    invalid_utf8()
+                end
+            else # too short
+                invalid_utf8()
+            end
+        else
+            # ASCII or invalid UTF-8 (continuation byte or too-high code point)
+        end
+        u16 += 1
+        if i >= n
+            break
+        end
+        i += 1
+        a = codeunit(s, i)
+    end
+
+    if from == -1
+        from = u16
+    end
+    if to == -1
+        to = u16
+    end
+
+    return (from, to)
+end
+
+function convert_diagnostic_to_dict(source, diag)
+    code = source.code
+
+    # JuliaSyntax uses `last_byte < first_byte` to signal an empty range.
+    # https://github.com/JuliaLang/JuliaSyntax.jl/blob/97e2825c68e770a3f56f0ec247deda1a8588070c/src/diagnostics.jl#L67-L75
+    # it references the byte range as such: `source[first_byte:last_byte]` whereas codemirror
+    # is non inclusive, therefore we move the `last_byte` to the next valid character in the string,
+    # an empty range then becomes `from == to`, also JuliaSyntax is one based whereas code-mirror is zero-based
+    # but this is handled in `map_byte_range_to_utf16_codepoints` with `u16 = 0` initially.
+    first_byte = min(diag.first_byte, lastindex(code) + 1)
+    last_byte = min(nextind(code, diag.last_byte), lastindex(code) + 1)
+
+    from, to = map_byte_range_to_utf16_codepoints(code, first_byte, last_byte)
+
+    Dict(:from => from,
+         :to => to,
+         :message => diag.message,
+         :source => "JuliaSyntax.jl",
+         :line => first(Base.JuliaSyntax.source_location(source, diag.first_byte)),
+         :severity => convert_julia_syntax_level(diag.level))
+end
+
+function convert_parse_error_to_dict(ex)
+   Dict(
+       :source => ex.source.code,
+       :diagnostics => [
+           convert_diagnostic_to_dict(ex.source, diag)
+           for diag in ex.diagnostics
+       ]
+   )
+end
+
+function throw_syntax_error(@nospecialize(syntax_err))
+    syntax_err isa String && (syntax_err = "syntax: $syntax_err")
+    syntax_err isa Exception || (syntax_err = ErrorException(syntax_err))
+    throw(syntax_err)
+end
+
+const has_julia_syntax = isdefined(Base, :JuliaSyntax) && fieldcount(Base.Meta.ParseError) == 2
+
 function format_output(val::CapturedException; context=default_iocontext)
+    if has_julia_syntax && val.ex isa Base.Meta.ParseError && val.ex.detail isa Base.JuliaSyntax.ParseError
+        dict = convert_parse_error_to_dict(val.ex.detail)
+        return dict, MIME"application/vnd.pluto.parseerror+object"()
+    end
+
     stacktrace = if PRETTY_STACKTRACES[]
         ## We hide the part of the stacktrace that belongs to Pluto's evalling of user code.
         stack = [s for (s, _) in val.processed_bt]
diff --git a/test/Dynamic.jl b/test/Dynamic.jl
index 669017f640..56496f0d2d 100644
--- a/test/Dynamic.jl
+++ b/test/Dynamic.jl
@@ -156,7 +156,7 @@ end
         let
             doc_output = Pluto.PlutoRunner.doc_fetcher("sor", Main)[1]
             @test occursin("Similar results:", doc_output)
-            @test occursin("<b>s</b><b>o</b><b>r</b>tperm", doc_output)
+            @test occursin("<b>s</b><b>o</b><b>r</b>t", doc_output)
         end
 
         @test occursin("\\div", Pluto.PlutoRunner.doc_fetcher("÷", Main)[1])
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index afe010c1ff..5ab13b83a9 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -1,4 +1,5 @@
 using Test
+import Pluto: PlutoRunner
 
 #=
 `@test_broken` means that the test doesn't pass right now, but we want it to pass. Feel free to try to fix it and open a PR!
@@ -795,3 +796,16 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test :Date ∈ rn.references
     end
 end
+
+@testset "UTF-8 to Codemirror UTF-16 byte mapping" begin
+    # range ends are non inclusives
+    tests = [
+        (" aaaa", (2, 4), (1, 3)), # cm is zero based
+        (" 🍕🍕", (2, 6), (1, 3)), # a 🍕 is two UTF16 codeunits
+        (" 🍕🍕", (6, 10), (3, 5)), # a 🍕 is two UTF16 codeunits
+    ]
+    for (s, (start_byte, end_byte), (from, to)) in tests
+        @show s
+        @test PlutoRunner.map_byte_range_to_utf16_codepoints(s, start_byte, end_byte) == (from, to)
+    end
+end
diff --git a/test/React.jl b/test/React.jl
index 191540c53a..0921a4ce0d 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -1752,4 +1752,28 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells)
         @test all(noerror, notebook.cells)
     end
+
+    @testset "ParseError messages" begin
+        notebook = Notebook(Cell.([
+            "begin",
+            "\n\nend",
+        ]))
+        update_run!(🍭, notebook, notebook.cells)
+        @test Pluto.is_just_text(notebook.topology, notebook.cells[1])
+        @test Pluto.is_just_text(notebook.topology, notebook.cells[2])
+        @static if VERSION >= v"1.10.0-DEV.1548" # ~JuliaSyntax PR Pluto.jl#2526 julia#46372
+            @test haskey(notebook.cells[1].output.body, :source)
+            @test haskey(notebook.cells[1].output.body, :diagnostics)
+
+            @test haskey(notebook.cells[2].output.body, :source)
+            @test haskey(notebook.cells[2].output.body, :diagnostics)
+        else
+            @test !occursinerror("(incomplete ", notebook.cells[1])
+            @test !occursinerror("(incomplete ", notebook.cells[2])
+
+            @show notebook.cells[1].output.body
+            @test startswith(notebook.cells[1].output.body[:msg], "syntax:")
+            @test startswith(notebook.cells[2].output.body[:msg], "syntax:")
+        end
+    end
 end
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index 773be1ec71..7cc83ee9b1 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -648,7 +648,25 @@ import Distributed
 
         WorkspaceManager.unmake_workspace((🍭, notebook))
     end
-    
+
+    @testset "PlutoRunner Syntax Error" begin
+        notebook = Notebook([
+            Cell("1 +"),
+            Cell("PlutoRunner.throw_syntax_error"),
+            Cell("PlutoRunner.throw_syntax_error(1)"),
+        ])
+
+        update_run!(🍭, notebook, notebook.cells)
+
+        @test notebook.cells[1].errored
+        @test noerror(notebook.cells[2])
+        @test notebook.cells[3].errored
+
+        @test Pluto.is_just_text(notebook.topology, notebook.cells[1])
+        @test !Pluto.is_just_text(notebook.topology, notebook.cells[2]) # Not a syntax error form
+        @test Pluto.is_just_text(notebook.topology, notebook.cells[3])
+    end
+
     @testset "Precompilation" begin
         compilation_dir = joinpath(DEPOT_PATH[1], "compiled", "v$(VERSION.major).$(VERSION.minor)")
         @assert isdir(compilation_dir)

From 83ec7c59661d672caa7e8be63049c9215bea14cf Mon Sep 17 00:00:00 2001
From: Alberto Mengali <disberd@gmail.com>
Date: Thu, 24 Aug 2023 20:02:48 +0200
Subject: [PATCH 673/821] switch any-point:coarse to pointer:coarse (#2631)

The current CSS keeps the hide cell buttons always on when Pluto is opened on laptops which also have a touchscreen.

Using pointer instead of any-pointer should only make the button always on only on devices that have the touchscreen as primary.
---
 frontend/editor.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 73964d87d5..8a08894962 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1520,7 +1520,7 @@ pluto-input > button > span {
     }
 }
 
-@media screen and (any-pointer: coarse) {
+@media screen and (pointer: coarse) {
     pluto-cell > button,
     pluto-cell > pluto-runarea {
         opacity: 0;

From 137420c7c8a7187a426503f2cf957c29086c9868 Mon Sep 17 00:00:00 2001
From: jbrea <jbrea@users.noreply.github.com>
Date: Sun, 27 Aug 2023 16:51:17 +0200
Subject: [PATCH 674/821] fix EmbeddableDisplay (#2632)

* fix EmbeddableDisplay

* pass cell_id to logs

* Revert "pass cell_id to logs"

This reverts commit 7829d4c0ff1777e7df3dc787d42d0130bf9ca487.

* Add test for `embed_display`

---------

Co-authored-by: Paul <paul@plutojl.org>
---
 src/runner/PlutoRunner.jl |  2 +-
 test/RichOutput.jl        | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index bbd1800e00..f1e67a5236 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -2382,7 +2382,7 @@ function Base.show(io::IO, m::MIME"text/html", e::EmbeddableDisplay)
 
         // see https://plutocon2021-demos.netlify.app/fonsp%20%E2%80%94%20javascript%20inside%20pluto to learn about the techniques used in this script
         
-        const body = $(publish_to_js(body, e.script_id));
+        const body = $(PublishedToJavascript(body));
         const mime = "$(string(mime))";
         
         const create_new = this == null || this._mime !== mime;
diff --git a/test/RichOutput.jl b/test/RichOutput.jl
index 1132472112..69e1eccff9 100644
--- a/test/RichOutput.jl
+++ b/test/RichOutput.jl
@@ -229,6 +229,21 @@ import Pluto: update_run!, WorkspaceManager, ClientSession, ServerSession, Noteb
         end
     end
 
+    @testset "embed_display" begin
+        🍭.options.evaluation.workspace_use_distributed = false
+        notebook = Notebook([
+            Cell("x = randn(10)"),
+            Cell(raw"md\"x = $(embed_display(x))\"")
+        ])
+        update_run!(🍭, notebook, notebook.cells)
+
+        @test notebook.cells[1] |> noerror
+        @test notebook.cells[2] |> noerror
+
+        @test notebook.cells[2].output.body isa String
+        @test occursin("getPublishedObject", notebook.cells[2].output.body)
+    end
+
     @testset "Table viewer" begin
         🍭.options.evaluation.workspace_use_distributed = true
         notebook = Notebook([

From fb1f1a5dc4e7ae35f6611c7f09203b87c57868ce Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Tue, 29 Aug 2023 23:28:46 +0200
Subject: [PATCH 675/821] Limit prefix length (#2636)

---
 src/runner/PlutoRunner.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index f1e67a5236..030de8cd48 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1422,7 +1422,7 @@ function array_prefix(@nospecialize(x::Vector{<:Any}))
 end
 
 function array_prefix(@nospecialize(x))
-    original = sprint(Base.showarg, x, false)
+    original = sprint(Base.showarg, x, false; context=:limit => true)
     string(lstrip(original, ':'), ": ")::String
 end
 

From 17d105b60282038f2194862109fab2afc5730a13 Mon Sep 17 00:00:00 2001
From: Vlad Flore <flore.vlad@gmail.com>
Date: Sun, 3 Sep 2023 17:29:24 +0200
Subject: [PATCH 676/821] change selector so that CSS applies correctly (#2637)

---
 frontend/editor.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 8a08894962..6cf6bf7617 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2665,7 +2665,7 @@ footer button {
     font-size: 0.75rem;
 }
 
-#info {
+footer #info {
     max-width: 9400px;
     margin: 0 auto;
     padding: 1rem;

From 5b96b85f1a2500dcefb0a739399f77edf5ae78d6 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 6 Sep 2023 22:36:00 +0200
Subject: [PATCH 677/821] Warn when including PasswordField content in an html
 export

---
 frontend/components/ExportBanner.js | 66 +++++++++++++++++++----------
 1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index 0c1bac5383..2188763d9b 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -26,8 +26,23 @@ const Square = ({ fill }) => html`
     </svg>
 `
 
-//@ts-ignore
-window.enable_secret_pluto_recording = true
+export const WarnForVisisblePasswords = () => {
+    if (
+        Array.from(document.querySelectorAll("bond")).some((bond_el) =>
+            Array.from(bond_el.querySelectorAll(`input[type="password"]`)).some((input) => {
+                // @ts-ignore
+                if (input?.value !== "") {
+                    input.scrollIntoView()
+                    return true
+                }
+            })
+        )
+    ) {
+        alert(
+            "Warning: this notebook includes a password input with something typed in it. The contents of this password field will be included in the exported file in an unsafe way. \n\nClear the password field and export again to avoid this problem."
+        )
+    }
+}
 
 export const ExportBanner = ({ notebook_id, onClose, notebookfile_url, notebookexport_url, start_recording }) => {
     // @ts-ignore
@@ -49,7 +64,16 @@ export const ExportBanner = ({ notebook_id, onClose, notebookfile_url, notebooke
                     <header><${Triangle} fill="#a270ba" /> Notebook file</header>
                     <section>Download a copy of the <b>.jl</b> script.</section>
                 </a>
-                <a href=${notebookexport_url} target="_blank" class="export_card" download="" onClick=${(e) => exportNotebook(e, 1)}>
+                <a
+                    href=${notebookexport_url}
+                    target="_blank"
+                    class="export_card"
+                    download=""
+                    onClick=${(e) => {
+                        WarnForVisisblePasswords()
+                        exportNotebook(e, 1)
+                    }}
+                >
                     <header><${Square} fill="#E86F51" /> Static HTML</header>
                     <section>An <b>.html</b> file for your web page, or to share online.</section>
                 </a>
@@ -57,26 +81,22 @@ export const ExportBanner = ({ notebook_id, onClose, notebookfile_url, notebooke
                     <header><${Square} fill="#619b3d" /> PDF</header>
                     <section>A static <b>.pdf</b> file for print or email.</section>
                 </a>
-                ${
-                    //@ts-ignore
-                    window.enable_secret_pluto_recording
-                        ? html`
-                              <div class="export_title">record</div>
-                              <a
-                                  href="#"
-                                  onClick=${(e) => {
-                                      start_recording()
-                                      onClose()
-                                      e.preventDefault()
-                                  }}
-                                  class="export_card"
-                              >
-                                  <header><${Circle} fill="#E86F51" /> Record <em>(preview)</em></header>
-                                  <section>Capture the entire notebook, and any changes you make.</section>
-                              </a>
-                          `
-                        : null
-                }
+                ${html`
+                    <div class="export_title">record</div>
+                    <a
+                        href="#"
+                        onClick=${(e) => {
+                            WarnForVisisblePasswords()
+                            start_recording()
+                            onClose()
+                            e.preventDefault()
+                        }}
+                        class="export_card"
+                    >
+                        <header><${Circle} fill="#E86F51" /> Record <em>(preview)</em></header>
+                        <section>Capture the entire notebook, and any changes you make.</section>
+                    </a>
+                `}
                 <div class="export_small_btns">
                     <button
                         title="Edit frontmatter"

From 394be9033e327e870bf0d56715938dc8d4b276e3 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 12 Sep 2023 12:45:24 +0200
Subject: [PATCH 678/821] fix test version check from #2626

The test should run in 1.9 versions, but not in 1.10 and later.
---
 test/packages/Basic.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index 7cc83ee9b1..e60d8f68a1 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -446,7 +446,7 @@ import Distributed
         WorkspaceManager.unmake_workspace((🍭, notebook))
     end
 
-    @static if VERSION ≤ v"1.9"
+    @static if VERSION < v"1.10.0-0" # see https://github.com/fonsp/Pluto.jl/pull/2626#issuecomment-1671244510
         @testset "File format -- Forwards compat" begin
             # Using Distributed, we will create a new Julia process in which we install Pluto 0.14.7 (before PlutoPkg). We run the new notebook file on the old Pluto.
             p = Distributed.addprocs(1) |> first

From 72a5847c3286e03497d158e32c920e94a6937a37 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 12 Sep 2023 13:07:38 +0200
Subject: [PATCH 679/821] fix juliasyntax test

missing from #2526
---
 test/packages/Basic.jl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index e60d8f68a1..bc1b204a0b 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -650,6 +650,8 @@ import Distributed
     end
 
     @testset "PlutoRunner Syntax Error" begin
+        🍭 = ServerSession()
+
         notebook = Notebook([
             Cell("1 +"),
             Cell("PlutoRunner.throw_syntax_error"),
@@ -665,6 +667,8 @@ import Distributed
         @test Pluto.is_just_text(notebook.topology, notebook.cells[1])
         @test !Pluto.is_just_text(notebook.topology, notebook.cells[2]) # Not a syntax error form
         @test Pluto.is_just_text(notebook.topology, notebook.cells[3])
+
+        WorkspaceManager.unmake_workspace((🍭, notebook))
     end
 
     @testset "Precompilation" begin

From e1bd21ca76c4883c61ca6eb4a8aa7bd335f005c8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 12 Sep 2023 22:27:43 +0200
Subject: [PATCH 680/821] Cleanup notebook config code and remove janky test

---
 src/webserver/WebServer.jl | 36 ++++++++++++---------------------
 test/Configuration.jl      | 41 +-------------------------------------
 2 files changed, 14 insertions(+), 63 deletions(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index fbdff63f5a..a016fcadad 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -23,8 +23,6 @@ function open_in_default_browser(url::AbstractString)::Bool
     end
 end
 
-isurl(s::String) = startswith(s, "http://") || startswith(s, "https://")
-
 function swallow_exception(f, exception_type::Type{T}) where {T}
     try
         f()
@@ -86,18 +84,6 @@ function run(port::Integer; kwargs...)
     "
 end
 
-# open notebook(s) on startup
-
-open_notebook!(session::ServerSession, notebook::Nothing) = Nothing
-
-open_notebook!(session::ServerSession, notebook::AbstractString) = SessionActions.open(session, notebook)
-
-function open_notebook!(session::ServerSession, notebook::AbstractVector{<:AbstractString})
-    for nb in notebook
-        SessionActions.open(session, nb)
-    end
-end
-
 
 const is_first_run = Ref(true)
 
@@ -136,8 +122,14 @@ function run(session::ServerSession)
     store_session_middleware = create_session_context_middleware(session)
     app = pluto_router |> auth_middleware |> store_session_middleware
 
-    notebook_at_startup = session.options.server.notebook
-    open_notebook!(session, notebook_at_startup)
+    let n = session.options.server.notebook
+        SessionActions.open.((session,), 
+            n === nothing ? [] : 
+            n isa AbstractString ? [n] : 
+            n;
+            run_async=true,
+        )
+    end
 
     host = session.options.server.host
     hostIP = parse(Sockets.IPAddr, host)
@@ -319,10 +311,6 @@ function run(session::ServerSession)
 end
 precompile(run, (ServerSession, HTTP.Handlers.Router{Symbol("##001")}))
 
-get_favorite_notebook(notebook::Nothing) = nothing
-get_favorite_notebook(notebook::String) = notebook
-get_favorite_notebook(notebook::AbstractVector) = first(notebook)
-
 function pretty_address(session::ServerSession, hostIP, port)
     root = if session.options.server.root_url !== nothing
         @assert endswith(session.options.server.root_url, "/")
@@ -352,10 +340,12 @@ function pretty_address(session::ServerSession, hostIP, port)
     if session.options.security.require_secret_for_access
         url_params["secret"] = session.secret
     end
-    fav_notebook = get_favorite_notebook(session.options.server.notebook)
+    fav_notebook = let n = session.options.server.notebook
+        n isa AbstractVector ? (isempty(n) ? nothing : first(n)) : n
+    end
     new_root = if fav_notebook !== nothing
-        key = isurl(fav_notebook) ? "url" : "path"
-        url_params[key] = string(fav_notebook)
+        # since this notebook already started running, this will get redicted to that session
+        url_params["path"] = string(fav_notebook)
         root * "open"
     else
         root
diff --git a/test/Configuration.jl b/test/Configuration.jl
index 0b6b131618..0507f688ea 100644
--- a/test/Configuration.jl
+++ b/test/Configuration.jl
@@ -126,42 +126,6 @@ end
     @async schedule(server_task, InterruptException(); error=true)
 end
 
-@testset "Open Notebooks at Startup" begin
-    port = 1338
-    host = "localhost"
-    local_url(suffix) = "http://$host:$port/$suffix"
-
-    urls = [
-    "https://raw.githubusercontent.com/fonsp/Pluto.jl/v0.12.16/sample/Basic.jl",
-    "https://gist.githubusercontent.com/fonsp/4e164a262a60fc4bdd638e124e629d64/raw/8ffe93c680e539056068456a62dea7bf6b8eb622/basic_pkg_notebook.jl",
-    ]
-    nbnames = download.(urls)
-    
-    server_running() = HTTP.get(local_url("favicon.ico")).status == 200 && HTTP.get(local_url("edit")).status == 200
-
-    # without notebook at startup
-    server_task = @async Pluto.run(port=port, launch_browser=false, workspace_use_distributed=false, require_secret_for_access=false, require_secret_for_open_links=false)
-    @test poll(5) do
-        server_running()
-    end
-    @async schedule(server_task, InterruptException(); error=true)
-
-    # with a single notebook at startup
-    server_task = @async Pluto.run(notebook=first(nbnames), port=port, launch_browser=false, workspace_use_distributed=false, require_secret_for_access=false, require_secret_for_open_links=false)
-    @test poll(5) do
-        server_running()
-    end
-    @async schedule(server_task, InterruptException(); error=true)
-
-    # with multiple notebooks at startup
-    server_task = @async Pluto.run(notebook=nbnames, port=port, launch_browser=false, workspace_use_distributed=false, require_secret_for_access=false, require_secret_for_open_links=false)
-    @test poll(5) do
-        server_running()
-    end
-    @async schedule(server_task, InterruptException(); error=true)
-
-end
-
 @testset "disable mimetype via workspace_custom_startup_expr" begin
     🍭 = ServerSession()
     🍭.options.evaluation.workspace_use_distributed = true
@@ -183,7 +147,4 @@ end
     Pluto.WorkspaceManager.unmake_workspace((🍭, nb))
 end
 
-# TODO are the processes closed properly?
-# TODO we reuse the same port without awaiting the shutdown of the previous server
-
-end # testset
+end

From 02793cce359ae80f775c669cec095022002d6c77 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 12 Sep 2023 22:27:57 +0200
Subject: [PATCH 681/821] update fallback stdlibs list

---
 src/packages/PkgCompat.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/packages/PkgCompat.jl b/src/packages/PkgCompat.jl
index 250b275359..f0e857fc00 100644
--- a/src/packages/PkgCompat.jl
+++ b/src/packages/PkgCompat.jl
@@ -258,7 +258,7 @@ _stdlibs() = try
 catch e
 	@warn "Pkg compat: failed to load standard libraries." exception=(e,catch_backtrace())
 
-	String["CRC32c", "Future", "Sockets", "MbedTLS_jll", "Random", "ArgTools", "libLLVM_jll", "GMP_jll", "Pkg", "Serialization", "LibSSH2_jll", "SHA", "OpenBLAS_jll", "REPL", "LibUV_jll", "nghttp2_jll", "Unicode", "Profile", "SparseArrays", "LazyArtifacts", "CompilerSupportLibraries_jll", "Base64", "Artifacts", "PCRE2_jll", "Printf", "p7zip_jll", "UUIDs", "Markdown", "TOML", "OpenLibm_jll", "Test", "MPFR_jll", "Mmap", "SuiteSparse", "LibGit2", "LinearAlgebra", "Logging", "NetworkOptions", "LibGit2_jll", "LibOSXUnwind_jll", "Dates", "LibUnwind_jll", "Libdl", "LibCURL_jll", "dSFMT_jll", "Distributed", "InteractiveUtils", "Downloads", "SharedArrays", "SuiteSparse_jll", "LibCURL", "Statistics", "Zlib_jll", "FileWatching", "DelimitedFiles", "Tar", "MozillaCACerts_jll"]
+	String["ArgTools", "Artifacts", "Base64", "CRC32c", "CompilerSupportLibraries_jll", "Dates", "DelimitedFiles", "Distributed", "Downloads", "FileWatching", "Future", "GMP_jll", "InteractiveUtils", "LLD_jll", "LLVMLibUnwind_jll", "LazyArtifacts", "LibCURL", "LibCURL_jll", "LibGit2", "LibGit2_jll", "LibOSXUnwind_jll", "LibSSH2_jll", "LibUV_jll", "LibUnwind_jll", "Libdl", "LinearAlgebra", "Logging", "MPFR_jll", "Markdown", "MbedTLS_jll", "Mmap", "MozillaCACerts_jll", "NetworkOptions", "OpenBLAS_jll", "OpenLibm_jll", "PCRE2_jll", "Pkg", "Printf", "Profile", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "SuiteSparse", "SuiteSparse_jll", "TOML", "Tar", "Test", "UUIDs", "Unicode", "Zlib_jll", "dSFMT_jll", "libLLVM_jll", "libblastrampoline_jll", "nghttp2_jll", "p7zip_jll"]
 end
 
 # ⚠️ Internal API with fallback

From b3205cbbd0f658922b3868de17486ff752446d9e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 13 Sep 2023 12:31:47 +0200
Subject: [PATCH 682/821] 40 -> 50 minute timeout for backend tests

---
 .github/workflows/Test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index ecf12bbf1f..1e6d28c4f1 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -27,7 +27,7 @@ on:
 jobs:
     test:
         runs-on: ${{ matrix.os }}
-        timeout-minutes: 40
+        timeout-minutes: 50
 
         strategy:
             # Without setting this, a failing test cancels all others

From b8d8af751c748d3f23db3722ee294851a94192af Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 13 Sep 2023 16:27:47 +0200
Subject: [PATCH 683/821] Test Julia 1.10 beta instead of nightly, drop 1.7
 tests (#2644)

---
 .github/workflows/Test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 1e6d28c4f1..27443f0c5a 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -34,7 +34,7 @@ jobs:
             fail-fast: false
             matrix:
                 # We test quite a lot of versions because we do some OS and version specific things unfortunately
-                julia-version: ["1.6", "1.7", "1.8", "1.9", "nightly"]
+                julia-version: ["1.6", "1.8", "1.9", "~1.10.0-0"]
                 os: [ubuntu-latest, macOS-latest, windows-latest]
 
         steps:

From bd6703e9f6cc43afd466a88c4d5862fb194c563a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 13 Sep 2023 16:41:09 +0200
Subject: [PATCH 684/821] Non-blocking API Pluto.run! that returns a reference
 to the running server (#2643)

---
 src/webserver/WebServer.jl | 47 ++++++++++++++++++++++++++------------
 test/Configuration.jl      |  5 ++--
 test/webserver.jl          | 39 ++++++++++++++-----------------
 3 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index a016fcadad..911a325704 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -103,12 +103,43 @@ function port_serversocket(hostIP::Sockets.IPAddr, favourite_port, port_hint)
     return port, serversocket
 end
 
+struct RunningPlutoServer
+    http_server
+    initial_registry_update_task::Task
+end
+
+function Base.close(ssc::RunningPlutoServer)
+    close(ssc.http_server)
+    wait(ssc.http_server)
+    wait(ssc.initial_registry_update_task)
+end
+
+function Base.wait(ssc::RunningPlutoServer)
+    try
+        # create blocking call and switch the scheduler back to the server task, so that interrupts land there
+        while isopen(ssc.http_server)
+            sleep(.1)
+        end
+    catch e
+        println()
+        println()
+        Base.close(ssc)
+        (e isa InterruptException) || rethrow(e)
+    end
+    
+    nothing
+end
+
 """
     run(session::ServerSession)
 
 Specifiy the [`Pluto.ServerSession`](@ref) to run the web server on, which includes the configuration. Passing a session as argument allows you to start the web server with some notebooks already running. See [`SessionActions`](@ref) to learn more about manipulating a `ServerSession`.
 """
 function run(session::ServerSession)
+    Base.wait(run!(session))
+end
+
+function run!(session::ServerSession)
     if is_first_run[]
         is_first_run[] = false
         @info "Loading..."
@@ -293,21 +324,7 @@ function run(session::ServerSession)
         will_update && println("    Updating registry done ✓")
     end
 
-    try
-        # create blocking call and switch the scheduler back to the server task, so that interrupts land there
-        while isopen(server)
-            sleep(.1)
-        end
-    catch e
-        println()
-        println()
-        close(server)
-        wait(server)
-        wait(initial_registry_update_task)
-        (e isa InterruptException) || rethrow(e)
-    end
-    
-    nothing
+    return RunningPlutoServer(server, initial_registry_update_task)
 end
 precompile(run, (ServerSession, HTTP.Handlers.Router{Symbol("##001")}))
 
diff --git a/test/Configuration.jl b/test/Configuration.jl
index 0507f688ea..4d2d6c2f54 100644
--- a/test/Configuration.jl
+++ b/test/Configuration.jl
@@ -64,8 +64,7 @@ end
     host = 🍭.options.server.host
     secret = 🍭.secret
     println("Launching test server...")
-    server_task = @async Pluto.run(🍭)
-    sleep(2)
+    server = Pluto.run!(🍭)
 
     local_url(suffix) = "http://$host:$port/$suffix"
     withsecret(url) = occursin('?', url) ? "$url&secret=$secret" : "$url?secret=$secret"
@@ -123,7 +122,7 @@ end
         @test requeststatus(url, method) ∈ 200:399 # 3xx are redirects
     end
 
-    @async schedule(server_task, InterruptException(); error=true)
+    close(server)
 end
 
 @testset "disable mimetype via workspace_custom_startup_expr" begin
diff --git a/test/webserver.jl b/test/webserver.jl
index 0d94e1887c..009ff34631 100644
--- a/test/webserver.jl
+++ b/test/webserver.jl
@@ -32,25 +32,21 @@ using Pluto.WorkspaceManager: WorkspaceManager, poll
         base_url,
     )
     🍭 = Pluto.ServerSession(; options)
-    server_task = @async Pluto.run(🍭)
+    server = Pluto.run!(🍭)
 
-    # FYI, you should normally use a PlutoEvent for things we do in this test instead of polling! Don't use this as an example.
-    @test poll(10) do
-        server_running()
-    end
+    @test server_running()
 
-    sleep(20)
-    @test HTTP.get("http://$host:$port/edit"; status_exception=false).status == 404
+    sleep(3)
+    @test poll(20) do
+        # should not exist because of the base url setting
+        HTTP.get("http://$host:$port/edit"; status_exception=false).status == 404
+    end
 
     for notebook in values(🍭.notebooks)
         SessionActions.shutdown(🍭, notebook; keep_in_session=false)
     end
 
-    schedule(server_task, InterruptException(); error=true)
-
-    # wait for the server task to finish
-    # normally this `wait` would rethrow the above InterruptException, but Pluto.run should catch for InterruptExceptions and not bubble them up.
-    wait(server_task)
+    close(server)
 end
 
 @testset "Exports" begin
@@ -69,14 +65,16 @@ end
 
 
     # without notebook at startup
-    options = Pluto.Configuration.from_flat_kwargs(; port, launch_browser=false, workspace_use_distributed=true, require_secret_for_access=false, require_secret_for_open_links=false)
+    options = Pluto.Configuration.from_flat_kwargs(; 
+        port, launch_browser=false, 
+        workspace_use_distributed=true, 
+        require_secret_for_access=false, 
+        require_secret_for_open_links=false
+    )
     🍭 = Pluto.ServerSession(; options)
-    server_task = @async Pluto.run(🍭)
+    server = Pluto.run!(🍭)
     
-    # FYI, you should normally use a PlutoEvent for things we do in this test instead of polling! Don't use this as an example.
-    @test poll(10) do
-        server_running()
-    end
+    @test server_running()
     
     @test isempty(🍭.notebooks)
     
@@ -112,10 +110,7 @@ end
         SessionActions.shutdown(🍭, notebook; keep_in_session=false)
     end
     
-    schedule(server_task, InterruptException(); error=true)
-    # wait for the server task to finish
-    # normally this `wait` would rethrow the above InterruptException, but Pluto.run should catch for InterruptExceptions and not bubble them up.
-    wait(server_task)
+    close(server)
 end
 
 end # testset

From 93cbf26efad9c773f7190e3bb1580f7195df222f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 13 Sep 2023 21:40:54 +0200
Subject: [PATCH 685/821] FrontendTest.yml: show logs from Pluto server (#2645)

---
 .github/workflows/FrontendTest.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/FrontendTest.yml b/.github/workflows/FrontendTest.yml
index a9b5d55961..07e6cf55da 100644
--- a/.github/workflows/FrontendTest.yml
+++ b/.github/workflows/FrontendTest.yml
@@ -63,17 +63,19 @@ jobs:
             - name: Run tests
               working-directory: ./test/frontend
               run: |
-                  julia -e "import Pkg; Pkg.add(path=\"$GITHUB_WORKSPACE\"); Pkg.instantiate(); import Pluto; Pluto.run(port=$PLUTO_PORT, require_secret_for_access=false)" & # Run Pluto.jl server in the background
+                julia --project=$GITHUB_WORKSPACE -e 'import Pluto
+                  # Run Pluto.jl server in the background
+                  options = Pluto.Configuration.from_flat_kwargs(; 
+                    port=parse(Int, ENV["PLUTO_PORT"]), 
+                    require_secret_for_access=false,
+                  )
+                  🍭 = Pluto.ServerSession(; options)
+                  server = Pluto.run!(🍭)
 
-                  # Wait for Pluto to initialize
-                  TIMES_TRIED=0
-                  until [ $TIMES_TRIED -eq 60 ] || $(curl --output /dev/null --silent --fail "http://localhost:$PLUTO_PORT/"); do
-                      printf '.'
-                      TIMES_TRIED=$((TIMES_TRIED+1))
-                      sleep 1
-                  done
+                  run(`npm run test`)
+                  
+                  close(server)'
 
-                  npm run test
               env:
                   PLUTO_PORT: 1235
                   PLUTO_TEST_OFFLINE: ${{ github.ref_name == 'release' }}

From ba73086b36ac2b7c167086eb101dc8a6a04d29b2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 13 Sep 2023 22:05:57 +0200
Subject: [PATCH 686/821] CSS: make export small buttons floating

---
 frontend/editor.css | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 6cf6bf7617..7d92b004a4 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -502,7 +502,7 @@ aside#export div#container {
     flex-direction: row;
     display: flex;
     max-width: 1000px;
-    padding-right: 20px;
+    padding-right: 10em;
     margin: 0 auto;
 }
 header aside#export div#container {
@@ -553,10 +553,14 @@ a.export_card section {
     padding: 3px;
 }
 aside#export .export_small_btns {
-    margin-left: auto;
-    height: 60px;
     display: flex;
     flex-direction: row;
+    padding: 0.9em;
+    border-radius: 0.9em;
+    position: absolute;
+    right: 0.8em;
+    top: 0em;
+    background: var(--export-bg-color);
 }
 body.static_preview button.toggle_export {
     display: none;

From a86709b0108261181bb915bd40beb292ca853c0d Mon Sep 17 00:00:00 2001
From: Lilith Orion Hafner <lilithhafner@gmail.com>
Date: Fri, 15 Sep 2023 14:12:31 -0500
Subject: [PATCH 687/821] Fix typo in docstring (#2648)

---
 src/runner/PlutoRunner.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 030de8cd48..bb496c4d7e 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -671,7 +671,7 @@ Notebook code does run in `Main` - it runs in workspace modules. Every time that
 
 The trick boils down to two things:
 1. When we create a new workspace module, we move over some of the global from the old workspace. (But not the ones that we want to 'delete'!)
-2. If a function used to be defined, but now we want to delete it, then we go through the method table of that function and snoop out all methods that we defined by us, and not by another package. This is how we reverse extending external functions. For example, if you run a cell with `Base.sqrt(s::String) = "the square root of" * s`, and then delete that cell, then you can still call `sqrt(1)` but `sqrt("one")` will err. Cool right!
+2. If a function used to be defined, but now we want to delete it, then we go through the method table of that function and snoop out all methods that were defined by us, and not by another package. This is how we reverse extending external functions. For example, if you run a cell with `Base.sqrt(s::String) = "the square root of" * s`, and then delete that cell, then you can still call `sqrt(1)` but `sqrt("one")` will err. Cool right!
 """
 function move_vars(
     old_workspace_name::Symbol,

From ea894795b7c84b3fe159617475e0ad5a53a5ecde Mon Sep 17 00:00:00 2001
From: Alberto Mengali <disberd@gmail.com>
Date: Sat, 16 Sep 2023 22:50:02 +0200
Subject: [PATCH 688/821] add keyboard shortcuts (LeftArrow and RightArrow) to
 move slides in presentation mode (#2611)

---
 frontend/components/SlideControls.js | 51 +++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/frontend/components/SlideControls.js b/frontend/components/SlideControls.js
index 60a6380eb0..0b096d6996 100644
--- a/frontend/components/SlideControls.js
+++ b/frontend/components/SlideControls.js
@@ -1,6 +1,35 @@
-import { html } from "../imports/Preact.js"
+import { html, useRef, useState, useLayoutEffect, useEffect } from "../imports/Preact.js"
+import { open_pluto_popup } from "./Popup.js"
 
 export const SlideControls = () => {
+    const button_prev_ref = useRef(/** @type {HTMLButtonElement?} */ (null))
+    const button_next_ref = useRef(/** @type {HTMLButtonElement?} */ (null))
+
+    const [presenting, set_presenting] = useState(false)
+
+    const move_slides_with_keyboard = (/** @type {KeyboardEvent} */ e) => {
+        const activeElement = document.activeElement
+        if (
+            activeElement != null &&
+            activeElement !== document.body &&
+            activeElement !== button_prev_ref.current &&
+            activeElement !== button_next_ref.current
+        ) {
+            // We do not move slides with arrow if we have an active element
+            return
+        }
+        if (e.key === "ArrowLeft" || e.key === "PageUp") {
+            button_prev_ref.current?.click()
+        } else if (e.key === "ArrowRight" || e.key === " " || e.key === "PageDown") {
+            button_next_ref.current?.click()
+        } else if (e.key === "Escape") {
+            set_presenting(false)
+        } else {
+            return
+        }
+        e.preventDefault()
+    }
+
     const calculate_slide_positions = (/** @type {Event} */ e) => {
         const notebook_node = /** @type {HTMLElement?} */ (e.target)?.closest("pluto-editor")?.querySelector("pluto-notebook")
         if (!notebook_node) return []
@@ -40,15 +69,29 @@ export const SlideControls = () => {
         if (pos) window.scrollTo(window.pageXOffset, pos)
     }
 
+    const presenting_ref = useRef(false)
+    presenting_ref.current = presenting
     // @ts-ignore
     window.present = () => {
-        document.body.classList.toggle("presentation")
+        set_presenting(!presenting_ref.current)
     }
 
+    useLayoutEffect(() => {
+        document.body.classList.toggle("presentation", presenting)
+
+        if (!presenting) return // We do not add listeners if not presenting
+
+        window.addEventListener("keydown", move_slides_with_keyboard)
+
+        return () => {
+            window.removeEventListener("keydown", move_slides_with_keyboard)
+        }
+    }, [presenting])
+
     return html`
         <nav id="slide_controls">
-            <button class="changeslide prev" title="Previous slide" onClick=${go_previous_slide}><span></span></button>
-            <button class="changeslide next" title="Next slide" onClick=${go_next_slide}><span></span></button>
+            <button ref=${button_prev_ref} class="changeslide prev" title="Previous slide" onClick=${go_previous_slide}><span></span></button>
+            <button ref=${button_next_ref} class="changeslide next" title="Next slide" onClick=${go_next_slide}><span></span></button>
         </nav>
     `
 }

From 89037c80cc0a92f9c14e1bbbfe8974383cd949f6 Mon Sep 17 00:00:00 2001
From: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
Date: Mon, 18 Sep 2023 12:16:59 +0200
Subject: [PATCH 689/821] Display banner from Pluto.__init__, not during
 precompile (#2628)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 Project.toml |  2 ++
 src/Pluto.jl | 36 ++++++++++++++++++++++++++----------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/Project.toml b/Project.toml
index 7c7f655297..ffb77d4640 100644
--- a/Project.toml
+++ b/Project.toml
@@ -25,6 +25,7 @@ PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 RegistryInstances = "2792f1a3-b283-48e8-9a74-f99dce5104f3"
 RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
+Scratch = "6c6a2e73-6563-6170-7368-637461726353"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
@@ -43,6 +44,7 @@ PrecompileSignatures = "3"
 PrecompileTools = "1"
 RegistryInstances = "0.1"
 RelocatableFolders = "0.1, 0.2, 0.3, 1"
+Scratch = "1.1"
 Tables = "1"
 URIs = "1.3"
 julia = "^1.6"
diff --git a/src/Pluto.jl b/src/Pluto.jl
index 2cb0eee2ad..8898d058f2 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -33,6 +33,7 @@ function project_relative_path(root, xs...)
 end
 
 import Pkg
+import Scratch
 
 include_dependency("../Project.toml")
 const PLUTO_VERSION = VersionNumber(Pkg.TOML.parsefile(joinpath(ROOT_DIR, "Project.toml"))["version"])
@@ -99,16 +100,31 @@ export activate_notebook_environment
 
 include("./precompile.jl")
 
-if get(ENV, "JULIA_PLUTO_SHOW_BANNER", "1") != "0" && get(ENV, "CI", "🍄") != "true"
-@info """\n
-    Welcome to Pluto $(PLUTO_VERSION_STR) 🎈
-    Start a notebook server using:
-
-  julia> Pluto.run()
-
-    Have a look at the FAQ:
-    https://github.com/fonsp/Pluto.jl/wiki
-\n"""
+function __init__()
+    # Print a welcome banner
+    if (get(ENV, "JULIA_PLUTO_SHOW_BANNER", "1") != "0" &&
+        get(ENV, "CI", "🍄") != "true" && isinteractive())
+        # Print the banner only once per version, if there isn't
+        # yet a file for this version in banner_shown scratch space.
+        # (Using the Pluto version as the filename enables later
+        # version-specific "what's new" messages.)
+        fn = joinpath(Scratch.@get_scratch!("banner_shown"), PLUTO_VERSION_STR)
+        if !isfile(fn)
+            @info """
+
+              Welcome to Pluto $(PLUTO_VERSION_STR) 🎈
+              Start a notebook server using:
+
+            julia> Pluto.run()
+
+              Have a look at the FAQ:
+              https://github.com/fonsp/Pluto.jl/wiki
+
+            """
+            # create empty file to indicate that we've shown the banner
+            write(fn, "");
+        end
+    end
 end
 
 end

From 06589c782994d8233e29c01742ac69c361c0d0aa Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 18 Sep 2023 14:08:30 +0200
Subject: [PATCH 690/821] minor TS type fixes

---
 frontend/components/Editor.js        | 8 ++++----
 frontend/components/SelectionArea.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 50f4326a71..99bcc2369f 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1185,13 +1185,13 @@ patch: ${JSON.stringify(
             // if (e.defaultPrevented) {
             //     return
             // }
-            if (e.key.toLowerCase() === "q" && has_ctrl_or_cmd_pressed(e)) {
+            if (e.key?.toLowerCase() === "q" && has_ctrl_or_cmd_pressed(e)) {
                 // This one can't be done as cmd+q on mac, because that closes chrome - Dral
                 if (Object.values(this.state.notebook.cell_results).some((c) => c.running || c.queued)) {
                     this.actions.interrupt_remote()
                 }
                 e.preventDefault()
-            } else if (e.key.toLowerCase() === "s" && has_ctrl_or_cmd_pressed(e)) {
+            } else if (e.key?.toLowerCase() === "s" && has_ctrl_or_cmd_pressed(e)) {
                 const some_cells_ran = this.actions.set_and_run_all_changed_remote_cells()
                 if (!some_cells_ran) {
                     // all cells were in sync allready
@@ -1239,8 +1239,8 @@ patch: ${JSON.stringify(
             }
 
             if (this.state.disable_ui && this.state.backend_launch_phase === BackendLaunchPhase.wait_for_user) {
-                // const code = e.key.charCodeAt(0)
-                if (e.key === "Enter" || e.key.length === 1) {
+                // const code = e.key?.charCodeAt(0)
+                if (e.key === "Enter" || e.key?.length === 1) {
                     if (!document.body.classList.contains("wiggle_binder")) {
                         document.body.classList.add("wiggle_binder")
                         setTimeout(() => {
diff --git a/frontend/components/SelectionArea.js b/frontend/components/SelectionArea.js
index 7f145bb7dd..eb705ad324 100644
--- a/frontend/components/SelectionArea.js
+++ b/frontend/components/SelectionArea.js
@@ -151,7 +151,7 @@ export const SelectionArea = ({ on_selection, set_scroller, cell_order }) => {
 
         // Ctrl+A to select all cells
         const onkeydown = (e) => {
-            if (e.key.toLowerCase() === "a" && has_ctrl_or_cmd_pressed(e)) {
+            if (e.key?.toLowerCase() === "a" && has_ctrl_or_cmd_pressed(e)) {
                 // if you are not writing text somewhere else
                 if (document.activeElement === document.body && (window.getSelection()?.isCollapsed ?? true)) {
                     on_selection(cell_order)

From 690b4012dfaac389df17d276ea4b4593c86fd90b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 18 Sep 2023 14:20:37 +0200
Subject: [PATCH 691/821] Frontmatter GUI: multiple authors (#2650)

---
 frontend/components/FrontmatterInput.js | 125 ++++++++++++++++++------
 frontend/editor.css                     |   4 +
 2 files changed, 101 insertions(+), 28 deletions(-)

diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index 3ca04e3d24..a60f4b5b6a 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -1,10 +1,12 @@
 import { html, Component, useRef, useLayoutEffect, useState, useEffect } from "../imports/Preact.js"
 import { has_ctrl_or_cmd_pressed } from "../common/KeyboardShortcuts.js"
+import _ from "../imports/lodash.js"
 
 import "https://cdn.jsdelivr.net/gh/fonsp/rebel-tag-input@1.0.6/lib/rebel-tag-input.mjs"
 
 //@ts-ignore
 import dialogPolyfill from "https://cdn.jsdelivr.net/npm/dialog-polyfill@0.5.6/dist/dialog-polyfill.esm.min.js"
+import immer from "../imports/immer.js"
 
 /**
  * @param {{
@@ -23,9 +25,12 @@ export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter })
     //     console.log("New frontmatter:", frontmatter)
     // }, [frontmatter])
 
-    const fm_setter = (key) => (value) => {
-        set_frontmatter((fm) => ({ ...fm, [key]: value }))
-    }
+    const fm_setter = (key) => (value) =>
+        set_frontmatter(
+            immer((fm) => {
+                _.set(fm, key, value)
+            })
+        )
 
     const dialog_ref = useRef(/** @type {HTMLDialogElement?} */ (null))
     useLayoutEffect(() => {
@@ -42,10 +47,26 @@ export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter })
         close()
     }
     const submit = () => {
-        set_remote_frontmatter(frontmatter).then(() => alert("Frontmatter synchronized ✔\n\nThese parameters will be used in future exports."))
+        set_remote_frontmatter(clean_data(frontmatter) ?? {}).then(() =>
+            alert("Frontmatter synchronized ✔\n\nThese parameters will be used in future exports.")
+        )
         close()
     }
 
+    const clean_data = (obj) => {
+        let a = _.isPlainObject(obj)
+            ? Object.fromEntries(
+                  Object.entries(obj)
+                      .map(([key, val]) => [key, clean_data(val)])
+                      .filter(([key, val]) => val != null)
+              )
+            : _.isArray(obj)
+            ? obj.map(clean_data).filter((x) => x != null)
+            : obj
+
+        return _.isEmpty(a) ? null : a
+    }
+
     useLayoutEffect(() => {
         window.addEventListener("open pluto frontmatter", open)
         return () => {
@@ -68,43 +89,91 @@ export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter })
         description: null,
         date: null,
         tags: [],
+        author: [{}],
         ...frontmatter,
     }
 
-    return html`<dialog ref=${dialog_ref} class="pluto-frontmatter">
-        <h1>Frontmatter</h1>
-        <p>
-            If you are publishing this notebook on the web, you can set the parameters below to provide HTML metadata. This is useful for search engines and
-            social media.
-        </p>
-        <div class="fm-table">
-            ${Object.entries(frontmatter_with_defaults).map(([key, value]) => {
-                let id = `fm-${key}`
-                return html`
-                    <label for=${id}>${key}</label>
-                    <${Input} type=${field_type(key)} id=${id} value=${value} on_value=${fm_setter(key)} />
-                    <button
-                        class="deletefield"
-                        title="Delete field"
-                        onClick=${() => {
-                            set_frontmatter((fm) => Object.fromEntries(Object.entries(fm).filter(([k]) => k !== key)))
-                        }}
-                    >
-                        ✕
-                    </button>
-                `
-            })}
+    const show_entry = ([key, value]) => !((_.isArray(value) && field_type(key) !== "tags") || _.isPlainObject(value))
+
+    const entries_input = (data, base_path) => {
+        return html`
+            ${Object.entries(data)
+                .filter(show_entry)
+                .map(([key, value]) => {
+                    let path = `${base_path}${key}`
+                    let id = `fm-${path}`
+                    return html`
+                        <label for=${id}>${key}</label>
+                        <${Input} type=${field_type(key)} id=${id} value=${value} on_value=${fm_setter(path)} />
+                        <button
+                            class="deletefield"
+                            title="Delete field"
+                            onClick=${() => {
+                                //  TODO
+                                set_frontmatter(
+                                    immer((fm) => {
+                                        _.unset(fm, path)
+                                    })
+                                )
+                            }}
+                        >
+                            ✕
+                        </button>
+                    `
+                })}
             <button
                 class="addentry"
                 onClick=${() => {
                     const fieldname = prompt("Field name:")
                     if (fieldname) {
-                        set_frontmatter((fm) => ({ ...fm, [fieldname]: null }))
+                        set_frontmatter(
+                            immer((fm) => {
+                                _.set(fm, `${base_path}${fieldname}`, null)
+                            })
+                        )
                     }
                 }}
             >
                 Add entry +
             </button>
+        `
+    }
+
+    return html`<dialog ref=${dialog_ref} class="pluto-frontmatter">
+        <h1>Frontmatter</h1>
+        <p>
+            If you are publishing this notebook on the web, you can set the parameters below to provide HTML metadata. This is useful for search engines and
+            social media.
+        </p>
+        <div class="fm-table">
+            ${entries_input(frontmatter_with_defaults, ``)}
+            ${!_.isArray(frontmatter_with_defaults.author)
+                ? null
+                : frontmatter_with_defaults.author.map((author, i) => {
+                      let author_with_defaults = {
+                          name: null,
+                          url: null,
+                          ...author,
+                      }
+
+                      return html`
+                          <fieldset class="fm-table">
+                              <legend>Author ${i + 1}</legend>
+
+                              ${entries_input(author_with_defaults, `author[${i}].`)}
+                          </fieldset>
+                      `
+                  })}
+            ${!_.isArray(frontmatter_with_defaults.author)
+                ? null
+                : html`<button
+                      class="addentry"
+                      onClick=${() => {
+                          set_frontmatter((fm) => ({ ...fm, author: [...(fm?.author ?? []), {}] }))
+                      }}
+                  >
+                      Add author +
+                  </button>`}
         </div>
 
         <div class="final"><button onClick=${cancel}>Cancel</button><button onClick=${submit}>Save</button></div>
diff --git a/frontend/editor.css b/frontend/editor.css
index 7d92b004a4..2f6b6b2e4a 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -3445,6 +3445,10 @@ pluto-cell.hooked_up pluto-output {
     margin-top: 0.5em;
 }
 
+.pluto-frontmatter fieldset {
+    grid-column: 1/4;
+}
+
 .pluto-frontmatter .final {
     display: flex;
     margin-top: 2rem;

From 03bbc9aa6785bb8ce7d35d64852ebf3efb775ba3 Mon Sep 17 00:00:00 2001
From: Connor Burns <ctrekker4@gmail.com>
Date: Mon, 18 Sep 2023 06:21:56 -0600
Subject: [PATCH 692/821] Slider server stuck loading on staterequest failure
 (#2649)

---
 frontend/common/SliderServerClient.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/frontend/common/SliderServerClient.js b/frontend/common/SliderServerClient.js
index e2a8933619..f93f46efd3 100644
--- a/frontend/common/SliderServerClient.js
+++ b/frontend/common/SliderServerClient.js
@@ -82,11 +82,15 @@ export const slider_server_actions = ({ setStatePromise, launch_params, actions,
         const dep_graph = get_current_state().cell_dependencies
         const starts = get_starts(dep_graph, bonds_to_set.current)
         const running_cells = [...recursive_dependencies(dep_graph, starts)]
-        await setStatePromise(
-            immer((state) => {
-                running_cells.forEach((cell_id) => (state.notebook.cell_results[cell_id][starts.has(cell_id) ? "running" : "queued"] = true))
-            })
-        )
+
+        const update_cells_running = async (running) =>
+            await setStatePromise(
+                immer((state) => {
+                    running_cells.forEach((cell_id) => (state.notebook.cell_results[cell_id][starts.has(cell_id) ? "running" : "queued"] = running))
+                })
+            )
+
+        await update_cells_running(true)
 
         if (bonds_to_set.current.size > 0) {
             const to_send = new Set(bonds_to_set.current)
@@ -129,14 +133,13 @@ export const slider_server_actions = ({ setStatePromise, launch_params, actions,
                         ids_of_cells_that_ran.forEach((id) => {
                             state.cell_results[id] = original.cell_results[id]
                         })
-                        running_cells.forEach((id) => {
-                            state.cell_results[id].queued = false
-                            state.cell_results[id].running = false
-                        })
                     })(get_current_state())
                 )
             } catch (e) {
                 console.error(unpacked, e)
+            } finally {
+                // reset cell running state regardless of request outcome
+                await update_cells_running(false)
             }
         }
     })

From a7a424c0412399b6057bb505194d01f2f2ea6131 Mon Sep 17 00:00:00 2001
From: "Sergio A. Vargas" <savargasqu+git@unal.edu.co>
Date: Mon, 18 Sep 2023 08:42:23 -0500
Subject: [PATCH 693/821] Replace Distributed with Malt soon! (#2240)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
Co-authored-by: Panagiotis Georgakopoulos <panagiotis.georgakopoulos@juliacomputing.com>
Co-authored-by: Paul Berg <naydex.mc+github@gmail.com>
---
 Project.toml                       |   3 +-
 src/Configuration.jl               |   5 +
 src/evaluation/WorkspaceManager.jl | 254 +++++++++++++----------------
 src/runner/PlutoRunner.jl          |  29 ++--
 src/webserver/REPLTools.jl         |  23 ++-
 test/Bonds.jl                      |  11 +-
 test/Dynamic.jl                    |   2 +-
 test/React.jl                      |  25 ++-
 test/ReloadFromFile.jl             |   1 -
 test/WorkspaceManager.jl           |  17 +-
 test/cell_disabling.jl             |   4 +-
 test/helpers.jl                    |   7 +-
 test/packages/Basic.jl             |  36 ++--
 test/runtests.jl                   |   4 +-
 14 files changed, 209 insertions(+), 212 deletions(-)

diff --git a/Project.toml b/Project.toml
index ffb77d4640..7292cf6847 100644
--- a/Project.toml
+++ b/Project.toml
@@ -8,7 +8,6 @@ version = "0.19.27"
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 Configurations = "5218b696-f38b-4ac9-8b61-a12ec717816d"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
-Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 FileWatching = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
 FuzzyCompletions = "fb4132e2-a121-4a70-b8a1-d5b831dcdcc2"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
@@ -17,6 +16,7 @@ InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 LoggingExtras = "e6f89c97-d47a-5376-807f-9c37f3926c36"
 MIMEs = "6c6e2e6c-3030-632d-7369-2d6c69616d65"
+Malt = "36869731-bdee-424d-aa32-cab38c994e3b"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 MsgPack = "99f44e22-a591-53d1-9472-aa23ef4bd671"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
@@ -39,6 +39,7 @@ HTTP = "^1.5.2"
 HypertextLiteral = "0.7, 0.8, 0.9"
 LoggingExtras = "0.4, 1"
 MIMEs = "0.1"
+Malt = "1.0.3"
 MsgPack = "1.1"
 PrecompileSignatures = "3"
 PrecompileTools = "1"
diff --git a/src/Configuration.jl b/src/Configuration.jl
index 95236fa6b4..2b7eed6ae9 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -140,6 +140,7 @@ end
 
 const RUN_NOTEBOOK_ON_LOAD_DEFAULT = true
 const WORKSPACE_USE_DISTRIBUTED_DEFAULT = true
+const WORKSPACE_USE_DISTRIBUTED_STDLIB_DEFAULT = nothing
 const LAZY_WORKSPACE_CREATION_DEFAULT = false
 const CAPTURE_STDOUT_DEFAULT = true
 const WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT = nothing
@@ -152,6 +153,7 @@ These options are not intended to be changed during normal use.
 
 - `run_notebook_on_load::Bool = $RUN_NOTEBOOK_ON_LOAD_DEFAULT` Whether to evaluate a notebook on load.
 - `workspace_use_distributed::Bool = $WORKSPACE_USE_DISTRIBUTED_DEFAULT` Whether to start notebooks in a separate process.
+- `workspace_use_distributed_stdlib::Bool? = $WORKSPACE_USE_DISTRIBUTED_STDLIB_DEFAULT` Should we use the Distributed stdlib to run processes? Distributed will be replaced by Malt.jl, you can use this option to already get the old behaviour. `nothing` means: determine automatically (which is currently the same as `true`).
 - `lazy_workspace_creation::Bool = $LAZY_WORKSPACE_CREATION_DEFAULT`
 - `capture_stdout::Bool = $CAPTURE_STDOUT_DEFAULT`
 - `workspace_custom_startup_expr::Union{Nothing,Expr} = $WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT` An expression to be evaluated in the workspace process before running notebook code.
@@ -159,6 +161,7 @@ These options are not intended to be changed during normal use.
 @option mutable struct EvaluationOptions
     run_notebook_on_load::Bool = RUN_NOTEBOOK_ON_LOAD_DEFAULT
     workspace_use_distributed::Bool = WORKSPACE_USE_DISTRIBUTED_DEFAULT
+    workspace_use_distributed_stdlib::Union{Bool,Nothing} = WORKSPACE_USE_DISTRIBUTED_STDLIB_DEFAULT
     lazy_workspace_creation::Bool = LAZY_WORKSPACE_CREATION_DEFAULT
     capture_stdout::Bool = CAPTURE_STDOUT_DEFAULT
     workspace_custom_startup_expr::Union{Nothing,Expr} = WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT
@@ -292,6 +295,7 @@ function from_flat_kwargs(;
 
         run_notebook_on_load::Bool = RUN_NOTEBOOK_ON_LOAD_DEFAULT,
         workspace_use_distributed::Bool = WORKSPACE_USE_DISTRIBUTED_DEFAULT,
+        workspace_use_distributed_stdlib::Union{Bool,Nothing} = WORKSPACE_USE_DISTRIBUTED_STDLIB_DEFAULT,
         lazy_workspace_creation::Bool = LAZY_WORKSPACE_CREATION_DEFAULT,
         capture_stdout::Bool = CAPTURE_STDOUT_DEFAULT,
         workspace_custom_startup_expr::Union{Nothing,Expr} = WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT,
@@ -340,6 +344,7 @@ function from_flat_kwargs(;
     evaluation = EvaluationOptions(;
         run_notebook_on_load,
         workspace_use_distributed,
+        workspace_use_distributed_stdlib,
         lazy_workspace_creation,
         capture_stdout,
         workspace_custom_startup_expr,
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 55fb090655..0d952a7d55 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -7,18 +7,19 @@ import ..Pluto.PkgCompat
 import ..Configuration: CompilerOptions, _merge_notebook_compiler_options, _convert_to_flags
 import ..Pluto.ExpressionExplorer: FunctionName
 import ..PlutoRunner
-import Distributed
+import Malt
+import Malt.Distributed
 
 """
-Contains the Julia process (in the sense of `Distributed.addprocs`) to evaluate code in.
+Contains the Julia process to evaluate code in.
 Each notebook gets at most one `Workspace` at any time, but it can also have no `Workspace`
 (it cannot `eval` code in this case).
 """
 Base.@kwdef mutable struct Workspace
-    pid::Integer
+    worker::Malt.AbstractWorker
     notebook_id::UUID
     discarded::Bool=false
-    remote_log_channel::Distributed.RemoteChannel
+    remote_log_channel::Union{Distributed.RemoteChannel,AbstractChannel}
     module_name::Symbol
     dowork_token::Token=Token()
     nbpkg_was_active::Bool=false
@@ -29,25 +30,19 @@ end
 
 const SN = Tuple{ServerSession, Notebook}
 
+"These expressions get evaluated whenever a new `Workspace` process is created."
+process_preamble() = quote
+    Base.exit_on_sigint(false)
+    include($(project_relative_path(joinpath("src", "runner"), "Loader.jl")))
+    ENV["GKSwstype"] = "nul"
+    ENV["JULIA_REVISE_WORKER_ONLY"] = "1"
+end
+
 const active_workspaces = Dict{UUID,Task}()
 
 "Set of notebook IDs that we will never make a process for again."
 const discarded_workspaces = Set{UUID}()
 
-const Distributed_expr = quote
-    Base.loaded_modules[Base.PkgId(Base.UUID("8ba89e20-285c-5b6f-9357-94700520ee1b"), "Distributed")]
-end
-
-"These expressions get evaluated whenever a new `Workspace` process is created."
-function process_preamble()
-    quote
-        Base.exit_on_sigint(false)
-        include($(project_relative_path(joinpath("src", "runner"), "Loader.jl")))
-        ENV["GKSwstype"] = "nul"
-        ENV["JULIA_REVISE_WORKER_ONLY"] = "1"
-    end
-end
-
 "Create a workspace for the notebook, optionally in the main process."
 function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false)::Workspace
     workspace_business = is_offline_renderer ? Status.Business(name=:gobble) : Status.report_business_started!(notebook.status_tree, :workspace)
@@ -55,26 +50,22 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
     Status.report_business_planned!(workspace_business, :init_process)
     
     is_offline_renderer || (notebook.process_status = ProcessStatus.starting)
-
-    use_distributed = !is_offline_renderer && session.options.evaluation.workspace_use_distributed
-
-    pid = if use_distributed
-        @debug "Creating workspace process" notebook.path length(notebook.cells)
-        create_workspaceprocess(; 
-            compiler_options=_merge_notebook_compiler_options(notebook, session.options.compiler),
-            status=create_status,
-        )
+    
+    WorkerType = if is_offline_renderer || !session.options.evaluation.workspace_use_distributed
+        Malt.InProcessWorker
+    elseif something(
+        session.options.evaluation.workspace_use_distributed_stdlib, 
+        true
+        # VERSION < v"1.8.0-0"
+    )
+        Malt.DistributedStdlibWorker
     else
-        pid = Distributed.myid()
-        if !(isdefined(Main, :PlutoRunner) && Main.PlutoRunner isa Module)
-            # Make PlutoRunner available in Main, right now it's only defined inside this Pluto module.
-            @eval Main begin
-                PlutoRunner = $(PlutoRunner)
-            end
-        end
-        pid
+        Malt.Worker
     end
     
+    @debug "Creating workspace process" notebook.path length(notebook.cells)
+    worker = create_workspaceprocess(WorkerType; compiler_options=_merge_notebook_compiler_options(notebook, session.options.compiler))
+    
     Status.report_business_finished!(workspace_business, :create_process)
     init_status = Status.report_business_started!(workspace_business, :init_process)
     Status.report_business_started!(init_status, Symbol(1))
@@ -82,33 +73,29 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
     Status.report_business_planned!(init_status, Symbol(3))
     Status.report_business_planned!(init_status, Symbol(4))
 
-    Distributed.remotecall_eval(Main, [pid], session.options.evaluation.workspace_custom_startup_expr)
+    Malt.remote_eval_wait(worker, session.options.evaluation.workspace_custom_startup_expr)
 
-    Distributed.remotecall_eval(Main, [pid], quote
+    Malt.remote_eval_wait(worker, quote
         PlutoRunner.notebook_id[] = $(notebook.notebook_id)
     end)
 
-    remote_log_channel = Core.eval(Main, quote
-        $(Distributed).RemoteChannel(() -> eval(quote
-            channel = Channel{Any}(10)
-            Main.PlutoRunner.setup_plutologger(
-                $($(notebook.notebook_id)), 
-                channel,
-            )
+    remote_log_channel = Malt.worker_channel(worker, quote
+        channel = Channel{Any}(10)
+        Main.PlutoRunner.setup_plutologger(
+            $(notebook.notebook_id),
             channel
-        end), $pid)
+        )
+        channel
     end)
 
-    run_channel = Core.eval(Main, quote
-        $(Distributed).RemoteChannel(() -> eval(:(Main.PlutoRunner.run_channel)), $pid)
-    end)
+    run_channel = Malt.worker_channel(worker, :(Main.PlutoRunner.run_channel))
 
-    module_name = create_emptyworkspacemodule(pid)
+    module_name = create_emptyworkspacemodule(worker)
 
-    original_LOAD_PATH, original_ACTIVE_PROJECT = Distributed.remotecall_eval(Main, pid, :(Base.LOAD_PATH, Base.ACTIVE_PROJECT[]))
+    original_LOAD_PATH, original_ACTIVE_PROJECT = Malt.remote_eval_fetch(worker, :(Base.LOAD_PATH, Base.ACTIVE_PROJECT[]))
 
     workspace = Workspace(;
-        pid,
+        worker,
         notebook_id=notebook.notebook_id,
         remote_log_channel,
         module_name,
@@ -155,20 +142,20 @@ function use_nbpkg_environment((session, notebook)::SN, workspace=nothing)
     workspace.discarded && return
 
     workspace.nbpkg_was_active = enabled
-    if workspace.pid != Distributed.myid()
-        new_LP = enabled ? ["@", "@stdlib"] : workspace.original_LOAD_PATH
-        new_AP = enabled ? PkgCompat.env_dir(notebook.nbpkg_ctx) : workspace.original_ACTIVE_PROJECT
-
-        Distributed.remotecall_eval(Main, [workspace.pid], quote
-            copy!(LOAD_PATH, $(new_LP))
-            Base.ACTIVE_PROJECT[] = $(new_AP)
-        end)
-    else
-        # TODO
+    if workspace.worker isa Malt.InProcessWorker
+        # Not supported
+        return
     end
+    new_LP = enabled ? ["@", "@stdlib"] : workspace.original_LOAD_PATH
+    new_AP = enabled ? PkgCompat.env_dir(notebook.nbpkg_ctx) : workspace.original_ACTIVE_PROJECT
+
+    Malt.remote_eval_wait(workspace.worker, quote
+        copy!(LOAD_PATH, $(new_LP))
+        Base.ACTIVE_PROJECT[] = $(new_AP)
+    end)
 end
 
-function start_relaying_self_updates((session, notebook)::SN, run_channel::Distributed.RemoteChannel)
+function start_relaying_self_updates((session, notebook)::SN, run_channel)
     while true
         try
             next_run_uuid = take!(run_channel)
@@ -184,7 +171,7 @@ function start_relaying_self_updates((session, notebook)::SN, run_channel::Distr
     end
 end
 
-function start_relaying_logs((session, notebook)::SN, log_channel::Distributed.RemoteChannel)
+function start_relaying_logs((session, notebook)::SN, log_channel)
     update_throttled, flush_throttled = Pluto.throttled(0.1) do
         Pluto.send_notebook_changes!(Pluto.ClientRequest(; session, notebook))
     end
@@ -255,7 +242,7 @@ end
 function bump_workspace_module(session_notebook::SN)
     workspace = get_workspace(session_notebook)
     old_name = workspace.module_name
-    new_name = workspace.module_name = create_emptyworkspacemodule(workspace.pid)
+    new_name = workspace.module_name = create_emptyworkspacemodule(workspace.worker)
 
     old_name, new_name
 end
@@ -263,21 +250,21 @@ end
 function get_bond_names(session_notebook::SN, cell_id)
     workspace = get_workspace(session_notebook)
 
-    Distributed.remotecall_eval(Main, workspace.pid, quote
-        PlutoRunner.get_bond_names($cell_id)
+    Malt.remote_eval_fetch(workspace.worker, quote
+    PlutoRunner.get_bond_names($cell_id)
     end)
 end
 
 function possible_bond_values(session_notebook::SN, n::Symbol; get_length::Bool=false)
     workspace = get_workspace(session_notebook)
 
-    Distributed.remotecall_eval(Main, workspace.pid, quote
+    Malt.remote_eval_fetch(workspace.worker, quote
         PlutoRunner.possible_bond_values($(QuoteNode(n)); get_length=$(get_length))
     end)
 end
 
-function create_emptyworkspacemodule(pid::Integer)::Symbol
-    Distributed.remotecall_eval(Main, pid, quote
+function create_emptyworkspacemodule(worker::Malt.AbstractWorker)::Symbol
+    Malt.remote_eval_fetch(worker, quote
         PlutoRunner.increment_current_module()
     end)
 end
@@ -285,33 +272,41 @@ end
 # NOTE: this function only start a worker process using given
 # compiler options, it does not resolve paths for notebooks
 # compiler configurations passed to it should be resolved before this
-function create_workspaceprocess(; compiler_options=CompilerOptions(), status::Status.Business=Business())::Integer
-    
-    Status.report_business_started!(status, Symbol(1))
-    Status.report_business_planned!(status, Symbol(2))
-    # run on proc 1 in case Pluto is being used inside a notebook process
-    # Workaround for "only process 1 can add/remove workers"
-    pid = Distributed.remotecall_eval(Main, 1, quote
-        $(Distributed_expr).addprocs(1; exeflags=$(_convert_to_flags(compiler_options))) |> first
-    end)
-    
-    Status.report_business_finished!(status, Symbol(1))
-    Status.report_business_started!(status, Symbol(2))
-
-    Distributed.remotecall_eval(Main, [pid], process_preamble())
+function create_workspaceprocess(WorkerType; compiler_options=CompilerOptions(), status::Status.Business=Status.Business())::Malt.AbstractWorker
 
-    # so that we NEVER break the workspace with an interrupt 🤕
-    @async Distributed.remotecall_eval(Main, [pid], quote
-        while true
-            try
-                wait()
-            catch end
+    if WorkerType === Malt.InProcessWorker
+        worker = WorkerType()
+        
+        if !(isdefined(Main, :PlutoRunner) && Main.PlutoRunner isa Module)
+            # we make PlutoRunner available in Main, right now it's only defined inside this Pluto module.
+            Malt.remote_eval_wait(Main, worker, quote
+                PlutoRunner = $(PlutoRunner)
+            end)
         end
-    end)
+    else
+            
+        Status.report_business_started!(status, Symbol(1))
+        Status.report_business_planned!(status, Symbol(2))
+        
+        worker = WorkerType(; exeflags=_convert_to_flags(compiler_options))
+            
+        Status.report_business_finished!(status, Symbol(1))
+        Status.report_business_started!(status, Symbol(2))
+        
+        Malt.remote_eval_wait(worker, process_preamble())
+    
+        # so that we NEVER break the workspace with an interrupt 🤕
+        Malt.remote_eval(worker, quote
+            while true
+                try
+                    wait()
+                catch end
+            end
+        end)
+    end
     
     Status.report_business_finished!(status)
-
-    pid
+    worker
 end
 
 """
@@ -348,28 +343,16 @@ function unmake_workspace(session_notebook::SN; async::Bool=false, verbose::Bool
     workspace.discarded = true
     allow_restart || push!(discarded_workspaces, notebook.notebook_id)
 
-    if workspace.pid != Distributed.myid()
-        filter!(p -> fetch(p.second).pid != workspace.pid, active_workspaces)
-        t = @async begin
-            interrupt_workspace(workspace; verbose=false)
-            # run on proc 1 in case Pluto is being used inside a notebook process
-            # Workaround for "only process 1 can add/remove workers"
-            Distributed.remotecall_eval(Main, 1, quote
-                $(Distributed_expr).rmprocs($(workspace.pid))
-            end)
-        end
-        async || wait(t)
-    else
-        if !isready(workspace.dowork_token)
-            @error "Cannot unmake a workspace running inside the same process: the notebook is still running."
-        elseif verbose
-            @warn "Cannot unmake a workspace running inside the same process: the notebook might still be running. If you are sure that your code is not running the notebook async, then you can use the `verbose=false` keyword argument to disable this message."
-        end
+    filter!(p -> fetch(p.second).worker != workspace.worker, active_workspaces)
+    t = @async begin
+        interrupt_workspace(workspace; verbose=false)
+        Malt.stop(workspace.worker)
     end
+    async || wait(t)
     nothing
 end
 
-function distributed_exception_result(ex::Base.IOError, workspace::Workspace)
+function workspace_exception_result(ex::Base.IOError, workspace::Workspace)
     (
         output_formatted=PlutoRunner.format_output(CapturedException(ex, [])),
         errored=true,
@@ -381,12 +364,11 @@ function distributed_exception_result(ex::Base.IOError, workspace::Workspace)
     )
 end
 
-function distributed_exception_result(exs::CompositeException, workspace::Workspace)
+function workspace_exception_result(exs::CompositeException, workspace::Workspace)
     ex = first(exs.exceptions)
 
-    if ex isa Distributed.RemoteException &&
-        ex.pid == workspace.pid &&
-        ex.captured.ex isa InterruptException
+    if ex isa InterruptException || (ex isa Malt.RemoteException && occursin("InterruptException", ex.message))
+        @info "Found an interrupt!" ex
         (
             output_formatted=PlutoRunner.format_output(CapturedException(InterruptException(), [])),
             errored=true,
@@ -396,7 +378,7 @@ function distributed_exception_result(exs::CompositeException, workspace::Worksp
             published_objects=Dict{String,Any}(),
             has_pluto_hook_features=false,
         )
-    elseif ex isa Distributed.ProcessExitedException
+    elseif ex isa Malt.TerminatedWorkerException
         (
             output_formatted=PlutoRunner.format_output(CapturedException(exs, [])),
             errored=true,
@@ -440,14 +422,10 @@ function eval_format_fetch_in_workspace(
 )::PlutoRunner.FormattedCellResult
 
     workspace = get_workspace(session_notebook)
-
-    is_on_this_process = workspace.pid == Distributed.myid()
+    is_on_this_process = workspace.worker isa Malt.InProcessWorker
 
     # if multiple notebooks run on the same process, then we need to `cd` between the different notebook paths
     if session_notebook isa Tuple
-        if is_on_this_process
-            cd_workspace(workspace, session_notebook[2].path)
-        end
         use_nbpkg_environment(session_notebook, workspace)
     end
 
@@ -456,8 +434,7 @@ function eval_format_fetch_in_workspace(
     # A try block (on this process) to catch an InterruptException
     take!(workspace.dowork_token)
     early_result = try
-        # Use [pid] instead of pid to prevent fetching output
-        Distributed.remotecall_eval(Main, [workspace.pid], quote
+        Malt.remote_eval_wait(workspace.worker, quote
             PlutoRunner.run_expression(
                 getfield(Main, $(QuoteNode(workspace.module_name))),
                 $(QuoteNode(expr)),
@@ -474,7 +451,7 @@ function eval_format_fetch_in_workspace(
     catch e
         # Don't use a `finally` because the token needs to be back asap for the interrupting code to pick it up.
         put!(workspace.dowork_token)
-        distributed_exception_result(e, workspace)
+        workspace_exception_result(e, workspace)
     end
 
     if early_result === nothing
@@ -488,7 +465,7 @@ end
 function eval_in_workspace(session_notebook::Union{SN,Workspace}, expr)
     workspace = get_workspace(session_notebook)
 
-    Distributed.remotecall_eval(Main, [workspace.pid], quote
+    Malt.remote_eval_wait(workspace.worker, quote
         Core.eval($(workspace.module_name), $(QuoteNode(expr)))
     end)
     nothing
@@ -509,7 +486,7 @@ function format_fetch_in_workspace(
     # we format the cell output on the worker, and fetch the formatted output.
     withtoken(workspace.dowork_token) do
         try
-            Distributed.remotecall_eval(Main, workspace.pid, quote
+            Malt.remote_eval_fetch(workspace.worker, quote
                 PlutoRunner.formatted_result_of(
                     $(workspace.notebook_id),
                     $cell_id,
@@ -521,7 +498,7 @@ function format_fetch_in_workspace(
                 )
             end)
         catch e
-            distributed_exception_result(CompositeException([e]), workspace)
+            workspace_exception_result(CompositeException([e]), workspace)
         end
     end
 end
@@ -529,7 +506,7 @@ end
 function collect_soft_definitions(session_notebook::SN, modules::Set{Expr})
     workspace = get_workspace(session_notebook)
 
-    Distributed.remotecall_eval(Main, workspace.pid, quote
+    Malt.remote_eval_fetch(workspace.worker, quote
         PlutoRunner.collect_soft_definitions($(workspace.module_name), $modules)
     end)
 end
@@ -538,7 +515,7 @@ function macroexpand_in_workspace(session_notebook::SN, macrocall, cell_id, modu
     workspace = get_workspace(session_notebook)
     module_name = module_name === Symbol("") ? workspace.module_name : module_name
 
-    Distributed.remotecall_eval(Main, workspace.pid, quote
+    Malt.remote_eval_fetch(workspace.worker, quote
         try
             (true, PlutoRunner.try_macroexpand($(module_name), $(workspace.notebook_id), $(cell_id), $(macrocall |> QuoteNode); capture_stdout=$(capture_stdout)))
         catch error
@@ -558,7 +535,7 @@ end
 function eval_fetch_in_workspace(session_notebook::Union{SN,Workspace}, expr)
     workspace = get_workspace(session_notebook)
 
-    Distributed.remotecall_eval(Main, workspace.pid, quote
+    Malt.remote_eval_fetch(workspace.worker, quote
         Core.eval($(workspace.module_name), $(QuoteNode(expr)))
     end)
 end
@@ -566,14 +543,14 @@ end
 function do_reimports(session_notebook::Union{SN,Workspace}, module_imports_to_move::Set{Expr})
     workspace = get_workspace(session_notebook)
 
-    Distributed.remotecall_eval(Main, [workspace.pid], quote
+    Malt.remote_eval_wait(workspace.worker, quote
         PlutoRunner.do_reimports($(workspace.module_name), $module_imports_to_move)
     end)
 end
 
 """
-Move variables to a new module. Variables to be 'deleted' will not be moved to
-the new module, making them unavailable.
+Move variables to a new module. A given set of variables to be 'deleted' will
+not be moved to the new module, making them unavailable.
 """
 function move_vars(
     session_notebook::Union{SN,Workspace},
@@ -590,7 +567,7 @@ function move_vars(
     workspace = get_workspace(session_notebook)
     new_workspace_name = something(new_workspace_name, workspace.module_name)
 
-    Distributed.remotecall_eval(Main, [workspace.pid], quote
+    Malt.remote_eval_wait(workspace.worker, quote
         PlutoRunner.move_vars(
             $(QuoteNode(old_workspace_name)),
             $(QuoteNode(new_workspace_name)),
@@ -679,11 +656,6 @@ function interrupt_workspace(session_notebook::Union{SN,Workspace}; verbose=true
         return false
     end
 
-    if workspace.pid == Distributed.myid()
-        verbose && @warn """Cells in this workspace can't be stopped, because it is not running in a separate workspace. Use `ENV["PLUTO_WORKSPACE_USE_DISTRIBUTED"]` to control whether future workspaces are generated in a separate process."""
-        return false
-    end
-
     if isready(workspace.dowork_token)
         verbose && @info "Tried to stop idle workspace - ignoring."
         return true
@@ -694,8 +666,8 @@ function interrupt_workspace(session_notebook::Union{SN,Workspace}; verbose=true
     # TODO: this will also kill "pending" evaluations, and any evaluations started within 100ms of the kill. A global "evaluation count" would fix this.
     # TODO: listen for the final words of the remote process on stdout/stderr: "Force throwing a SIGINT"
     try
-        verbose && @info "Sending interrupt to process $(workspace.pid)"
-        Distributed.interrupt(workspace.pid)
+        verbose && @info "Sending interrupt to process $(workspace.worker)"
+        Malt.interrupt(workspace.worker)
 
         if poll(() -> isready(workspace.dowork_token), 5.0, 5/100)
             verbose && println("Cell interrupted!")
@@ -706,7 +678,7 @@ function interrupt_workspace(session_notebook::Union{SN,Workspace}; verbose=true
         while !isready(workspace.dowork_token)
             for _ in 1:5
                 verbose && print(" 🔥 ")
-                Distributed.interrupt(workspace.pid)
+                Malt.interrupt(workspace.worker)
                 sleep(0.18)
                 if isready(workspace.dowork_token)
                     break
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index bb496c4d7e..d51a29cd85 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1,17 +1,21 @@
 # Will be evaluated _inside_ the workspace process.
 
-# Pluto does most things on process 1 (the server), and it uses little workspace processes to evaluate notebook code in.
-# These baby processes don't import Pluto, they only import this module. Functions from this module are called by WorkspaceManager.jl via Distributed
+# Pluto does most things on the server, but it uses worker processes to evaluate notebook code in.
+# These processes don't import Pluto, they only import this module.
+# Functions from this module are called by WorkspaceManager.jl via Malt.
 
-# So when reading this file, pretend that you are living in process 2, and you are communicating with Pluto's server, who lives in process 1.
+# When reading this file, pretend that you are living in a worker process,
+# and you are communicating with Pluto's server, who lives in the main process.
 # The package environment that this file is loaded with is the NotebookProcessProject.toml file in this directory.
 
 # SOME EXTRA NOTES
 
 # 1. The entire PlutoRunner should be a single file.
-# 2. We restrict the communication between this PlutoRunner and the Pluto server to only use *Base Julia types*, like `String`, `Dict`, `NamedTuple`, etc. 
+# 2. Restrict the communication between this PlutoRunner and the Pluto server to only use *Base Julia types*, like `String`, `Dict`, `NamedTuple`, etc. 
 
-# These restriction are there to allow flexibility in the way that this file is loaded on a runner process, which is something that we might want to change in the future, like when we make the transition to our own Distributed.
+# These restriction are there to allow flexibility in the way that this file is
+# loaded on a runner process, which is something that we might want to change
+# in the future.
 
 module PlutoRunner
 
@@ -21,7 +25,6 @@ import InteractiveUtils
 
 using Markdown
 import Markdown: html, htmlinline, LaTeX, withtag, htmlesc
-import Distributed
 import Base64
 import FuzzyCompletions: Completion, BslashCompletion, ModuleCompletion, PropertyCompletion, FieldCompletion, PathCompletion, DictCompletion, completions, completion_text, score
 import Base: show, istextmime
@@ -32,7 +35,7 @@ import REPL
 
 export @bind
 
-# This is not a struct to make it easier to pass these objects between distributed processes.
+# This is not a struct to make it easier to pass these objects between processes.
 const MimedOutput = Tuple{Union{String,Vector{UInt8},Dict{Symbol,Any}},MIME}
 
 const ObjectID = typeof(objectid("hello computer"))
@@ -878,7 +881,7 @@ const table_column_display_limit_increase = 30
 
 const tree_display_extra_items = Dict{UUID,Dict{ObjectDimPair,Int64}}()
 
-# This is not a struct to make it easier to pass these objects between distributed processes.
+# This is not a struct to make it easier to pass these objects between processes.
 const FormattedCellResult = NamedTuple{(:output_formatted, :errored, :interrupted, :process_exited, :runtime, :published_objects, :has_pluto_hook_features),Tuple{PlutoRunner.MimedOutput,Bool,Bool,Bool,Union{UInt64,Nothing},Dict{String,Any},Bool}}
 
 function formatted_result_of(
@@ -2192,15 +2195,15 @@ function possible_bond_values(s::Symbol; get_length::Bool=false)
             try
                 length(possible_values)
             catch
-                length(make_distributed_serializable(possible_values))
+                length(make_serializable(possible_values))
             end : 
-            make_distributed_serializable(possible_values)
+            make_serializable(possible_values)
     end
 end
 
-make_distributed_serializable(x::Any) = x
-make_distributed_serializable(x::Union{AbstractVector,AbstractSet,Base.Generator}) = collect(x)
-make_distributed_serializable(x::Union{Vector,Set,OrdinalRange}) = x
+make_serializable(x::Any) = x
+make_serializable(x::Union{AbstractVector,AbstractSet,Base.Generator}) = collect(x)
+make_serializable(x::Union{Vector,Set,OrdinalRange}) = x
 
 
 """
diff --git a/src/webserver/REPLTools.jl b/src/webserver/REPLTools.jl
index 74f432b19d..7da202f6ca 100644
--- a/src/webserver/REPLTools.jl
+++ b/src/webserver/REPLTools.jl
@@ -1,5 +1,5 @@
 import FuzzyCompletions: complete_path, completion_text, score
-import Distributed
+import Malt
 import .PkgCompat: package_completions
 using Markdown
 import REPL
@@ -83,10 +83,13 @@ responses[:complete] = function response_complete(🙋::ClientRequest)
         if will_run_code(🙋.notebook) && workspace isa WorkspaceManager.Workspace && isready(workspace.dowork_token)
             # we don't use eval_format_fetch_in_workspace because we don't want the output to be string-formatted.
             # This works in this particular case, because the return object, a `Completion`, exists in this scope too.
-            Distributed.remotecall_eval(Main, workspace.pid, :(PlutoRunner.completion_fetcher(
-                $query, $pos,
-                getfield(Main, $(QuoteNode(workspace.module_name))),
-                )))
+            Malt.remote_eval_fetch(workspace.worker, quote
+                PlutoRunner.completion_fetcher(
+                    $query,
+                    $pos,
+                    getfield(Main, $(QuoteNode(workspace.module_name))),
+                )
+            end)
         else
             # We can at least autocomplete general julia things:
             PlutoRunner.completion_fetcher(query, pos, Main)
@@ -132,10 +135,12 @@ responses[:docs] = function response_docs(🙋::ClientRequest)
         (repr(MIME("text/html"), doc_md), :👍)
     else
         if will_run_code(🙋.notebook) && workspace isa WorkspaceManager.Workspace && isready(workspace.dowork_token)
-            Distributed.remotecall_eval(Main, workspace.pid, :(PlutoRunner.doc_fetcher(
-                $query,
-                getfield(Main, $(QuoteNode(workspace.module_name))),
-            )))
+            Malt.remote_eval_fetch(workspace.worker, quote
+                PlutoRunner.doc_fetcher(
+                    $query,
+                    getfield(Main, $(QuoteNode(workspace.module_name))),
+                )
+            end)
         else
             (nothing, :⌛)
         end
diff --git a/test/Bonds.jl b/test/Bonds.jl
index 3fe9e559c4..bf1b028e09 100644
--- a/test/Bonds.jl
+++ b/test/Bonds.jl
@@ -1,7 +1,7 @@
 using Test
 import Pluto
 import Pluto: update_run!, update_save_run!, WorkspaceManager, ClientSession, ServerSession, Notebook, Cell
-import Distributed
+import Malt
 
 @testset "Bonds" begin
 
@@ -358,9 +358,8 @@ import Distributed
         
         # test that the notebook file is runnable:
         
-        test_proc = Distributed.addprocs(1)[1]
-        
-        Distributed.remotecall_eval(Main, test_proc, quote
+        test_proc = Malt.Worker()
+        Malt.remote_eval_wait(test_proc, quote
             import Pkg
             try
                 Pkg.UPDATED_REGISTRY_THIS_SESSION[] = true
@@ -368,11 +367,11 @@ import Distributed
             Pkg.activate(mktempdir())
             Pkg.add("AbstractPlutoDingetjes")
         end)
-        @test Distributed.remotecall_eval(Main, test_proc, quote
+        @test Malt.remote_eval_fetch(test_proc, quote
             include($(notebook.path))
             true
         end)
-        Distributed.rmprocs(test_proc)
+        Malt.stop(test_proc)
     end
 
     @testset "Dependent Bound Variables" begin
diff --git a/test/Dynamic.jl b/test/Dynamic.jl
index 56496f0d2d..1d8675c740 100644
--- a/test/Dynamic.jl
+++ b/test/Dynamic.jl
@@ -193,7 +193,7 @@ end
 
     @testset "PlutoRunner API" begin
         🍭 = ServerSession()
-        🍭.options.evaluation.workspace_use_distributed = true
+        # 🍭.options.evaluation.workspace_use_distributed = true
         
         cid = uuid1()
 
diff --git a/test/React.jl b/test/React.jl
index 0921a4ce0d..bb249032c9 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -1,14 +1,15 @@
 using Test
 import Pluto: Configuration, Notebook, ServerSession, ClientSession, update_run!, Cell, WorkspaceManager
 import Pluto.Configuration: Options, EvaluationOptions
-import Distributed
 
 @testset "Reactivity" begin
     🍭 = ServerSession()
     🍭.options.evaluation.workspace_use_distributed = false
 
-    @testset "Basic $(parallel ? "distributed" : "single-process")" for parallel in [false, true]
-        🍭.options.evaluation.workspace_use_distributed = parallel
+    @testset "Basic $workertype" for workertype in [:Malt, :Distributed, :InProcess]
+        🍭.options.evaluation.workspace_use_distributed = workertype !== :InProcess
+        🍭.options.evaluation.workspace_use_distributed_stdlib = workertype === :Distributed
+        
         
         notebook = Notebook([
             Cell("x = 1"),
@@ -22,7 +23,13 @@ import Distributed
             end"""),
             Cell("g(6) + g(6,6)"),
 
-            Cell("import Distributed"),
+            Cell("""
+            begin
+                pushfirst!(LOAD_PATH, "@stdlib")
+                import Distributed
+                popfirst!(LOAD_PATH)
+            end
+            """),
             Cell("Distributed.myid()"),
         ])
 
@@ -70,10 +77,14 @@ import Distributed
         @test notebook.cells[6].output.body == "3"
 
         update_run!(🍭, notebook, notebook.cells[7:8])
-        @test if parallel
-            notebook.cells[8].output.body != string(Distributed.myid())
+        if workertype === :Distributed
+            @test notebook.cells[8].output.body ∉ ("1", string(Distributed.myid()))
+        elseif workertype === :Malt
+            @test notebook.cells[8].output.body == "1"
+        elseif workertype === :InProcess
+            @test notebook.cells[8].output.body == string(Distributed.myid())
         else
-            notebook.cells[8].output.body == string(Distributed.myid())
+            error()
         end
 
         WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
diff --git a/test/ReloadFromFile.jl b/test/ReloadFromFile.jl
index 7cc6b9aac4..ec602fee3c 100644
--- a/test/ReloadFromFile.jl
+++ b/test/ReloadFromFile.jl
@@ -1,7 +1,6 @@
 using Test
 import Pluto: Configuration, Notebook, ServerSession, ClientSession, update_run!, Cell, WorkspaceManager, SessionActions, save_notebook
 import Pluto.Configuration: Options, EvaluationOptions
-import Distributed
 using Pluto.WorkspaceManager: poll
 import Pkg
 
diff --git a/test/WorkspaceManager.jl b/test/WorkspaceManager.jl
index 92975be90a..fc7138e4a9 100644
--- a/test/WorkspaceManager.jl
+++ b/test/WorkspaceManager.jl
@@ -2,7 +2,7 @@ using Test
 using Pluto.Configuration: CompilerOptions
 using Pluto.WorkspaceManager: _merge_notebook_compiler_options
 import Pluto: update_save_run!, update_run!, WorkspaceManager, ClientSession, ServerSession, Notebook, Cell, project_relative_path
-import Distributed
+import Malt
 
 @testset "Workspace manager" begin
 # basic functionality is already tested by the reactivity tests
@@ -54,7 +54,8 @@ import Distributed
 
     Sys.iswindows() || @testset "Pluto inside Pluto" begin
         🍭 = ServerSession()
-        🍭.options.evaluation.workspace_use_distributed = true
+        🍭.options.evaluation.capture_stdout = false
+        🍭.options.evaluation.workspace_use_distributed_stdlib = false
 
         notebook = Notebook([
             Cell("""begin
@@ -65,7 +66,10 @@ import Distributed
                 import Pluto
             end"""),
             Cell("""
-            s = Pluto.ServerSession()
+            begin
+                s = Pluto.ServerSession()
+                s.options.evaluation.workspace_use_distributed_stdlib = false
+            end
             """),
             Cell("""
             nb = Pluto.SessionActions.open(s, Pluto.project_relative_path("sample", "Tower of Hanoi.jl"); run_async=false, as_sample=true)
@@ -86,17 +90,10 @@ import Distributed
         update_run!(🍭, notebook, notebook.cells[5])
         @test notebook.cells[5] |> noerror
 
-
-        desired_nprocs = Distributed.nprocs() - 1
         setcode!(notebook.cells[5], "Pluto.SessionActions.shutdown(s, nb)")
         update_run!(🍭, notebook, notebook.cells[5])
         @test noerror(notebook.cells[5])
 
-        while Distributed.nprocs() != desired_nprocs
-            sleep(.1)
-        end
-        sleep(.1)
-
         WorkspaceManager.unmake_workspace((🍭, notebook))
     end
 end
diff --git a/test/cell_disabling.jl b/test/cell_disabling.jl
index f5f9575dd3..3c8e8f498b 100644
--- a/test/cell_disabling.jl
+++ b/test/cell_disabling.jl
@@ -1,6 +1,6 @@
 using Test
 using Pluto
-using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook, set_disabled, is_disabled
+using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook, set_disabled, is_disabled, WorkspaceManager
 
 
 
@@ -236,6 +236,7 @@ using Pluto: update_run!, ServerSession, ClientSession, Cell, Notebook, set_disa
     update_run!(🍭, notebook, c([12]))
     @test c(14).output.body == "3"
     
+    WorkspaceManager.unmake_workspace((🍭, notebook))
 end
 
 
@@ -342,4 +343,5 @@ end
     update_run!(🍭, notebook, notebook.cells)
     @test get_disabled_cells(notebook) == []
 
+    WorkspaceManager.unmake_workspace((🍭, notebook))
 end
diff --git a/test/helpers.jl b/test/helpers.jl
index c61217a08b..3b745c25fc 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -16,8 +16,9 @@ import Pluto.ExpressionExplorer: SymbolsState, compute_symbolreferences, Functio
 using Sockets
 using Test
 using HTTP
-import Distributed
 import Pkg
+import Malt
+import Malt.Distributed
 
 function Base.show(io::IO, s::SymbolsState)
     print(io, "SymbolsState([")
@@ -243,8 +244,8 @@ has_embedded_pkgfiles(nb::Pluto.Notebook) =
 Log an error message if there are any running processes created by Distrubted, that were not shut down.
 """
 function verify_no_running_processes()
-    if length(Distributed.procs()) != 1
-        @error "Not all notebook processes were closed during tests!" Distributed.procs()
+    if length(Distributed.procs()) != 1 || !isempty(Malt.__iNtErNaL_get_running_procs())
+        @error "Not all notebook processes were closed during tests!" Distributed.procs() Malt.__iNtErNaL_get_running_procs()
     end
 end
 
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index bc1b204a0b..a255865c77 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -5,7 +5,7 @@ using Pluto.Configuration: CompilerOptions
 import Pluto: update_save_run!, update_run!, WorkspaceManager, ClientSession, ServerSession, Notebook, Cell, project_relative_path, SessionActions, load_notebook
 import Pluto.PkgUtils
 import Pluto.PkgCompat
-import Distributed
+import Malt
 
 
 @testset "Built-in Pkg" begin
@@ -13,8 +13,9 @@ import Distributed
     # We have our own registry for these test! Take a look at https://github.com/JuliaPluto/PlutoPkgTestRegistry#readme for more info about the test packages and their dependencies.
     Pkg.Registry.add(pluto_test_registry_spec)
 
-    @testset "Basic" begin
+    @testset "Basic $(use_distributed_stdlib ? "Distributed" : "Malt")" for use_distributed_stdlib in (false, true)
         🍭 = ServerSession()
+        🍭.options.evaluation.workspace_use_distributed_stdlib = use_distributed_stdlib
 
         # See https://github.com/JuliaPluto/PlutoPkgTestRegistry
 
@@ -395,8 +396,7 @@ import Distributed
     end
 
     @testset "DrWatson cell" begin
-        🍭 = ServerSession()            
-        🍭.options.evaluation.workspace_use_distributed = false
+        🍭 = ServerSession()
 
         notebook = Notebook([
             Cell("using Plots"),
@@ -449,11 +449,11 @@ import Distributed
     @static if VERSION < v"1.10.0-0" # see https://github.com/fonsp/Pluto.jl/pull/2626#issuecomment-1671244510
         @testset "File format -- Forwards compat" begin
             # Using Distributed, we will create a new Julia process in which we install Pluto 0.14.7 (before PlutoPkg). We run the new notebook file on the old Pluto.
-            p = Distributed.addprocs(1) |> first
+            test_worker = Malt.Worker()
 
             @test post_pkg_notebook isa String
 
-            Distributed.remotecall_eval(Main, p, quote
+            Malt.remote_eval_wait(Main, test_worker, quote
                 path = tempname()
                 write(path, $(post_pkg_notebook))
                 import Pkg
@@ -462,35 +462,38 @@ import Distributed
                     Pkg.UPDATED_REGISTRY_THIS_SESSION[] = true
                 end
 
-                Pkg.activate(mktempdir())
+                Pkg.activate(;temp=true)
                 Pkg.add(Pkg.PackageSpec(;name="Pluto",version=v"0.14.7"))
+                # Distributed is required for old Pluto to work!
+                Pkg.add("Distributed") 
+
                 import Pluto
+                @info Pluto.PLUTO_VERSION
                 @assert Pluto.PLUTO_VERSION == v"0.14.7"
+            end)
 
+            @test Malt.remote_eval_fetch(Main, test_worker, quote
                 s = Pluto.ServerSession()
-                s.options.evaluation.workspace_use_distributed = false
-
                 nb = Pluto.SessionActions.open(s, path; run_async=false)
-
-                nothing
+                nb.cells[2].errored == false
             end)
 
             # Cells that use Example will error because the package is not installed.
 
-            # @test Distributed.remotecall_eval(Main, p, quote
+            # @test Malt.remote_eval_fetch(Main, test_worker, quote
             #     nb.cells[1].errored == false
             # end)
-            @test Distributed.remotecall_eval(Main, p, quote
+            @test Malt.remote_eval_fetch(Main, test_worker, quote
                 nb.cells[2].errored == false
             end)
-            # @test Distributed.remotecall_eval(Main, p, quote
+            # @test Malt.remote_eval_fetch(Main, test_worker, quote
             #     nb.cells[3].errored == false
             # end)
-            # @test Distributed.remotecall_eval(Main, p, quote
+            # @test Malt.remote_eval_fetch(Main, test_worker, quote
             #     nb.cells[3].output.body == "25"
             # end)
 
-            Distributed.rmprocs([p])
+            Malt.stop(test_worker)
         end
     end
 
@@ -768,4 +771,3 @@ end
 
 # LibGit2.checkout!(repo, "aef26d37e1d0e8f8387c011ccb7c4a38398a18f6")
 
-
diff --git a/test/runtests.jl b/test/runtests.jl
index 3b3ce21a51..88901d4ae3 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -10,7 +10,7 @@ if get(ENV, "PLUTO_TEST_ONLY_COMPILETIMES", nothing) == "true"
 end
 @timeit_include("Events.jl")
 verify_no_running_processes()
-@timeit_include("WorkspaceManager.jl")
+@timeit_include("Configuration.jl")
 verify_no_running_processes()
 @timeit_include("packages/Basic.jl")
 verify_no_running_processes()
@@ -30,7 +30,7 @@ verify_no_running_processes()
 verify_no_running_processes()
 @timeit_include("Notebook.jl")
 verify_no_running_processes()
-@timeit_include("Configuration.jl")
+@timeit_include("WorkspaceManager.jl")
 verify_no_running_processes()
 
 # tests that don't start new processes:

From 62f7898323140fda199ada9657a810f72da2513a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 18 Sep 2023 16:04:29 +0200
Subject: [PATCH 694/821] =?UTF-8?q?=F0=9F=A6=A7=20Fix=20#2548?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Paul Berg <9824244+Pangoraw@users.noreply.github.com>
---
 frontend/components/CellInput.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 33cdb5e2e8..247775d413 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -644,14 +644,16 @@ export const CellInput = ({
                             if (!caused_by_window_blur) {
                                 // then it's caused by focusing something other than this cell in the editor.
                                 // in this case, we want to collapse the selection into a single point, for aesthetic reasons.
-                                view.dispatch({
-                                    selection: {
-                                        anchor: view.state.selection.main.head,
-                                    },
-                                    scrollIntoView: false,
-                                })
-                                // and blur the DOM again (because the previous transaction might have re-focused it)
-                                view.contentDOM.blur()
+                                setTimeout(() => {
+                                    view.dispatch({
+                                        selection: {
+                                            anchor: view.state.selection.main.head,
+                                        },
+                                        scrollIntoView: false,
+                                    })
+                                    // and blur the DOM again (because the previous transaction might have re-focused it)
+                                    view.contentDOM.blur()
+                                }, 0)
 
                                 set_cm_forced_focus(null)
                             }

From cc706f5cbe50bec9111aa65b8aca01fd9e2efd86 Mon Sep 17 00:00:00 2001
From: JL <142803222+JuliaLoetfering@users.noreply.github.com>
Date: Mon, 18 Sep 2023 17:08:07 +0200
Subject: [PATCH 695/821] Added keyboard shortcut display in tooltips (#2638)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/components/Cell.js    | 4 ++--
 frontend/components/RunArea.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index b43b843ae2..8ae055ab7f 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -301,7 +301,7 @@ export const Cell = ({
             pluto_actions.add_remote_cell(cell_id, "before")
         }}
                 class="add_cell before"
-                title="Add cell"
+                title="Add cell (Ctrl + Enter)"
             >
                 <span></span>
             </button>
@@ -359,7 +359,7 @@ export const Cell = ({
             pluto_actions.add_remote_cell(cell_id, "after")
         }}
                 class="add_cell after"
-                title="Add cell"
+                title="Add cell (Ctrl + Enter)"
             >
                 <span></span>
             </button>
diff --git a/frontend/components/RunArea.js b/frontend/components/RunArea.js
index 6cdb33d1a6..db4b3a5fc3 100644
--- a/frontend/components/RunArea.js
+++ b/frontend/components/RunArea.js
@@ -33,10 +33,10 @@ export const RunArea = ({
     }
 
     const titlemap = {
-        interrupt: "Interrupt",
+        interrupt: "Interrupt (Ctrl + Q)",
         save: "Save code without running",
         jump: "This cell depends on a disabled cell",
-        run: "Run cell",
+        run: "Run cell (Shift + Enter)",
     }
 
     const on_double_click = (/** @type {MouseEvent} */ e) => {

From a7908ddecf7c40930a3ce41e71ab3312b2ab7606 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 18 Sep 2023 18:45:30 +0200
Subject: [PATCH 696/821] Malt tweaks

---
 src/evaluation/WorkspaceManager.jl | 20 +++++---------------
 src/runner/PlutoRunner.jl          |  3 +++
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 0d952a7d55..ba798bb114 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -352,7 +352,7 @@ function unmake_workspace(session_notebook::SN; async::Bool=false, verbose::Bool
     nothing
 end
 
-function workspace_exception_result(ex::Base.IOError, workspace::Workspace)
+function workspace_exception_result(ex::Union{Base.IOError, Malt.TerminatedWorkerException, Distributed.ProcessExitedException}, workspace::Workspace)
     (
         output_formatted=PlutoRunner.format_output(CapturedException(ex, [])),
         errored=true,
@@ -364,9 +364,9 @@ function workspace_exception_result(ex::Base.IOError, workspace::Workspace)
     )
 end
 
-function workspace_exception_result(exs::CompositeException, workspace::Workspace)
-    ex = first(exs.exceptions)
+workspace_exception_result(exs::CompositeException, workspace::Workspace) = workspace_exception_result(first(exs.exceptions), workspace)
 
+function workspace_exception_result(ex::Exception, workspace::Workspace)
     if ex isa InterruptException || (ex isa Malt.RemoteException && occursin("InterruptException", ex.message))
         @info "Found an interrupt!" ex
         (
@@ -378,23 +378,13 @@ function workspace_exception_result(exs::CompositeException, workspace::Workspac
             published_objects=Dict{String,Any}(),
             has_pluto_hook_features=false,
         )
-    elseif ex isa Malt.TerminatedWorkerException
-        (
-            output_formatted=PlutoRunner.format_output(CapturedException(exs, [])),
-            errored=true,
-            interrupted=true,
-            process_exited=true && !workspace.discarded, # don't report a process exit if the workspace was discarded on purpose
-            runtime=nothing,
-            published_objects=Dict{String,Any}(),
-            has_pluto_hook_features=false,
-        )
     else
         @error "Unkown error during eval_format_fetch_in_workspace" ex
         (
-            output_formatted=PlutoRunner.format_output(CapturedException(exs, [])),
+            output_formatted=PlutoRunner.format_output(CapturedException(ex, [])),
             errored=true,
             interrupted=true,
-            process_exited=false,
+            process_exited=!Malt.isrunning(workspace.worker) && !workspace.discarded, # don't report a process exit if the workspace was discarded on purpose
             runtime=nothing,
             published_objects=Dict{String,Any}(),
             has_pluto_hook_features=false,
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index d51a29cd85..cf252733ab 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -2645,6 +2645,9 @@ function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogL
             _send_stdio_output!(output, loglevel)
         catch err
             @error "Failed to redirect stdout/stderr to logs"  exception=(err,catch_backtrace())
+            if err isa InterruptException
+                rethrow(err)
+            end
         end
     end
 

From a3ffc09b21e2362fc1c18511b19c74867e4fb470 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 19 Sep 2023 11:06:07 +0200
Subject: [PATCH 697/821] Accessibility and style tweaks

---
 frontend/components/ExportBanner.js  |  4 ++--
 frontend/components/SlideControls.js |  2 +-
 frontend/components/UndoDelete.js    |  1 +
 frontend/editor.css                  | 13 +++++++------
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index 2188763d9b..2cfdc24696 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -44,7 +44,7 @@ export const WarnForVisisblePasswords = () => {
     }
 }
 
-export const ExportBanner = ({ notebook_id, onClose, notebookfile_url, notebookexport_url, start_recording }) => {
+export const ExportBanner = ({ notebook_id, open, onClose, notebookfile_url, notebookexport_url, start_recording }) => {
     // @ts-ignore
     const isDesktop = !!window.plutoDesktop
 
@@ -56,7 +56,7 @@ export const ExportBanner = ({ notebook_id, onClose, notebookfile_url, notebooke
     }
 
     return html`
-        <aside id="export">
+        <aside id="export" inert=${!open}>
             <div id="container">
                 <div class="export_title">export</div>
                 <!-- no "download" attribute here: we want the jl contents to be shown in a new tab -->
diff --git a/frontend/components/SlideControls.js b/frontend/components/SlideControls.js
index 0b096d6996..d96e3dce9b 100644
--- a/frontend/components/SlideControls.js
+++ b/frontend/components/SlideControls.js
@@ -89,7 +89,7 @@ export const SlideControls = () => {
     }, [presenting])
 
     return html`
-        <nav id="slide_controls">
+        <nav id="slide_controls" inert=${!presenting}>
             <button ref=${button_prev_ref} class="changeslide prev" title="Previous slide" onClick=${go_previous_slide}><span></span></button>
             <button ref=${button_next_ref} class="changeslide next" title="Next slide" onClick=${go_next_slide}><span></span></button>
         </nav>
diff --git a/frontend/components/UndoDelete.js b/frontend/components/UndoDelete.js
index 88840353de..472822621e 100644
--- a/frontend/components/UndoDelete.js
+++ b/frontend/components/UndoDelete.js
@@ -24,6 +24,7 @@ export const UndoDelete = ({ recently_deleted, on_click }) => {
     return html`
         <nav
             id="undo_delete"
+            inert=${hidden}
             class=${cl({
                 hidden: hidden,
             })}
diff --git a/frontend/editor.css b/frontend/editor.css
index 2f6b6b2e4a..3c462f4ff7 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -600,12 +600,6 @@ nav#at_the_top > a {
     /* margin-right: 5rem; */
 }
 
-nav#at_the_top img {
-    height: 39px;
-    margin-bottom: -8px;
-    filter: var(--image-filters);
-}
-
 nav#at_the_top h1 {
     font-weight: 700;
     font-size: 1.8rem;
@@ -613,6 +607,13 @@ nav#at_the_top h1 {
     border-bottom: none;
 }
 
+nav#at_the_top img#logo-small,
+nav#at_the_top img#logo-big {
+    height: 39px;
+    margin-bottom: -8px;
+    filter: var(--image-filters);
+}
+
 nav#at_the_top img#logo-small {
     display: none;
 }

From cef414d9814fb8253b0033f016c27f0661aafcdb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 19 Sep 2023 12:15:41 +0200
Subject: [PATCH 698/821] css tweaks

---
 frontend/editor.css | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index 3c462f4ff7..d16dea71c2 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -322,6 +322,7 @@ pluto-output div.admonition .admonition-title ~ * {
 
 pluto-output div.admonition {
     padding-left: 0.5rem;
+    padding-right: 0.5rem;
     background: var(--jl-message-color);
     border: 5px solid var(--jl-message-accent-color);
 }
@@ -329,6 +330,7 @@ pluto-output div.admonition .admonition-title {
     background: var(--jl-message-accent-color);
     margin: -1px; /* Fixes a rendering glitch in Chrome */
     margin-left: -0.55rem;
+    margin-right: -0.55rem;
 }
 pluto-output div.admonition.note,
 pluto-output div.admonition.info,
@@ -1002,7 +1004,7 @@ main > preamble #saveall-container.saved > span {
     opacity: 0.5;
 }
 
-.overlay-button span.pluto-icon::after {
+span.pluto-icon::after {
     content: "";
     display: inline-block;
     padding-right: 20px;
@@ -1780,17 +1782,18 @@ pkg-status-mark.disable_pkg > button > span::after {
 pluto-popup {
     display: block;
     position: absolute;
-    z-index: 70;
+    z-index: 1800;
     /* left: 1.5em; */
     /* top: calc((1.5em - 200px) * 0.5); */
-    width: min(90vw, 251px);
+    --max-size: 251px;
+    width: min(90vw, var(--max-size));
     /* min-height: 80px; */
     margin-left: 0.4rem;
     margin-top: 0px;
     margin-top: -1rem;
     /* margin-top: calc(0.5 * (1rem - 80px)); */
     overflow-wrap: break-word;
-    font-family: var(--lato-ui-font-stack);
+    font-family: var(--system-ui-font-stack);
     opacity: 0;
     transform: scale(0.2);
     transform-origin: left;
@@ -1814,6 +1817,15 @@ pluto-popup > * {
     padding: 8px;
     /* Slightly changes the layout of the three pkg buttons... in just the way that we want it! */
     position: absolute;
+    max-width: 100%;
+}
+
+pluto-popup > div > *:first-child {
+    margin-block-start: 0;
+}
+
+pluto-popup h1 {
+    font-size: 1.6em;
 }
 
 pluto-popup.warn > * {
@@ -2686,7 +2698,7 @@ footer #info {
 /* UNDO DELETED CELL */
 
 nav#undo_delete {
-    z-index: 1000;
+    z-index: 2000;
     display: block;
     position: fixed;
     bottom: 0px;

From dd9a837e9e9f9fa9a8781419bf421f880c41a4f3 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 19 Sep 2023 12:16:20 +0200
Subject: [PATCH 699/821] popup: big option

---
 frontend/components/NotifyWhenDone.js |  2 +-
 frontend/components/Popup.js          | 13 +++++++++----
 frontend/editor.css                   |  4 ++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/frontend/components/NotifyWhenDone.js b/frontend/components/NotifyWhenDone.js
index b05b25fe07..f31bedb12d 100644
--- a/frontend/components/NotifyWhenDone.js
+++ b/frontend/components/NotifyWhenDone.js
@@ -60,7 +60,7 @@ export let NotifyWhenDone = ({ status }) => {
     const visible = useDelayedTruth(!all_done, 2500) || enabled
 
     return html`
-        <div class=${cl({ visible, "notify-when-done": true })}>
+        <div class=${cl({ visible, "notify-when-done": true })} inert=${!visible}>
             <label
                 >${"Notify when done"}
                 <input
diff --git a/frontend/components/Popup.js b/frontend/components/Popup.js
index 16d3491ac2..27013725a9 100644
--- a/frontend/components/Popup.js
+++ b/frontend/components/Popup.js
@@ -19,7 +19,8 @@ export const help_circle_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/
 /**
  * @typedef PkgPopupDetails
  * @property {"nbpkg"} type
- * @property {HTMLElement?} source_element
+ * @property {HTMLElement} [source_element]
+ * @property {Boolean} [big]
  * @property {string} package_name
  * @property {boolean} is_disable_pkg
  */
@@ -28,7 +29,8 @@ export const help_circle_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/
  * @typedef MiscPopupDetails
  * @property {"info" | "warn"} type
  * @property {import("../imports/Preact.js").ReactElement} body
- * @property {HTMLElement?} source_element
+ * @property {HTMLElement} [source_element]
+ * @property {Boolean} [big]
  */
 
 export const open_pluto_popup = (/** @type{PkgPopupDetails | MiscPopupDetails} */ detail) => {
@@ -41,6 +43,8 @@ export const open_pluto_popup = (/** @type{PkgPopupDetails | MiscPopupDetails} *
 
 export const Popup = ({ notebook, disable_input }) => {
     const [recent_event, set_recent_event] = useState(/** @type{(PkgPopupDetails | MiscPopupDetails)?} */ (null))
+    const recent_event_ref = useRef(/** @type{(PkgPopupDetails | MiscPopupDetails)?} */ (null))
+    recent_event_ref.current = recent_event
     const recent_source_element_ref = useRef(/** @type{HTMLElement?} */ (null))
     const pos_ref = useRef("")
 
@@ -66,10 +70,10 @@ export const Popup = ({ notebook, disable_input }) => {
 
     useEffect(() => {
         const onpointerdown = (e) => {
+            if (recent_event_ref.current == null) return
             if (e.target == null) return
             if (e.target.closest("pluto-popup") != null) return
-            if (recent_source_element_ref.current == null) return
-            if (recent_source_element_ref.current.contains(e.target)) return
+            if (recent_source_element_ref.current != null && recent_source_element_ref.current.contains(e.target)) return
 
             close()
         }
@@ -96,6 +100,7 @@ export const Popup = ({ notebook, disable_input }) => {
         class=${cl({
             visible: recent_event != null,
             [type ?? ""]: type != null,
+            big: recent_event?.big === true,
         })}
         style="${pos_ref.current}"
     >
diff --git a/frontend/editor.css b/frontend/editor.css
index d16dea71c2..b72ff39df1 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1808,6 +1808,10 @@ pluto-popup.visible {
     pointer-events: initial;
 }
 
+pluto-popup.big {
+    --max-size: 25em;
+}
+
 pluto-popup > * {
     display: block;
     background: var(--overlay-button-bg);

From bae7d1c9ad2d12a63b3bc7976e60e6c2a70d9613 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 19 Sep 2023 14:01:11 +0200
Subject: [PATCH 700/821] tiny type fix

---
 frontend/components/Editor.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 99bcc2369f..fe2ad5a6a7 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -847,7 +847,6 @@ patch: ${JSON.stringify(
                 // https://github.com/fonsp/Pluto.jl/issues/2398
                 open_pluto_popup({
                     type: "warn",
-                    source_element: null,
                     body: html`<p>A new server was started - this notebook session is no longer running.</p>
                         <p>Would you like to go back to the main menu?</p>
                         <br />

From 681981e4a84e8f289f6c1e9fa6dbf19a4ee072bc Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 19 Sep 2023 14:29:02 +0200
Subject: [PATCH 701/821] css tweaks

---
 frontend/editor.css | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index b72ff39df1..a72a230cfe 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -920,16 +920,19 @@ body.is_recording header#pluto-nav {
 #record-ui-container > .overlay-button.playback {
     border-color: #c6c6dc;
 }
-#record-ui-container span.stop-recording-icon::after {
+span.pluto-icon.stop-recording-icon::after {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/stop-circle-outline.svg");
 }
-#record-ui-container span.microphone-icon::after {
+span.pluto-icon.microphone-icon::after {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/mic-outline.svg");
 }
-#record-ui-container span.mute-icon::after {
+span.pluto-icon.info-icon::after {
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/information-circle-outline.svg");
+}
+span.pluto-icon.mute-icon::after {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/mic-off-outline.svg");
 }
-#record-ui-container span.follow-recording-icon::after {
+span.pluto-icon.follow-recording-icon::after {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-undo-outline.svg");
 }
 
@@ -1007,11 +1010,11 @@ main > preamble #saveall-container.saved > span {
 span.pluto-icon::after {
     content: "";
     display: inline-block;
-    padding-right: 20px;
-    /* width: 17px; */
-    height: 18px;
-    margin-bottom: -5px;
-    background-size: 17px 17px;
+    padding-right: 1.5em;
+    height: 1.3em;
+    margin-bottom: -0.3em;
+    transform: translateY(-0.1em);
+    background-size: 1.3em;
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/sync-circle-outline.svg");
     background-repeat: no-repeat;
     background-position-x: right;

From 27b23a408ebe12e2ef335405b2f3899fd40775b5 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 19 Sep 2023 14:33:25 +0200
Subject: [PATCH 702/821] Show errored, folded code with less opacity

---
 frontend/editor.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/editor.css b/frontend/editor.css
index a72a230cfe..3e3ab1d2ef 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -2005,6 +2005,9 @@ pluto-runarea.save > button.runcell > span::after {
 pluto-cell:not(.show_input) > pluto-runarea {
     display: none;
 }
+pluto-cell.code_folded.show_input > pluto-input:not(:focus-within) {
+    opacity: 0.4;
+}
 
 pluto-cell:focus-within > pluto-runarea,
 pluto-cell.code_differs > pluto-runarea {

From 871517cdb359110d4e9c4c8c27c6321a9fadea4b Mon Sep 17 00:00:00 2001
From: Gerhard Dorn <67096719+dorn-gerhard@users.noreply.github.com>
Date: Tue, 19 Sep 2023 18:33:43 +0200
Subject: [PATCH 703/821] Linebreaks with small spacing in Firefox (#2605)

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 frontend/editor.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/editor.css b/frontend/editor.css
index 3e3ab1d2ef..97f5913be3 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -192,6 +192,11 @@ pluto-output p {
     line-height: 1.45em;
 }
 
+/* This allows a linebreak in Markdown using backslash with smaller spacing compared to paragraph in firefox */
+pluto-output br {
+    margin-block-end: 0;
+}
+
 pluto-output p:first-child {
     margin-block-start: 0px;
 }

From 50b2dc50780da5369d038f4a29e9639cba88b10b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 20 Sep 2023 15:05:54 +0200
Subject: [PATCH 704/821] workspace_custom_startup_expr as String (#2654)

Co-authored-by: Paul Berg <paul@plutojl.org>
---
 src/Configuration.jl               | 6 +++---
 src/evaluation/WorkspaceManager.jl | 4 +++-
 test/Configuration.jl              | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index 2b7eed6ae9..b99c429723 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -156,7 +156,7 @@ These options are not intended to be changed during normal use.
 - `workspace_use_distributed_stdlib::Bool? = $WORKSPACE_USE_DISTRIBUTED_STDLIB_DEFAULT` Should we use the Distributed stdlib to run processes? Distributed will be replaced by Malt.jl, you can use this option to already get the old behaviour. `nothing` means: determine automatically (which is currently the same as `true`).
 - `lazy_workspace_creation::Bool = $LAZY_WORKSPACE_CREATION_DEFAULT`
 - `capture_stdout::Bool = $CAPTURE_STDOUT_DEFAULT`
-- `workspace_custom_startup_expr::Union{Nothing,Expr} = $WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT` An expression to be evaluated in the workspace process before running notebook code.
+- `workspace_custom_startup_expr::Union{Nothing,String} = $WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT` An expression to be evaluated in the workspace process before running notebook code.
 """
 @option mutable struct EvaluationOptions
     run_notebook_on_load::Bool = RUN_NOTEBOOK_ON_LOAD_DEFAULT
@@ -164,7 +164,7 @@ These options are not intended to be changed during normal use.
     workspace_use_distributed_stdlib::Union{Bool,Nothing} = WORKSPACE_USE_DISTRIBUTED_STDLIB_DEFAULT
     lazy_workspace_creation::Bool = LAZY_WORKSPACE_CREATION_DEFAULT
     capture_stdout::Bool = CAPTURE_STDOUT_DEFAULT
-    workspace_custom_startup_expr::Union{Nothing,Expr} = WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT
+    workspace_custom_startup_expr::Union{Nothing,String} = WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT
 end
 
 const COMPILE_DEFAULT = nothing
@@ -298,7 +298,7 @@ function from_flat_kwargs(;
         workspace_use_distributed_stdlib::Union{Bool,Nothing} = WORKSPACE_USE_DISTRIBUTED_STDLIB_DEFAULT,
         lazy_workspace_creation::Bool = LAZY_WORKSPACE_CREATION_DEFAULT,
         capture_stdout::Bool = CAPTURE_STDOUT_DEFAULT,
-        workspace_custom_startup_expr::Union{Nothing,Expr} = WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT,
+        workspace_custom_startup_expr::Union{Nothing,String} = WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT,
 
         compile::Union{Nothing,String} = COMPILE_DEFAULT,
         pkgimages::Union{Nothing,String} = PKGIMAGES_DEFAULT,
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index ba798bb114..e6f44eda44 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -73,7 +73,9 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
     Status.report_business_planned!(init_status, Symbol(3))
     Status.report_business_planned!(init_status, Symbol(4))
 
-    Malt.remote_eval_wait(worker, session.options.evaluation.workspace_custom_startup_expr)
+    let s = session.options.evaluation.workspace_custom_startup_expr
+        s === nothing || Malt.remote_eval_wait(worker, Meta.parseall(s))
+    end
 
     Malt.remote_eval_wait(worker, quote
         PlutoRunner.notebook_id[] = $(notebook.notebook_id)
diff --git a/test/Configuration.jl b/test/Configuration.jl
index 4d2d6c2f54..8b92d5b179 100644
--- a/test/Configuration.jl
+++ b/test/Configuration.jl
@@ -128,9 +128,10 @@ end
 @testset "disable mimetype via workspace_custom_startup_expr" begin
     🍭 = ServerSession()
     🍭.options.evaluation.workspace_use_distributed = true
-    🍭.options.evaluation.workspace_custom_startup_expr = quote
+    🍭.options.evaluation.workspace_custom_startup_expr = """
+        1 + 1
         PlutoRunner.is_mime_enabled(m::MIME"application/vnd.pluto.tree+object") = false
-    end
+    """
 
     nb = Pluto.Notebook([
         Pluto.Cell("x = [1, 2]")

From 3ee127597b007d627971ed5326643fe9f03074bd Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 21 Sep 2023 18:05:56 +0200
Subject: [PATCH 705/821] release 0.19.28

---
 Project.toml                 | 2 +-
 frontend/featured_sources.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Project.toml b/Project.toml
index 7292cf6847..740b6a12aa 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.27"
+version = "0.19.28"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
diff --git a/frontend/featured_sources.js b/frontend/featured_sources.js
index 5acc0b97d9..e0dd1b0822 100644
--- a/frontend/featured_sources.js
+++ b/frontend/featured_sources.js
@@ -2,8 +2,8 @@ export default {
     // check out https://github.com/JuliaPluto/pluto-developer-instructions/blob/main/How%20to%20update%20the%20featured%20notebooks.md to learn more
     sources: [
         {
-            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@v2/pluto_export.json",
-            integrity: "sha256-fDkEwI4YcuoCcQPZQmafTwnHD0evKyq0dGLEL+XLjZA=",
+            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@v3/pluto_export.json",
+            integrity: "sha256-y2E/niS8Em5a4wfSupsmDi0JaTrKSI0WF9DBkfEiQYQ=",
         },
     ],
 }

From 91c169573f6f2bbc8106e339ded251a31bceaeb8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 27 Sep 2023 19:41:21 +0200
Subject: [PATCH 706/821] Support interrupt on Windows soon! (#2659)

---
 Project.toml                       | 2 +-
 src/evaluation/WorkspaceManager.jl | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Project.toml b/Project.toml
index 740b6a12aa..9587b46a28 100644
--- a/Project.toml
+++ b/Project.toml
@@ -39,7 +39,7 @@ HTTP = "^1.5.2"
 HypertextLiteral = "0.7, 0.8, 0.9"
 LoggingExtras = "0.4, 1"
 MIMEs = "0.1"
-Malt = "1.0.3"
+Malt = "1.1"
 MsgPack = "1.1"
 PrecompileSignatures = "3"
 PrecompileTools = "1"
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index e6f44eda44..178b44f5f9 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -641,10 +641,8 @@ function interrupt_workspace(session_notebook::Union{SN,Workspace}; verbose=true
         return true
     end
 
-    if Sys.iswindows()
-        verbose && @warn "Unfortunately, stopping cells is currently not supported on Windows :(
-        Maybe the Windows Subsystem for Linux is right for you:
-        https://docs.microsoft.com/en-us/windows/wsl"
+    if (workspace.worker isa Malt.DistributedStdlibWorker) && Sys.iswindows()
+        verbose && @warn "Stopping cells is not yet supported on Windows, but it will be soon!\n\nYou can already try out this new functionality with:\n\nPluto.run(workspace_use_distributed_stdlib=false)\n\nLet us know what you think!"
         return false
     end
 

From fe491d96239e4ac12ef5a84bceb46d4b91de607f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 27 Sep 2023 19:44:51 +0200
Subject: [PATCH 707/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 9587b46a28..5a3222a5ee 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.28"
+version = "0.19.29"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 82185cf3d56aef36eb598d2b38c7209ec4b46e61 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 27 Sep 2023 22:34:35 +0200
Subject: [PATCH 708/821] Update Julia Computing to JuliaHub in sponsors list

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 613c7a3cf4..2d974b6881 100644
--- a/README.md
+++ b/README.md
@@ -188,7 +188,7 @@ Development of Pluto.jl is partially sponsored by
 |----|----|
 | <a href="https://computationalthinking.mit.edu"><img title="Massachusetts Institute of Technology" src="https://user-images.githubusercontent.com/6933510/103308960-09412e00-4a14-11eb-8a3a-39201a9c186d.png" width=400 alt="MIT logo"></a> | The free online course _[Introduction to Computational Thinking](https://computationalthinking.mit.edu)_ at **MIT** uses Pluto notebooks to teach scientific computing in a new way. Homeworks react to the student in realtime, with _live answer checks and visualizations_ while you solve problems. |
 | <a href="http://quera-computing.com"><img title="QuEra Computing" src="https://user-images.githubusercontent.com/6933510/103309531-9e90f200-4a15-11eb-850f-99609e3b9bd8.png" width=400 alt="QuEra logo"></a> | **QuEra Computing** uses a Pluto notebook as an online dashboard to control their _quantum computer_! |
-| <a href="https://juliacomputing.com/"><img title="Julia Computing" src="https://user-images.githubusercontent.com/6933510/110478267-780dc800-80e4-11eb-91e5-2ef0256ad0db.png" width=400 alt="Julia Computing logo"></a> | [JuliaHub](https://juliahub.com) by **Julia Computing** enables the creation and editing of Pluto notebooks *on the cloud*! |
+| <a href="https://juliahub.com/"><img title="JuliaHub" src="https://github.com/fonsp/Pluto.jl/assets/6933510/42496111-6831-4519-a399-d5c1e28e5241" width=400 alt="Julia Computing logo"></a> | [**JuliaHub**](https://juliahub.com) enables the creation and editing of Pluto notebooks *on the cloud*! |
 | <a href="https://numfocus.org/"><img title="Julia Computing" src="https://user-images.githubusercontent.com/6933510/110683397-42e4a100-81dc-11eb-9bdb-db58f9c283b4.png" width=400 alt="NumFOCUS logo"></a> | The mission of **NumFOCUS** is to promote open practices in research, data, and scientific computing by serving as a fiscal sponsor for open source projects and organizing community-driven educational programs. |
 
 _Created by [**Fons van der Plas**](https://github.com/fonsp) and [**Mikołaj Bochenski**](https://github.com/malyvsen). Inspired by [Observable](https://observablehq.com/)._

From 049ff094a2d2495f757fb9a1422281fea3e285fa Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 27 Sep 2023 22:46:04 +0200
Subject: [PATCH 709/821] readme: update juliahub sponsor

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2d974b6881..39ba98b02b 100644
--- a/README.md
+++ b/README.md
@@ -188,7 +188,7 @@ Development of Pluto.jl is partially sponsored by
 |----|----|
 | <a href="https://computationalthinking.mit.edu"><img title="Massachusetts Institute of Technology" src="https://user-images.githubusercontent.com/6933510/103308960-09412e00-4a14-11eb-8a3a-39201a9c186d.png" width=400 alt="MIT logo"></a> | The free online course _[Introduction to Computational Thinking](https://computationalthinking.mit.edu)_ at **MIT** uses Pluto notebooks to teach scientific computing in a new way. Homeworks react to the student in realtime, with _live answer checks and visualizations_ while you solve problems. |
 | <a href="http://quera-computing.com"><img title="QuEra Computing" src="https://user-images.githubusercontent.com/6933510/103309531-9e90f200-4a15-11eb-850f-99609e3b9bd8.png" width=400 alt="QuEra logo"></a> | **QuEra Computing** uses a Pluto notebook as an online dashboard to control their _quantum computer_! |
-| <a href="https://juliahub.com/"><img title="JuliaHub" src="https://github.com/fonsp/Pluto.jl/assets/6933510/42496111-6831-4519-a399-d5c1e28e5241" width=400 alt="Julia Computing logo"></a> | [**JuliaHub**](https://juliahub.com) enables the creation and editing of Pluto notebooks *on the cloud*! |
+| <a href="https://juliahub.com/"><img title="JuliaHub" src="https://i.imgur.com/IGdcVt7.png" width=200 alt="JuliaHub logo"></a> | [**JuliaHub**](https://juliahub.com) enables the creation and editing of Pluto notebooks *on the cloud*! |
 | <a href="https://numfocus.org/"><img title="Julia Computing" src="https://user-images.githubusercontent.com/6933510/110683397-42e4a100-81dc-11eb-9bdb-db58f9c283b4.png" width=400 alt="NumFOCUS logo"></a> | The mission of **NumFOCUS** is to promote open practices in research, data, and scientific computing by serving as a fiscal sponsor for open source projects and organizing community-driven educational programs. |
 
 _Created by [**Fons van der Plas**](https://github.com/fonsp) and [**Mikołaj Bochenski**](https://github.com/malyvsen). Inspired by [Observable](https://observablehq.com/)._

From 3f108c0a461123e8c19cdff27e6459b118a6ee1f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 2 Oct 2023 16:04:18 +0200
Subject: [PATCH 710/821] Button to toggle presentation mode in export menu
 (#2660)

---
 frontend/components/ExportBanner.js  | 11 +++++++++++
 frontend/components/SlideControls.js | 12 ++++++------
 frontend/editor.css                  |  5 +++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index 2cfdc24696..dff5a1fb43 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -108,6 +108,17 @@ export const ExportBanner = ({ notebook_id, open, onClose, notebookfile_url, not
                     >
                         <span></span>
                     </button>
+                    <button
+                        title="Start presentation"
+                        class="toggle_presentation"
+                        onClick=${() => {
+                            onClose()
+                            // @ts-ignore
+                            window.present()
+                        }}
+                    >
+                        <span></span>
+                    </button>
                     <button title="Close" class="toggle_export" onClick=${() => onClose()}>
                         <span></span>
                     </button>
diff --git a/frontend/components/SlideControls.js b/frontend/components/SlideControls.js
index d96e3dce9b..d1295b436c 100644
--- a/frontend/components/SlideControls.js
+++ b/frontend/components/SlideControls.js
@@ -37,9 +37,9 @@ export const SlideControls = () => {
         const height = window.innerHeight
         const headers = Array.from(notebook_node.querySelectorAll("pluto-output h1, pluto-output h2"))
         const pos = headers.map((el) => el.getBoundingClientRect())
-        const edges = pos.map((rect) => rect.top + window.pageYOffset)
+        const edges = pos.map((rect) => rect.top + window.scrollY)
 
-        edges.push(notebook_node.getBoundingClientRect().bottom + window.pageYOffset)
+        edges.push(notebook_node.getBoundingClientRect().bottom + window.scrollY)
 
         const scrollPositions = headers.map((el, i) => {
             if (el.tagName == "H1") {
@@ -58,15 +58,15 @@ export const SlideControls = () => {
     const go_previous_slide = (/** @type {Event} */ e) => {
         const positions = calculate_slide_positions(e)
 
-        const pos = positions.reverse().find((y) => y < window.pageYOffset - 10)
+        const pos = positions.reverse().find((y) => y < window.scrollY - 10)
 
-        if (pos) window.scrollTo(window.pageXOffset, pos)
+        if (pos) window.scrollTo(window.scrollX, pos)
     }
 
     const go_next_slide = (/** @type {Event} */ e) => {
         const positions = calculate_slide_positions(e)
-        const pos = positions.find((y) => y - 10 > window.pageYOffset)
-        if (pos) window.scrollTo(window.pageXOffset, pos)
+        const pos = positions.find((y) => y - 10 > window.scrollY)
+        if (pos) window.scrollTo(window.scrollX, pos)
     }
 
     const presenting_ref = useRef(false)
diff --git a/frontend/editor.css b/frontend/editor.css
index 97f5913be3..0ca807c9f4 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -511,6 +511,7 @@ aside#export div#container {
     max-width: 1000px;
     padding-right: 10em;
     margin: 0 auto;
+    position: relative;
 }
 header aside#export div#container {
     /* to prevent the div from taking up horizontal page when the export pane is closed. On small screen this causes overscroll on the right. */
@@ -732,6 +733,10 @@ aside#export button.toggle_frontmatter_edit span {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/newspaper-outline.svg");
     filter: invert(1);
 }
+aside#export button.toggle_presentation span {
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/easel-outline.svg");
+    filter: invert(1);
+}
 nav#at_the_top:after {
     margin-left: auto;
     align-self: center;

From 3b375490a2e2984a9cb81f50f23a71427269a83a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 2 Oct 2023 17:33:35 +0200
Subject: [PATCH 711/821] Featured sources: valid_until and id attribute

---
 frontend/components/welcome/Featured.js | 82 ++++++++++++++++++++-----
 1 file changed, 66 insertions(+), 16 deletions(-)

diff --git a/frontend/components/welcome/Featured.js b/frontend/components/welcome/Featured.js
index 03b9e97484..6937d13241 100644
--- a/frontend/components/welcome/Featured.js
+++ b/frontend/components/welcome/Featured.js
@@ -94,9 +94,16 @@ const fallback_collections = [
 
 /**
  * @typedef FeaturedSource
- * @type {{url: String, integrity?: String}}
+ * @type {{
+ *  url: String,
+ *  id?: String,
+ *  integrity?: String,
+ *  valid_until?: String
+ * }}
  */
 
+const get_id = (/** @type {FeaturedSource} */ source) => source?.id ?? source.url
+
 /**
  * @param {{
  * sources: FeaturedSource[]?,
@@ -109,25 +116,51 @@ export const Featured = ({ sources, direct_html_links }) => {
 
     useEffect(() => {
         if (sources != null) {
+            set_waited_too_long(false)
+            set_source_data({})
+
             // Start downloading the sources
-            const promises = sources.map(async ({ url, integrity }) => {
-                const data = await (await fetch(new Request(url, { integrity: integrity ?? undefined }))).json()
-
-                if (data.format_version !== "1") {
-                    throw new Error(`Invalid format version: ${data.format_version}`)
-                }
-
-                set_source_data((old) => ({
-                    ...old,
-                    [url]: {
-                        ...data,
-                        source_url: url,
-                    },
-                }))
+
+            const ids = Array.from(new Set(sources.map(get_id)))
+
+            console.log(ids)
+            console.log("123123123213123")
+
+            const promises = ids.map((id) => {
+                const sources_for_id = sources.filter((source) => get_id(source) === id)
+
+                let result = promise_any_with_priority(
+                    sources_for_id.map(async (source) => {
+                        const { url, integrity, valid_until } = source
+
+                        if (valid_until != null && new Date(valid_until) < new Date()) {
+                            throw new Error(`Source ${url} is expired with valid_until ${valid_until}`)
+                        }
+
+                        const data = await (await fetch(new Request(url, { integrity: integrity ?? undefined }))).json()
+
+                        if (data.format_version !== "1") {
+                            throw new Error(`Invalid format version: ${data.format_version}`)
+                        }
+
+                        return [data, id, url]
+                    })
+                )
+
+                return result.then(([data, id, url]) => {
+                    set_source_data((old) => ({
+                        ...old,
+                        [id]: {
+                            ...data,
+                            source_url: url,
+                        },
+                    }))
+                })
             })
 
             Promise.any(promises).catch((e) => {
                 console.error("All featured sources failed to load: ", e)
+                ;(e?.errors ?? []).forEach((e) => console.error(e))
                 set_waited_too_long(true)
             })
         }
@@ -148,10 +181,14 @@ export const Featured = ({ sources, direct_html_links }) => {
 
     const no_data = Object.entries(source_data).length === 0
 
+    const ids = Array.from(new Set(sources?.map(get_id) ?? []))
+
+    const sorted_on_source_order = ids.map((id) => source_data[id]).filter((d) => d != null)
+
     return no_data && waited_too_long
         ? offline_html
         : html`
-              ${(no_data ? placeholder_data : Object.values(source_data)).map((/** @type {SourceManifest} */ data) => {
+              ${(no_data ? placeholder_data : sorted_on_source_order).map((/** @type {SourceManifest} */ data) => {
                   let collections = data?.collections ?? fallback_collections
 
                   return html`
@@ -187,3 +224,16 @@ const collection = (/** @type {SourceManifestNotebookEntry[]} */ notebooks, /**
     let n = (s) => (isNaN(s) ? s : Number(s))
     return /** @type {SourceManifestNotebookEntry[]} */ (_.sortBy(nbs, [(nb) => n(nb?.frontmatter?.order), "id"]))
 }
+
+/**
+ * Given a list promises, return promise[0].catch(() => promise[1].catch(() => promise[2]... etc))
+ * @param {Promise[]} promises
+ * @returns {Promise}
+ */
+const promise_any_with_priority = (/** @type {Promise[]} */ promises, /** @type {Promise[]} */ already_rejected = []) => {
+    if (promises.length <= 1) {
+        return Promise.any([...promises, ...already_rejected])
+    } else {
+        return promises[0].catch(() => promise_any_with_priority(promises.slice(1), [...already_rejected, promises[0]]))
+    }
+}

From a44ccc5dcd88994dc849e79f85c6fa9fe21271c3 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Sat, 7 Oct 2023 15:21:04 +0200
Subject: [PATCH 712/821] Filter on exported symbols in 1.11 (#2661)

* Filter on exported symbols in 1.11

See
https://github.com/JuliaLang/julia/pull/50105#issuecomment-1721111250
for context

* Update PlutoRunner.jl
---
 src/runner/PlutoRunner.jl  | 10 +++++++++-
 test/ExpressionExplorer.jl |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index cf252733ab..fdc891be03 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -324,9 +324,17 @@ function try_macroexpand(mod::Module, notebook_id::UUID, cell_id::UUID, expr; ca
     return (sanitize_expr(expr_to_save), expr_hash(expr_to_save))
 end
 
+function exported_names(mod::Module)
+    @static if VERSION ≥ v"1.11.0-DEV.469"
+        filter!(Base.Fix1(Base.isexported, mod), names(mod; all=true))
+    else
+        names(mod)
+    end
+end
+
 function get_module_names(workspace_module, module_ex::Expr)
     try
-        Core.eval(workspace_module, Expr(:call, :names, module_ex)) |> Set{Symbol}
+        Core.eval(workspace_module, Expr(:call, exported_names, module_ex)) |> Set{Symbol}
     catch
         Set{Symbol}()
     end
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index 5ab13b83a9..aa086d6eb4 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -805,7 +805,6 @@ end
         (" 🍕🍕", (6, 10), (3, 5)), # a 🍕 is two UTF16 codeunits
     ]
     for (s, (start_byte, end_byte), (from, to)) in tests
-        @show s
         @test PlutoRunner.map_byte_range_to_utf16_codepoints(s, start_byte, end_byte) == (from, to)
     end
 end

From ebebf3ccb0a2dc6aded6c4f84608fdbc8da64512 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 21 Oct 2023 19:46:15 +0200
Subject: [PATCH 713/821] Improve frontend test stability (#2671)

---
 frontend/components/BottomRightPanel.js      |  2 ++
 frontend/components/Editor.js                |  4 ++++
 test/frontend/__tests__/autocomplete_test.js |  5 +---
 test/frontend/__tests__/bonds.js             |  9 +++----
 test/frontend/__tests__/javascript_api.js    | 25 +++++---------------
 test/frontend/__tests__/new_notebook_test.js |  7 +++---
 test/frontend/__tests__/paste_test.disabled  |  8 +++----
 test/frontend/__tests__/published_to_js.js   | 18 ++++----------
 test/frontend/__tests__/slide_controls.js    | 13 ++--------
 test/frontend/helpers/pluto.js               | 22 +++++++++++++----
 10 files changed, 49 insertions(+), 64 deletions(-)

diff --git a/frontend/components/BottomRightPanel.js b/frontend/components/BottomRightPanel.js
index 51ef149e8d..25bbbb2649 100644
--- a/frontend/components/BottomRightPanel.js
+++ b/frontend/components/BottomRightPanel.js
@@ -94,7 +94,9 @@ export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, noteboo
                             "helpbox-process": true,
                             "active": open_tab === "process",
                             "busy": show_business_outline,
+                            "something_is_happening": busy || !connected,
                         })}
+                        id="process-status-tab-button"
                         onClick=${() => {
                             set_open_tab(open_tab === "process" ? null : "process")
                         }}
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index fe2ad5a6a7..e4e02b697f 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -957,6 +957,10 @@ patch: ${JSON.stringify(
             // console.info("All scripts finished!")
             this.send_queued_bond_changes()
         })
+
+        // @ts-ignore This is for tests
+        document.body._js_init_set = this.js_init_set
+
         /** Is the notebook ready to execute code right now? (i.e. are no cells queued or running?) */
         this.notebook_is_idle = () => {
             return !(
diff --git a/test/frontend/__tests__/autocomplete_test.js b/test/frontend/__tests__/autocomplete_test.js
index b44a5b4a0f..7af4ca3a42 100644
--- a/test/frontend/__tests__/autocomplete_test.js
+++ b/test/frontend/__tests__/autocomplete_test.js
@@ -1,13 +1,11 @@
 import puppeteer from "puppeteer"
-import { lastElement, saveScreenshot, getTestScreenshotPath, createPage } from "../helpers/common"
+import { lastElement, saveScreenshot, createPage } from "../helpers/common"
 import {
     getCellIds,
     importNotebook,
     waitForCellOutput,
     getPlutoUrl,
-    prewarmPluto,
     writeSingleLineInPlutoInput,
-    waitForNoUpdateOngoing,
     shutdownCurrentNotebook,
     setupPlutoBrowser,
 } from "../helpers/pluto"
@@ -42,7 +40,6 @@ describe("PlutoAutocomplete", () => {
 
     it("should get the correct autocomplete suggestions", async () => {
         await importNotebook(page, "autocomplete_notebook.jl")
-        await waitForNoUpdateOngoing(page, { polling: 100 })
         const importedCellIds = await getCellIds(page)
         await Promise.all(importedCellIds.map((cellId) => waitForCellOutput(page, cellId)))
 
diff --git a/test/frontend/__tests__/bonds.js b/test/frontend/__tests__/bonds.js
index 717e88b924..50f9ee67ba 100644
--- a/test/frontend/__tests__/bonds.js
+++ b/test/frontend/__tests__/bonds.js
@@ -1,6 +1,6 @@
 import puppeteer from "puppeteer"
 import { saveScreenshot, createPage, paste } from "../helpers/common"
-import { createNewNotebook, getPlutoUrl, prewarmPluto, setupPlutoBrowser, shutdownCurrentNotebook, waitForNoUpdateOngoing } from "../helpers/pluto"
+import { createNewNotebook, getPlutoUrl, setupPlutoBrowser, shutdownCurrentNotebook, waitForPlutoToCalmDown } from "../helpers/pluto"
 
 // https://github.com/fonsp/Pluto.jl/issues/928
 describe("Bonds should run once when refreshing page", () => {
@@ -51,7 +51,7 @@ describe("Bonds should run once when refreshing page", () => {
         await page.click(`.runallchanged`)
 
         await page.waitForSelector(`pluto-cell.running`, { visible: true, timeout: 0 })
-        await waitForNoUpdateOngoing(page)
+        await waitForPlutoToCalmDown(page)
 
         await paste(
             page,
@@ -66,9 +66,10 @@ numberoftimes = Ref(0)
 
         await page.waitForSelector(`.runallchanged`, { visible: true, polling: 200, timeout: 0 })
         await page.click(`.runallchanged`)
+        await waitForPlutoToCalmDown(page)
         await page.waitForFunction(() => Boolean(document.querySelector("pluto-cell:nth-of-type(5) pluto-output")?.textContent))
+        await waitForPlutoToCalmDown(page)
 
-        await waitForNoUpdateOngoing(page)
         let output_after_running_bonds = await page.evaluate(() => {
             return document.querySelector("pluto-cell:nth-of-type(5) pluto-output")?.textContent
         })
@@ -77,7 +78,7 @@ numberoftimes = Ref(0)
         // Let's refresh and see
         await page.reload({ waitUntil: ["networkidle0", "domcontentloaded"] })
         await page.waitForFunction(() => Boolean(document.querySelector("pluto-cell:nth-of-type(5) pluto-output")?.textContent))
-        await waitForNoUpdateOngoing(page)
+        await waitForPlutoToCalmDown(page)
         let output_after_reload = await page.evaluate(() => {
             return document.querySelector("pluto-cell:nth-of-type(5) pluto-output")?.textContent
         })
diff --git a/test/frontend/__tests__/javascript_api.js b/test/frontend/__tests__/javascript_api.js
index a555ec0d19..6c6c700529 100644
--- a/test/frontend/__tests__/javascript_api.js
+++ b/test/frontend/__tests__/javascript_api.js
@@ -1,19 +1,6 @@
 import puppeteer from "puppeteer"
-import { waitForContent, lastElement, saveScreenshot, getTestScreenshotPath, waitForContentToBecome, createPage, paste, countCells } from "../helpers/common"
-import {
-    createNewNotebook,
-    getCellIds,
-    waitForCellOutput,
-    waitForNoUpdateOngoing,
-    getPlutoUrl,
-    prewarmPluto,
-    waitForCellOutputToChange,
-    keyboardPressInPlutoInput,
-    writeSingleLineInPlutoInput,
-    manuallyEnterCells,
-    shutdownCurrentNotebook,
-    setupPlutoBrowser,
-} from "../helpers/pluto"
+import { saveScreenshot, waitForContentToBecome, createPage, paste } from "../helpers/common"
+import { createNewNotebook, waitForNoUpdateOngoing, getPlutoUrl, shutdownCurrentNotebook, setupPlutoBrowser, waitForPlutoToCalmDown } from "../helpers/pluto"
 
 describe("JavaScript API", () => {
     /**
@@ -62,7 +49,7 @@ describe("JavaScript API", () => {
             timeout: 0,
         })
         await page.click(`.runallchanged`)
-        await waitForNoUpdateOngoing(page, { polling: 100 })
+        await waitForPlutoToCalmDown(page, { polling: 100 })
         const initialLastCellContent = await waitForContentToBecome(page, `pluto-cell:last-child pluto-output`, expected)
         expect(initialLastCellContent).toBe(expected)
     })
@@ -83,7 +70,7 @@ describe("JavaScript API", () => {
             timeout: 0,
         })
         await page.click(`.runallchanged`)
-        await waitForNoUpdateOngoing(page, { polling: 100 })
+        await waitForPlutoToCalmDown(page, { polling: 100 })
         let initialLastCellContent = await waitForContentToBecome(page, `pluto-cell:last-child pluto-output`, expected)
         expect(initialLastCellContent).toBe(expected)
 
@@ -103,7 +90,7 @@ describe("JavaScript API", () => {
             timeout: 0,
         })
         await page.click(`.runallchanged`)
-        await waitForNoUpdateOngoing(page, { polling: 100 })
+        await waitForPlutoToCalmDown(page, { polling: 100 })
         initialLastCellContent = await waitForContentToBecome(page, `pluto-cell:last-child pluto-output`, expected)
         expect(initialLastCellContent).toBe(expected)
     })
@@ -136,7 +123,7 @@ describe("JavaScript API", () => {
             timeout: 0,
         })
         await page.click(`.runallchanged`)
-        await waitForNoUpdateOngoing(page, { polling: 100 })
+        await waitForPlutoToCalmDown(page, { polling: 100 })
         await waitForContentToBecome(page, `pluto-cell:nth-child(2) pluto-output`, "emitter")
         page.waitForTimeout(2000)
 
diff --git a/test/frontend/__tests__/new_notebook_test.js b/test/frontend/__tests__/new_notebook_test.js
index 4938d16df3..4945328b29 100644
--- a/test/frontend/__tests__/new_notebook_test.js
+++ b/test/frontend/__tests__/new_notebook_test.js
@@ -3,14 +3,13 @@ import { waitForContent, lastElement, saveScreenshot, waitForContentToBecome, cr
 import {
     createNewNotebook,
     getCellIds,
-    waitForNoUpdateOngoing,
     getPlutoUrl,
-    prewarmPluto,
     waitForCellOutputToChange,
     keyboardPressInPlutoInput,
     writeSingleLineInPlutoInput,
     shutdownCurrentNotebook,
     setupPlutoBrowser,
+    waitForPlutoToCalmDown,
 } from "../helpers/pluto"
 
 const manuallyEnterCells = async (page, cells) => {
@@ -80,7 +79,7 @@ describe("PlutoNewNotebook", () => {
         const plutoCellIds = await manuallyEnterCells(page, cells)
         await page.waitForSelector(`.runallchanged`, { visible: true, polling: 200, timeout: 0 })
         await page.click(`.runallchanged`)
-        await waitForNoUpdateOngoing(page, { polling: 100 })
+        await waitForPlutoToCalmDown(page, { polling: 100 })
         const content = await waitForContentToBecome(page, `pluto-cell[id="${plutoCellIds[3]}"] pluto-output`, "6")
         expect(content).toBe("6")
     })
@@ -90,7 +89,7 @@ describe("PlutoNewNotebook", () => {
         const plutoCellIds = await manuallyEnterCells(page, cells)
         await page.waitForSelector(`.runallchanged`, { visible: true, polling: 200, timeout: 0 })
         await page.click(`.runallchanged`)
-        await waitForNoUpdateOngoing(page, { polling: 100 })
+        await waitForPlutoToCalmDown(page, { polling: 100 })
         const initialLastCellContent = await waitForContentToBecome(page, `pluto-cell[id="${plutoCellIds[3]}"] pluto-output`, "6")
         expect(initialLastCellContent).toBe("6")
 
diff --git a/test/frontend/__tests__/paste_test.disabled b/test/frontend/__tests__/paste_test.disabled
index c2461bbe3a..b85f288577 100644
--- a/test/frontend/__tests__/paste_test.disabled
+++ b/test/frontend/__tests__/paste_test.disabled
@@ -14,7 +14,7 @@ import {
     createNewNotebook,
     getCellIds,
     waitForCellOutput,
-    waitForNoUpdateOngoing,
+    waitForPlutoToCalmDown,
     getPlutoUrl,
     prewarmPluto,
     waitForCellOutputToChange,
@@ -46,7 +46,7 @@ describe("Paste Functionality", () => {
         const plutoCellIds = await manuallyEnterCells(page, cells)
         await page.waitForSelector(`.runallchanged`, { visible: true, polling: 200, timeout: 0 })
         await page.click(`.runallchanged`)
-        await waitForNoUpdateOngoing(page, { polling: 100 })
+        await waitForPlutoToCalmDown(page, { polling: 100 })
         const initialLastCellContent = await waitForContentToBecome(page, `pluto-cell[id="${plutoCellIds[3]}"] pluto-output`, "6")
         expect(initialLastCellContent).toBe("6")
 
@@ -77,7 +77,7 @@ describe("Paste Functionality", () => {
         const plutoCellIds = await manuallyEnterCells(page, cells)
         await page.waitForSelector(`.runallchanged`, { visible: true, polling: 200, timeout: 0 })
         await page.click(`.runallchanged`)
-        await waitForNoUpdateOngoing(page, { polling: 100 })
+        await waitForPlutoToCalmDown(page, { polling: 100 })
         const initialLastCellContent = await waitForContentToBecome(page, `pluto-cell[id="${plutoCellIds[3]}"] pluto-output`, "6")
         expect(initialLastCellContent).toBe("6")
 
@@ -119,7 +119,7 @@ describe("Paste Functionality", () => {
         const plutoCellIds = await manuallyEnterCells(page, cells)
         await page.waitForSelector(`.runallchanged`, { visible: true, polling: 200, timeout: 0 })
         await page.click(`.runallchanged`)
-        await waitForNoUpdateOngoing(page, { polling: 100 })
+        await waitForPlutoToCalmDown(page, { polling: 100 })
         const initialLastCellContent = await waitForContentToBecome(page, `pluto-cell[id="${plutoCellIds[3]}"] pluto-output`, "6")
         expect(initialLastCellContent).toBe("6")
 
diff --git a/test/frontend/__tests__/published_to_js.js b/test/frontend/__tests__/published_to_js.js
index 348b3cd6bf..51364a7c6d 100644
--- a/test/frontend/__tests__/published_to_js.js
+++ b/test/frontend/__tests__/published_to_js.js
@@ -1,16 +1,6 @@
 import puppeteer from "puppeteer"
-import { lastElement, saveScreenshot, getTestScreenshotPath, createPage } from "../helpers/common"
-import {
-    getCellIds,
-    importNotebook,
-    waitForCellOutput,
-    getPlutoUrl,
-    prewarmPluto,
-    writeSingleLineInPlutoInput,
-    waitForNoUpdateOngoing,
-    shutdownCurrentNotebook,
-    setupPlutoBrowser,
-} from "../helpers/pluto"
+import { saveScreenshot, createPage } from "../helpers/common"
+import { importNotebook, getPlutoUrl, shutdownCurrentNotebook, setupPlutoBrowser } from "../helpers/pluto"
 
 describe("published_to_js", () => {
     /**
@@ -42,7 +32,7 @@ describe("published_to_js", () => {
 
     it("Should correctly show published_to_js in cell output, and in logs", async () => {
         await importNotebook(page, "published_to_js.jl")
-        await waitForNoUpdateOngoing(page, { polling: 100 })
+
         let output_of_published = await page.evaluate(() => {
             return document.querySelector("#to_cell_output")?.textContent
         })
@@ -53,6 +43,6 @@ describe("published_to_js", () => {
             return document.querySelector("#to_cell_log")?.textContent
         })
         // This test is currently broken, due to https://github.com/fonsp/Pluto.jl/issues/2092
-        // expect(log_of_published).toBe("[4,5,6] MAGIC!")
+        expect(log_of_published).toBe("[4,5,6] MAGIC!")
     })
 })
diff --git a/test/frontend/__tests__/slide_controls.js b/test/frontend/__tests__/slide_controls.js
index 97ee66fe1c..4817278313 100644
--- a/test/frontend/__tests__/slide_controls.js
+++ b/test/frontend/__tests__/slide_controls.js
@@ -1,14 +1,5 @@
-import puppeteer from "puppeteer"
 import { saveScreenshot, createPage, waitForContent } from "../helpers/common"
-import {
-    createNewNotebook,
-    getPlutoUrl,
-    manuallyEnterCells,
-    prewarmPluto,
-    setupPlutoBrowser,
-    shutdownCurrentNotebook,
-    waitForNoUpdateOngoing,
-} from "../helpers/pluto"
+import { createNewNotebook, getPlutoUrl, manuallyEnterCells, setupPlutoBrowser, shutdownCurrentNotebook, waitForPlutoToCalmDown } from "../helpers/pluto"
 
 describe("slideControls", () => {
     let browser = null
@@ -38,7 +29,7 @@ describe("slideControls", () => {
         const plutoCellIds = await manuallyEnterCells(page, cells)
         await page.waitForSelector(".runallchanged", { visible: true, polling: 200, timeout: 0 })
         await page.click(".runallchanged")
-        await waitForNoUpdateOngoing(page, { polling: 100 })
+        await waitForPlutoToCalmDown(page, { polling: 100 })
         const content = await waitForContent(page, `pluto-cell[id="${plutoCellIds[1]}"] pluto-output`)
         expect(content).toBe("Slide 2")
 
diff --git a/test/frontend/helpers/pluto.js b/test/frontend/helpers/pluto.js
index eb837848ab..26c7621aac 100644
--- a/test/frontend/helpers/pluto.js
+++ b/test/frontend/helpers/pluto.js
@@ -79,6 +79,7 @@ export const createNewNotebook = async (page) => {
     const newNotebookSelector = 'a[href="new"]'
     await page.waitForSelector(newNotebookSelector)
     await clickAndWaitForNavigation(page, newNotebookSelector)
+    await page.waitForTimeout(1000)
     await waitForPlutoToCalmDown(page)
     await page.waitForSelector("pluto-input", { visible: true })
 }
@@ -98,6 +99,7 @@ export const importNotebook = async (page, notebookName) => {
 
     const openFileButton = "pluto-filepicker button"
     await clickAndWaitForNavigation(page, openFileButton)
+    await page.waitForTimeout(1000)
     await waitForPlutoToCalmDown(page)
 }
 
@@ -109,10 +111,22 @@ export const getCellIds = (page) => page.evaluate(() => Array.from(document.quer
 /**
  * @param {Page} page
  */
-export const waitForPlutoToCalmDown = async (page) => {
-    await page.waitForTimeout(1000)
-    //@ts-ignore
-    await page.waitForFunction(() => document?.body?._update_is_ongoing === false && document?.querySelector(`pluto-cell.running, pluto-cell.queued`) === null)
+export const restartProcess = async (page) => {
+    await page.click(`a#restart-process-button`)
+}
+
+export const waitForPlutoToCalmDown = async (/** @type {puppeteer.Page} */ page, /** @type {{ polling: string | number; timeout?: number; }} */ options) => {
+    await page.waitForFunction(
+        () =>
+            //@ts-ignore
+            document?.body?._update_is_ongoing === false &&
+            //@ts-ignore
+            document?.body?._js_init_set?.size === 0 &&
+            document?.body?.classList?.contains("loading") === false &&
+            document?.querySelector(`#process-status-tab-button.something_is_happening`) == null &&
+            document?.querySelector(`pluto-cell.running, pluto-cell.queued`) === null,
+        options
+    )
 }
 
 /**

From dd1f7501c30ad70c236ad742366eecd6dd76927c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 21 Oct 2023 23:48:14 +0200
Subject: [PATCH 714/821] more frontend test stability

---
 test/frontend/helpers/pluto.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/frontend/helpers/pluto.js b/test/frontend/helpers/pluto.js
index 26c7621aac..0d9dddef50 100644
--- a/test/frontend/helpers/pluto.js
+++ b/test/frontend/helpers/pluto.js
@@ -112,7 +112,13 @@ export const getCellIds = (page) => page.evaluate(() => Array.from(document.quer
  * @param {Page} page
  */
 export const restartProcess = async (page) => {
+    await page.waitForSelector(`a#restart-process-button`)
     await page.click(`a#restart-process-button`)
+    // page.once("dialog", async (dialog) => {
+    //     await dialog.accept()
+    // })
+    await page.waitForFunction(() => document?.querySelector(`a#restart-process-button`) == null)
+    await page.waitForSelector(`#process-status-tab-button.something_is_happening`)
 }
 
 export const waitForPlutoToCalmDown = async (/** @type {puppeteer.Page} */ page, /** @type {{ polling: string | number; timeout?: number; }} */ options) => {

From 88408eb07a7f06c64bbe46404964688748d7d44b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 21 Oct 2023 23:48:40 +0200
Subject: [PATCH 715/821] Render cells as queued when restarting process

---
 src/notebook/Notebook.jl        | 11 +++++++++++
 src/webserver/Dynamic.jl        |  1 +
 src/webserver/SessionActions.jl |  8 +-------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/notebook/Notebook.jl b/src/notebook/Notebook.jl
index f7b2dbaea8..fc8b049927 100644
--- a/src/notebook/Notebook.jl
+++ b/src/notebook/Notebook.jl
@@ -72,6 +72,17 @@ function _initial_nb_status()
     return b
 end
 
+function _report_business_cells_planned!(notebook::Notebook)
+    run_status = Status.report_business_planned!(notebook.status_tree, :run)
+    Status.report_business_planned!(run_status, :resolve_topology)
+    cell_status = Status.report_business_planned!(run_status, :evaluate)
+    for (i,c) in enumerate(notebook.cells)
+        c.running = true
+        c.queued = true
+        Status.report_business_planned!(cell_status, Symbol(i))
+    end
+end
+
 _collect_cells(cells_dict::Dict{UUID,Cell}, cells_order::Vector{UUID}) = 
     map(i -> cells_dict[i], cells_order)
 _initial_topology(cells_dict::Dict{UUID,Cell}, cells_order::Vector{UUID}) =
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 60e3677510..7fef996b80 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -473,6 +473,7 @@ responses[:restart_process] = function response_restart_process(🙋::ClientRequ
     
     if 🙋.notebook.process_status != ProcessStatus.waiting_to_restart
         🙋.notebook.process_status = ProcessStatus.waiting_to_restart
+        🙋.session.options.evaluation.run_notebook_on_load && _report_business_cells_planned!(🙋.notebook)
         send_notebook_changes!(🙋 |> without_initiator)
 
         SessionActions.shutdown(🙋.session, 🙋.notebook; keep_in_session=true, async=true)
diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 8355cf552d..83ea1f1c20 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -76,14 +76,8 @@ function open(session::ServerSession, path::AbstractString;
 
     session.notebooks[notebook.notebook_id] = notebook
     
-    run_status = Status.report_business_planned!(notebook.status_tree, :run)
     if session.options.evaluation.run_notebook_on_load
-        Status.report_business_planned!(run_status, :resolve_topology)
-        cell_status = Status.report_business_planned!(run_status, :evaluate)
-        for (i,c) in enumerate(notebook.cells)
-            c.queued = true
-            Status.report_business_planned!(cell_status, Symbol(i))
-        end
+        _report_business_cells_planned!(notebook)
     end
 
     update_save_run!(session, notebook, notebook.cells; run_async, prerender_text=true)

From c22cbb9ce9ee7e539c126bc81dd8cf26d18d7ea0 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 22 Oct 2023 10:41:23 +0200
Subject: [PATCH 716/821] more frontend test improvements

---
 .github/workflows/FrontendTest.yml            |  1 +
 test/frontend/README.md                       |  8 ++--
 test/frontend/__tests__/autocomplete_test.js  | 10 +----
 test/frontend/__tests__/bonds.js              | 12 ++----
 .../__tests__/import_notebook_test.js         |  7 +---
 test/frontend/__tests__/javascript_api.js     | 38 +++++++-----------
 test/frontend/__tests__/new_notebook_test.js  | 39 +++----------------
 test/frontend/__tests__/paste_test.disabled   | 12 ++----
 test/frontend/__tests__/slide_controls.js     | 26 ++++++++-----
 test/frontend/fixtures/slides.jl              | 23 +++++++++++
 test/frontend/helpers/pluto.js                | 29 ++++++++++++++
 11 files changed, 102 insertions(+), 103 deletions(-)
 create mode 100644 test/frontend/fixtures/slides.jl

diff --git a/.github/workflows/FrontendTest.yml b/.github/workflows/FrontendTest.yml
index 07e6cf55da..99db72eeee 100644
--- a/.github/workflows/FrontendTest.yml
+++ b/.github/workflows/FrontendTest.yml
@@ -68,6 +68,7 @@ jobs:
                   options = Pluto.Configuration.from_flat_kwargs(; 
                     port=parse(Int, ENV["PLUTO_PORT"]), 
                     require_secret_for_access=false,
+                    workspace_use_distributed_stdlib=false,
                   )
                   🍭 = Pluto.ServerSession(; options)
                   server = Pluto.run!(🍭)
diff --git a/test/frontend/README.md b/test/frontend/README.md
index 36c12d61c7..7d05333478 100644
--- a/test/frontend/README.md
+++ b/test/frontend/README.md
@@ -9,13 +9,13 @@ All commands here are executed in this folder (`Pluto.jl/test/frontend`).
 ## Run Pluto.jl server
 
 ```
-PLUTO_PORT=2345; julia --project=/path/to/PlutoDev -e "import Pluto; Pluto.run(port=$PLUTO_PORT, require_secret_for_access=false, require_secret_for_open_links=false, launch_browser=false)"
+PLUTO_PORT=2345; julia --project=/path/to/PlutoDev -e "import Pluto; Pluto.run(port=$PLUTO_PORT, require_secret_for_access=false, launch_browser=false)"
 ```
 
 or if Pluto is dev'ed in your global environment:
 
 ```
-PLUTO_PORT=2345; julia -e "import Pluto; Pluto.run(port=$PLUTO_PORT, require_secret_for_access=false, require_secret_for_open_links=false, launch_browser=false)"
+PLUTO_PORT=2345; julia -e "import Pluto; Pluto.run(port=$PLUTO_PORT, require_secret_for_access=false, launch_browser=false)"
 ```
 
 ## Run tests
@@ -26,13 +26,13 @@ PLUTO_PORT=2345; julia -e "import Pluto; Pluto.run(port=$PLUTO_PORT, require_sec
 
 Add `HEADLESS=false` when running the test command.
 
-`clear && HEADLESS=false PLUTO_PORT=2345 npm run test`
+`clear && HEADLESS=false PLUTO_PORT=1234 npm run test`
 
 ## Run a particular suite of tests
 
 Add `-- -t=name of the suite` to the end of the test command.
 
-`clear && PLUTO_PORT=2345 npm run test -- -t=PlutoAutocomplete`
+`clear && HEADLESS=false PLUTO_PORT=1234 npm run test -- -t=PlutoAutocomplete`
 
 ## To make a test fail on a case that does not crash Pluto
 
diff --git a/test/frontend/__tests__/autocomplete_test.js b/test/frontend/__tests__/autocomplete_test.js
index 7af4ca3a42..bef1588aac 100644
--- a/test/frontend/__tests__/autocomplete_test.js
+++ b/test/frontend/__tests__/autocomplete_test.js
@@ -1,5 +1,5 @@
 import puppeteer from "puppeteer"
-import { lastElement, saveScreenshot, createPage } from "../helpers/common"
+import { lastElement, saveScreenshot, createPage, waitForContentToBecome } from "../helpers/common"
 import {
     getCellIds,
     importNotebook,
@@ -81,13 +81,7 @@ describe("PlutoAutocomplete", () => {
 
         // Trigger autocomplete
         await page.keyboard.press("Tab")
-        await page.waitForTimeout(5000)
 
-        // Get suggestions
-        const autocompletedInput = await page.evaluate(
-            (selector) => document.querySelector(selector).textContent.trim(),
-            `pluto-cell[id="${lastPlutoCellId}"] pluto-input .CodeMirror-line`
-        )
-        expect(autocompletedInput).toEqual("my_subtract")
+        expect(await waitForContentToBecome(page, `pluto-cell[id="${lastPlutoCellId}"] pluto-input .CodeMirror-line`, "my_subtract")).toBe("my_subtract")
     })
 })
diff --git a/test/frontend/__tests__/bonds.js b/test/frontend/__tests__/bonds.js
index 50f9ee67ba..af633a3400 100644
--- a/test/frontend/__tests__/bonds.js
+++ b/test/frontend/__tests__/bonds.js
@@ -1,6 +1,6 @@
 import puppeteer from "puppeteer"
 import { saveScreenshot, createPage, paste } from "../helpers/common"
-import { createNewNotebook, getPlutoUrl, setupPlutoBrowser, shutdownCurrentNotebook, waitForPlutoToCalmDown } from "../helpers/pluto"
+import { createNewNotebook, getPlutoUrl, runAllChanged, setupPlutoBrowser, shutdownCurrentNotebook, waitForPlutoToCalmDown } from "../helpers/pluto"
 
 // https://github.com/fonsp/Pluto.jl/issues/928
 describe("Bonds should run once when refreshing page", () => {
@@ -47,11 +47,7 @@ describe("Bonds should run once when refreshing page", () => {
 @bind z html"<input type=range>"
 `
         )
-        await page.waitForSelector(`.runallchanged`, { visible: true, polling: 200, timeout: 0 })
-        await page.click(`.runallchanged`)
-
-        await page.waitForSelector(`pluto-cell.running`, { visible: true, timeout: 0 })
-        await waitForPlutoToCalmDown(page)
+        await runAllChanged(page)
 
         await paste(
             page,
@@ -64,9 +60,7 @@ numberoftimes = Ref(0)
         `
         )
 
-        await page.waitForSelector(`.runallchanged`, { visible: true, polling: 200, timeout: 0 })
-        await page.click(`.runallchanged`)
-        await waitForPlutoToCalmDown(page)
+        await runAllChanged(page)
         await page.waitForFunction(() => Boolean(document.querySelector("pluto-cell:nth-of-type(5) pluto-output")?.textContent))
         await waitForPlutoToCalmDown(page)
 
diff --git a/test/frontend/__tests__/import_notebook_test.js b/test/frontend/__tests__/import_notebook_test.js
index 591a7bb697..bf49cb81b1 100644
--- a/test/frontend/__tests__/import_notebook_test.js
+++ b/test/frontend/__tests__/import_notebook_test.js
@@ -9,6 +9,7 @@ import {
     writeSingleLineInPlutoInput,
     shutdownCurrentNotebook,
     setupPlutoBrowser,
+    runAllChanged,
 } from "../helpers/pluto"
 
 describe("PlutoImportNotebook", () => {
@@ -61,11 +62,7 @@ describe("PlutoImportNotebook", () => {
         // Use the previously defined sum function in the new cell
         lastPlutoCellId = lastElement(await getCellIds(page))
         await writeSingleLineInPlutoInput(page, `pluto-cell[id="${lastPlutoCellId}"] pluto-input`, "sum(2, 3)")
-
-        // Run cells
-
-        await page.waitForSelector(`.runallchanged`, { visible: true, polling: 200, timeout: 0 })
-        await page.click(".runallchanged")
+        await runAllChanged(page)
         const lastCellContent = await waitForCellOutput(page, lastPlutoCellId)
         expect(lastCellContent).toBe("5")
     })
diff --git a/test/frontend/__tests__/javascript_api.js b/test/frontend/__tests__/javascript_api.js
index 6c6c700529..252132f37d 100644
--- a/test/frontend/__tests__/javascript_api.js
+++ b/test/frontend/__tests__/javascript_api.js
@@ -1,6 +1,14 @@
 import puppeteer from "puppeteer"
 import { saveScreenshot, waitForContentToBecome, createPage, paste } from "../helpers/common"
-import { createNewNotebook, waitForNoUpdateOngoing, getPlutoUrl, shutdownCurrentNotebook, setupPlutoBrowser, waitForPlutoToCalmDown } from "../helpers/pluto"
+import {
+    createNewNotebook,
+    waitForNoUpdateOngoing,
+    getPlutoUrl,
+    shutdownCurrentNotebook,
+    setupPlutoBrowser,
+    waitForPlutoToCalmDown,
+    runAllChanged,
+} from "../helpers/pluto"
 
 describe("JavaScript API", () => {
     /**
@@ -43,12 +51,7 @@ describe("JavaScript API", () => {
 </script>"""
         `
         )
-        await page.waitForSelector(`.runallchanged`, {
-            visible: true,
-            polling: 200,
-            timeout: 0,
-        })
-        await page.click(`.runallchanged`)
+        await runAllChanged(page)
         await waitForPlutoToCalmDown(page, { polling: 100 })
         const initialLastCellContent = await waitForContentToBecome(page, `pluto-cell:last-child pluto-output`, expected)
         expect(initialLastCellContent).toBe(expected)
@@ -64,12 +67,7 @@ describe("JavaScript API", () => {
 </script>"""
         `
         )
-        await page.waitForSelector(`.runallchanged`, {
-            visible: true,
-            polling: 200,
-            timeout: 0,
-        })
-        await page.click(`.runallchanged`)
+        await runAllChanged(page)
         await waitForPlutoToCalmDown(page, { polling: 100 })
         let initialLastCellContent = await waitForContentToBecome(page, `pluto-cell:last-child pluto-output`, expected)
         expect(initialLastCellContent).toBe(expected)
@@ -84,12 +82,7 @@ describe("JavaScript API", () => {
 </script>"""
         `
         )
-        await page.waitForSelector(`.runallchanged`, {
-            visible: true,
-            polling: 200,
-            timeout: 0,
-        })
-        await page.click(`.runallchanged`)
+        await runAllChanged(page)
         await waitForPlutoToCalmDown(page, { polling: 100 })
         initialLastCellContent = await waitForContentToBecome(page, `pluto-cell:last-child pluto-output`, expected)
         expect(initialLastCellContent).toBe(expected)
@@ -117,12 +110,7 @@ describe("JavaScript API", () => {
                 v
         `
         )
-        await page.waitForSelector(`.runallchanged`, {
-            visible: true,
-            polling: 200,
-            timeout: 0,
-        })
-        await page.click(`.runallchanged`)
+        await runAllChanged(page)
         await waitForPlutoToCalmDown(page, { polling: 100 })
         await waitForContentToBecome(page, `pluto-cell:nth-child(2) pluto-output`, "emitter")
         page.waitForTimeout(2000)
diff --git a/test/frontend/__tests__/new_notebook_test.js b/test/frontend/__tests__/new_notebook_test.js
index 4945328b29..87f0a6f935 100644
--- a/test/frontend/__tests__/new_notebook_test.js
+++ b/test/frontend/__tests__/new_notebook_test.js
@@ -10,22 +10,11 @@ import {
     shutdownCurrentNotebook,
     setupPlutoBrowser,
     waitForPlutoToCalmDown,
+    manuallyEnterCells,
+    runAllChanged,
+    clearPlutoInput,
 } from "../helpers/pluto"
 
-const manuallyEnterCells = async (page, cells) => {
-    const plutoCellIds = []
-    for (const cell of cells) {
-        const plutoCellId = lastElement(await getCellIds(page))
-        plutoCellIds.push(plutoCellId)
-        await page.waitForSelector(`pluto-cell[id="${plutoCellId}"] pluto-input .cm-content`)
-        await writeSingleLineInPlutoInput(page, `pluto-cell[id="${plutoCellId}"] pluto-input`, cell)
-
-        await page.click(`pluto-cell[id="${plutoCellId}"] .add_cell.after`)
-        await page.waitForFunction((nCells) => document.querySelectorAll("pluto-cell").length === nCells, {}, plutoCellIds.length + 1)
-    }
-    return plutoCellIds
-}
-
 describe("PlutoNewNotebook", () => {
     /**
      * Launch a shared browser instance for all tests.
@@ -55,12 +44,6 @@ describe("PlutoNewNotebook", () => {
         browser = null
     })
 
-    it("should create new notebook", async () => {
-        // A pluto-input should exist in a new notebook
-        const plutoInput = await page.evaluate(() => document.querySelector("pluto-input"))
-        expect(plutoInput).not.toBeNull()
-    })
-
     it("should run a single cell", async () => {
         const cellInputSelector = "pluto-input .cm-content"
         await page.waitForSelector(cellInputSelector)
@@ -72,24 +55,12 @@ describe("PlutoNewNotebook", () => {
 
         const content = await waitForContent(page, "pluto-output")
         expect(content).toBe("2")
-    })
 
-    it("should run multiple cells", async () => {
-        const cells = ["a = 1", "b = 2", "c = 3", "a + b + c"]
-        const plutoCellIds = await manuallyEnterCells(page, cells)
-        await page.waitForSelector(`.runallchanged`, { visible: true, polling: 200, timeout: 0 })
-        await page.click(`.runallchanged`)
-        await waitForPlutoToCalmDown(page, { polling: 100 })
-        const content = await waitForContentToBecome(page, `pluto-cell[id="${plutoCellIds[3]}"] pluto-output`, "6")
-        expect(content).toBe("6")
-    })
+        await clearPlutoInput(page, "pluto-input")
 
-    it("should reactively re-evaluate dependent cells", async () => {
         const cells = ["a = 1", "b = 2", "c = 3", "a + b + c"]
         const plutoCellIds = await manuallyEnterCells(page, cells)
-        await page.waitForSelector(`.runallchanged`, { visible: true, polling: 200, timeout: 0 })
-        await page.click(`.runallchanged`)
-        await waitForPlutoToCalmDown(page, { polling: 100 })
+        await runAllChanged(page)
         const initialLastCellContent = await waitForContentToBecome(page, `pluto-cell[id="${plutoCellIds[3]}"] pluto-output`, "6")
         expect(initialLastCellContent).toBe("6")
 
diff --git a/test/frontend/__tests__/paste_test.disabled b/test/frontend/__tests__/paste_test.disabled
index b85f288577..5adde25082 100644
--- a/test/frontend/__tests__/paste_test.disabled
+++ b/test/frontend/__tests__/paste_test.disabled
@@ -44,9 +44,7 @@ describe("Paste Functionality", () => {
     it("should *not* create new cell when you paste code into cell", async () => {
         const cells = ["a = 1", "b = 2", "c = 3", "a + b + c"]
         const plutoCellIds = await manuallyEnterCells(page, cells)
-        await page.waitForSelector(`.runallchanged`, { visible: true, polling: 200, timeout: 0 })
-        await page.click(`.runallchanged`)
-        await waitForPlutoToCalmDown(page, { polling: 100 })
+        await runAllChanged(page)
         const initialLastCellContent = await waitForContentToBecome(page, `pluto-cell[id="${plutoCellIds[3]}"] pluto-output`, "6")
         expect(initialLastCellContent).toBe("6")
 
@@ -75,9 +73,7 @@ describe("Paste Functionality", () => {
     it("should create new cell when you paste cell into page", async () => {
         const cells = ["a = 1", "b = 2", "c = 3", "a + b + c"]
         const plutoCellIds = await manuallyEnterCells(page, cells)
-        await page.waitForSelector(`.runallchanged`, { visible: true, polling: 200, timeout: 0 })
-        await page.click(`.runallchanged`)
-        await waitForPlutoToCalmDown(page, { polling: 100 })
+        await runAllChanged(page)
         const initialLastCellContent = await waitForContentToBecome(page, `pluto-cell[id="${plutoCellIds[3]}"] pluto-output`, "6")
         expect(initialLastCellContent).toBe("6")
 
@@ -117,9 +113,7 @@ describe("Paste Functionality", () => {
     it("should create new cell when you paste cell into cell", async () => {
         const cells = ["a = 1", "b = 2", "c = 3", "a + b + c"]
         const plutoCellIds = await manuallyEnterCells(page, cells)
-        await page.waitForSelector(`.runallchanged`, { visible: true, polling: 200, timeout: 0 })
-        await page.click(`.runallchanged`)
-        await waitForPlutoToCalmDown(page, { polling: 100 })
+        await runAllChanged(page)
         const initialLastCellContent = await waitForContentToBecome(page, `pluto-cell[id="${plutoCellIds[3]}"] pluto-output`, "6")
         expect(initialLastCellContent).toBe("6")
 
diff --git a/test/frontend/__tests__/slide_controls.js b/test/frontend/__tests__/slide_controls.js
index 4817278313..421d2f7f9a 100644
--- a/test/frontend/__tests__/slide_controls.js
+++ b/test/frontend/__tests__/slide_controls.js
@@ -1,5 +1,15 @@
 import { saveScreenshot, createPage, waitForContent } from "../helpers/common"
-import { createNewNotebook, getPlutoUrl, manuallyEnterCells, setupPlutoBrowser, shutdownCurrentNotebook, waitForPlutoToCalmDown } from "../helpers/pluto"
+import {
+    createNewNotebook,
+    getCellIds,
+    getPlutoUrl,
+    importNotebook,
+    manuallyEnterCells,
+    runAllChanged,
+    setupPlutoBrowser,
+    shutdownCurrentNotebook,
+    waitForPlutoToCalmDown,
+} from "../helpers/pluto"
 
 describe("slideControls", () => {
     let browser = null
@@ -11,7 +21,6 @@ describe("slideControls", () => {
     beforeEach(async () => {
         page = await createPage(browser)
         await page.goto(getPlutoUrl(), { waitUntil: "networkidle0" })
-        await createNewNotebook(page)
     })
     afterEach(async () => {
         await saveScreenshot(page)
@@ -25,11 +34,8 @@ describe("slideControls", () => {
     })
 
     it("should create titles", async () => {
-        const cells = ['md"# Slide 1"', 'md"# Slide 2"']
-        const plutoCellIds = await manuallyEnterCells(page, cells)
-        await page.waitForSelector(".runallchanged", { visible: true, polling: 200, timeout: 0 })
-        await page.click(".runallchanged")
-        await waitForPlutoToCalmDown(page, { polling: 100 })
+        await importNotebook(page, "slides.jl", { permissionToRunCode: false })
+        const plutoCellIds = await getCellIds(page)
         const content = await waitForContent(page, `pluto-cell[id="${plutoCellIds[1]}"] pluto-output`)
         expect(content).toBe("Slide 2")
 
@@ -39,8 +45,10 @@ describe("slideControls", () => {
         expect(await slide_2_title.isIntersectingViewport()).toBe(true)
         expect(await slide_1_title.isIntersectingViewport()).toBe(true)
 
-        /* @ts-ignore */
-        await page.evaluate(() => window.present())
+        await page.click(`.toggle_export[title="Export..."]`)
+        await page.waitForTimeout(500)
+        await page.waitForSelector(".toggle_presentation", { visible: true })
+        await page.click(".toggle_presentation")
 
         await page.click(".changeslide.next")
         expect(await slide_1_title.isIntersectingViewport()).toBe(true)
diff --git a/test/frontend/fixtures/slides.jl b/test/frontend/fixtures/slides.jl
new file mode 100644
index 0000000000..d903c7dce1
--- /dev/null
+++ b/test/frontend/fixtures/slides.jl
@@ -0,0 +1,23 @@
+### A Pluto.jl notebook ###
+# v0.11.14
+
+using Markdown
+using InteractiveUtils
+
+# ╔═╡ cbcf36de-f360-11ea-0c7f-719e93324b27
+md"# Slide 1"
+
+# ╔═╡ d71c5ee2-f360-11ea-2753-a132fa41871a
+md"# Slide 2"
+
+# ╔═╡ d8f5a4f6-f360-11ea-043d-47667f6a7e76
+
+
+# ╔═╡ dcd9ebb8-f360-11ea-2050-fd2e11d27c6d
+
+
+# ╔═╡ Cell order:
+# ╠═cbcf36de-f360-11ea-0c7f-719e93324b27
+# ╠═d71c5ee2-f360-11ea-2753-a132fa41871a
+# ╠═d8f5a4f6-f360-11ea-043d-47667f6a7e76
+# ╠═dcd9ebb8-f360-11ea-2050-fd2e11d27c6d
diff --git a/test/frontend/helpers/pluto.js b/test/frontend/helpers/pluto.js
index 0d9dddef50..c380955870 100644
--- a/test/frontend/helpers/pluto.js
+++ b/test/frontend/helpers/pluto.js
@@ -12,6 +12,7 @@ import {
     lastElement,
     createPage,
     getArtifactsDir,
+    waitForContentToBecome,
 } from "./common"
 import path from "path"
 
@@ -164,6 +165,17 @@ export const waitForNoUpdateOngoing = async (page, options = {}) => {
     )
 }
 
+/**
+ * @param {Page} page
+ */
+export const runAllChanged = async (page) => {
+    await page.waitForSelector(`.runallchanged`, {
+        visible: true,
+    })
+    await page.click(`.runallchanged`)
+    await waitForPlutoToCalmDown(page)
+}
+
 /**
  * @param {Page} page
  * @param {string} plutoInputSelector
@@ -203,6 +215,23 @@ export const keyboardPressInPlutoInput = async (page, plutoInputSelector, key) =
     return waitForContentToChange(page, `${plutoInputSelector} .cm-line`, currentLineText)
 }
 
+/**
+ * @param {Page} page
+ * @param {string} plutoInputSelector
+ */
+export const clearPlutoInput = async (page, plutoInputSelector) => {
+    await page.focus(`${plutoInputSelector} .cm-content`)
+    await page.waitForTimeout(500)
+    // Move to end of the input
+    await page.keyboard.down(platform === "darwin" ? "Meta" : "Control")
+    await page.keyboard.press("KeyA")
+    await page.keyboard.up(platform === "darwin" ? "Meta" : "Control")
+    // Press the key we care about
+    await page.keyboard.press("Delete")
+    // Wait for CodeMirror to process the input and display the text
+    await page.waitForSelector(`${plutoInputSelector} .cm-placeholder`)
+}
+
 /**
  * @param {Page} page
  * @param {string[]} cells

From 4118584d881c63d83b3a0336164be5b3d684656a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 22 Oct 2023 10:52:47 +0200
Subject: [PATCH 717/821] fixiefix

---
 src/webserver/SessionActions.jl           | 2 +-
 test/frontend/__tests__/slide_controls.js | 2 +-
 test/frontend/helpers/pluto.js            | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 83ea1f1c20..551feddce8 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -77,7 +77,7 @@ function open(session::ServerSession, path::AbstractString;
     session.notebooks[notebook.notebook_id] = notebook
     
     if session.options.evaluation.run_notebook_on_load
-        _report_business_cells_planned!(notebook)
+        Pluto._report_business_cells_planned!(notebook)
     end
 
     update_save_run!(session, notebook, notebook.cells; run_async, prerender_text=true)
diff --git a/test/frontend/__tests__/slide_controls.js b/test/frontend/__tests__/slide_controls.js
index 421d2f7f9a..5e312da037 100644
--- a/test/frontend/__tests__/slide_controls.js
+++ b/test/frontend/__tests__/slide_controls.js
@@ -34,7 +34,7 @@ describe("slideControls", () => {
     })
 
     it("should create titles", async () => {
-        await importNotebook(page, "slides.jl", { permissionToRunCode: false })
+        await importNotebook(page, "slides.jl")
         const plutoCellIds = await getCellIds(page)
         const content = await waitForContent(page, `pluto-cell[id="${plutoCellIds[1]}"] pluto-output`)
         expect(content).toBe("Slide 2")
diff --git a/test/frontend/helpers/pluto.js b/test/frontend/helpers/pluto.js
index c380955870..cd4208d512 100644
--- a/test/frontend/helpers/pluto.js
+++ b/test/frontend/helpers/pluto.js
@@ -173,6 +173,7 @@ export const runAllChanged = async (page) => {
         visible: true,
     })
     await page.click(`.runallchanged`)
+    await page.waitForSelector(`#process-status-tab-button.something_is_happening`, { timeout: 10000 }).catch(() => {})
     await waitForPlutoToCalmDown(page)
 }
 

From a7c7fded0c9658f793aa0068f77674af1370da56 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 22 Oct 2023 11:24:16 +0200
Subject: [PATCH 718/821] more frontend test stability

---
 frontend/components/Cell.js               | 75 ++++++++++++-----------
 test/frontend/__tests__/slide_controls.js |  8 +++
 test/frontend/helpers/pluto.js            | 56 ++++++++++-------
 3 files changed, 80 insertions(+), 59 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 8ae055ab7f..ff762e8d05 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -272,21 +272,22 @@ export const Cell = ({
             key=${cell_key}
             ref=${node_ref}
             class=${cl({
-        queued: queued || (waiting_to_run && is_process_ready),
-        running,
-        activate_animation,
-        errored,
-        selected,
-        code_differs: class_code_differs,
-        code_folded: class_code_folded,
-        skip_as_script,
-        running_disabled,
-        depends_on_disabled_cells,
-        depends_on_skipped_cells,
-        show_input,
-        shrunk: Object.values(logs).length > 0,
-        hooked_up: output?.has_pluto_hook_features ?? false,
-    })}
+                queued: queued || (waiting_to_run && is_process_ready),
+                internal_test_queued: !is_process_ready && (queued || waiting_to_run),
+                running,
+                activate_animation,
+                errored,
+                selected,
+                code_differs: class_code_differs,
+                code_folded: class_code_folded,
+                skip_as_script,
+                running_disabled,
+                depends_on_disabled_cells,
+                depends_on_skipped_cells,
+                show_input,
+                shrunk: Object.values(logs).length > 0,
+                hooked_up: output?.has_pluto_hook_features ?? false,
+            })}
             id=${cell_id}
         >
             ${variables.map((name) => html`<span id=${encodeURI(name)} />`)}
@@ -298,14 +299,14 @@ export const Cell = ({
             <pluto-trafficlight></pluto-trafficlight>
             <button
                 onClick=${() => {
-            pluto_actions.add_remote_cell(cell_id, "before")
-        }}
+                    pluto_actions.add_remote_cell(cell_id, "before")
+                }}
                 class="add_cell before"
                 title="Add cell (Ctrl + Enter)"
             >
                 <span></span>
             </button>
-        ${cell_api_ready ? html`<${CellOutput} errored=${errored} ...${output} cell_id=${cell_id} />` : html``}
+            ${cell_api_ready ? html`<${CellOutput} errored=${errored} ...${output} cell_id=${cell_id} />` : html``}
             <${CellInput}
                 local_code=${cell_input_local?.code ?? code}
                 remote_code=${code}
@@ -345,8 +346,8 @@ export const Cell = ({
                 depends_on_disabled_cells=${depends_on_disabled_cells}
                 on_run=${on_run}
                 on_interrupt=${() => {
-            pluto_actions.interrupt_remote(cell_id)
-        }}
+                    pluto_actions.interrupt_remote(cell_id)
+                }}
                 set_cell_disabled=${set_cell_disabled}
                 runtime=${runtime}
                 running=${running}
@@ -356,42 +357,42 @@ export const Cell = ({
             />
             <button
                 onClick=${() => {
-            pluto_actions.add_remote_cell(cell_id, "after")
-        }}
+                    pluto_actions.add_remote_cell(cell_id, "after")
+                }}
                 class="add_cell after"
                 title="Add cell (Ctrl + Enter)"
             >
                 <span></span>
             </button>
             ${skip_as_script
-            ? html`<div
+                ? html`<div
                       class="skip_as_script_marker"
                       title=${`This cell is directly flagged as disabled in file. Click to know more!`}
                       onClick=${(e) => {
-                    open_pluto_popup({
-                        type: "info",
-                        source_element: e.target,
-                        body: html`This cell is currently stored in the notebook file as a Julia <em>comment</em>, instead of <em>code</em>.<br />
+                          open_pluto_popup({
+                              type: "info",
+                              source_element: e.target,
+                              body: html`This cell is currently stored in the notebook file as a Julia <em>comment</em>, instead of <em>code</em>.<br />
                                   This way, it will not run when the notebook runs as a script outside of Pluto.<br />
                                   Use the context menu to enable it again`,
-                    })
-                }}
+                          })
+                      }}
                   ></div>`
-            : depends_on_skipped_cells
+                : depends_on_skipped_cells
                 ? html`<div
                       class="depends_on_skipped_marker"
                       title=${`This cell is indirectly flagged as disabled in file. Click to know more!`}
                       onClick=${(e) => {
-                        open_pluto_popup({
-                            type: "info",
-                            source_element: e.target,
-                            body: html`This cell is currently stored in the notebook file as a Julia <em>comment</em>, instead of <em>code</em>.<br />
+                          open_pluto_popup({
+                              type: "info",
+                              source_element: e.target,
+                              body: html`This cell is currently stored in the notebook file as a Julia <em>comment</em>, instead of <em>code</em>.<br />
                                   This way, it will not run when the notebook runs as a script outside of Pluto.<br />
                                   An upstream cell is <b> indirectly</b> <em>disabling in file</em> this one; enable
                                   <span onClick=${skip_as_script_jump} style="cursor: pointer; text-decoration: underline"> the upstream one</span> to affect
                                   this cell.`,
-                        })
-                    }}
+                          })
+                      }}
                   ></div>`
                 : null}
         </pluto-cell>
@@ -413,7 +414,7 @@ export const IsolatedCell = ({ cell_input: { cell_id, metadata }, cell_result: {
     return html`
         <pluto-cell ref=${node_ref} id=${cell_id} class=${hidden ? "hidden-cell" : "isolated-cell"}>
             ${cell_api_ready ? html`<${CellOutput} ...${output} cell_id=${cell_id} />` : html``}
-            ${show_logs ? html`<${Logs} logs=${Object.values(logs)} line_heights=${[15]} set_cm_highlighted_line=${() => { }} />` : null}
+            ${show_logs ? html`<${Logs} logs=${Object.values(logs)} line_heights=${[15]} set_cm_highlighted_line=${() => {}} />` : null}
         </pluto-cell>
     `
 }
diff --git a/test/frontend/__tests__/slide_controls.js b/test/frontend/__tests__/slide_controls.js
index 5e312da037..8f1eedd6ed 100644
--- a/test/frontend/__tests__/slide_controls.js
+++ b/test/frontend/__tests__/slide_controls.js
@@ -1,3 +1,4 @@
+import puppeteer from "puppeteer"
 import { saveScreenshot, createPage, waitForContent } from "../helpers/common"
 import {
     createNewNotebook,
@@ -12,7 +13,14 @@ import {
 } from "../helpers/pluto"
 
 describe("slideControls", () => {
+    /**
+     * Launch a shared browser instance for all tests.
+     * I don't use jest-puppeteer because it takes away a lot of control and works buggy for me,
+     * so I need to manually create the shared browser.
+     * @type {puppeteer.Browser}
+     */
     let browser = null
+    /** @type {puppeteer.Page} */
     let page = null
 
     beforeAll(async () => {
diff --git a/test/frontend/helpers/pluto.js b/test/frontend/helpers/pluto.js
index cd4208d512..94f82fca61 100644
--- a/test/frontend/helpers/pluto.js
+++ b/test/frontend/helpers/pluto.js
@@ -122,18 +122,28 @@ export const restartProcess = async (page) => {
     await page.waitForSelector(`#process-status-tab-button.something_is_happening`)
 }
 
-export const waitForPlutoToCalmDown = async (/** @type {puppeteer.Page} */ page, /** @type {{ polling: string | number; timeout?: number; }} */ options) => {
+const waitForPlutoBusy = async (page, iWantBusiness, options) => {
+    await page.waitForTimeout(1)
     await page.waitForFunction(
-        () =>
-            //@ts-ignore
-            document?.body?._update_is_ongoing === false &&
-            //@ts-ignore
-            document?.body?._js_init_set?.size === 0 &&
-            document?.body?.classList?.contains("loading") === false &&
-            document?.querySelector(`#process-status-tab-button.something_is_happening`) == null &&
-            document?.querySelector(`pluto-cell.running, pluto-cell.queued`) === null,
-        options
+        (iWantBusiness) => {
+            let quiet = //@ts-ignore
+                document?.body?._update_is_ongoing === false &&
+                //@ts-ignore
+                document?.body?._js_init_set?.size === 0 &&
+                document?.body?.classList?.contains("loading") === false &&
+                document?.querySelector(`#process-status-tab-button.something_is_happening`) == null &&
+                document?.querySelector(`pluto-cell.running, pluto-cell.queued, pluto-cell.internal_test_queued`) == null
+
+            return iWantBusiness ? !quiet : quiet
+        },
+        options,
+        iWantBusiness
     )
+    await page.waitForTimeout(1)
+}
+
+export const waitForPlutoToCalmDown = async (/** @type {puppeteer.Page} */ page, /** @type {{ polling: string | number; timeout?: number; }} */ options) => {
+    await waitForPlutoBusy(page, false, options)
 }
 
 /**
@@ -173,8 +183,8 @@ export const runAllChanged = async (page) => {
         visible: true,
     })
     await page.click(`.runallchanged`)
-    await page.waitForSelector(`#process-status-tab-button.something_is_happening`, { timeout: 10000 }).catch(() => {})
-    await waitForPlutoToCalmDown(page)
+    await waitForPlutoBusy(page, true)
+    await waitForPlutoBusy(page, false)
 }
 
 /**
@@ -221,16 +231,18 @@ export const keyboardPressInPlutoInput = async (page, plutoInputSelector, key) =
  * @param {string} plutoInputSelector
  */
 export const clearPlutoInput = async (page, plutoInputSelector) => {
-    await page.focus(`${plutoInputSelector} .cm-content`)
-    await page.waitForTimeout(500)
-    // Move to end of the input
-    await page.keyboard.down(platform === "darwin" ? "Meta" : "Control")
-    await page.keyboard.press("KeyA")
-    await page.keyboard.up(platform === "darwin" ? "Meta" : "Control")
-    // Press the key we care about
-    await page.keyboard.press("Delete")
-    // Wait for CodeMirror to process the input and display the text
-    await page.waitForSelector(`${plutoInputSelector} .cm-placeholder`)
+    if ((await page.$(`${plutoInputSelector} .cm-placeholder`)) == null) {
+        await page.focus(`${plutoInputSelector} .cm-content`)
+        await page.waitForTimeout(500)
+        // Move to end of the input
+        await page.keyboard.down(platform === "darwin" ? "Meta" : "Control")
+        await page.keyboard.press("KeyA")
+        await page.keyboard.up(platform === "darwin" ? "Meta" : "Control")
+        // Press the key we care about
+        await page.keyboard.press("Delete")
+        // Wait for CodeMirror to process the input and display the text
+        await page.waitForSelector(`${plutoInputSelector} .cm-placeholder`)
+    }
 }
 
 /**

From 89a078d67442b92129be891358ef65710ae5c0cc Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 22 Oct 2023 12:45:41 +0200
Subject: [PATCH 719/821] Also enable set_waiting_to_run_smart for Ctrl+S

Related to #1892
---
 frontend/components/Cell.js     | 14 +++++++++-----
 frontend/components/Editor.js   |  8 ++++++++
 test/frontend/helpers/common.js |  2 ++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index ff762e8d05..ada38c3493 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -211,7 +211,13 @@ export const Cell = ({
     disable_input_ref.current = disable_input
     const should_set_waiting_to_run_ref = useRef(true)
     should_set_waiting_to_run_ref.current = !running_disabled && !depends_on_disabled_cells
-    const set_waiting_to_run_smart = (x) => set_waiting_to_run(x && should_set_waiting_to_run_ref.current)
+    useEffect(() => {
+        const handler = (e) => {
+            if (e.detail.cell_ids.includes(cell_id)) set_waiting_to_run(should_set_waiting_to_run_ref.current)
+        }
+        window.addEventListener("set_waiting_to_run_smart", handler)
+        return () => window.removeEventListener("set_waiting_to_run_smart", handler)
+    }, [cell_id])
 
     const cell_api_ready = useCellApi(node_ref, published_object_keys, pluto_actions)
     const on_delete = useCallback(() => {
@@ -219,10 +225,9 @@ export const Cell = ({
     }, [pluto_actions, selected, cell_id])
     const on_submit = useCallback(() => {
         if (!disable_input_ref.current) {
-            set_waiting_to_run_smart(true)
             pluto_actions.set_and_run_multiple([cell_id])
         }
-    }, [pluto_actions, set_waiting_to_run, cell_id])
+    }, [pluto_actions, cell_id])
     const on_change_cell_input = useCallback(
         (new_code) => {
             if (!disable_input_ref.current) {
@@ -242,8 +247,7 @@ export const Cell = ({
     }, [pluto_actions, cell_id, selected, code_folded])
     const on_run = useCallback(() => {
         pluto_actions.set_and_run_multiple(pluto_actions.get_selected_cells(cell_id, selected))
-        set_waiting_to_run_smart(true)
-    }, [pluto_actions, cell_id, selected, set_waiting_to_run_smart])
+    }, [pluto_actions, cell_id, selected])
     const set_show_logs = useCallback(
         (show_logs) =>
             pluto_actions.update_notebook((notebook) => {
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index e4e02b697f..776668a2c4 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -591,6 +591,14 @@ export class Editor extends Component {
             set_and_run_multiple: async (cell_ids) => {
                 // TODO: this function is called with an empty list sometimes, where?
                 if (cell_ids.length > 0) {
+                    window.dispatchEvent(
+                        new CustomEvent("set_waiting_to_run_smart", {
+                            detail: {
+                                cell_ids,
+                            },
+                        })
+                    )
+
                     await update_notebook((notebook) => {
                         for (let cell_id of cell_ids) {
                             if (this.state.cell_inputs_local[cell_id]) {
diff --git a/test/frontend/helpers/common.js b/test/frontend/helpers/common.js
index 572d03e33b..42c7a73766 100644
--- a/test/frontend/helpers/common.js
+++ b/test/frontend/helpers/common.js
@@ -1,3 +1,4 @@
+import puppeteer from "puppeteer"
 import path from "path";
 import mkdirp from "mkdirp";
 import * as process from "process";
@@ -187,6 +188,7 @@ const blocked_domains = ["cdn.jsdelivr.net", "unpkg.com", "cdn.skypack.dev", "es
 const hide_warning = url => url.includes("mathjax")
 
 export const createPage = async (browser) => {
+    /** @type {puppeteer.Page} */
   const page = await browser.newPage()
   
   failOnError(page);

From 5df9cc5e302c66612f61c6f879beb109c9268725 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 22 Oct 2023 15:41:06 +0200
Subject: [PATCH 720/821] =?UTF-8?q?=F0=9F=91=80=20Open=20notebooks=20witho?=
 =?UTF-8?q?ut=20running=20(#2563)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/common/Binder.js                 |   1 +
 frontend/common/ProcessStatus.js          |   7 +
 frontend/common/RunLocal.js               |   1 +
 frontend/components/Cell.js               |  31 ++-
 frontend/components/CellOutput.js         |  50 +++--
 frontend/components/Editor.js             |  58 +++--
 frontend/components/Logs.js               |  10 +-
 frontend/components/Notebook.js           |  22 +-
 frontend/components/PkgStatusMark.js      |  10 +-
 frontend/components/Popup.js              |   5 +-
 frontend/components/RecordingUI.js        |   6 +-
 frontend/components/SafePreviewUI.js      |  70 ++++++
 frontend/components/TreeView.js           |   9 +-
 frontend/components/welcome/Open.js       |  14 +-
 frontend/components/welcome/Recent.js     |  62 ++++--
 frontend/components/welcome/Welcome.js    |   1 +
 frontend/dark_color.css                   |   1 +
 frontend/editor.css                       |  69 +++++-
 frontend/editor.js                        |   9 +-
 frontend/imports/DOMPurify.d.ts           | 148 +++++++++++++
 frontend/imports/DOMPurify.js             |   4 +
 frontend/light_color.css                  |   1 +
 src/Configuration.jl                      |  12 +-
 src/evaluation/Run.jl                     |  41 ++--
 src/evaluation/WorkspaceManager.jl        |   7 +-
 src/notebook/Notebook.jl                  |   1 +
 src/packages/Packages.jl                  |  32 ++-
 src/webserver/Dynamic.jl                  |  27 ++-
 src/webserver/Router.jl                   |  15 +-
 src/webserver/Session.jl                  |   3 +-
 src/webserver/SessionActions.jl           |  22 +-
 src/webserver/Status.jl                   |   4 +
 test/Configuration.jl                     |  31 ++-
 test/frontend/__tests__/safe_preview.js   | 248 ++++++++++++++++++++++
 test/frontend/__tests__/slide_controls.js |   2 +-
 test/frontend/fixtures/safe_preview.jl    |  65 ++++++
 test/frontend/helpers/pluto.js            |  20 +-
 37 files changed, 981 insertions(+), 138 deletions(-)
 create mode 100644 frontend/common/ProcessStatus.js
 create mode 100644 frontend/components/SafePreviewUI.js
 create mode 100644 frontend/imports/DOMPurify.d.ts
 create mode 100644 frontend/imports/DOMPurify.js
 create mode 100644 test/frontend/__tests__/safe_preview.js
 create mode 100644 test/frontend/fixtures/safe_preview.jl

diff --git a/frontend/common/Binder.js b/frontend/common/Binder.js
index dee8a749f3..21c9842dd9 100644
--- a/frontend/common/Binder.js
+++ b/frontend/common/Binder.js
@@ -144,6 +144,7 @@ export const start_binder = async ({ setStatePromise, connect, launch_params })
             const upload_url = with_token(
                 with_query_params(new URL("notebookupload", binder_session_url), {
                     name: new URLSearchParams(window.location.search).get("name"),
+                    execution_allowed: "true",
                 })
             )
             console.log(`downloading locally and uploading `, upload_url, launch_params.notebookfile)
diff --git a/frontend/common/ProcessStatus.js b/frontend/common/ProcessStatus.js
new file mode 100644
index 0000000000..00fa9d5e73
--- /dev/null
+++ b/frontend/common/ProcessStatus.js
@@ -0,0 +1,7 @@
+export const ProcessStatus = {
+    ready: "ready",
+    starting: "starting",
+    no_process: "no_process",
+    waiting_to_restart: "waiting_to_restart",
+    waiting_for_permission: "waiting_for_permission",
+}
diff --git a/frontend/common/RunLocal.js b/frontend/common/RunLocal.js
index 60a7dc4e4b..b43e8b90b5 100644
--- a/frontend/common/RunLocal.js
+++ b/frontend/common/RunLocal.js
@@ -41,6 +41,7 @@ export const start_local = async ({ setStatePromise, connect, launch_params }) =
                 with_query_params(new URL("notebookupload", binder_session_url), {
                     name: new URLSearchParams(window.location.search).get("name"),
                     clear_frontmatter: "yesplease",
+                    execution_allowed: "yepperz",
                 })
             ),
             {
diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index ada38c3493..8014c24fc9 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -8,6 +8,7 @@ import { RunArea, useDebouncedTruth } from "./RunArea.js"
 import { cl } from "../common/ClassTable.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
 import { open_pluto_popup } from "./Popup.js"
+import { SafePreviewOutput } from "./SafePreviewUI.js"
 
 const useCellApi = (node_ref, published_object_keys, pluto_actions) => {
     const [cell_api_ready, set_cell_api_ready] = useState(false)
@@ -96,6 +97,8 @@ const on_jump = (hasBarrier, pluto_actions, cell_id) => () => {
  *  selected: boolean,
  *  force_hide_input: boolean,
  *  focus_after_creation: boolean,
+ *  process_waiting_for_permission: boolean,
+ *  sanitize_html: boolean,
  *  [key: string]: any,
  * }} props
  * */
@@ -110,6 +113,8 @@ export const Cell = ({
     focus_after_creation,
     is_process_ready,
     disable_input,
+    process_waiting_for_permission,
+    sanitize_html = true,
     nbpkg,
     global_definition_locations,
 }) => {
@@ -134,8 +139,8 @@ export const Cell = ({
 
     const remount = useMemo(() => () => setKey(key + 1))
     // cm_forced_focus is null, except when a line needs to be highlighted because it is part of a stack trace
-    const [cm_forced_focus, set_cm_forced_focus] = useState(/** @type{any} */ (null))
-    const [cm_highlighted_range, set_cm_highlighted_range] = useState(null)
+    const [cm_forced_focus, set_cm_forced_focus] = useState(/** @type {any} */ (null))
+    const [cm_highlighted_range, set_cm_highlighted_range] = useState(/** @type {{from, to}?} */ (null))
     const [cm_highlighted_line, set_cm_highlighted_line] = useState(null)
     const [cm_diagnostics, set_cm_diagnostics] = useState([])
 
@@ -200,9 +205,11 @@ export const Cell = ({
 
     const class_code_differs = code !== (cell_input_local?.code ?? code)
     const class_code_folded = code_folded && cm_forced_focus == null
+    const no_output_yet = (output?.last_run_timestamp ?? 0) === 0
+    const code_not_trusted_yet = process_waiting_for_permission && no_output_yet
 
     // during the initial page load, force_hide_input === true, so that cell outputs render fast, and codemirrors are loaded after
-    let show_input = !force_hide_input && (errored || class_code_differs || !class_code_folded)
+    let show_input = !force_hide_input && (code_not_trusted_yet || errored || class_code_differs || !class_code_folded)
 
     const [line_heights, set_line_heights] = useState([15])
     const node_ref = useRef(null)
@@ -291,6 +298,7 @@ export const Cell = ({
                 show_input,
                 shrunk: Object.values(logs).length > 0,
                 hooked_up: output?.has_pluto_hook_features ?? false,
+                no_output_yet,
             })}
             id=${cell_id}
         >
@@ -310,7 +318,11 @@ export const Cell = ({
             >
                 <span></span>
             </button>
-            ${cell_api_ready ? html`<${CellOutput} errored=${errored} ...${output} cell_id=${cell_id} />` : html``}
+            ${code_not_trusted_yet
+                ? html`<${SafePreviewOutput} />`
+                : cell_api_ready
+                ? html`<${CellOutput} errored=${errored} ...${output} sanitize_html=${sanitize_html} cell_id=${cell_id} />`
+                : html``}
             <${CellInput}
                 local_code=${cell_input_local?.code ?? code}
                 remote_code=${code}
@@ -342,7 +354,12 @@ export const Cell = ({
                 onerror=${remount}
             />
             ${show_logs && cell_api_ready
-                ? html`<${Logs} logs=${Object.values(logs)} line_heights=${line_heights} set_cm_highlighted_line=${set_cm_highlighted_line} />`
+                ? html`<${Logs}
+                      logs=${Object.values(logs)}
+                      line_heights=${line_heights}
+                      set_cm_highlighted_line=${set_cm_highlighted_line}
+                      sanitize_html=${sanitize_html}
+                  />`
                 : null}
             <${RunArea}
                 cell_id=${cell_id}
@@ -409,7 +426,7 @@ export const Cell = ({
  *  [key: string]: any,
  * }} props
  * */
-export const IsolatedCell = ({ cell_input: { cell_id, metadata }, cell_result: { logs, output, published_object_keys }, hidden }) => {
+export const IsolatedCell = ({ cell_input: { cell_id, metadata }, cell_result: { logs, output, published_object_keys }, hidden }, sanitize_html = true) => {
     const node_ref = useRef(null)
     let pluto_actions = useContext(PlutoActionsContext)
     const cell_api_ready = useCellApi(node_ref, published_object_keys, pluto_actions)
@@ -417,7 +434,7 @@ export const IsolatedCell = ({ cell_input: { cell_id, metadata }, cell_result: {
 
     return html`
         <pluto-cell ref=${node_ref} id=${cell_id} class=${hidden ? "hidden-cell" : "isolated-cell"}>
-            ${cell_api_ready ? html`<${CellOutput} ...${output} cell_id=${cell_id} />` : html``}
+            ${cell_api_ready ? html`<${CellOutput} ...${output} sanitize_html=${sanitize_html} cell_id=${cell_id} />` : html``}
             ${show_logs ? html`<${Logs} logs=${Object.values(logs)} line_heights=${[15]} set_cm_highlighted_line=${() => {}} />` : null}
         </pluto-cell>
     `
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 8eb7b4943a..0b65b7dcc7 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -1,5 +1,7 @@
 import { html, Component, useRef, useLayoutEffect, useContext } from "../imports/Preact.js"
 
+import DOMPurify from "../imports/DOMPurify.js"
+
 import { ErrorMessage, ParseError } from "./ErrorMessage.js"
 import { TreeView, TableView, DivElement } from "./TreeView.js"
 
@@ -24,6 +26,7 @@ import { pluto_syntax_colors, ENABLE_CM_MIXED_PARSER } from "./CellInput.js"
 import hljs from "../imports/highlightjs.js"
 import { julia_mixed } from "./CellInput/mixedParsers.js"
 import { julia_andrey } from "../imports/CodemirrorPlutoSetup.js"
+import { SafePreviewSanitizeMessage } from "./SafePreviewUI.js"
 
 export class CellOutput extends Component {
     constructor() {
@@ -50,8 +53,8 @@ export class CellOutput extends Component {
         })
     }
 
-    shouldComponentUpdate({ last_run_timestamp }) {
-        return last_run_timestamp !== this.props.last_run_timestamp
+    shouldComponentUpdate({ last_run_timestamp, sanitize_html }) {
+        return last_run_timestamp !== this.props.last_run_timestamp || sanitize_html !== this.props.sanitize_html
     }
 
     componentDidMount() {
@@ -113,7 +116,7 @@ export let PlutoImage = ({ body, mime }) => {
     return html`<img ref=${imgref} type=${mime} src=${""} />`
 }
 
-export const OutputBody = ({ mime, body, cell_id, persist_js_state = false, last_run_timestamp }) => {
+export const OutputBody = ({ mime, body, cell_id, persist_js_state = false, last_run_timestamp, sanitize_html = true }) => {
     switch (mime) {
         case "image/png":
         case "image/jpg":
@@ -130,23 +133,24 @@ export const OutputBody = ({ mime, body, cell_id, persist_js_state = false, last
             // NOTE: Jupyter doesn't do this, jupyter renders everything directly in pages DOM.
             //                                                                   -DRAL
             if (body.startsWith("<!DOCTYPE") || body.startsWith("<html")) {
-                return html`<${IframeContainer} body=${body} />`
+                return sanitize_html ? null : html`<${IframeContainer} body=${body} />`
             } else {
                 return html`<${RawHTMLContainer}
                     cell_id=${cell_id}
                     body=${body}
                     persist_js_state=${persist_js_state}
                     last_run_timestamp=${last_run_timestamp}
+                    sanitize_html=${sanitize_html}
                 />`
             }
             break
         case "application/vnd.pluto.tree+object":
             return html`<div>
-                <${TreeView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} />
+                <${TreeView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} sanitize_html=${sanitize_html} />
             </div>`
             break
         case "application/vnd.pluto.table+object":
-            return html`<${TableView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} />`
+            return html`<${TableView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} sanitize_html=${sanitize_html} />`
             break
         case "application/vnd.pluto.parseerror+object":
             return html`<div><${ParseError} cell_id=${cell_id} ...${body} /></div>`
@@ -155,7 +159,7 @@ export const OutputBody = ({ mime, body, cell_id, persist_js_state = false, last
             return html`<div><${ErrorMessage} cell_id=${cell_id} ...${body} /></div>`
             break
         case "application/vnd.pluto.divelement+object":
-            return DivElement({ cell_id, ...body, persist_js_state })
+            return DivElement({ cell_id, ...body, persist_js_state, sanitize_html })
             break
         case "text/plain":
             if (body) {
@@ -177,7 +181,7 @@ export const OutputBody = ({ mime, body, cell_id, persist_js_state = false, last
     }
 }
 
-register(OutputBody, "pluto-display", ["mime", "body", "cell_id", "persist_js_state", "last_run_timestamp"])
+register(OutputBody, "pluto-display", ["mime", "body", "cell_id", "persist_js_state", "last_run_timestamp", "sanitize_html"])
 
 let IframeContainer = ({ body }) => {
     let iframeref = useRef()
@@ -469,7 +473,7 @@ let declarative_shadow_dom_polyfill = (template) => {
     }
 }
 
-export let RawHTMLContainer = ({ body, className = "", persist_js_state = false, last_run_timestamp }) => {
+export let RawHTMLContainer = ({ body, className = "", persist_js_state = false, last_run_timestamp, sanitize_html = true }) => {
     let pluto_actions = useContext(PlutoActionsContext)
     let pluto_bonds = useContext(PlutoBondsContext)
     let js_init_set = useContext(PlutoJSInitializingContext)
@@ -481,7 +485,7 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
 
     useLayoutEffect(() => {
         if (container_ref.current && pluto_bonds) set_bound_elements_to_their_value(container_ref.current.querySelectorAll("bond"), pluto_bonds)
-    }, [body, persist_js_state, pluto_actions, pluto_bonds])
+    }, [body, persist_js_state, pluto_actions, pluto_bonds, sanitize_html])
 
     useLayoutEffect(() => {
         const container = container_ref.current
@@ -498,8 +502,30 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
         // @ts-ignore
         dump.append(...container.childNodes)
 
+        let html_content_to_set = sanitize_html
+            ? DOMPurify.sanitize(body, {
+                  FORBID_TAGS: ["style"],
+              })
+            : body
+
         // Actually "load" the html
-        container.innerHTML = body
+        container.innerHTML = html_content_to_set
+
+        if (html_content_to_set !== body) {
+            // DOMPurify also resolves HTML entities, which can give a false positive. To fix this, we use DOMParser to parse both strings, and we compare the innerHTML of the resulting documents.
+            const parser = new DOMParser()
+            const p1 = parser.parseFromString(body, "text/html")
+            const p2 = parser.parseFromString(html_content_to_set, "text/html")
+
+            if (p2.documentElement.innerHTML !== p1.documentElement.innerHTML) {
+                console.info("HTML sanitized", { body, html_content_to_set })
+                let info_element = document.createElement("div")
+                info_element.innerHTML = SafePreviewSanitizeMessage
+                container.prepend(info_element)
+            }
+        }
+
+        if (sanitize_html) return
 
         let scripts_in_shadowroots = Array.from(container.querySelectorAll("template[shadowroot]")).flatMap((template) => {
             // @ts-ignore
@@ -564,7 +590,7 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
             js_init_set?.delete(container)
             invalidate_scripts.current?.()
         }
-    }, [body, persist_js_state, last_run_timestamp, pluto_actions])
+    }, [body, persist_js_state, last_run_timestamp, pluto_actions, sanitize_html])
 
     return html`<div class="raw-html-wrapper ${className}" ref=${container_ref}></div>`
 }
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 776668a2c4..d5fd127593 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -35,6 +35,8 @@ import { HijackExternalLinksToOpenInNewTab } from "./HackySideStuff/HijackExtern
 import { FrontMatterInput } from "./FrontmatterInput.js"
 import { EditorLaunchBackendButton } from "./Editor/LaunchBackendButton.js"
 import { get_environment } from "../common/Environment.js"
+import { ProcessStatus } from "../common/ProcessStatus.js"
+import { SafePreviewUI } from "./SafePreviewUI.js"
 
 // This is imported asynchronously - uncomment for development
 // import environment from "../common/Environment.js"
@@ -64,13 +66,6 @@ const Main = ({ children }) => {
     return html`<main>${children}</main>`
 }
 
-const ProcessStatus = {
-    ready: "ready",
-    starting: "starting",
-    no_process: "no_process",
-    waiting_to_restart: "waiting_to_restart",
-}
-
 /**
  * Map of status => Bool. In order of decreasing priority.
  */
@@ -82,11 +77,12 @@ const statusmap = (/** @type {EditorState} */ state, /** @type {LaunchParameters
             state.backend_launch_phase < BackendLaunchPhase.ready) ||
         state.initializing ||
         state.moving_file,
+    process_waiting_for_permission: state.notebook.process_status === ProcessStatus.waiting_for_permission && !state.initializing,
     process_restarting: state.notebook.process_status === ProcessStatus.waiting_to_restart,
     process_dead: state.notebook.process_status === ProcessStatus.no_process || state.notebook.process_status === ProcessStatus.waiting_to_restart,
     nbpkg_restart_required: state.notebook.nbpkg?.restart_required_msg != null,
     nbpkg_restart_recommended: state.notebook.nbpkg?.restart_recommended_msg != null,
-    nbpkg_disabled: state.notebook.nbpkg?.enabled === false,
+    nbpkg_disabled: state.notebook.nbpkg?.enabled === false || state.notebook.nbpkg?.waiting_for_permission_but_probably_disabled === true,
     static_preview: state.static_preview,
     bonds_disabled: !(state.connected || state.initializing || launch_params.slider_server_url != null),
     offer_binder: state.backend_launch_phase === BackendLaunchPhase.wait_for_user && launch_params.binder_url != null,
@@ -98,6 +94,7 @@ const statusmap = (/** @type {EditorState} */ state, /** @type {LaunchParameters
     recording_waiting_to_start: state.recording_waiting_to_start,
     is_recording: state.is_recording,
     isolated_cell_view: launch_params.isolated_cell_ids != null && launch_params.isolated_cell_ids.length > 0,
+    sanitize_html: state.notebook.process_status === ProcessStatus.waiting_for_permission,
 })
 
 const first_true_key = (obj) => {
@@ -185,6 +182,8 @@ const first_true_key = (obj) => {
  * @typedef NotebookPkgData
  * @type {{
  *  enabled: boolean,
+ *  waiting_for_permission: boolean?,
+ *  waiting_for_permission_but_probably_disabled: boolean?,
  *  restart_recommended_msg: string?,
  *  restart_required_msg: string?,
  *  installed_versions: { [pkg_name: string]: string },
@@ -256,6 +255,7 @@ export const url_logo_small = document.head.querySelector("link[rel='pluto-logo-
  * @type {{
  * launch_params: LaunchParameters,
  * initial_notebook_state: NotebookData,
+ * preamble_element: preact.ReactElement?,
  * }}
  */
 
@@ -1413,6 +1413,7 @@ patch: ${JSON.stringify(
                                             cell_input=${notebook.cell_inputs[cell_id]}
                                             cell_result=${this.state.notebook.cell_results[cell_id]}
                                             hidden=${!launch_params.isolated_cell_ids?.includes(cell_id)}
+                                            sanitize_html=${status.sanitize_html}
                                         />
                                     `
                                 )}
@@ -1423,19 +1424,31 @@ patch: ${JSON.stringify(
             `
         }
 
-        const restart_button = (text) => html`<a
-            href="#"
-            onClick=${() => {
-                this.client.send(
+        const warn_about_untrusted_code = this.client.session_options?.security?.warn_about_untrusted_code ?? true
+
+        const restart = async (maybe_confirm = false) => {
+            let source = notebook.metadata?.risky_file_source
+            if (
+                !warn_about_untrusted_code ||
+                !maybe_confirm ||
+                source == null ||
+                confirm(`⚠️ Danger! Are you sure that you trust this file? \n\n${source}\n\nA malicious notebook can steal passwords and data.`)
+            ) {
+                await this.actions.update_notebook((notebook) => {
+                    delete notebook.metadata.risky_file_source
+                })
+                await this.client.send(
                     "restart_process",
                     {},
                     {
                         notebook_id: notebook.notebook_id,
                     }
                 )
-            }}
-            >${text}</a
-        >`
+            }
+        }
+
+        const restart_button = (text, maybe_confirm = false) =>
+            html`<a href="#" id="restart-process-button" onClick=${() => restart(maybe_confirm)}>${text}</a>`
 
         return html`
             ${this.state.disable_ui === false && html`<${HijackExternalLinksToOpenInNewTab} />`}
@@ -1489,7 +1502,7 @@ patch: ${JSON.stringify(
                                           on_submit=${this.submit_file_change}
                                           on_desktop_submit=${this.desktop_submit_file_change}
                                           suggest_new_file=${{
-                                              base: this.client.session_options == null ? "" : this.client.session_options.server.notebook_path_suggestion,
+                                              base: this.client.session_options?.server?.notebook_path_suggestion ?? "",
                                               name: notebook.shortpath,
                                           }}
                                           placeholder="Save notebook..."
@@ -1515,11 +1528,20 @@ patch: ${JSON.stringify(
                                     ? "Process exited — restarting..."
                                     : statusval === "process_dead"
                                     ? html`${"Process exited — "}${restart_button("restart")}`
+                                    : statusval === "process_waiting_for_permission"
+                                    ? html`${restart_button("Run notebook code", true)}`
                                     : null
                             }</div>
                         </nav>
                     </header>
                     
+                    <${SafePreviewUI}
+                        process_waiting_for_permission=${status.process_waiting_for_permission}
+                        risky_file_source=${notebook.metadata?.risky_file_source}
+                        restart=${restart}
+                        warn_about_untrusted_code=${warn_about_untrusted_code}
+                    />
+                    
                     <${RecordingUI} 
                         notebook_name=${notebook.shortpath}
                         recording_waiting_to_start=${this.state.recording_waiting_to_start}
@@ -1547,7 +1569,7 @@ patch: ${JSON.stringify(
                                 nb.metadata["frontmatter"] = newval
                             })} 
                     />
-                    ${launch_params.preamble_html ? html`<${RawHTMLContainer} body=${launch_params.preamble_html} className=${"preamble"} />` : null}
+                    ${this.props.preamble_element}
                     <${Main}>
                         <${Preamble}
                             last_update_time=${this.state.last_update_time}
@@ -1563,6 +1585,8 @@ patch: ${JSON.stringify(
                             selected_cells=${this.state.selected_cells}
                             is_initializing=${this.state.initializing}
                             is_process_ready=${this.is_process_ready()}
+                            process_waiting_for_permission=${status.process_waiting_for_permission}
+                            sanitize_html=${status.sanitize_html}
                         />
                         <${DropRuler} 
                             actions=${this.actions}
diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
index 950b909680..529d55bb7a 100644
--- a/frontend/components/Logs.js
+++ b/frontend/components/Logs.js
@@ -20,7 +20,7 @@ const is_stdout_log = (log) => {
     return log.level == STDOUT_LOG_LEVEL
 }
 
-export const Logs = ({ logs, line_heights, set_cm_highlighted_line }) => {
+export const Logs = ({ logs, line_heights, set_cm_highlighted_line, sanitize_html }) => {
     const progress_logs = logs.filter(is_progress_log)
     const latest_progress_logs = progress_logs.reduce((progress_logs, log) => ({ ...progress_logs, [log.id]: log }), {})
     const stdout_log = logs.reduce((stdout_log, log) => {
@@ -63,6 +63,7 @@ export const Logs = ({ logs, line_heights, set_cm_highlighted_line }) => {
         level=${log.level}
         msg=${log.msg}
         kwargs=${log.kwargs}
+        sanitize_html=${sanitize_html}
         key=${i}
         y=${is_hidden_input ? 0 : log.line - 1}
     /> `
@@ -97,9 +98,7 @@ const Progress = ({ progress }) => {
     return html`<pluto-progress-bar ref=${bar_ref}>${Math.ceil(100 * progress)}%</pluto-progress-bar>`
 }
 
-const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${"adsf"} mime=${pair[1]} body=${pair[0]} persist_js_state=${false} />`
-
-const Dot = ({ set_cm_highlighted_line, msg, kwargs, y, level }) => {
+const Dot = ({ set_cm_highlighted_line, msg, kwargs, y, level, sanitize_html }) => {
     const is_progress = is_progress_log({ level, kwargs })
     const is_stdout = level === STDOUT_LOG_LEVEL
     let progress = null
@@ -119,6 +118,9 @@ const Dot = ({ set_cm_highlighted_line, msg, kwargs, y, level }) => {
         level = "Stdout"
     }
 
+    const mimepair_output = (pair) =>
+        html`<${SimpleOutputBody} cell_id=${"adsf"} mime=${pair[1]} body=${pair[0]} persist_js_state=${false} sanitize_html=${sanitize_html} />`
+
     return html`<pluto-log-dot-positioner
         class=${cl({ [level]: true })}
         onMouseenter=${() => is_progress || set_cm_highlighted_line(y + 1)}
diff --git a/frontend/components/Notebook.js b/frontend/components/Notebook.js
index c5d8d9d736..6158966bba 100644
--- a/frontend/components/Notebook.js
+++ b/frontend/components/Notebook.js
@@ -35,6 +35,8 @@ let CellMemo = ({
     force_hide_input,
     is_process_ready,
     disable_input,
+    sanitize_html = true,
+    process_waiting_for_permission,
     show_logs,
     set_show_logs,
     nbpkg,
@@ -56,6 +58,8 @@ let CellMemo = ({
                 focus_after_creation=${focus_after_creation}
                 is_process_ready=${is_process_ready}
                 disable_input=${disable_input}
+                process_waiting_for_permission=${process_waiting_for_permission}
+                sanitize_html=${sanitize_html}
                 nbpkg=${nbpkg}
                 global_definition_locations=${global_definition_locations}
             />
@@ -87,6 +91,8 @@ let CellMemo = ({
         focus_after_creation,
         is_process_ready,
         disable_input,
+        process_waiting_for_permission,
+        sanitize_html,
         ...nbpkg_fingerprint(nbpkg),
         global_definition_locations,
     ])
@@ -114,9 +120,21 @@ const render_cell_outputs_minimum = 20
  *  is_initializing: boolean,
  *  is_process_ready: boolean,
  *  disable_input: boolean,
+ *  process_waiting_for_permission: boolean,
+ *  sanitize_html: boolean,
  * }} props
  * */
-export const Notebook = ({ notebook, cell_inputs_local, last_created_cell, selected_cells, is_initializing, is_process_ready, disable_input }) => {
+export const Notebook = ({
+    notebook,
+    cell_inputs_local,
+    last_created_cell,
+    selected_cells,
+    is_initializing,
+    is_process_ready,
+    disable_input,
+    process_waiting_for_permission,
+    sanitize_html = true,
+}) => {
     let pluto_actions = useContext(PlutoActionsContext)
 
     // Add new cell when the last cell gets deleted
@@ -170,6 +188,8 @@ export const Notebook = ({ notebook, cell_inputs_local, last_created_cell, selec
                         force_hide_input=${false}
                         is_process_ready=${is_process_ready}
                         disable_input=${disable_input}
+                        process_waiting_for_permission=${process_waiting_for_permission}
+                        sanitize_html=${sanitize_html}
                         nbpkg=${notebook.nbpkg}
                         global_definition_locations=${global_definition_locations}
                     />`
diff --git a/frontend/components/PkgStatusMark.js b/frontend/components/PkgStatusMark.js
index 3083b42839..a7abe4745b 100644
--- a/frontend/components/PkgStatusMark.js
+++ b/frontend/components/PkgStatusMark.js
@@ -42,7 +42,8 @@ export const package_status = ({ nbpkg, package_name, available_versions, is_dis
     let hint = html`error`
     let offer_update = false
     const chosen_version = nbpkg?.installed_versions[package_name] ?? null
-    const busy = (nbpkg?.busy_packages ?? []).includes(package_name) || !(nbpkg?.instantiated ?? true)
+    const nbpkg_waiting_for_permission = nbpkg?.waiting_for_permission ?? false
+    const busy = !nbpkg_waiting_for_permission && ((nbpkg?.busy_packages ?? []).includes(package_name) || !(nbpkg?.instantiated ?? true))
 
     if (is_disable_pkg) {
         const f_name = package_name
@@ -55,7 +56,12 @@ export const package_status = ({ nbpkg, package_name, available_versions, is_dis
             hint_raw = `${package_name} is part of Julia's pre-installed 'standard library'.`
             hint = html`<b>${package_name}</b> is part of Julia's pre-installed <em>standard library</em>.`
         } else {
-            if (busy) {
+            if (nbpkg_waiting_for_permission) {
+                status = "will_be_installed"
+                hint_raw = `${package_name} (v${_.last(available_versions)}) will be installed when you run this notebook.`
+                hint = html`<header><b>${package_name}</b> <pkg-version>v${_.last(available_versions)}</pkg-version></header>
+                    will be installed when you run this notebook.`
+            } else if (busy) {
                 status = "busy"
                 hint_raw = `${package_name} (v${chosen_version}) is installing...`
                 hint = html`<header><b>${package_name}</b> <pkg-version>v${chosen_version}</pkg-version></header>
diff --git a/frontend/components/Popup.js b/frontend/components/Popup.js
index 27013725a9..8a2b47ee4b 100644
--- a/frontend/components/Popup.js
+++ b/frontend/components/Popup.js
@@ -29,7 +29,7 @@ export const help_circle_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/
  * @typedef MiscPopupDetails
  * @property {"info" | "warn"} type
  * @property {import("../imports/Preact.js").ReactElement} body
- * @property {HTMLElement} [source_element]
+ * @property {HTMLElement?} [source_element]
  * @property {Boolean} [big]
  */
 
@@ -188,7 +188,8 @@ const PkgPopup = ({ notebook, recent_event, clear_recent_event, disable_input })
                 class="pkg-update"
                 target="_blank"
                 title="Update packages"
-                style=${(!!showupdate ? "" : "opacity: .4;") + (recent_event?.is_disable_pkg || disable_input ? "display: none;" : "")}
+                style=${(!!showupdate ? "" : "opacity: .4;") +
+                (recent_event?.is_disable_pkg || disable_input || notebook.nbpkg?.waiting_for_permission ? "display: none;" : "")}
                 href="#"
                 onClick=${(e) => {
                     if (busy) {
diff --git a/frontend/components/RecordingUI.js b/frontend/components/RecordingUI.js
index 2d773f7581..ebd170f7ba 100644
--- a/frontend/components/RecordingUI.js
+++ b/frontend/components/RecordingUI.js
@@ -180,7 +180,7 @@ export const RecordingUI = ({ notebook_name, is_recording, recording_waiting_to_
     return html`
         <div class="outline-frame recording"></div>
         ${recording_waiting_to_start
-            ? html`<div id="record-ui-container">
+            ? html`<div class="outline-frame-actions-container">
                   <div class="overlay-button">
                       <button
                           onclick=${() => {
@@ -201,7 +201,7 @@ export const RecordingUI = ({ notebook_name, is_recording, recording_waiting_to_
                   </div>
               </div>`
             : is_recording
-            ? html`<div id="record-ui-container">
+            ? html`<div class="outline-frame-actions-container">
                   <div class="overlay-button">
                       <button
                           onclick=${() => {
@@ -444,7 +444,7 @@ export const RecordingPlaybackUI = ({ launch_params, initializing, apply_noteboo
     return html`
         ${recording_url
             ? html`${!following_scroll
-                      ? html` <div id="record-ui-container">
+                      ? html` <div class="outline-frame-actions-container">
                             <div class="overlay-button playback">
                                 <button
                                     onclick=${() => {
diff --git a/frontend/components/SafePreviewUI.js b/frontend/components/SafePreviewUI.js
new file mode 100644
index 0000000000..8ebb973f3a
--- /dev/null
+++ b/frontend/components/SafePreviewUI.js
@@ -0,0 +1,70 @@
+import _ from "../imports/lodash.js"
+import { html } from "../imports/Preact.js"
+import { open_pluto_popup } from "./Popup.js"
+
+export const SafePreviewUI = ({ process_waiting_for_permission, risky_file_source, restart, warn_about_untrusted_code }) => {
+    return html`
+        <div class="outline-frame safe-preview"></div>
+        ${process_waiting_for_permission
+            ? html`<div class="outline-frame-actions-container safe-preview">
+                  <div class="safe-preview-info">
+                      <span
+                          >Safe preview
+                          <button
+                              onclick=${(e) => {
+                                  open_pluto_popup({
+                                      type: "info",
+                                      big: true,
+                                      body: html`
+                                          <h1>Safe preview</h1>
+                                          <p>You are reading and editing this file without running Julia code.</p>
+
+                                          <p>
+                                              ${`When you are ready, you can `}<a
+                                                  href="#"
+                                                  onClick=${(e) => {
+                                                      e.preventDefault()
+                                                      restart(true)
+                                                      window.dispatchEvent(new CustomEvent("close pluto popup"))
+                                                  }}
+                                                  >run this notebook</a
+                                              >.
+                                          </p>
+                                          ${warn_about_untrusted_code
+                                              ? html`
+                                                    <pluto-output class="rich_output"
+                                                        ><div class="markdown">
+                                                            <div class="admonition warning">
+                                                                <p class="admonition-title">Warning</p>
+                                                                <p>Are you sure that you trust this file?</p>
+                                                                ${risky_file_source == null ? null : html`<p><code>${risky_file_source}</code></pre>`}
+                                                                <p>A malicious notebook can steal passwords and data.</p>
+                                                            </div>
+                                                        </div></pluto-output
+                                                    >
+                                                `
+                                              : null}
+                                      `,
+                                  })
+                              }}
+                          >
+                              <span><span class="info-icon pluto-icon"></span></span>
+                          </button>
+                      </span>
+                  </div>
+              </div>`
+            : null}
+    `
+}
+
+export const SafePreviewOutput = () => {
+    return html`<pluto-output class="rich_output"
+        ><div class="safe-preview-output">
+            <span class="offline-icon pluto-icon"></span><span>${`Code not executed in `}<em>Safe preview</em></span>
+        </div></pluto-output
+    >`
+}
+
+export const SafePreviewSanitizeMessage = `<div class="safe-preview-output">
+<span class="offline-icon pluto-icon"></span><span>${`Scripts and styles not rendered in `}<em>Safe preview</em></span>
+</div>`
diff --git a/frontend/components/TreeView.js b/frontend/components/TreeView.js
index 32e8de53c9..48ae5ddedd 100644
--- a/frontend/components/TreeView.js
+++ b/frontend/components/TreeView.js
@@ -11,7 +11,7 @@ import { PlutoActionsContext } from "../common/PlutoContext.js"
 // We use a `<pre>${body}` instead of `<pre><code>${body}`, also for some CSS reasons that I forgot
 //
 // TODO: remove this, use OutputBody instead (maybe add a `wrap_in_div` option), and fix the CSS classes so that i all looks nice again
-export const SimpleOutputBody = ({ mime, body, cell_id, persist_js_state }) => {
+export const SimpleOutputBody = ({ mime, body, cell_id, persist_js_state, sanitize_html = true }) => {
     switch (mime) {
         case "image/png":
         case "image/jpg":
@@ -27,7 +27,7 @@ export const SimpleOutputBody = ({ mime, body, cell_id, persist_js_state }) => {
             return html`<${TreeView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} />`
             break
         default:
-            return OutputBody({ mime, body, cell_id, persist_js_state, last_run_timestamp: null })
+            return OutputBody({ mime, body, cell_id, persist_js_state, sanitize_html, last_run_timestamp: null })
             break
     }
 }
@@ -56,7 +56,7 @@ const actions_show_more = ({ pluto_actions, cell_id, node_ref, objectid, dim })
     actions.reshow_cell(cell_id ?? node_ref.current.closest("pluto-cell").id, objectid, dim)
 }
 
-export const TreeView = ({ mime, body, cell_id, persist_js_state }) => {
+export const TreeView = ({ mime, body, cell_id, persist_js_state, sanitize_html = true }) => {
     let pluto_actions = useContext(PlutoActionsContext)
     const node_ref = useRef(/** @type {HTMLElement?} */ (null))
     const onclick = (e) => {
@@ -87,7 +87,8 @@ export const TreeView = ({ mime, body, cell_id, persist_js_state }) => {
         })
     }
 
-    const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${cell_id} mime=${pair[1]} body=${pair[0]} persist_js_state=${persist_js_state} />`
+    const mimepair_output = (pair) =>
+        html`<${SimpleOutputBody} cell_id=${cell_id} mime=${pair[1]} body=${pair[0]} persist_js_state=${persist_js_state} sanitize_html=${sanitize_html} />`
     const more = html`<p-r><${More} on_click_more=${on_click_more} /></p-r>`
 
     let inner = null
diff --git a/frontend/components/welcome/Open.js b/frontend/components/welcome/Open.js
index 70aac04696..3a0dc213c1 100644
--- a/frontend/components/welcome/Open.js
+++ b/frontend/components/welcome/Open.js
@@ -17,15 +17,8 @@ import { guess_notebook_location } from "../../common/NotebookLocationFromURL.js
 export const Open = ({ client, connected, CustomPicker, show_samples, on_start_navigation }) => {
     const on_open_path = async (new_path) => {
         const processed = await guess_notebook_location(new_path)
-        if (processed.type === "path") {
-            on_start_navigation(processed.path_or_url)
-            window.location.href = link_open_path(processed.path_or_url)
-        } else {
-            if (confirm("Are you sure? This will download and run the file at\n\n" + processed.path_or_url)) {
-                on_start_navigation(processed.path_or_url)
-                window.location.href = link_open_url(processed.path_or_url)
-            }
-        }
+        on_start_navigation(processed.path_or_url)
+        window.location.href = (processed.type === "path" ? link_open_path : link_open_url)(processed.path_or_url)
     }
 
     const desktop_on_open_path = async (_p) => {
@@ -65,7 +58,6 @@ export const Open = ({ client, connected, CustomPicker, show_samples, on_start_n
         </div>`
 }
 
-// /open will execute a script from your hard drive, so we include a token in the URL to prevent a mean person from getting a bad file on your computer _using another hypothetical intrusion_, and executing it using Pluto
-export const link_open_path = (path) => "open?" + new URLSearchParams({ path: path }).toString()
+export const link_open_path = (path, execution_allowed = false) => "open?" + new URLSearchParams({ path: path }).toString()
 export const link_open_url = (url) => "open?" + new URLSearchParams({ url: url }).toString()
 export const link_edit = (notebook_id) => "edit?id=" + notebook_id
diff --git a/frontend/components/welcome/Recent.js b/frontend/components/welcome/Recent.js
index ac81a507c6..2fbc72d5d4 100644
--- a/frontend/components/welcome/Recent.js
+++ b/frontend/components/welcome/Recent.js
@@ -4,30 +4,41 @@ import * as preact from "../../imports/Preact.js"
 
 import { cl } from "../../common/ClassTable.js"
 import { link_edit, link_open_path } from "./Open.js"
+import { ProcessStatus } from "../../common/ProcessStatus.js"
 
 /**
  * @typedef CombinedNotebook
  * @type {{
- *    path: String,
+ *    path: string,
  *    transitioning: Boolean,
- *    notebook_id: String?,
+ *    entry?: import("./Welcome.js").NotebookListEntry,
  * }}
  */
 
 /**
- *
  * @param {string} path
- * @param {string?} notebook_id
  * @returns {CombinedNotebook}
  */
-const entry = (path, notebook_id = null) => {
+const entry_notrunning = (path) => {
     return {
         transitioning: false, // between running and being shut down
-        notebook_id: notebook_id, // null means that it is not running
+        entry: undefined, // undefined means that it is not running
         path: path,
     }
 }
 
+/**
+ * @param {import("./Welcome.js").NotebookListEntry} entry
+ * @returns {CombinedNotebook}
+ */
+const entry_running = (entry) => {
+    return {
+        transitioning: false, // between running and being shut down
+        entry,
+        path: entry.path,
+    }
+}
+
 const split_at_level = (path, level) => path.split(/\/|\\/).slice(-level).join("/")
 
 const shortest_path = (path, allpaths) => {
@@ -68,7 +79,7 @@ export const Recent = ({ client, connected, remote_notebooks, CustomRecent, on_s
     useEffect(() => {
         if (client != null && connected) {
             client.send("get_all_notebooks", {}, {}).then(({ message }) => {
-                const running = /** @type {Array<import("./Welcome.js").NotebookListEntry>} */ (message.notebooks).map((nb) => entry(nb.path, nb.notebook_id))
+                const running = /** @type {Array<import("./Welcome.js").NotebookListEntry>} */ (message.notebooks).map((nb) => entry_running(nb))
 
                 const recent_notebooks = get_stored_recent_notebooks()
 
@@ -100,48 +111,48 @@ export const Recent = ({ client, connected, remote_notebooks, CustomRecent, on_s
                 // try to find a matching notebook in the remote list
                 let running_version = null
 
-                if (nb.notebook_id) {
+                if (nb.entry != null) {
                     // match notebook_ids to handle a path change
-                    running_version = new_running.find((rnb) => rnb.notebook_id == nb.notebook_id)
+                    running_version = new_running.find((rnb) => rnb.notebook_id === nb.entry?.notebook_id)
                 } else {
                     // match paths to handle a notebook bootup
-                    running_version = new_running.find((rnb) => rnb.path == nb.path)
+                    running_version = new_running.find((rnb) => rnb.path === nb.path)
                 }
 
                 if (running_version == null) {
-                    return entry(nb.path)
+                    return entry_notrunning(nb.path)
                 } else {
-                    const new_notebook = entry(running_version.path, running_version.notebook_id)
+                    const new_notebook = entry_running(running_version)
                     rendered_and_running.push(running_version)
                     return new_notebook
                 }
             })
 
-            const not_rendered_but_running = new_running.filter((rnb) => !rendered_and_running.includes(rnb)).map((rnb) => entry(rnb.path, rnb.notebook_id))
+            const not_rendered_but_running = new_running.filter((rnb) => !rendered_and_running.includes(rnb)).map(entry_running)
 
             set_combined_notebooks([...not_rendered_but_running, ...new_combined_notebooks])
         }
     }, [remote_notebooks])
 
-    const on_session_click = (nb) => {
+    const on_session_click = (/** @type {CombinedNotebook} */ nb) => {
         if (nb.transitioning) {
             return
         }
-        const running = nb.notebook_id != null
+        const running = nb.entry != null
         if (running) {
             if (client == null) return
-            if (confirm("Shut down notebook process?")) {
+            if (confirm(nb.entry?.process_status === ProcessStatus.waiting_for_permission ? "Close notebook session?" : "Shut down notebook process?")) {
                 set_notebook_state(nb.path, {
                     running: false,
                     transitioning: true,
                 })
-                client.send("shutdown_notebook", { keep_in_session: false }, { notebook_id: nb.notebook_id }, false)
+                client.send("shutdown_notebook", { keep_in_session: false }, { notebook_id: nb.entry?.notebook_id }, false)
             }
         } else {
             set_notebook_state(nb.path, {
                 transitioning: true,
             })
-            fetch(link_open_path(nb.path), {
+            fetch(link_open_path(nb.path) + "&execution_allowed=true", {
                 method: "GET",
             })
                 .then((r) => {
@@ -172,7 +183,7 @@ export const Recent = ({ client, connected, remote_notebooks, CustomRecent, on_s
         combined_notebooks == null
             ? html`<li><em>Loading...</em></li>`
             : combined_notebooks.map((nb) => {
-                  const running = nb.notebook_id != null
+                  const running = nb.entry != null
                   return html`<li
                       key=${nb.path}
                       class=${cl({
@@ -181,11 +192,18 @@ export const Recent = ({ client, connected, remote_notebooks, CustomRecent, on_s
                           transitioning: nb.transitioning,
                       })}
                   >
-                      <button onclick=${() => on_session_click(nb)} title=${running ? "Shut down notebook" : "Start notebook in background"}>
+                      <button
+                          onclick=${() => on_session_click(nb)}
+                          title=${running
+                              ? nb.entry?.process_status === ProcessStatus.waiting_for_permission
+                                  ? "Stop session"
+                                  : "Shut down notebook"
+                              : "Start notebook in background"}
+                      >
                           <span class="ionicon"></span>
                       </button>
                       <a
-                          href=${running ? link_edit(nb.notebook_id) : link_open_path(nb.path)}
+                          href=${running ? link_edit(nb.entry?.notebook_id) : link_open_path(nb.path)}
                           title=${nb.path}
                           onClick=${(e) => {
                               if (!running) {
@@ -225,5 +243,5 @@ const get_stored_recent_notebooks = () => {
     const storedString = localStorage.getItem("recent notebooks")
     const storedData = storedString != null ? JSON.parse(storedString) : []
     const storedList = storedData instanceof Array ? storedData : []
-    return storedList.map((path) => entry(path))
+    return storedList.map(entry_notrunning)
 }
diff --git a/frontend/components/welcome/Welcome.js b/frontend/components/welcome/Welcome.js
index aca858f838..f836db7cd7 100644
--- a/frontend/components/welcome/Welcome.js
+++ b/frontend/components/welcome/Welcome.js
@@ -20,6 +20,7 @@ import default_featured_sources from "../../featured_sources.js"
  *  path: string,
  *  in_temp_dir: boolean,
  *  shortpath: string,
+ *  process_status: string,
  * }}
  */
 
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index 3249d19803..4a676bab4a 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -96,6 +96,7 @@
 
         /*header*/
         --restart-recc-header-color: rgb(44 106 157 / 56%);
+        --restart-recc-accent-color: rgb(44 106 157);
         --restart-req-header-color: rgb(145 66 60 / 56%);
         --dead-process-header-color: rgba(250, 75, 21, 0.473);
         --loading-header-color: hsl(0deg 0% 20% / 50%);
diff --git a/frontend/editor.css b/frontend/editor.css
index 0ca807c9f4..fb85b10c9b 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -798,6 +798,7 @@ body.binder header#pluto-nav > nav#at_the_top > pluto-filepicker > a {
 body.nbpkg_restart_recommended header#pluto-nav,
 body.nbpkg_restart_required header#pluto-nav,
 body.binder.loading header#pluto-nav,
+body.process_waiting_for_permission header#pluto-nav,
 body.process_dead header#pluto-nav,
 body.disconnected header#pluto-nav {
     position: sticky;
@@ -815,6 +816,9 @@ body.nbpkg_restart_required header#pluto-nav {
 body.process_dead header#pluto-nav {
     background-color: var(--dead-process-header-color);
 }
+body.process_waiting_for_permission header#pluto-nav {
+    background-color: var(--restart-recc-header-color);
+}
 body.loading header#pluto-nav {
     background-color: var(--loading-header-color);
 }
@@ -879,7 +883,7 @@ body.binder.loading #binder_spinners {
 }
 
 .outline-frame {
-    z-index: 9990;
+    z-index: 1500;
     pointer-events: none;
     position: fixed;
     top: 0px;
@@ -890,6 +894,10 @@ body.binder.loading #binder_spinners {
     box-sizing: border-box;
 }
 
+body.process_waiting_for_permission .outline-frame.safe-preview {
+    border-bottom: 12px solid var(--restart-recc-header-color);
+}
+
 body.recording_waiting_to_start .outline-frame.recording {
     border: 12px solid #be6f6fba;
 }
@@ -910,24 +918,29 @@ body.is_recording header#pluto-nav {
     display: none;
 }
 
-#record-ui-container {
+.outline-frame-actions-container {
     position: fixed;
     top: 3px;
-    z-index: 9999;
+    z-index: 1501;
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
 }
 
-#record-ui-container > .overlay-button {
+.outline-frame-actions-container.safe-preview {
+    top: auto;
+    bottom: 4px;
+}
+
+.outline-frame-actions-container > .overlay-button {
     /* background: pink; */
     border-color: #e86f6c;
     margin: 0 3px;
 }
-#record-ui-container > .overlay-button.record-no-audio {
+.outline-frame-actions-container > .overlay-button.record-no-audio {
     border-color: #dcc6c6;
 }
-#record-ui-container > .overlay-button.playback {
+.outline-frame-actions-container > .overlay-button.playback {
     border-color: #c6c6dc;
 }
 span.pluto-icon.stop-recording-icon::after {
@@ -939,6 +952,9 @@ span.pluto-icon.microphone-icon::after {
 span.pluto-icon.info-icon::after {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/information-circle-outline.svg");
 }
+span.pluto-icon.offline-icon::after {
+    background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/cloud-offline-outline.svg");
+}
 span.pluto-icon.mute-icon::after {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/mic-off-outline.svg");
 }
@@ -950,12 +966,46 @@ div.recording-playback {
     width: min(500px, 90vw);
     position: fixed;
     bottom: 16px;
-    z-index: 9999;
+    z-index: 1501;
 }
 div.recording-playback audio {
     width: 100%;
 }
 
+.safe-preview-info {
+    color: var(--black);
+    font-family: var(--system-ui-font-stack);
+    font-weight: 700;
+    background: var(--white);
+    border: 3px solid var(--restart-recc-accent-color);
+    padding: 0.3em 0.8em;
+    border-radius: 0.8em;
+}
+.safe-preview-info > span {
+    display: flex;
+    /* flex-direction: row; */
+}
+.safe-preview-info button {
+    background: none;
+    border: none;
+    cursor: pointer;
+}
+
+.safe-preview-output {
+    color: var(--helpbox-header-color);
+    font-family: var(--system-ui-font-stack);
+    font-weight: 700;
+    opacity: 0.5;
+    font-size: 0.8rem;
+    padding: 0.2em 0.4em;
+    background: var(--restart-recc-header-color);
+    border-radius: 0.4em;
+    display: inline-flex;
+    margin: 0.7em 0;
+    gap: 0.3em;
+    align-items: baseline;
+}
+
 /* PREAMBLE */
 
 .raw-html-wrapper.preamble {
@@ -1261,6 +1311,9 @@ pluto-input .cm-editor .cm-line.cm-highlighted-line {
 pluto-cell:not(.show_input) > pluto-input {
     display: none;
 }
+pluto-cell.code_folded.show_input > pluto-input:not(:focus-within) {
+    opacity: 0.4;
+}
 
 pluto-cell.code_differs > pluto-input > .cm-editor {
     border: 1px solid var(--code-differs-cell-color);
@@ -1835,6 +1888,8 @@ pluto-popup > * {
     /* Slightly changes the layout of the three pkg buttons... in just the way that we want it! */
     position: absolute;
     max-width: 100%;
+    max-height: 80vh;
+    overflow-y: auto;
 }
 
 pluto-popup > div > *:first-child {
diff --git a/frontend/editor.js b/frontend/editor.js
index c74face3df..6fb9826699 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -5,6 +5,7 @@ import { Editor, default_path } from "./components/Editor.js"
 import { FetchProgress, read_Uint8Array_with_progress } from "./components/FetchProgress.js"
 import { unpack } from "./common/MsgPack.js"
 import { RawHTMLContainer } from "./components/CellOutput.js"
+import { ProcessStatus } from "./common/ProcessStatus.js"
 
 const url_params = new URLSearchParams(window.location.search)
 
@@ -73,6 +74,8 @@ const from_attribute = (element, name) => {
     }
 }
 
+const preamble_html_comes_from_url_params = url_params.has("preamble_url")
+
 /**
  *
  * @returns {import("./components/Editor.js").NotebookData}
@@ -83,7 +86,7 @@ export const empty_notebook_state = ({ notebook_id }) => ({
     path: default_path,
     shortpath: "",
     in_temp_dir: true,
-    process_status: "starting",
+    process_status: ProcessStatus.starting,
     last_save_time: 0.0,
     last_hot_reload_time: 0.0,
     cell_inputs: {},
@@ -153,7 +156,9 @@ const EditorLoader = ({ launch_params }) => {
         set_disable_ui_css(launch_params.disable_ui)
     }, [launch_params.disable_ui])
 
-    const preamble_element = launch_params.preamble_html ? html`<${RawHTMLContainer} body=${launch_params.preamble_html} className=${"preamble"} />` : null
+    const preamble_element = launch_params.preamble_html
+        ? html`<${RawHTMLContainer} body=${launch_params.preamble_html} className=${"preamble"} sanitize_html=${preamble_html_comes_from_url_params} />`
+        : null
 
     return ready_for_editor
         ? html`<${Editor} initial_notebook_state=${initial_notebook_state_ref.current} launch_params=${launch_params} preamble_element=${preamble_element} />`
diff --git a/frontend/imports/DOMPurify.d.ts b/frontend/imports/DOMPurify.d.ts
new file mode 100644
index 0000000000..ff1c9b5cf6
--- /dev/null
+++ b/frontend/imports/DOMPurify.d.ts
@@ -0,0 +1,148 @@
+// Type definitions for DOM Purify 3.0
+// Project: https://github.com/cure53/DOMPurify
+// Definitions by: Dave Taylor https://github.com/davetayls
+//                 Samira Bazuzi <https://github.com/bazuzi>
+//                 FlowCrypt <https://github.com/FlowCrypt>
+//                 Exigerr <https://github.com/Exigerr>
+//                 Piotr Błażejewicz <https://github.com/peterblazejewicz>
+//                 Nicholas Ellul <https://github.com/NicholasEllul>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.5
+
+
+export as namespace DOMPurify;
+export = DOMPurify;
+
+declare const DOMPurify: createDOMPurifyI;
+
+type WindowLike = Pick<
+    typeof globalThis,
+    | 'NodeFilter'
+    | 'Node'
+    | 'Element'
+    | 'HTMLTemplateElement'
+    | 'DocumentFragment'
+    | 'HTMLFormElement'
+    | 'DOMParser'
+    | 'NamedNodeMap'
+>;
+
+interface createDOMPurifyI extends DOMPurify.DOMPurifyI {
+    (window?: Window | WindowLike): DOMPurify.DOMPurifyI;
+}
+
+declare namespace DOMPurify {
+    interface DOMPurifyI {
+        sanitize(source: string | Node): string;
+        // sanitize(source: string | Node, config: Config & { RETURN_TRUSTED_TYPE: true }): TrustedHTML;
+        sanitize(
+            source: string | Node,
+            config: Config & { RETURN_DOM_FRAGMENT?: false | undefined; RETURN_DOM?: false | undefined },
+        ): string;
+        sanitize(source: string | Node, config: Config & { RETURN_DOM_FRAGMENT: true }): DocumentFragment;
+        sanitize(source: string | Node, config: Config & { RETURN_DOM: true }): HTMLElement;
+        sanitize(source: string | Node, config: Config): string | HTMLElement | DocumentFragment;
+
+        addHook(
+            hook: 'uponSanitizeElement',
+            cb: (currentNode: Element, data: SanitizeElementHookEvent, config: Config) => void,
+        ): void;
+        addHook(
+            hook: 'uponSanitizeAttribute',
+            cb: (currentNode: Element, data: SanitizeAttributeHookEvent, config: Config) => void,
+        ): void;
+        addHook(hook: HookName, cb: (currentNode: Element, data: HookEvent, config: Config) => void): void;
+
+        setConfig(cfg: Config): void;
+        clearConfig(): void;
+        isValidAttribute(tag: string, attr: string, value: string): boolean;
+
+        removeHook(entryPoint: HookName): void;
+        removeHooks(entryPoint: HookName): void;
+        removeAllHooks(): void;
+
+        version: string;
+        removed: any[];
+        isSupported: boolean;
+    }
+
+    interface Config {
+        ADD_ATTR?: string[] | undefined;
+        ADD_DATA_URI_TAGS?: string[] | undefined;
+        ADD_TAGS?: string[] | undefined;
+        ADD_URI_SAFE_ATTR?: string[] | undefined;
+        ALLOW_ARIA_ATTR?: boolean | undefined;
+        ALLOW_DATA_ATTR?: boolean | undefined;
+        ALLOW_UNKNOWN_PROTOCOLS?: boolean | undefined;
+        ALLOW_SELF_CLOSE_IN_ATTR?: boolean | undefined;
+        ALLOWED_ATTR?: string[] | undefined;
+        ALLOWED_TAGS?: string[] | undefined;
+        ALLOWED_NAMESPACES?: string[] | undefined;
+        ALLOWED_URI_REGEXP?: RegExp | undefined;
+        FORBID_ATTR?: string[] | undefined;
+        FORBID_CONTENTS?: string[] | undefined;
+        FORBID_TAGS?: string[] | undefined;
+        FORCE_BODY?: boolean | undefined;
+        IN_PLACE?: boolean | undefined;
+        KEEP_CONTENT?: boolean | undefined;
+        /**
+         * change the default namespace from HTML to something different
+         */
+        NAMESPACE?: string | undefined;
+        PARSER_MEDIA_TYPE?: string | undefined;
+        RETURN_DOM_FRAGMENT?: boolean | undefined;
+        /**
+         * This defaults to `true` starting DOMPurify 2.2.0. Note that setting it to `false`
+         * might cause XSS from attacks hidden in closed shadowroots in case the browser
+         * supports Declarative Shadow: DOM https://web.dev/declarative-shadow-dom/
+         */
+        RETURN_DOM_IMPORT?: boolean | undefined;
+        RETURN_DOM?: boolean | undefined;
+        RETURN_TRUSTED_TYPE?: boolean | undefined;
+        SAFE_FOR_TEMPLATES?: boolean | undefined;
+        SANITIZE_DOM?: boolean | undefined;
+        /** @default false */
+        SANITIZE_NAMED_PROPS?: boolean | undefined;
+        USE_PROFILES?:
+            | false
+            | {
+                  mathMl?: boolean | undefined;
+                  svg?: boolean | undefined;
+                  svgFilters?: boolean | undefined;
+                  html?: boolean | undefined;
+              }
+            | undefined;
+        WHOLE_DOCUMENT?: boolean | undefined;
+        CUSTOM_ELEMENT_HANDLING?: {
+            tagNameCheck?: RegExp | ((tagName: string) => boolean) | null | undefined;
+            attributeNameCheck?: RegExp | ((lcName: string) => boolean) | null | undefined;
+            allowCustomizedBuiltInElements?: boolean | undefined;
+        };
+    }
+
+    type HookName =
+        | 'beforeSanitizeElements'
+        | 'uponSanitizeElement'
+        | 'afterSanitizeElements'
+        | 'beforeSanitizeAttributes'
+        | 'uponSanitizeAttribute'
+        | 'afterSanitizeAttributes'
+        | 'beforeSanitizeShadowDOM'
+        | 'uponSanitizeShadowNode'
+        | 'afterSanitizeShadowDOM';
+
+    type HookEvent = SanitizeElementHookEvent | SanitizeAttributeHookEvent | null;
+
+    interface SanitizeElementHookEvent {
+        tagName: string;
+        allowedTags: { [key: string]: boolean };
+    }
+
+    interface SanitizeAttributeHookEvent {
+        attrName: string;
+        attrValue: string;
+        keepAttr: boolean;
+        allowedAttributes: { [key: string]: boolean };
+        forceKeepAttr?: boolean | undefined;
+    }
+}
\ No newline at end of file
diff --git a/frontend/imports/DOMPurify.js b/frontend/imports/DOMPurify.js
new file mode 100644
index 0000000000..f49c6bfe36
--- /dev/null
+++ b/frontend/imports/DOMPurify.js
@@ -0,0 +1,4 @@
+// @ts-ignore
+import purify from "https://esm.sh/dompurify@3.0.3?pin=v122"
+
+export default purify
diff --git a/frontend/light_color.css b/frontend/light_color.css
index 0f7e2ce49f..0dd3749c1d 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -99,6 +99,7 @@
 
         /*header*/
         --restart-recc-header-color: rgba(114, 192, 255, 0.56);
+        --restart-recc-accent-color: rgba(114, 192, 255);
         --restart-req-header-color: rgba(170, 41, 32, 0.56);
         --dead-process-header-color: rgb(230 88 46 / 38%);
         --loading-header-color: hsla(290, 10%, 80%, 0.5);
diff --git a/src/Configuration.jl b/src/Configuration.jl
index b99c429723..9fd22cbb58 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -109,6 +109,7 @@ end
 
 const REQUIRE_SECRET_FOR_OPEN_LINKS_DEFAULT = true
 const REQUIRE_SECRET_FOR_ACCESS_DEFAULT = true
+const WARN_ABOUT_UNTRUSTED_CODE_DEFAULT = true
 
 """
     SecurityOptions([; kwargs...])
@@ -125,10 +126,14 @@ Security settings for the HTTP server.
 
 - `require_secret_for_access::Bool = $REQUIRE_SECRET_FOR_ACCESS_DEFAULT`
 
-    If false, you do not need to use a `secret` in the URL to access Pluto: you will be authenticated by visiting `http://localhost:1234/` in your browser. An authentication cookie is still used for access (to prevent XSS and deceptive links or an img src to `http://localhost:1234/open?url=badpeople.org/script.jl`), and is set automatically, but this request to `/` is protected by cross-origin policy.
+    If `false`, you do not need to use a `secret` in the URL to access Pluto: you will be authenticated by visiting `http://localhost:1234/` in your browser. An authentication cookie is still used for access (to prevent XSS and deceptive links or an img src to `http://localhost:1234/open?url=badpeople.org/script.jl`), and is set automatically, but this request to `/` is protected by cross-origin policy.
 
     Use `true` on a computer used by multiple people simultaneously. Only use `false` if necessary.
 
+- `warn_about_untrusted_code::Bool = $WARN_ABOUT_UNTRUSTED_CODE_DEFAULT`
+
+    Should the Pluto GUI show warning messages about executing code from an unknown source, e.g. when opening a notebook from a URL? When `false`, notebooks will still open in Safe mode, but there is no scary message when you run it.
+        
 **Leave these options on `true` for the most secure setup.**
 
 Note that Pluto is quickly evolving software, maintained by designers, educators and enthusiasts — not security experts. If security is a serious concern for your application, then we recommend running Pluto inside a container and verifying the relevant security aspects of Pluto yourself.
@@ -136,6 +141,7 @@ Note that Pluto is quickly evolving software, maintained by designers, educators
 @option mutable struct SecurityOptions
     require_secret_for_open_links::Bool = REQUIRE_SECRET_FOR_OPEN_LINKS_DEFAULT
     require_secret_for_access::Bool = REQUIRE_SECRET_FOR_ACCESS_DEFAULT
+    warn_about_untrusted_code::Bool = WARN_ABOUT_UNTRUSTED_CODE_DEFAULT
 end
 
 const RUN_NOTEBOOK_ON_LOAD_DEFAULT = true
@@ -151,7 +157,7 @@ const WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT = nothing
 Options to change Pluto's evaluation behaviour during internal testing and by downstream packages.
 These options are not intended to be changed during normal use.
 
-- `run_notebook_on_load::Bool = $RUN_NOTEBOOK_ON_LOAD_DEFAULT` Whether to evaluate a notebook on load.
+- `run_notebook_on_load::Bool = $RUN_NOTEBOOK_ON_LOAD_DEFAULT` When running a notebook (not in Safe mode), should all cells evaluate immediately? Warning: this is only for internal testing, and using it will lead to unexpected behaviour and hard-to-reproduce notebooks. It's not the Pluto way!
 - `workspace_use_distributed::Bool = $WORKSPACE_USE_DISTRIBUTED_DEFAULT` Whether to start notebooks in a separate process.
 - `workspace_use_distributed_stdlib::Bool? = $WORKSPACE_USE_DISTRIBUTED_STDLIB_DEFAULT` Should we use the Distributed stdlib to run processes? Distributed will be replaced by Malt.jl, you can use this option to already get the old behaviour. `nothing` means: determine automatically (which is currently the same as `true`).
 - `lazy_workspace_creation::Bool = $LAZY_WORKSPACE_CREATION_DEFAULT`
@@ -292,6 +298,7 @@ function from_flat_kwargs(;
 
         require_secret_for_open_links::Bool = REQUIRE_SECRET_FOR_OPEN_LINKS_DEFAULT,
         require_secret_for_access::Bool = REQUIRE_SECRET_FOR_ACCESS_DEFAULT,
+        warn_about_untrusted_code::Bool = WARN_ABOUT_UNTRUSTED_CODE_DEFAULT,
 
         run_notebook_on_load::Bool = RUN_NOTEBOOK_ON_LOAD_DEFAULT,
         workspace_use_distributed::Bool = WORKSPACE_USE_DISTRIBUTED_DEFAULT,
@@ -340,6 +347,7 @@ function from_flat_kwargs(;
     security = SecurityOptions(;
         require_secret_for_open_links,
         require_secret_for_access,
+        warn_about_untrusted_code,
     )
     evaluation = EvaluationOptions(;
         run_notebook_on_load,
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index b9eb7679f9..7fb349082c 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -337,7 +337,17 @@ function set_output!(cell::Cell, run, expr_cache::ExprAnalysisCache; persist_js_
 	cell.running = cell.queued = false
 end
 
-will_run_code(notebook::Notebook) = notebook.process_status != ProcessStatus.no_process && notebook.process_status != ProcessStatus.waiting_to_restart
+function clear_output!(cell::Cell)
+	cell.output = CellOutput()
+	cell.published_objects = Dict{String,Any}()
+	
+	cell.runtime = nothing
+	cell.errored = false
+	cell.running = cell.queued = false
+end
+
+will_run_code(notebook::Notebook) = notebook.process_status ∈ (ProcessStatus.ready, ProcessStatus.starting)
+will_run_pkg(notebook::Notebook) = notebook.process_status !== ProcessStatus.waiting_for_permission
 
 
 "Do all the things!"
@@ -348,6 +358,7 @@ function update_save_run!(
 	save::Bool=true, 
 	run_async::Bool=false, 
 	prerender_text::Bool=false, 
+	clear_not_prerenderable_cells::Bool=false, 
 	auto_solve_multiple_defs::Bool=false,
 	on_auto_solve_multiple_defs::Function=identity,
 	kwargs...
@@ -377,9 +388,8 @@ function update_save_run!(
 	save && save_notebook(session, notebook)
 
 	# _assume `prerender_text == false` if you want to skip some details_
-	to_run_online = if !prerender_text
-		cells
-	else
+	to_run_online = cells
+	if prerender_text
 		# this code block will run cells that only contain text offline, i.e. on the server process, before doing anything else
 		# this makes the notebook load a lot faster - the front-end does not have to wait for each output, and perform costly reflows whenever one updates
 		# "A Workspace on the main process, used to prerender markdown before starting a notebook process for speedy UI."
@@ -392,16 +402,20 @@ function update_save_run!(
 			is_offline_renderer=true,
 		)
 
-		to_run_offline = filter(c -> !c.running && is_just_text(new, c) && is_just_text(old, c), cells)
+		to_run_offline = filter(c -> !c.running && is_just_text(new, c), cells)
 		for cell in to_run_offline
 			run_single!(offline_workspace, cell, new.nodes[cell], new.codes[cell])
 		end
 
 		cd(original_pwd)
-		setdiff(cells, to_run_offline)
+		to_run_online = setdiff(cells, to_run_offline)
+		
+		clear_not_prerenderable_cells && foreach(clear_output!, to_run_online)
+		
+		send_notebook_changes!(ClientRequest(; session, notebook))
 	end
-	
-	# this setting is not officially supported (default is `false`), so you can skip this block when reading the code
+
+	# this setting is not officially supported (default is `true`), so you can skip this block when reading the code
 	if !session.options.evaluation.run_notebook_on_load && prerender_text
 		# these cells do something like settings up an environment, we should always run them
 		setup_cells = filter(notebook.cells) do c
@@ -438,10 +452,13 @@ function update_save_run!(
 				@async WorkspaceManager.get_workspace((session, notebook))
 			end
 			
-            sync_nbpkg(session, notebook, old, new; 
-				save=(save && !session.options.server.disable_writing_notebook_files), 
-				take_token=false
-			)
+			if will_run_pkg(notebook)
+				# downloading and precompiling packages from the General registry is also arbitrary code execution
+				sync_nbpkg(session, notebook, old, new; 
+					save=(save && !session.options.server.disable_writing_notebook_files), 
+					take_token=false
+				)
+			end
 			
             if run_code
                 # not async because that would be double async
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 178b44f5f9..d993c0d7a2 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -23,6 +23,7 @@ Base.@kwdef mutable struct Workspace
     module_name::Symbol
     dowork_token::Token=Token()
     nbpkg_was_active::Bool=false
+    has_executed_effectful_code::Bool=false
     is_offline_renderer::Bool=false
     original_LOAD_PATH::Vector{String}=String[]
     original_ACTIVE_PROJECT::Union{Nothing,String}=nothing
@@ -124,7 +125,7 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
     
     # TODO: precompile 1+1 with display
     # sleep(3)
-    eval_format_fetch_in_workspace(workspace, Expr(:toplevel, LineNumberNode(-1), :(1+1)), uuid1())
+    eval_format_fetch_in_workspace(workspace, Expr(:toplevel, LineNumberNode(-1), :(1+1)), uuid1(); code_is_effectful=false)
     
     Status.report_business_finished!(init_status, Symbol(4))
     Status.report_business_finished!(workspace_business, :init_process)
@@ -410,7 +411,8 @@ function eval_format_fetch_in_workspace(
     forced_expr_id::Union{PlutoRunner.ObjectID,Nothing}=nothing,
     known_published_objects::Vector{String}=String[],
     user_requested_run::Bool=true,
-    capture_stdout::Bool=true
+    capture_stdout::Bool=true,
+    code_is_effectful::Bool=true,
 )::PlutoRunner.FormattedCellResult
 
     workspace = get_workspace(session_notebook)
@@ -425,6 +427,7 @@ function eval_format_fetch_in_workspace(
 
     # A try block (on this process) to catch an InterruptException
     take!(workspace.dowork_token)
+    workspace.has_executed_effectful_code |= code_is_effectful
     early_result = try
         Malt.remote_eval_wait(workspace.worker, quote
             PlutoRunner.run_expression(
diff --git a/src/notebook/Notebook.jl b/src/notebook/Notebook.jl
index fc8b049927..45f2be62ab 100644
--- a/src/notebook/Notebook.jl
+++ b/src/notebook/Notebook.jl
@@ -19,6 +19,7 @@ const ProcessStatus = (
     starting="starting",
     no_process="no_process",
     waiting_to_restart="waiting_to_restart",
+    waiting_for_permission="waiting_for_permission",
 )
 
 "Like a [`Diary`](@ref) but more serious. 📓"
diff --git a/src/packages/Packages.jl b/src/packages/Packages.jl
index f7ff3ea335..37a3437438 100644
--- a/src/packages/Packages.jl
+++ b/src/packages/Packages.jl
@@ -323,6 +323,8 @@ In addition to the steps performed by [`sync_nbpkg_core`](@ref):
 - `try` `catch` and reset the package environment on failure.
 """
 function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topology::NotebookTopology; save::Bool=true, take_token::Bool=true)
+    @assert will_run_pkg(notebook)
+
     cleanup = Ref{Function}(_default_cleanup)
 	try
         Status.report_business_started!(notebook.status_tree, :pkg)
@@ -353,16 +355,18 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
 		end
 
 		if pkg_result.did_something
-			@debug "PlutoPkg: success!" notebook.path pkg_result 
-
-			if pkg_result.restart_recommended
-				notebook.nbpkg_restart_recommended_msg = "Yes, something changed during regular sync."
-				@debug "PlutoPkg: Notebook restart recommended" notebook.path notebook.nbpkg_restart_recommended_msg
-			end
-			if pkg_result.restart_required
-				notebook.nbpkg_restart_required_msg = "Yes, something changed during regular sync."
-				@debug "PlutoPkg: Notebook restart REQUIRED" notebook.path notebook.nbpkg_restart_required_msg
-			end
+			@debug "PlutoPkg: success!" notebook.path pkg_result
+            
+            if _has_executed_effectful_code(session, notebook)
+                if pkg_result.restart_recommended
+                    notebook.nbpkg_restart_recommended_msg = "Yes, something changed during regular sync."
+                    @debug "PlutoPkg: Notebook restart recommended" notebook.path notebook.nbpkg_restart_recommended_msg
+                end
+                if pkg_result.restart_required
+                    notebook.nbpkg_restart_required_msg = "Yes, something changed during regular sync."
+                    @debug "PlutoPkg: Notebook restart REQUIRED" notebook.path notebook.nbpkg_restart_required_msg
+                end
+            end
 
 			notebook.nbpkg_busy_packages = String[]
             update_nbpkg_cache!(notebook)
@@ -403,6 +407,12 @@ function sync_nbpkg(session, notebook, old_topology::NotebookTopology, new_topol
     end
 end
 
+function _has_executed_effectful_code(session::ServerSession, notebook::Notebook)
+    workspace = WorkspaceManager.get_workspace((session, notebook); allow_creation=false)
+    workspace === nothing ? false : workspace.has_executed_effectful_code
+end
+    
+
 function writebackup(notebook::Notebook)
     backup_path = backup_filename(notebook.path)
     Pluto.readwrite(notebook.path, backup_path)
@@ -613,6 +623,8 @@ end
 
 
 function update_nbpkg(session, notebook::Notebook; level::Pkg.UpgradeLevel=Pkg.UPLEVEL_MAJOR, backup::Bool=true, save::Bool=true)
+    @assert will_run_pkg(notebook)
+
     bp = if backup && save
         writebackup(notebook)
     end
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 7fef996b80..8a138813e9 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -101,8 +101,8 @@ function notebook_to_js(notebook::Notebook)
     Dict{String,Any}(
         "notebook_id" => notebook.notebook_id,
         "path" => notebook.path,
-        "in_temp_dir" => startswith(notebook.path, new_notebooks_directory()),
         "shortpath" => basename(notebook.path),
+        "in_temp_dir" => startswith(notebook.path, new_notebooks_directory()),
         "process_status" => notebook.process_status,
         "last_save_time" => notebook.last_save_time,
         "last_hot_reload_time" => notebook.last_hot_reload_time,
@@ -154,6 +154,8 @@ function notebook_to_js(notebook::Notebook)
             ctx = notebook.nbpkg_ctx
             Dict{String,Any}(
                 "enabled" => ctx !== nothing,
+                "waiting_for_permission" => notebook.process_status === ProcessStatus.waiting_for_permission,
+                "waiting_for_permission_but_probably_disabled" => notebook.process_status === ProcessStatus.waiting_for_permission && !use_plutopkg(notebook.topology),
                 "restart_recommended_msg" => notebook.nbpkg_restart_recommended_msg,
                 "restart_required_msg" => notebook.nbpkg_restart_required_msg,
                 "installed_versions" => ctx === nothing ? Dict{String,String}() : notebook.nbpkg_installed_versions_cache,
@@ -247,6 +249,18 @@ const effects_of_changed_state = Dict(
 
         @info "Process status set by client" newstatus
     end,
+    # "execution_allowed" => function(; request::ClientRequest, patch::Firebasey.ReplacePatch)
+    #     Firebasey.applypatch!(request.notebook, patch)
+    #     newstatus = patch.value
+
+    #     @info "execution_allowed set by client" newstatus
+    #     if newstatus
+    #         @info "lets run some cells!"
+    #         update_save_run!(request.session, request.notebook, notebook.cells; 
+    #             run_async=true, save=true
+    #         )
+    #     end
+    # end,
     "in_temp_dir" => function(; _...) no_changes end,
     "cell_inputs" => Dict(
         Wildcard() => function(cell_id, rest...; request::ClientRequest, patch::Firebasey.JSONPatch)
@@ -434,10 +448,14 @@ responses[:run_multiple_cells] = function response_run_multiple_cells(🙋::Clie
         putclientupdates!(🙋.session, 🙋.initiator, UpdateMessage(:run_feedback, response, 🙋.notebook, nothing, 🙋.initiator))
     end
     
-    # save=true fixes the issue where "Submit all changes" or `Ctrl+S` has no effect.
+    wfp = 🙋.notebook.process_status == ProcessStatus.waiting_for_permission
+
     update_save_run!(🙋.session, 🙋.notebook, cells; 
         run_async=true, save=true, 
-        auto_solve_multiple_defs=true, on_auto_solve_multiple_defs
+        auto_solve_multiple_defs=true, on_auto_solve_multiple_defs,
+        # special case: just render md cells in "Safe preview" mode
+        prerender_text=wfp,
+        clear_not_prerenderable_cells=wfp,
     )
 end
 
@@ -476,6 +494,7 @@ responses[:restart_process] = function response_restart_process(🙋::ClientRequ
         🙋.session.options.evaluation.run_notebook_on_load && _report_business_cells_planned!(🙋.notebook)
         send_notebook_changes!(🙋 |> without_initiator)
 
+        # TODO skip necessary?
         SessionActions.shutdown(🙋.session, 🙋.notebook; keep_in_session=true, async=true)
 
         🙋.notebook.process_status = ProcessStatus.starting
@@ -488,6 +507,8 @@ end
 
 responses[:reshow_cell] = function response_reshow_cell(🙋::ClientRequest)
     require_notebook(🙋)
+    @assert will_run_code(🙋.notebook)
+
     cell = let
         cell_id = UUID(🙋.body["cell_id"])
         🙋.notebook.cells_dict[cell_id]
diff --git a/src/webserver/Router.jl b/src/webserver/Router.jl
index a3cca00625..cfbfed3d28 100644
--- a/src/webserver/Router.jl
+++ b/src/webserver/Router.jl
@@ -13,7 +13,12 @@ function http_router_for(session::ServerSession)
     HTTP.register!(router, "GET", "/ping", r -> HTTP.Response(200, "OK!"))
     HTTP.register!(router, "GET", "/possible_binder_token_please", r -> session.binder_token === nothing ? HTTP.Response(200,"") : HTTP.Response(200, session.binder_token))
     
-    function try_launch_notebook_response(action::Function, path_or_url::AbstractString; title="", advice="", home_url="./", as_redirect=true, action_kwargs...)
+    function try_launch_notebook_response(
+        action::Function, path_or_url::AbstractString; 
+        as_redirect=true,
+        title="", advice="", home_url="./", 
+        action_kwargs...
+    )
         try
             nb = action(session, path_or_url; action_kwargs...)
             notebook_response(nb; home_url, as_redirect)
@@ -39,13 +44,16 @@ function http_router_for(session::ServerSession)
             uri = HTTP.URI(request.target)
             query = HTTP.queryparams(uri)
             as_sample = haskey(query, "as_sample")
+            execution_allowed = haskey(query, "execution_allowed")
             if haskey(query, "path")
                 path = tamepath(maybe_convert_path_to_wsl(query["path"]))
                 if isfile(path)
                     return try_launch_notebook_response(
                         SessionActions.open, path; 
+                        execution_allowed,
                         as_redirect=(request.method == "GET"), 
                         as_sample, 
+                        risky_file_source=nothing,
                         title="Failed to load notebook", 
                         advice="The file <code>$(htmlesc(path))</code> could not be loaded. Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!",
                     )
@@ -56,8 +64,10 @@ function http_router_for(session::ServerSession)
                 url = query["url"]
                 return try_launch_notebook_response(
                     SessionActions.open_url, url;
+                    execution_allowed,
                     as_redirect=(request.method == "GET"), 
                     as_sample, 
+                    risky_file_source=url,
                     title="Failed to load notebook", 
                     advice="The notebook from <code>$(htmlesc(url))</code> could not be loaded. Please <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
                 )
@@ -192,7 +202,8 @@ function http_router_for(session::ServerSession)
             save_path;
             as_redirect=false,
             as_sample=false,
-            clear_frontmatter=!isnothing(get(query, "clear_frontmatter", nothing)),
+            execution_allowed=haskey(query, "execution_allowed"),
+            clear_frontmatter=haskey(query, "clear_frontmatter"),
             title="Failed to load notebook",
             advice="The contents could not be read as a Pluto notebook file. When copying contents from somewhere else, make sure that you copy the entire notebook file.  You can also <a href='https://github.com/fonsp/Pluto.jl/issues'>report this error</a>!"
         )
diff --git a/src/webserver/Session.jl b/src/webserver/Session.jl
index c7dfb2a240..36b912ae82 100644
--- a/src/webserver/Session.jl
+++ b/src/webserver/Session.jl
@@ -82,7 +82,8 @@ function clientupdate_notebook_list(notebooks; initiator::Union{Initiator,Nothin
                     :notebook_id => notebook.notebook_id,
                     :path => notebook.path,
                     :in_temp_dir => startswith(notebook.path, new_notebooks_directory()),
-                    :shortpath => basename(notebook.path)
+                    :shortpath => basename(notebook.path),
+                    :process_status => notebook.process_status,
                 ) for notebook in values(notebooks)
             ]
         ), nothing, nothing, initiator)
diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 551feddce8..a8ef828d12 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -1,6 +1,6 @@
 module SessionActions
 
-import ..Pluto: Pluto, Status, ServerSession, Notebook, Cell, emptynotebook, tamepath, new_notebooks_directory, without_pluto_file_extension, numbered_until_new, cutename, readwrite, update_save_run!, update_from_file, wait_until_file_unchanged, putnotebookupdates!, putplutoupdates!, load_notebook, clientupdate_notebook_list, WorkspaceManager, try_event_call, NewNotebookEvent, OpenNotebookEvent, ShutdownNotebookEvent, @asynclog, ProcessStatus, maybe_convert_path_to_wsl, move_notebook!, throttled
+import ..Pluto: Pluto, Status, ServerSession, Notebook, Cell, emptynotebook, tamepath, new_notebooks_directory, without_pluto_file_extension, numbered_until_new, cutename, readwrite, update_save_run!, update_nbpkg_cache!, update_from_file, wait_until_file_unchanged, putnotebookupdates!, putplutoupdates!, load_notebook, clientupdate_notebook_list, WorkspaceManager, try_event_call, NewNotebookEvent, OpenNotebookEvent, ShutdownNotebookEvent, @asynclog, ProcessStatus, maybe_convert_path_to_wsl, move_notebook!, throttled
 using FileWatching
 import ..Pluto.DownloadCool: download_cool
 import HTTP
@@ -42,9 +42,11 @@ end
 
 "Open the notebook at `path` into `session::ServerSession` and run it. Returns the `Notebook`."
 function open(session::ServerSession, path::AbstractString; 
+    execution_allowed::Bool=true,
     run_async::Bool=true, 
     compiler_options=nothing, 
     as_sample::Bool=false, 
+    risky_file_source::Union{Nothing,String}=nothing,
     clear_frontmatter::Bool=false,
     notebook_id::UUID=uuid1()
 )
@@ -64,7 +66,13 @@ function open(session::ServerSession, path::AbstractString;
     end
     
     notebook = load_notebook(tamepath(path); disable_writing_notebook_files=session.options.server.disable_writing_notebook_files)
+    execution_allowed = execution_allowed && !haskey(notebook.metadata, "risky_file_source")
+
     notebook.notebook_id = notebook_id
+    if !isnothing(risky_file_source)
+        notebook.metadata["risky_file_source"] = risky_file_source
+    end
+    notebook.process_status = execution_allowed ? ProcessStatus.starting : ProcessStatus.waiting_for_permission
 
     # overwrites the notebook environment if specified
     if compiler_options !== nothing
@@ -76,9 +84,17 @@ function open(session::ServerSession, path::AbstractString;
 
     session.notebooks[notebook.notebook_id] = notebook
     
-    if session.options.evaluation.run_notebook_on_load
+    if execution_allowed && session.options.evaluation.run_notebook_on_load
         Pluto._report_business_cells_planned!(notebook)
     end
+    
+    if !execution_allowed
+        Status.delete_business!(notebook.status_tree, :run)
+        Status.delete_business!(notebook.status_tree, :workspace)
+        Status.delete_business!(notebook.status_tree, :pkg)
+    end
+
+    update_nbpkg_cache!(notebook)
 
     update_save_run!(session, notebook, notebook.cells; run_async, prerender_text=true)
     add(session, notebook; run_async)
@@ -223,7 +239,7 @@ function shutdown(session::ServerSession, notebook::Notebook; keep_in_session::B
     notebook.nbpkg_restart_recommended_msg = nothing
     notebook.nbpkg_restart_required_msg = nothing
     
-    if notebook.process_status == ProcessStatus.ready || notebook.process_status == ProcessStatus.starting
+    if notebook.process_status ∈ (ProcessStatus.ready, ProcessStatus.starting)
         notebook.process_status = ProcessStatus.no_process
     end
 
diff --git a/src/webserver/Status.jl b/src/webserver/Status.jl
index 8a139af2c0..8586659d90 100644
--- a/src/webserver/Status.jl
+++ b/src/webserver/Status.jl
@@ -78,6 +78,10 @@ finally
     report_business_finished!(parent, args...)
 end
 
+delete_business!(business::Business, name::Symbol) = lock(business.lock) do
+    delete!(business.subtasks, name)
+end
+
 
 
 # GLOBAL
diff --git a/test/Configuration.jl b/test/Configuration.jl
index 8b92d5b179..3cabe2a942 100644
--- a/test/Configuration.jl
+++ b/test/Configuration.jl
@@ -58,6 +58,8 @@ end
 end
 
 @testset "Authentication" begin
+    basic_nb_path = Pluto.project_relative_path("sample", "Basic.jl")
+
     port = 1238
     options = Pluto.Configuration.from_flat_kwargs(; port, launch_browser=false, workspace_use_distributed=false)
     🍭 = Pluto.ServerSession(; options)
@@ -71,11 +73,12 @@ end
     @test HTTP.get(local_url("favicon.ico")).status == 200
 
     function requeststatus(url, method)
-        r = HTTP.request(method, url; status_exception=false, redirect=false)
+        r = HTTP.request(method, url, nothing, method == "POST" ? read(basic_nb_path) : UInt8[]; status_exception=false, redirect=false)
         r.status
     end
+    
 
-    nb = SessionActions.open(🍭, Pluto.project_relative_path("sample", "Basic.jl"); as_sample=true)
+    nb = SessionActions.open(🍭, basic_nb_path; as_sample=true)
 
     simple_routes = [
         ("", "GET"),
@@ -90,18 +93,20 @@ end
         Pluto.readwrite(x, p)
         p
     end
-    @assert isfile(Pluto.project_relative_path("sample", "Basic.jl"))
+    @assert isfile(basic_nb_path)
 
     effect_routes = [
         ("new", "GET"),
         ("new", "POST"),
         ("open?url=$(URIs.escapeuri("https://raw.githubusercontent.com/fonsp/Pluto.jl/v0.14.5/sample/Basic.jl"))", "GET"),
+        ("open?url=$(URIs.escapeuri("https://raw.githubusercontent.com/fonsp/Pluto.jl/v0.14.5/sample/Basic.jl"))&execution_allowed=asdf", "GET"),
         ("open?url=$(URIs.escapeuri("https://raw.githubusercontent.com/fonsp/Pluto.jl/v0.14.5/sample/Basic.jl"))", "POST"),
-        ("open?path=$(URIs.escapeuri(Pluto.project_relative_path("sample", "Basic.jl") |> tempcopy))", "GET"),
-        ("open?path=$(URIs.escapeuri(Pluto.project_relative_path("sample", "Basic.jl") |> tempcopy))", "POST"),
+        ("open?path=$(URIs.escapeuri(basic_nb_path |> tempcopy))", "GET"),
+        ("open?path=$(URIs.escapeuri(basic_nb_path |> tempcopy))", "POST"),
         ("sample/Basic.jl", "GET"),
         ("sample/Basic.jl", "POST"),
         ("notebookupload", "POST"),
+        ("notebookupload?execution_allowed=asdf", "POST"),
     ]
 
     for (suffix, method) in simple_routes ∪ effect_routes
@@ -117,9 +122,23 @@ end
         @test requeststatus(url, method)  ∈ 200:299
     end
 
-    for (suffix, method) in setdiff(effect_routes, [("notebookupload", "POST")])
+    for (suffix, method) in effect_routes
+        old_ids = collect(keys(🍭.notebooks))
+        
         url = local_url(suffix) |> withsecret
         @test requeststatus(url, method) ∈ 200:399 # 3xx are redirects
+        
+        new_ids = collect(keys(🍭.notebooks))
+        nb = 🍭.notebooks[only(setdiff(new_ids, old_ids))]
+
+        if any(x -> occursin(x, suffix), ["new", "execution_allowed", "sample/Basic.jl"])
+            @test Pluto.will_run_code(nb)
+            @test Pluto.will_run_pkg(nb)
+        else
+            @test !Pluto.will_run_code(nb)
+            @test !Pluto.will_run_pkg(nb)
+            @test nb.process_status === Pluto.ProcessStatus.waiting_for_permission
+        end
     end
 
     close(server)
diff --git a/test/frontend/__tests__/safe_preview.js b/test/frontend/__tests__/safe_preview.js
new file mode 100644
index 0000000000..e8b37b1d03
--- /dev/null
+++ b/test/frontend/__tests__/safe_preview.js
@@ -0,0 +1,248 @@
+import puppeteer from "puppeteer"
+import { saveScreenshot, createPage, paste, clickAndWaitForNavigation } from "../helpers/common"
+import {
+    importNotebook,
+    getPlutoUrl,
+    shutdownCurrentNotebook,
+    setupPlutoBrowser,
+    waitForPlutoToCalmDown,
+    restartProcess,
+    getCellIds,
+    clearPlutoInput,
+    writeSingleLineInPlutoInput,
+    runAllChanged,
+    openPathOrURLNotebook,
+    getAllCellOutputs,
+} from "../helpers/pluto"
+
+describe("safe_preview", () => {
+    /**
+     * Launch a shared browser instance for all tests.
+     * I don't use jest-puppeteer because it takes away a lot of control and works buggy for me,
+     * so I need to manually create the shared browser.
+     * @type {puppeteer.Browser}
+     */
+    let browser = null
+    /** @type {puppeteer.Page} */
+    let page = null
+    beforeAll(async () => {
+        browser = await setupPlutoBrowser()
+    })
+    beforeEach(async () => {
+        page = await createPage(browser)
+        await page.goto(getPlutoUrl(), { waitUntil: "networkidle0" })
+    })
+    afterEach(async () => {
+        await saveScreenshot(page)
+        await shutdownCurrentNotebook(page)
+        await page.close()
+        page = null
+    })
+    afterAll(async () => {
+        await browser.close()
+        browser = null
+    })
+
+    const expect_safe_preview = async (/** @type {puppeteer.Page} */ page) => {
+        await waitForPlutoToCalmDown(page)
+        expect(await page.evaluate(() => window.I_DID_SOMETHING_DANGEROUS)).toBeUndefined()
+        expect(await page.evaluate(() => [...document.body.classList])).toContain("process_waiting_for_permission")
+        expect(await page.evaluate(() => document.querySelector("a#restart-process-button"))).not.toBeNull()
+        expect(await page.evaluate(() => document.querySelector(".safe-preview-info"))).not.toBeNull()
+    }
+
+    it("Pasting notebook contents should open in safe preview", async () => {
+        await Promise.all([
+            page.waitForNavigation(),
+            paste(
+                page,
+                `### A Pluto.jl notebook ###
+# v0.14.0
+
+using Markdown
+using InteractiveUtils
+
+# ╔═╡ b2d786ec-7f73-11ea-1a0c-f38d7b6bbc1e
+md"""
+Hello
+"""
+
+# ╔═╡ b2d79330-7f73-11ea-0d1c-a9aad1efaae1
+1 + 2
+
+# ╔═╡ Cell order:
+# ╟─b2d786ec-7f73-11ea-1a0c-f38d7b6bbc1e
+# ╠═b2d79330-7f73-11ea-0d1c-a9aad1efaae1
+`
+            ),
+        ])
+        await expect_safe_preview(page)
+    })
+
+    it("Notebook from URL source", async () => {
+        const url = "https://raw.githubusercontent.com/fonsp/Pluto.jl/v0.14.5/sample/Basic.jl"
+
+        await openPathOrURLNotebook(page, url, { permissionToRunCode: false })
+        await expect_safe_preview(page)
+
+        let expectWarningMessage = async () => {
+            await page.waitForSelector(`a#restart-process-button`)
+            const [dmsg, _] = await Promise.all([
+                new Promise((res) => {
+                    page.once("dialog", async (dialog) => {
+                        let msg = dialog.message()
+                        await dialog.dismiss()
+                        res(msg)
+                    })
+                }),
+                page.click(`a#restart-process-button`),
+            ])
+
+            expect(dmsg).toContain(url)
+            expect(dmsg.toLowerCase()).toContain("danger")
+            expect(dmsg.toLowerCase()).toContain("are you sure")
+
+            await page.waitForTimeout(1000)
+            await waitForPlutoToCalmDown(page)
+            await expect_safe_preview(page)
+        }
+
+        await expectWarningMessage()
+
+        // Make some edits
+        expect((await getAllCellOutputs(page))[0]).toContain("Basel problem")
+
+        let sel = `pluto-cell[id="${(await getCellIds(page))[0]}"]`
+        await page.click(`${sel} .foldcode`)
+
+        await clearPlutoInput(page, sel)
+        await writeSingleLineInPlutoInput(page, sel, "1 + 1")
+        await runAllChanged(page)
+
+        expect((await getAllCellOutputs(page))[0]).toBe("Code not executed in Safe preview")
+        await expect_safe_preview(page)
+
+        //////////////////////////
+        // Let's shut it down
+        // @ts-ignore
+        let path = await page.evaluate(() => window.editor_state.notebook.path.replaceAll("\\", "\\\\"))
+        let shutdown = async () => {
+            await shutdownCurrentNotebook(page)
+            await page.goto(getPlutoUrl(), { waitUntil: "networkidle0" })
+            // Wait for it to be shut down
+            await page.waitForSelector(`li.recent a[title="${path}"]`)
+        }
+        await shutdown()
+
+        // Run it again
+        await clickAndWaitForNavigation(page, `a[title="${path}"]`)
+        await page.waitForTimeout(1000)
+        await waitForPlutoToCalmDown(page)
+
+        await expect_safe_preview(page)
+        await expectWarningMessage()
+
+        ////////////////////
+        await shutdown()
+
+        // Now let's try to run the notebook in the background. This should start it in safe mode because of the risky source
+        await page.evaluate((path) => {
+            let a = document.querySelector(`a[title="${path}"]`)
+            let btn = a.previousElementSibling
+            btn.click()
+        }, path)
+
+        await page.waitForSelector(`li.running a[title="${path}"]`)
+        await clickAndWaitForNavigation(page, `a[title="${path}"]`)
+
+        await expect_safe_preview(page)
+        await expectWarningMessage()
+
+        // Let's run it
+        await Promise.all([
+            new Promise((res) => {
+                page.once("dialog", (dialog) => {
+                    res(dialog.accept())
+                })
+            }),
+            page.click(`a#restart-process-button`),
+        ])
+        await page.waitForTimeout(1000)
+        await waitForPlutoToCalmDown(page)
+
+        // Nice
+        expect((await getAllCellOutputs(page))[0]).toBe("2")
+
+        ////////////////////
+        await shutdown()
+
+        await clickAndWaitForNavigation(page, `a[title="${path}"]`)
+
+        await expect_safe_preview(page)
+        expect((await getAllCellOutputs(page))[0]).toBe("Code not executed in Safe preview")
+
+        // Since we ran the notebook once, there should be no warning message:
+        await page.waitForSelector(`a#restart-process-button`)
+        await page.click(`a#restart-process-button`)
+
+        // If there was a dialog, we would stall right now and the test would fail.
+        await page.waitForTimeout(1000)
+        await waitForPlutoToCalmDown(page)
+        expect((await getAllCellOutputs(page))[0]).toBe("2")
+    })
+
+    it("Importing notebook should open in safe preview", async () => {
+        await importNotebook(page, "safe_preview.jl", { permissionToRunCode: false })
+        await expect_safe_preview(page)
+
+        await waitForPlutoToCalmDown(page)
+
+        let cell_contents = await getAllCellOutputs(page)
+
+        expect(cell_contents[0]).toBe("one")
+        expect(cell_contents[1]).toBe("Scripts and styles not rendered in Safe preview\ni should not be red\ntwo\nsafe")
+        expect(cell_contents[2]).toBe("three")
+        expect(cell_contents[3]).toBe("Code not executed in Safe preview")
+        expect(cell_contents[4]).toBe("Code not executed in Safe preview")
+        expect(cell_contents[5]).toContain("yntax")
+        expect(cell_contents[6]).toBe("")
+
+        expect(await page.evaluate(() => getComputedStyle(document.querySelector(`.zo`)).color)).not.toBe("rgb(255, 0, 0)")
+
+        // Modifying should not execute code
+        const cellids = await getCellIds(page)
+        let sel = `pluto-cell[id="${cellids[0]}"] pluto-input`
+
+        let expectNewOutput = async (contents) => {
+            await clearPlutoInput(page, sel)
+            await writeSingleLineInPlutoInput(page, sel, contents)
+            await runAllChanged(page)
+            return expect((await getAllCellOutputs(page))[0])
+        }
+
+        ;(await expectNewOutput(`md"een"`)).toBe("een")
+        ;(await expectNewOutput(`un`)).toBe("Code not executed in Safe preview")
+        ;(await expectNewOutput(`md"one"`)).toBe("one")
+        ;(await expectNewOutput(`a b c function`)).toContain("yntax")
+        ;(await expectNewOutput(`md"one"`)).toBe("one")
+        ;(await expectNewOutput(``)).toBe("")
+        ;(await expectNewOutput(`md"one"`)).toBe("one")
+
+        await restartProcess(page)
+        await waitForPlutoToCalmDown(page)
+
+        cell_contents = await getAllCellOutputs(page)
+
+        expect(cell_contents[0]).toBe("one")
+        expect(cell_contents[1]).toBe("i should not be red\ntwo\nsafe\nDANGER")
+        expect(cell_contents[2]).toBe("three")
+        expect(cell_contents[3]).toBe("123")
+        expect(cell_contents[4]).toBe("")
+        expect(cell_contents[5]).toContain("yntax")
+        expect(cell_contents[6]).toBe("")
+
+        expect(await page.evaluate(() => document.querySelector(`pluto-log-dot`).innerText)).toBe("four\nDANGER")
+
+        expect(await page.evaluate(() => getComputedStyle(document.querySelector(`.zo`)).color)).toBe("rgb(255, 0, 0)")
+    })
+})
diff --git a/test/frontend/__tests__/slide_controls.js b/test/frontend/__tests__/slide_controls.js
index 8f1eedd6ed..15a50e07ea 100644
--- a/test/frontend/__tests__/slide_controls.js
+++ b/test/frontend/__tests__/slide_controls.js
@@ -42,7 +42,7 @@ describe("slideControls", () => {
     })
 
     it("should create titles", async () => {
-        await importNotebook(page, "slides.jl")
+        await importNotebook(page, "slides.jl", { permissionToRunCode: false })
         const plutoCellIds = await getCellIds(page)
         const content = await waitForContent(page, `pluto-cell[id="${plutoCellIds[1]}"] pluto-output`)
         expect(content).toBe("Slide 2")
diff --git a/test/frontend/fixtures/safe_preview.jl b/test/frontend/fixtures/safe_preview.jl
new file mode 100644
index 0000000000..7fb6014e80
--- /dev/null
+++ b/test/frontend/fixtures/safe_preview.jl
@@ -0,0 +1,65 @@
+### A Pluto.jl notebook ###
+# v0.19.29
+
+using Markdown
+using InteractiveUtils
+
+# ╔═╡ e28131d9-9877-4b44-8213-9e6c041b5da5
+md"""
+one
+"""
+
+# ╔═╡ ef63b97e-700d-11ee-2997-7bf929019c2d
+html"""
+<div class="zo">
+i should not be red
+</div>
+
+<x>two</x>
+
+<div style="color: green;">safe</div>
+
+
+<script>
+window.I_DID_SOMETHING_DANGEROUS = true
+return html`<div style="color: red;">DANGER</div>`
+</script>
+
+
+<style>
+.zo {
+	color: red;
+}
+</style>
+"""
+
+# ╔═╡ 99e2bfea-4e5d-4d94-bd96-77be7b04811d
+html"three"
+
+# ╔═╡ 76e68adf-16ab-4e88-a601-3177f34db6ec
+122 + 1
+
+# ╔═╡ 873d58c2-8590-4bb3-bf9c-596b1cdbe402
+let
+	stuff = html"""
+four <script>
+return html`<div style="color: red;">DANGER</div>`
+</script>
+"""
+	@info stuff
+end
+
+# ╔═╡ 55c74b79-41a6-461e-99c4-a61994673824
+modify me to make me safe
+
+# ╔═╡ f5209e95-761d-4861-a00d-b7e33a1b3d69
+
+
+# ╔═╡ Cell order:
+# ╠═e28131d9-9877-4b44-8213-9e6c041b5da5
+# ╠═ef63b97e-700d-11ee-2997-7bf929019c2d
+# ╠═99e2bfea-4e5d-4d94-bd96-77be7b04811d
+# ╠═76e68adf-16ab-4e88-a601-3177f34db6ec
+# ╠═873d58c2-8590-4bb3-bf9c-596b1cdbe402
+# ╠═55c74b79-41a6-461e-99c4-a61994673824
+# ╠═f5209e95-761d-4861-a00d-b7e33a1b3d69
diff --git a/test/frontend/helpers/pluto.js b/test/frontend/helpers/pluto.js
index 94f82fca61..1ad04d9520 100644
--- a/test/frontend/helpers/pluto.js
+++ b/test/frontend/helpers/pluto.js
@@ -89,17 +89,27 @@ export const createNewNotebook = async (page) => {
  * @param {Page} page
  * @param {string} notebookName`
  */
-export const importNotebook = async (page, notebookName) => {
+export const importNotebook = async (page, notebookName, { permissionToRunCode = true } = {}) => {
     // Copy notebook before using it, so we don't mess it up with test changes
     const notebookPath = getFixtureNotebookPath(notebookName)
     const artifactsPath = getTemporaryNotebookPath()
     fs.copyFileSync(notebookPath, artifactsPath)
+    await openPathOrURLNotebook(page, artifactsPath, { permissionToRunCode })
+}
+
+/**
+ * @param {Page} page
+ * @param {string} path_or_url
+ */
+export const openPathOrURLNotebook = async (page, path_or_url, { permissionToRunCode = true } = {}) => {
     const openFileInputSelector = "pluto-filepicker"
-    await writeSingleLineInPlutoInput(page, openFileInputSelector, artifactsPath)
+    await writeSingleLineInPlutoInput(page, openFileInputSelector, path_or_url)
     // await writeSingleLineInPlutoInput(page, openFileInputSelector, notebookPath)
 
     const openFileButton = "pluto-filepicker button"
     await clickAndWaitForNavigation(page, openFileButton)
+    // Give permission to run code in this notebook
+    if (permissionToRunCode) await restartProcess(page)
     await page.waitForTimeout(1000)
     await waitForPlutoToCalmDown(page)
 }
@@ -155,6 +165,11 @@ export const waitForCellOutput = (page, cellId) => {
     return waitForContent(page, cellOutputSelector)
 }
 
+/**
+ * @param {Page} page
+ */
+export const getAllCellOutputs = (page) => page.evaluate(() => Array.from(document.querySelectorAll(`pluto-cell > pluto-output`)).map((c) => c.innerText))
+
 /**
  * @param {Page} page
  * @param {string} cellId
@@ -231,6 +246,7 @@ export const keyboardPressInPlutoInput = async (page, plutoInputSelector, key) =
  * @param {string} plutoInputSelector
  */
 export const clearPlutoInput = async (page, plutoInputSelector) => {
+    await page.waitForSelector(`${plutoInputSelector} .cm-editor`)
     if ((await page.$(`${plutoInputSelector} .cm-placeholder`)) == null) {
         await page.focus(`${plutoInputSelector} .cm-content`)
         await page.waitForTimeout(500)

From fb7ca864bacdb90a0f0c9d45d3c11995afbd2187 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 22 Oct 2023 15:44:43 +0200
Subject: [PATCH 721/821] =?UTF-8?q?=E2=8F=B1=EF=B8=8F=20Estimate=20for=20p?=
 =?UTF-8?q?ackage=20install=20and=20load=20time=20(#2672)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/common/InstallTimeEstimate.js | 99 ++++++++++++++++++++++++++
 frontend/components/EditOrRunButton.js | 13 +++-
 frontend/components/PkgStatusMark.js   |  1 +
 frontend/components/Popup.js           | 15 +++-
 frontend/editor.css                    |  8 +++
 5 files changed, 132 insertions(+), 4 deletions(-)
 create mode 100644 frontend/common/InstallTimeEstimate.js

diff --git a/frontend/common/InstallTimeEstimate.js b/frontend/common/InstallTimeEstimate.js
new file mode 100644
index 0000000000..89aaad2326
--- /dev/null
+++ b/frontend/common/InstallTimeEstimate.js
@@ -0,0 +1,99 @@
+import { useEffect, useState } from "../imports/Preact.js"
+import _ from "../imports/lodash.js"
+
+const loading_times_url = `https://julia-loading-times-test.netlify.app/pkg_load_times.csv`
+const package_list_url = `https://julia-loading-times-test.netlify.app/top_packages_sorted_with_deps.txt`
+
+/** @typedef {{ install: Number, precompile: Number, load: Number }} LoadingTime */
+
+/**
+ * @typedef PackageTimingData
+ * @type {{
+ *  times: Map<String,LoadingTime>,
+ *  packages: Map<String,String[]>,
+ * }}
+ */
+
+/** @type {{ current: Promise<PackageTimingData>? }} */
+const data_promise_ref = { current: null }
+
+export const get_data = () => {
+    if (data_promise_ref.current != null) {
+        return data_promise_ref.current
+    } else {
+        const times_p = fetch(loading_times_url)
+            .then((res) => res.text())
+            .then((text) => {
+                const lines = text.split("\n")
+                const header = lines[0].split(",")
+                return new Map(
+                    lines.slice(1).map((line) => {
+                        let [pkg, ...times] = line.split(",")
+
+                        return [pkg, { install: Number(times[0]), precompile: Number(times[1]), load: Number(times[2]) }]
+                    })
+                )
+            })
+
+        const packages_p = fetch(package_list_url)
+            .then((res) => res.text())
+            .then(
+                (text) =>
+                    new Map(
+                        text.split("\n").map((line) => {
+                            let [pkg, ...deps] = line.split(",")
+                            return [pkg, deps]
+                        })
+                    )
+            )
+
+        data_promise_ref.current = Promise.all([times_p, packages_p]).then(([times, packages]) => ({ times, packages }))
+
+        return data_promise_ref.current
+    }
+}
+
+export const usePackageTimingData = () => {
+    const [data, set_data] = useState(/** @type {PackageTimingData?} */ (null))
+
+    useEffect(() => {
+        get_data().then(set_data)
+    }, [])
+
+    return data
+}
+
+const recursive_deps = (/** @type {PackageTimingData} */ data, /** @type {string} */ pkg, found = []) => {
+    const deps = data.packages.get(pkg)
+    if (deps == null) {
+        return []
+    } else {
+        const newfound = _.union(found, deps)
+        return [...deps, ..._.difference(deps, found).flatMap((dep) => recursive_deps(data, dep, newfound))]
+    }
+}
+
+export const time_estimate = (/** @type {PackageTimingData} */ data, /** @type {string[]} */ packages) => {
+    let deps = packages.flatMap((pkg) => recursive_deps(data, pkg))
+    let times = _.uniq([...packages, ...deps])
+        .map((pkg) => data.times.get(pkg))
+        .filter((x) => x != null)
+
+    console.log({ packages, deps, times, z: _.uniq([...packages, ...deps]) })
+    let sum = (xs) => xs.reduce((acc, x) => acc + (x == null || isNaN(x) ? 0 : x), 0)
+
+    return {
+        install: sum(times.map(_.property("install"))) * timing_weights.install,
+        precompile: sum(times.map(_.property("precompile"))) * timing_weights.precompile,
+        load: sum(times.map(_.property("load"))) * timing_weights.load,
+    }
+}
+
+const timing_weights = {
+    // Because the GitHub Action runner has superfast internet
+    install: 2,
+    // Because the GitHub Action runner has average compute speed
+    load: 1,
+    // Because precompilation happens in parallel
+    precompile: 0.3,
+}
diff --git a/frontend/components/EditOrRunButton.js b/frontend/components/EditOrRunButton.js
index aad48acaa5..77632e0ac4 100644
--- a/frontend/components/EditOrRunButton.js
+++ b/frontend/components/EditOrRunButton.js
@@ -180,10 +180,17 @@ const expected_runtime_str = (/** @type {import("./Editor.js").NotebookData} */
     }
 
     const sec = _.round(runtime_overhead + ex * runtime_multiplier, -1)
+    return pretty_long_time(sec)
+}
+
+export const pretty_long_time = (/** @type {number} */ sec) => {
+    const min = sec / 60
+    const sec_r = Math.ceil(sec)
+    const min_r = Math.round(min)
+
     if (sec < 60) {
-        return `${Math.ceil(sec)} second${sec > 1 ? "s" : ""}`
+        return `${sec_r} second${sec_r > 1 ? "s" : ""}`
     } else {
-        const min = sec / 60
-        return `${Math.ceil(min)} minute${min > 1 ? "s" : ""}`
+        return `${min_r} minute${min_r > 1 ? "s" : ""}`
     }
 }
diff --git a/frontend/components/PkgStatusMark.js b/frontend/components/PkgStatusMark.js
index a7abe4745b..4779948a58 100644
--- a/frontend/components/PkgStatusMark.js
+++ b/frontend/components/PkgStatusMark.js
@@ -94,6 +94,7 @@ export const package_status = ({ nbpkg, package_name, available_versions, is_dis
 }
 
 /**
+ * The little icon that appears inline next to a package import in code (e.g. `using PlutoUI ✅`)
  * @param {{
  *  package_name: string,
  *  pluto_actions: any,
diff --git a/frontend/components/Popup.js b/frontend/components/Popup.js
index 8a2b47ee4b..f3b78f6918 100644
--- a/frontend/components/Popup.js
+++ b/frontend/components/Popup.js
@@ -7,7 +7,9 @@ import { RawHTMLContainer, highlight } from "./CellOutput.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
 import { package_status, nbpkg_fingerprint_without_terminal } from "./PkgStatusMark.js"
 import { PkgTerminalView } from "./PkgTerminalView.js"
-import { useDebouncedTruth } from "./RunArea.js"
+import { prettytime, useDebouncedTruth } from "./RunArea.js"
+import { time_estimate, usePackageTimingData } from "../common/InstallTimeEstimate.js"
+import { pretty_long_time } from "./EditOrRunButton.js"
 
 // This funny thing is a way to tell parcel to bundle these files..
 // Eventually I'll write a plugin that is able to parse html`...`, but this is it for now.
@@ -174,6 +176,11 @@ const PkgPopup = ({ notebook, recent_event, clear_recent_event, disable_input })
 
     const showupdate = pkg_status?.offer_update ?? false
 
+    const timingdata = usePackageTimingData()
+    const estimate = timingdata == null || recent_event?.package_name == null ? null : time_estimate(timingdata, [recent_event?.package_name])
+    const total_time = estimate == null ? 0 : estimate.install + estimate.load + estimate.precompile
+    const total_second_time = estimate == null ? 0 : estimate.load
+
     // <header>${recent_event?.package_name}</header>
     return html`<pkg-popup
         class=${cl({
@@ -183,6 +190,12 @@ const PkgPopup = ({ notebook, recent_event, clear_recent_event, disable_input })
         })}
     >
         ${pkg_status?.hint ?? "Loading..."}
+        ${(pkg_status?.status === "will_be_installed" || pkg_status?.status === "busy") && total_time > 10
+            ? html`<div class="pkg-time-estimate">
+                  Installation can take <strong>${pretty_long_time(total_time)}</strong>${`. `}<br />${`Afterwards, it loads in `}
+                  <strong>${pretty_long_time(total_second_time)}</strong>.
+              </div>`
+            : null}
         <div class="pkg-buttons">
             <a
                 class="pkg-update"
diff --git a/frontend/editor.css b/frontend/editor.css
index fb85b10c9b..e349ee748e 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1957,6 +1957,14 @@ pkg-popup .toggle-terminal {
     right: 20px;
 }
 
+.pkg-time-estimate {
+    font-size: 0.8em;
+    margin: 0.5em 0em;
+    padding: 0.5em 0.5em;
+    background: var(--pluto-logs-info-color);
+    border-radius: 0.5em;
+}
+
 pkg-terminal {
     display: block;
     /* width: 20rem; */

From cb21fa9beead6d55d74a2991d1bd8e8ce422b7e4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 22 Oct 2023 15:45:31 +0200
Subject: [PATCH 722/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 5a3222a5ee..4ea06c228f 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.29"
+version = "0.19.30"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From bc4726f989379cc3ca6f8cdd35264b998ea43437 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 22 Oct 2023 17:11:46 +0200
Subject: [PATCH 723/821] frontend test stability

---
 frontend/components/welcome/Featured.js | 5 -----
 frontend/components/welcome/Recent.js   | 4 ++--
 frontend/index.html                     | 2 +-
 frontend/welcome.css                    | 8 ++++----
 test/frontend/helpers/pluto.js          | 2 ++
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/frontend/components/welcome/Featured.js b/frontend/components/welcome/Featured.js
index 6937d13241..08f9a4e84b 100644
--- a/frontend/components/welcome/Featured.js
+++ b/frontend/components/welcome/Featured.js
@@ -119,13 +119,8 @@ export const Featured = ({ sources, direct_html_links }) => {
             set_waited_too_long(false)
             set_source_data({})
 
-            // Start downloading the sources
-
             const ids = Array.from(new Set(sources.map(get_id)))
 
-            console.log(ids)
-            console.log("123123123213123")
-
             const promises = ids.map((id) => {
                 const sources_for_id = sources.filter((source) => get_id(source) === id)
 
diff --git a/frontend/components/welcome/Recent.js b/frontend/components/welcome/Recent.js
index 2fbc72d5d4..c9b7e13845 100644
--- a/frontend/components/welcome/Recent.js
+++ b/frontend/components/welcome/Recent.js
@@ -181,7 +181,7 @@ export const Recent = ({ client, connected, remote_notebooks, CustomRecent, on_s
 
     let recents =
         combined_notebooks == null
-            ? html`<li><em>Loading...</em></li>`
+            ? html`<li class="not_yet_ready"><em>Loading...</em></li>`
             : combined_notebooks.map((nb) => {
                   const running = nb.entry != null
                   return html`<li
@@ -221,7 +221,7 @@ export const Recent = ({ client, connected, remote_notebooks, CustomRecent, on_s
     if (CustomRecent == null) {
         return html`
             <h2>My work</h2>
-            <ul id="recent" class="show-scrollbar">
+            <ul id="recent" class="show_scrollbar">
                 <li class="new">
                     <a
                         href="new"
diff --git a/frontend/index.html b/frontend/index.html
index 5aff4717ac..0c235dc91b 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -46,7 +46,7 @@ <h1>welcome to <img src="img/logo.svg"></h1>
         <section id="mywork">
             <div>
                 <h2>My work</h2>
-                <ul id="recent">
+                <ul id="recent" class="not_yet_ready">
                     <li class="new"><a href="new"><button><span class="ionicon"></span></button>Create a <strong>new notebook</strong></a></li>
                     <li><em>Loading...</em></li>
                 </ul>
diff --git a/frontend/welcome.css b/frontend/welcome.css
index 891ab44c37..87436e1cea 100644
--- a/frontend/welcome.css
+++ b/frontend/welcome.css
@@ -257,18 +257,18 @@ a#github {
     right: 0.5rem;
 }
 
-.show-scrollbar::-webkit-scrollbar {
+.show_scrollbar::-webkit-scrollbar {
     width: 10px;
     opacity: 0.1;
 }
-.show-scrollbar::-webkit-scrollbar-track {
+.show_scrollbar::-webkit-scrollbar-track {
 }
-.show-scrollbar::-webkit-scrollbar-thumb {
+.show_scrollbar::-webkit-scrollbar-thumb {
     /* height: 11px; */
     background-color: var(--black);
     opacity: 0.6;
     border-radius: 1000px;
 }
-.show-scrollbar::-webkit-scrollbar-thumb:hover {
+.show_scrollbar::-webkit-scrollbar-thumb:hover {
     opacity: 1;
 }
diff --git a/test/frontend/helpers/pluto.js b/test/frontend/helpers/pluto.js
index 1ad04d9520..044dd4c407 100644
--- a/test/frontend/helpers/pluto.js
+++ b/test/frontend/helpers/pluto.js
@@ -102,6 +102,8 @@ export const importNotebook = async (page, notebookName, { permissionToRunCode =
  * @param {string} path_or_url
  */
 export const openPathOrURLNotebook = async (page, path_or_url, { permissionToRunCode = true } = {}) => {
+    await page.waitForFunction(() => document.querySelector(`.not_yet_ready`) == null)
+
     const openFileInputSelector = "pluto-filepicker"
     await writeSingleLineInPlutoInput(page, openFileInputSelector, path_or_url)
     // await writeSingleLineInPlutoInput(page, openFileInputSelector, notebookPath)

From 487755ad76138226700c08e7cba79bb9d9171fe8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 22 Oct 2023 17:19:43 +0200
Subject: [PATCH 724/821] frontend tests: increase default timeout for loading
 notebooks

---
 test/frontend/__tests__/published_to_js.js | 2 +-
 test/frontend/helpers/pluto.js             | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/frontend/__tests__/published_to_js.js b/test/frontend/__tests__/published_to_js.js
index 51364a7c6d..7ab4940115 100644
--- a/test/frontend/__tests__/published_to_js.js
+++ b/test/frontend/__tests__/published_to_js.js
@@ -31,7 +31,7 @@ describe("published_to_js", () => {
     })
 
     it("Should correctly show published_to_js in cell output, and in logs", async () => {
-        await importNotebook(page, "published_to_js.jl")
+        await importNotebook(page, "published_to_js.jl", { timeout: 120 * 1000 })
 
         let output_of_published = await page.evaluate(() => {
             return document.querySelector("#to_cell_output")?.textContent
diff --git a/test/frontend/helpers/pluto.js b/test/frontend/helpers/pluto.js
index 044dd4c407..6a92bd9d32 100644
--- a/test/frontend/helpers/pluto.js
+++ b/test/frontend/helpers/pluto.js
@@ -89,19 +89,19 @@ export const createNewNotebook = async (page) => {
  * @param {Page} page
  * @param {string} notebookName`
  */
-export const importNotebook = async (page, notebookName, { permissionToRunCode = true } = {}) => {
+export const importNotebook = async (page, notebookName, { permissionToRunCode = true, timeout = 60000 } = {}) => {
     // Copy notebook before using it, so we don't mess it up with test changes
     const notebookPath = getFixtureNotebookPath(notebookName)
     const artifactsPath = getTemporaryNotebookPath()
     fs.copyFileSync(notebookPath, artifactsPath)
-    await openPathOrURLNotebook(page, artifactsPath, { permissionToRunCode })
+    await openPathOrURLNotebook(page, artifactsPath, { permissionToRunCode, timeout })
 }
 
 /**
  * @param {Page} page
  * @param {string} path_or_url
  */
-export const openPathOrURLNotebook = async (page, path_or_url, { permissionToRunCode = true } = {}) => {
+export const openPathOrURLNotebook = async (page, path_or_url, { permissionToRunCode = true, timeout = 60000 } = {}) => {
     await page.waitForFunction(() => document.querySelector(`.not_yet_ready`) == null)
 
     const openFileInputSelector = "pluto-filepicker"
@@ -113,7 +113,7 @@ export const openPathOrURLNotebook = async (page, path_or_url, { permissionToRun
     // Give permission to run code in this notebook
     if (permissionToRunCode) await restartProcess(page)
     await page.waitForTimeout(1000)
-    await waitForPlutoToCalmDown(page)
+    await waitForPlutoToCalmDown(page, { polling: "raf", timeout })
 }
 
 /**

From a5feb55c96aaaeddbc15fe0a1875e6c6d69011bc Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Mon, 23 Oct 2023 21:57:40 +0200
Subject: [PATCH 725/821] Update codemirror and support try-catch-else (#2673)

* update codemirror

* support try-catch-else in ExpressionExplorer

* Update ExpressionExplorer.jl

* oops

* Update ExpressionExplorer.jl

* Update ExpressionExplorer.jl
---
 frontend/components/CellInput.js              |    1 +
 .../CellInput/LiveDocsFromCursor.js           |   12 +-
 .../CellInput/block_matcher_plugin.js         |   67 +-
 .../CellInput/pluto_autocomplete.js           |   18 +-
 frontend/imports/CodemirrorPlutoSetup.d.ts    | 1890 +++++++++++++++--
 frontend/imports/CodemirrorPlutoSetup.js      |    2 +-
 src/analysis/ExpressionExplorer.jl            |    9 +-
 test/ExpressionExplorer.jl                    |   10 +-
 8 files changed, 1767 insertions(+), 242 deletions(-)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 247775d413..cec87eb7d5 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -6,6 +6,7 @@ import { utf8index_to_ut16index } from "../common/UnicodeTools.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
 import { get_selected_doc_from_state } from "./CellInput/LiveDocsFromCursor.js"
 import { go_to_definition_plugin, GlobalDefinitionsFacet } from "./CellInput/go_to_definition_plugin.js"
+// import { debug_syntax_plugin } from "./CellInput/debug_syntax_plugin.js"
 
 import {
     EditorState,
diff --git a/frontend/components/CellInput/LiveDocsFromCursor.js b/frontend/components/CellInput/LiveDocsFromCursor.js
index f8ddce3345..6e89f344f5 100644
--- a/frontend/components/CellInput/LiveDocsFromCursor.js
+++ b/frontend/components/CellInput/LiveDocsFromCursor.js
@@ -133,6 +133,15 @@ export let get_selected_doc_from_state = (/** @type {EditorState} */ state, verb
                         // We're inside a `... = ...` inside the struct
                     } else if (parents.includes("TypedExpression") && parents.indexOf("TypedExpression") < index_of_struct_in_parents) {
                         // We're inside a `x::X` inside the struct
+                    } else if (parents.includes("SubtypedExpression") && parents.indexOf("SubtypedExpression") < index_of_struct_in_parents) {
+                        // We're inside `Real` in `struct MyNumber<:Real`
+                        while (parent?.name !== "SubtypedExpression") {
+                            parent = parent.parent
+                        }
+                        const type_node = parent.lastChild
+                        if (type_node.from <= cursor.from && type_node.to >= cursor.to) {
+                            return state.doc.sliceString(type_node.from, type_node.to)
+                        }
                     } else if (cursor.name === "struct" || cursor.name === "mutable") {
                         cursor.parent()
                         cursor.firstChild()
@@ -235,7 +244,8 @@ export let get_selected_doc_from_state = (/** @type {EditorState} */ state, verb
                 if (
                     cursor.name === "Identifier" &&
                     parent.name === "ArgumentList" &&
-                    (parent.parent.name === "FunctionAssignmentExpression" || parent.parent.name === "FunctionDefinition")
+                    (parent.parent.parent.name === "FunctionAssignmentExpression" ||
+                        parent.parent.name === "FunctionDefinition")
                 ) {
                     continue
                 }
diff --git a/frontend/components/CellInput/block_matcher_plugin.js b/frontend/components/CellInput/block_matcher_plugin.js
index 09f72c7e45..b6d05bbee8 100644
--- a/frontend/components/CellInput/block_matcher_plugin.js
+++ b/frontend/components/CellInput/block_matcher_plugin.js
@@ -13,6 +13,26 @@ import { Decoration } from "../../imports/CodemirrorPlutoSetup.js"
  * Also it doesn't do non-matching now, there is just matching or nothing.
  */
 
+function match_try_node(node) {
+    let try_node = node.parent.firstChild
+    let possibly_end = node.parent.lastChild
+    let did_match = possibly_end.name === "end"
+    if (!did_match) return null
+
+    let catch_node = node.parent.getChild("CatchClause")?.firstChild
+    let else_node = node.parent.getChild("TryElseClause")?.firstChild
+    let finally_node = node.parent.getChild("FinallyClause")?.firstChild
+
+    return [
+        { from: try_node.from, to: try_node.to },
+        catch_node && { from: catch_node.from, to: catch_node.to },
+        else_node && { from: else_node.from, to: else_node.to },
+        finally_node && { from: finally_node.from, to: finally_node.to },
+        { from: possibly_end.from, to: possibly_end.to },
+    ].filter((x) => x != null)
+
+}
+
 function match_block(node) {
     if (node.name === "end") {
         if (node.parent.name === "IfStatement") {
@@ -154,29 +174,13 @@ function match_block(node) {
         ]
     }
 
-    if (node.name === "try" || node.name === "catch" || node.name === "finally") {
-        if (node.name === "catch") node = node.parent
-        if (node.name === "finally") node = node.parent
-
-        let try_node = node.parent.firstChild
-        let possibly_end = node.parent.lastChild
-        let did_match = possibly_end.name === "end"
-        if (!did_match) return null
-
-        let catch_node = node.parent.getChild("CatchClause")?.firstChild
-        let finally_node = node.parent.getChild("FinallyClause")?.firstChild
-
-        return [
-            { from: try_node.from, to: try_node.to },
-            catch_node && { from: catch_node.from, to: catch_node.to },
-            finally_node && { from: finally_node.from, to: finally_node.to },
-            { from: possibly_end.from, to: possibly_end.to },
-        ].filter((x) => x != null)
-    }
-
     if (node.name === "if" || node.name === "else" || node.name === "elseif") {
         if (node.name === "if") node = node.parent
-        if (node.name === "else") node = node.parent
+        let iselse = false
+        if (node.name === "else") {
+            node = node.parent
+            iselse = true
+        }
         if (node.name === "elseif") node = node.parent.parent
 
         let try_node = node.parent.firstChild
@@ -184,6 +188,10 @@ function match_block(node) {
         let did_match = possibly_end.name === "end"
         if (!did_match) return null
 
+        if (iselse && try_node.name === "try") {
+            return match_try_node(node) // try catch else finally end
+        }
+
         let decorations = []
         decorations.push({ from: try_node.from, to: try_node.to })
         for (let elseif_clause_node of node.parent.getChildren("ElseifClause")) {
@@ -199,6 +207,23 @@ function match_block(node) {
         return decorations
     }
 
+    if (node.name === "try"
+        || node.name === "catch"
+        || node.name === "finally"
+        || node.name === "else") {
+
+        if (node.name === "catch") node = node.parent
+        if (node.name === "finally") node = node.parent
+        if (node.name === "else") node = node.parent
+
+        let possibly_end = node.parent.lastChild
+        let did_match = possibly_end.name === "end"
+        if (!did_match) return null
+
+        return match_try_node(node)
+    }
+
+
     return null
 }
 
diff --git a/frontend/components/CellInput/pluto_autocomplete.js b/frontend/components/CellInput/pluto_autocomplete.js
index 94885157fc..e49fdbd1fb 100644
--- a/frontend/components/CellInput/pluto_autocomplete.js
+++ b/frontend/components/CellInput/pluto_autocomplete.js
@@ -20,11 +20,17 @@ import { open_bottom_right_panel } from "../BottomRightPanel.js"
 
 let { autocompletion, completionKeymap, completionStatus, acceptCompletion } = autocomplete
 
+// Option.source is now the source, we find to find the corresponding ActiveResult
+// https://github.com/codemirror/autocomplete/commit/6d9f24115e9357dc31bc265cd3da7ce2287fdcbd
+const getActiveResult = (view, source) =>
+    view.state.field(completionState).active.find(a => a.source == source)
+
 // These should be imported from  @codemirror/autocomplete, but they are not exported.
 let completionState = autocompletion()[0]
 let applyCompletion = (/** @type {EditorView} */ view, option) => {
     let apply = option.completion.apply || option.completion.label
-    let result = option.source
+    let result = getActiveResult(view, option.source)
+    if (!result?.from) return
     if (typeof apply == "string") {
         view.dispatch({
             changes: { from: result.from, to: result.to, insert: apply },
@@ -127,13 +133,19 @@ let update_docs_from_autocomplete_selection = (on_update_doc_query) => {
         let text_to_apply = selected_option.completion.apply ?? selected_option.completion.label
         if (typeof text_to_apply !== "string") return
 
+        const active_result = getActiveResult(update.view, selected_option.source)
+        if (!active_result?.from) return // not an ActiveResult instance
+
+        const from = active_result.from,
+              to = Math.min(active_result.to, update.state.doc.length)
+
         // Apply completion to state, which will yield us a `Transaction`.
         // The nice thing about this is that we can use the resulting state from the transaction,
         // without updating the actual state of the editor.
         let result_transaction = update.state.update({
             changes: {
-                from: selected_option.source.from,
-                to: Math.min(selected_option.source.to, update.state.doc.length),
+                from,
+                to,
                 insert: text_to_apply,
             },
         })
diff --git a/frontend/imports/CodemirrorPlutoSetup.d.ts b/frontend/imports/CodemirrorPlutoSetup.d.ts
index 4e298e6d9d..11151ceb79 100644
--- a/frontend/imports/CodemirrorPlutoSetup.d.ts
+++ b/frontend/imports/CodemirrorPlutoSetup.d.ts
@@ -85,6 +85,11 @@ declare abstract class Text implements Iterable<string> {
     */
     iterLines(from?: number, to?: number): TextIterator;
     /**
+    Return the document as a string, using newline characters to
+    separate lines.
+    */
+    toString(): string;
+    /**
     Convert the document to an array of lines (which can be
     deserialized again via [`Text.of`](https://codemirror.net/6/docs/ref/#state.Text^of)).
     */
@@ -252,7 +257,7 @@ plain object describing a change (a deletion, insertion, or
 replacement, depending on which fields are present), a [change
 set](https://codemirror.net/6/docs/ref/#state.ChangeSet), or an array of change specs.
 */
-declare type ChangeSpec = {
+type ChangeSpec = {
     from: number;
     to?: number;
     insert?: string | Text;
@@ -479,7 +484,7 @@ declare class EditorSelection {
     static range(anchor: number, head: number, goalColumn?: number, bidiLevel?: number): SelectionRange;
 }
 
-declare type FacetConfig<Input, Output> = {
+type FacetConfig<Input, Output> = {
     /**
     How to combine the input values into a single output value. When
     not given, the array of input values becomes the output. This
@@ -523,11 +528,19 @@ Examples of uses of facets are the [tab
 size](https://codemirror.net/6/docs/ref/#state.EditorState^tabSize), [editor
 attributes](https://codemirror.net/6/docs/ref/#view.EditorView^editorAttributes), and [update
 listeners](https://codemirror.net/6/docs/ref/#view.EditorView^updateListener).
+
+Note that `Facet` instances can be used anywhere where
+[`FacetReader`](https://codemirror.net/6/docs/ref/#state.FacetReader) is expected.
 */
-declare class Facet<Input, Output = readonly Input[]> {
+declare class Facet<Input, Output = readonly Input[]> implements FacetReader<Output> {
     private isStatic;
     private constructor();
     /**
+    Returns a facet reader for this facet, which can be used to
+    [read](https://codemirror.net/6/docs/ref/#state.EditorState.facet) it but not to define values for it.
+    */
+    get reader(): FacetReader<Output>;
+    /**
     Define a new facet.
     */
     static define<Input, Output = readonly Input[]>(config?: FacetConfig<Input, Output>): Facet<Input, Output>;
@@ -558,9 +571,24 @@ declare class Facet<Input, Output = readonly Input[]> {
     */
     from<T extends Input>(field: StateField<T>): Extension;
     from<T>(field: StateField<T>, get: (value: T) => Input): Extension;
+    tag: Output;
 }
-declare type Slot<T> = Facet<any, T> | StateField<T> | "doc" | "selection";
-declare type StateFieldSpec<Value> = {
+/**
+A facet reader can be used to fetch the value of a facet, though
+[`EditorState.facet`](https://codemirror.net/6/docs/ref/#state.EditorState.facet) or as a dependency
+in [`Facet.compute`](https://codemirror.net/6/docs/ref/#state.Facet.compute), but not to define new
+values for the facet.
+*/
+type FacetReader<Output> = {
+    /**
+    Dummy tag that makes sure TypeScript doesn't consider all object
+    types as conforming to this type. Not actually present on the
+    object.
+    */
+    tag: Output;
+};
+type Slot<T> = FacetReader<T> | StateField<T> | "doc" | "selection";
+type StateFieldSpec<Value> = {
     /**
     Creates the initial value for the field when a state is created.
     */
@@ -635,7 +663,7 @@ providers](https://codemirror.net/6/docs/ref/#state.Facet.of), or objects with a
 `extension` property. Extensions can be nested in arrays
 arbitrarily deep—they will be flattened when processed.
 */
-declare type Extension = {
+type Extension = {
     extension: Extension;
 } | readonly Extension[];
 /**
@@ -744,7 +772,10 @@ declare class StateEffect<Value> {
     is<T>(type: StateEffectType<T>): this is StateEffect<T>;
     /**
     Define a new effect type. The type parameter indicates the type
-    of values that his effect holds.
+    of values that his effect holds. It should be a type that
+    doesn't include `undefined`, since that is used in
+    [mapping](https://codemirror.net/6/docs/ref/#state.StateEffect.map) to indicate that an effect is
+    removed.
     */
     static define<Value = null>(spec?: StateEffectSpec<Value>): StateEffectType<Value>;
     /**
@@ -1079,7 +1110,7 @@ declare class EditorState {
     /**
     Get the value of a state [facet](https://codemirror.net/6/docs/ref/#state.Facet).
     */
-    facet<Output>(facet: Facet<any, Output>): Output;
+    facet<Output>(facet: FacetReader<Output>): Output;
     /**
     Convert this state to a JSON-serializable object. When custom
     fields should be serialized, you can pass them in as an object
@@ -1281,7 +1312,7 @@ Subtype of [`Command`](https://codemirror.net/6/docs/ref/#view.Command) that doe
 to the actual editor view. Mostly useful to define commands that
 can be run and tested outside of a browser environment.
 */
-declare type StateCommand = (target: {
+type StateCommand = (target: {
     state: EditorState;
     dispatch: (transaction: Transaction) => void;
 }) => boolean;
@@ -1423,7 +1454,7 @@ interface RangeCursor<T> {
     */
     to: number;
 }
-declare type RangeSetUpdate<T extends RangeValue> = {
+type RangeSetUpdate<T extends RangeValue> = {
     /**
     An array of ranges to add. If given, this should be sorted by
     `from` position and `startSide` unless
@@ -1502,8 +1533,7 @@ declare class RangeSet<T extends RangeValue> {
     static compare<T extends RangeValue>(oldSets: readonly RangeSet<T>[], newSets: readonly RangeSet<T>[], 
     /**
     This indicates how the underlying data changed between these
-    ranges, and is needed to synchronize the iteration. `from` and
-    `to` are coordinates in the _new_ space, after these changes.
+    ranges, and is needed to synchronize the iteration.
     */
     textDiff: ChangeDesc, comparator: RangeComparator<T>, 
     /**
@@ -1543,129 +1573,632 @@ declare class RangeSet<T extends RangeValue> {
     static empty: RangeSet<any>;
 }
 
+/**
+The [`TreeFragment.applyChanges`](#common.TreeFragment^applyChanges)
+method expects changed ranges in this format.
+*/
 interface ChangedRange {
+    /**
+    The start of the change in the start document
+    */
     fromA: number;
+    /**
+    The end of the change in the start document
+    */
     toA: number;
+    /**
+    The start of the replacement in the new document
+    */
     fromB: number;
+    /**
+    The end of the replacement in the new document
+    */
     toB: number;
 }
+/**
+Tree fragments are used during [incremental
+parsing](#common.Parser.startParse) to track parts of old trees
+that can be reused in a new parse. An array of fragments is used
+to track regions of an old tree whose nodes might be reused in new
+parses. Use the static
+[`applyChanges`](#common.TreeFragment^applyChanges) method to
+update fragments for document changes.
+*/
 declare class TreeFragment {
+    /**
+    The start of the unchanged range pointed to by this fragment.
+    This refers to an offset in the _updated_ document (as opposed
+    to the original tree).
+    */
     readonly from: number;
+    /**
+    The end of the unchanged range.
+    */
     readonly to: number;
+    /**
+    The tree that this fragment is based on.
+    */
     readonly tree: Tree;
+    /**
+    The offset between the fragment's tree and the document that
+    this fragment can be used against. Add this when going from
+    document to tree positions, subtract it to go from tree to
+    document positions.
+    */
     readonly offset: number;
-    constructor(from: number, to: number, tree: Tree, offset: number, openStart?: boolean, openEnd?: boolean);
+    /**
+    Construct a tree fragment. You'll usually want to use
+    [`addTree`](#common.TreeFragment^addTree) and
+    [`applyChanges`](#common.TreeFragment^applyChanges) instead of
+    calling this directly.
+    */
+    constructor(
+    /**
+    The start of the unchanged range pointed to by this fragment.
+    This refers to an offset in the _updated_ document (as opposed
+    to the original tree).
+    */
+    from: number, 
+    /**
+    The end of the unchanged range.
+    */
+    to: number, 
+    /**
+    The tree that this fragment is based on.
+    */
+    tree: Tree, 
+    /**
+    The offset between the fragment's tree and the document that
+    this fragment can be used against. Add this when going from
+    document to tree positions, subtract it to go from tree to
+    document positions.
+    */
+    offset: number, openStart?: boolean, openEnd?: boolean);
+    /**
+    Whether the start of the fragment represents the start of a
+    parse, or the end of a change. (In the second case, it may not
+    be safe to reuse some nodes at the start, depending on the
+    parsing algorithm.)
+    */
     get openStart(): boolean;
+    /**
+    Whether the end of the fragment represents the end of a
+    full-document parse, or the start of a change.
+    */
     get openEnd(): boolean;
-    static addTree(tree: Tree, fragments?: readonly TreeFragment[], partial?: boolean): TreeFragment[];
+    /**
+    Create a set of fragments from a freshly parsed tree, or update
+    an existing set of fragments by replacing the ones that overlap
+    with a tree with content from the new tree. When `partial` is
+    true, the parse is treated as incomplete, and the resulting
+    fragment has [`openEnd`](#common.TreeFragment.openEnd) set to
+    true.
+    */
+    static addTree(tree: Tree, fragments?: readonly TreeFragment[], partial?: boolean): readonly TreeFragment[];
+    /**
+    Apply a set of edits to an array of fragments, removing or
+    splitting fragments as necessary to remove edited ranges, and
+    adjusting offsets for fragments that moved.
+    */
     static applyChanges(fragments: readonly TreeFragment[], changes: readonly ChangedRange[], minGap?: number): readonly TreeFragment[];
 }
+/**
+Interface used to represent an in-progress parse, which can be
+moved forward piece-by-piece.
+*/
 interface PartialParse {
+    /**
+    Advance the parse state by some amount. Will return the finished
+    syntax tree when the parse completes.
+    */
     advance(): Tree | null;
+    /**
+    The position up to which the document has been parsed. Note
+    that, in multi-pass parsers, this will stay back until the last
+    pass has moved past a given position.
+    */
     readonly parsedPos: number;
+    /**
+    Tell the parse to not advance beyond the given position.
+    `advance` will return a tree when the parse has reached the
+    position. Note that, depending on the parser algorithm and the
+    state of the parse when `stopAt` was called, that tree may
+    contain nodes beyond the position. It is an error to call
+    `stopAt` with a higher position than it's [current
+    value](#common.PartialParse.stoppedAt).
+    */
     stopAt(pos: number): void;
+    /**
+    Reports whether `stopAt` has been called on this parse.
+    */
     readonly stoppedAt: number | null;
 }
+/**
+A superclass that parsers should extend.
+*/
 declare abstract class Parser {
+    /**
+    Start a parse for a single tree. This is the method concrete
+    parser implementations must implement. Called by `startParse`,
+    with the optional arguments resolved.
+    */
     abstract createParse(input: Input, fragments: readonly TreeFragment[], ranges: readonly {
         from: number;
         to: number;
     }[]): PartialParse;
+    /**
+    Start a parse, returning a [partial parse](#common.PartialParse)
+    object. [`fragments`](#common.TreeFragment) can be passed in to
+    make the parse incremental.
+    
+    By default, the entire input is parsed. You can pass `ranges`,
+    which should be a sorted array of non-empty, non-overlapping
+    ranges, to parse only those ranges. The tree returned in that
+    case will start at `ranges[0].from`.
+    */
     startParse(input: Input | string, fragments?: readonly TreeFragment[], ranges?: readonly {
         from: number;
         to: number;
     }[]): PartialParse;
+    /**
+    Run a full parse, returning the resulting tree.
+    */
     parse(input: Input | string, fragments?: readonly TreeFragment[], ranges?: readonly {
         from: number;
         to: number;
     }[]): Tree;
 }
+/**
+This is the interface parsers use to access the document. To run
+Lezer directly on your own document data structure, you have to
+write an implementation of it.
+*/
 interface Input {
+    /**
+    The length of the document.
+    */
     readonly length: number;
+    /**
+    Get the chunk after the given position. The returned string
+    should start at `from` and, if that isn't the end of the
+    document, may be of any length greater than zero.
+    */
     chunk(from: number): string;
+    /**
+    Indicates whether the chunks already end at line breaks, so that
+    client code that wants to work by-line can avoid re-scanning
+    them for line breaks. When this is true, the result of `chunk()`
+    should either be a single line break, or the content between
+    `from` and the next line break.
+    */
     readonly lineChunks: boolean;
+    /**
+    Read the part of the document between the given positions.
+    */
     read(from: number, to: number): string;
 }
+/**
+Parse wrapper functions are supported by some parsers to inject
+additional parsing logic.
+*/
 type ParseWrapper = (inner: PartialParse, input: Input, fragments: readonly TreeFragment[], ranges: readonly {
     from: number;
     to: number;
 }[]) => PartialParse;
-
+/**
+Each [node type](#common.NodeType) or [individual tree](#common.Tree)
+can have metadata associated with it in props. Instances of this
+class represent prop names.
+*/
 declare class NodeProp<T> {
+    /**
+    Indicates whether this prop is stored per [node
+    type](#common.NodeType) or per [tree node](#common.Tree).
+    */
     perNode: boolean;
+    /**
+    A method that deserializes a value of this prop from a string.
+    Can be used to allow a prop to be directly written in a grammar
+    file.
+    */
     deserialize: (str: string) => T;
+    /**
+    Create a new node prop type.
+    */
     constructor(config?: {
+        /**
+        The [deserialize](#common.NodeProp.deserialize) function to
+        use for this prop, used for example when directly providing
+        the prop from a grammar file. Defaults to a function that
+        raises an error.
+        */
         deserialize?: (str: string) => T;
+        /**
+        By default, node props are stored in the [node
+        type](#common.NodeType). It can sometimes be useful to directly
+        store information (usually related to the parsing algorithm)
+        in [nodes](#common.Tree) themselves. Set this to true to enable
+        that for this prop.
+        */
         perNode?: boolean;
     });
+    /**
+    This is meant to be used with
+    [`NodeSet.extend`](#common.NodeSet.extend) or
+    [`LRParser.configure`](#lr.ParserConfig.props) to compute
+    prop values for each node type in the set. Takes a [match
+    object](#common.NodeType^match) or function that returns undefined
+    if the node type doesn't get this prop, and the prop's value if
+    it does.
+    */
     add(match: {
         [selector: string]: T;
     } | ((type: NodeType) => T | undefined)): NodePropSource;
+    /**
+    Prop that is used to describe matching delimiters. For opening
+    delimiters, this holds an array of node names (written as a
+    space-separated string when declaring this prop in a grammar)
+    for the node types of closing delimiters that match it.
+    */
     static closedBy: NodeProp<readonly string[]>;
+    /**
+    The inverse of [`closedBy`](#common.NodeProp^closedBy). This is
+    attached to closing delimiters, holding an array of node names
+    of types of matching opening delimiters.
+    */
     static openedBy: NodeProp<readonly string[]>;
+    /**
+    Used to assign node types to groups (for example, all node
+    types that represent an expression could be tagged with an
+    `"Expression"` group).
+    */
     static group: NodeProp<readonly string[]>;
+    /**
+    The hash of the [context](#lr.ContextTracker.constructor)
+    that the node was parsed in, if any. Used to limit reuse of
+    contextual nodes.
+    */
     static contextHash: NodeProp<number>;
+    /**
+    The distance beyond the end of the node that the tokenizer
+    looked ahead for any of the tokens inside the node. (The LR
+    parser only stores this when it is larger than 25, for
+    efficiency reasons.)
+    */
     static lookAhead: NodeProp<number>;
+    /**
+    This per-node prop is used to replace a given node, or part of a
+    node, with another tree. This is useful to include trees from
+    different languages in mixed-language parsers.
+    */
     static mounted: NodeProp<MountedTree>;
 }
+/**
+A mounted tree, which can be [stored](#common.NodeProp^mounted) on
+a tree node to indicate that parts of its content are
+represented by another tree.
+*/
 declare class MountedTree {
+    /**
+    The inner tree.
+    */
     readonly tree: Tree;
+    /**
+    If this is null, this tree replaces the entire node (it will
+    be included in the regular iteration instead of its host
+    node). If not, only the given ranges are considered to be
+    covered by this tree. This is used for trees that are mixed in
+    a way that isn't strictly hierarchical. Such mounted trees are
+    only entered by [`resolveInner`](#common.Tree.resolveInner)
+    and [`enter`](#common.SyntaxNode.enter).
+    */
     readonly overlay: readonly {
         from: number;
         to: number;
     }[] | null;
+    /**
+    The parser used to create this subtree.
+    */
     readonly parser: Parser;
-    constructor(tree: Tree, overlay: readonly {
+    constructor(
+    /**
+    The inner tree.
+    */
+    tree: Tree, 
+    /**
+    If this is null, this tree replaces the entire node (it will
+    be included in the regular iteration instead of its host
+    node). If not, only the given ranges are considered to be
+    covered by this tree. This is used for trees that are mixed in
+    a way that isn't strictly hierarchical. Such mounted trees are
+    only entered by [`resolveInner`](#common.Tree.resolveInner)
+    and [`enter`](#common.SyntaxNode.enter).
+    */
+    overlay: readonly {
         from: number;
         to: number;
-    }[] | null, parser: Parser);
+    }[] | null, 
+    /**
+    The parser used to create this subtree.
+    */
+    parser: Parser);
 }
+/**
+Type returned by [`NodeProp.add`](#common.NodeProp.add). Describes
+whether a prop should be added to a given node type in a node set,
+and what value it should have.
+*/
 type NodePropSource = (type: NodeType) => null | [NodeProp<any>, any];
+/**
+Each node in a syntax tree has a node type associated with it.
+*/
 declare class NodeType {
+    /**
+    The name of the node type. Not necessarily unique, but if the
+    grammar was written properly, different node types with the
+    same name within a node set should play the same semantic
+    role.
+    */
     readonly name: string;
+    /**
+    The id of this node in its set. Corresponds to the term ids
+    used in the parser.
+    */
     readonly id: number;
+    /**
+    Define a node type.
+    */
     static define(spec: {
+        /**
+        The ID of the node type. When this type is used in a
+        [set](#common.NodeSet), the ID must correspond to its index in
+        the type array.
+        */
         id: number;
+        /**
+        The name of the node type. Leave empty to define an anonymous
+        node.
+        */
         name?: string;
+        /**
+        [Node props](#common.NodeProp) to assign to the type. The value
+        given for any given prop should correspond to the prop's type.
+        */
         props?: readonly ([NodeProp<any>, any] | NodePropSource)[];
+        /**
+        Whether this is a [top node](#common.NodeType.isTop).
+        */
         top?: boolean;
+        /**
+        Whether this node counts as an [error
+        node](#common.NodeType.isError).
+        */
         error?: boolean;
+        /**
+        Whether this node is a [skipped](#common.NodeType.isSkipped)
+        node.
+        */
         skipped?: boolean;
     }): NodeType;
+    /**
+    Retrieves a node prop for this type. Will return `undefined` if
+    the prop isn't present on this node.
+    */
     prop<T>(prop: NodeProp<T>): T | undefined;
+    /**
+    True when this is the top node of a grammar.
+    */
     get isTop(): boolean;
+    /**
+    True when this node is produced by a skip rule.
+    */
     get isSkipped(): boolean;
+    /**
+    Indicates whether this is an error node.
+    */
     get isError(): boolean;
+    /**
+    When true, this node type doesn't correspond to a user-declared
+    named node, for example because it is used to cache repetition.
+    */
     get isAnonymous(): boolean;
+    /**
+    Returns true when this node's name or one of its
+    [groups](#common.NodeProp^group) matches the given string.
+    */
     is(name: string | number): boolean;
+    /**
+    An empty dummy node type to use when no actual type is available.
+    */
     static none: NodeType;
+    /**
+    Create a function from node types to arbitrary values by
+    specifying an object whose property names are node or
+    [group](#common.NodeProp^group) names. Often useful with
+    [`NodeProp.add`](#common.NodeProp.add). You can put multiple
+    names, separated by spaces, in a single property name to map
+    multiple node names to a single value.
+    */
     static match<T>(map: {
         [selector: string]: T;
     }): (node: NodeType) => T | undefined;
 }
+/**
+A node set holds a collection of node types. It is used to
+compactly represent trees by storing their type ids, rather than a
+full pointer to the type object, in a numeric array. Each parser
+[has](#lr.LRParser.nodeSet) a node set, and [tree
+buffers](#common.TreeBuffer) can only store collections of nodes
+from the same set. A set can have a maximum of 2**16 (65536) node
+types in it, so that the ids fit into 16-bit typed array slots.
+*/
 declare class NodeSet {
+    /**
+    The node types in this set, by id.
+    */
     readonly types: readonly NodeType[];
-    constructor(types: readonly NodeType[]);
+    /**
+    Create a set with the given types. The `id` property of each
+    type should correspond to its position within the array.
+    */
+    constructor(
+    /**
+    The node types in this set, by id.
+    */
+    types: readonly NodeType[]);
+    /**
+    Create a copy of this set with some node properties added. The
+    arguments to this method can be created with
+    [`NodeProp.add`](#common.NodeProp.add).
+    */
     extend(...props: NodePropSource[]): NodeSet;
 }
+/**
+Options that control iteration. Can be combined with the `|`
+operator to enable multiple ones.
+*/
 declare enum IterMode {
+    /**
+    When enabled, iteration will only visit [`Tree`](#common.Tree)
+    objects, not nodes packed into
+    [`TreeBuffer`](#common.TreeBuffer)s.
+    */
     ExcludeBuffers = 1,
+    /**
+    Enable this to make iteration include anonymous nodes (such as
+    the nodes that wrap repeated grammar constructs into a balanced
+    tree).
+    */
     IncludeAnonymous = 2,
+    /**
+    By default, regular [mounted](#common.NodeProp^mounted) nodes
+    replace their base node in iteration. Enable this to ignore them
+    instead.
+    */
     IgnoreMounts = 4,
+    /**
+    This option only applies in
+    [`enter`](#common.SyntaxNode.enter)-style methods. It tells the
+    library to not enter mounted overlays if one covers the given
+    position.
+    */
     IgnoreOverlays = 8
 }
+/**
+A piece of syntax tree. There are two ways to approach these
+trees: the way they are actually stored in memory, and the
+convenient way.
+
+Syntax trees are stored as a tree of `Tree` and `TreeBuffer`
+objects. By packing detail information into `TreeBuffer` leaf
+nodes, the representation is made a lot more memory-efficient.
+
+However, when you want to actually work with tree nodes, this
+representation is very awkward, so most client code will want to
+use the [`TreeCursor`](#common.TreeCursor) or
+[`SyntaxNode`](#common.SyntaxNode) interface instead, which provides
+a view on some part of this data structure, and can be used to
+move around to adjacent nodes.
+*/
 declare class Tree {
+    /**
+    The type of the top node.
+    */
     readonly type: NodeType;
+    /**
+    This node's child nodes.
+    */
     readonly children: readonly (Tree | TreeBuffer)[];
+    /**
+    The positions (offsets relative to the start of this tree) of
+    the children.
+    */
     readonly positions: readonly number[];
+    /**
+    The total length of this tree
+    */
     readonly length: number;
-    constructor(type: NodeType, children: readonly (Tree | TreeBuffer)[], positions: readonly number[], length: number, props?: readonly [NodeProp<any> | number, any][]);
+    /**
+    Construct a new tree. See also [`Tree.build`](#common.Tree^build).
+    */
+    constructor(
+    /**
+    The type of the top node.
+    */
+    type: NodeType, 
+    /**
+    This node's child nodes.
+    */
+    children: readonly (Tree | TreeBuffer)[], 
+    /**
+    The positions (offsets relative to the start of this tree) of
+    the children.
+    */
+    positions: readonly number[], 
+    /**
+    The total length of this tree
+    */
+    length: number, 
+    /**
+    Per-node [node props](#common.NodeProp) to associate with this node.
+    */
+    props?: readonly [NodeProp<any> | number, any][]);
+    /**
+    The empty tree
+    */
     static empty: Tree;
+    /**
+    Get a [tree cursor](#common.TreeCursor) positioned at the top of
+    the tree. Mode can be used to [control](#common.IterMode) which
+    nodes the cursor visits.
+    */
     cursor(mode?: IterMode): TreeCursor;
+    /**
+    Get a [tree cursor](#common.TreeCursor) pointing into this tree
+    at the given position and side (see
+    [`moveTo`](#common.TreeCursor.moveTo).
+    */
     cursorAt(pos: number, side?: -1 | 0 | 1, mode?: IterMode): TreeCursor;
+    /**
+    Get a [syntax node](#common.SyntaxNode) object for the top of the
+    tree.
+    */
     get topNode(): SyntaxNode;
+    /**
+    Get the [syntax node](#common.SyntaxNode) at the given position.
+    If `side` is -1, this will move into nodes that end at the
+    position. If 1, it'll move into nodes that start at the
+    position. With 0, it'll only enter nodes that cover the position
+    from both sides.
+    
+    Note that this will not enter
+    [overlays](#common.MountedTree.overlay), and you often want
+    [`resolveInner`](#common.Tree.resolveInner) instead.
+    */
     resolve(pos: number, side?: -1 | 0 | 1): SyntaxNode;
+    /**
+    Like [`resolve`](#common.Tree.resolve), but will enter
+    [overlaid](#common.MountedTree.overlay) nodes, producing a syntax node
+    pointing into the innermost overlaid tree at the given position
+    (with parent links going through all parent structure, including
+    the host trees).
+    */
     resolveInner(pos: number, side?: -1 | 0 | 1): SyntaxNode;
+    /**
+    In some situations, it can be useful to iterate through all
+    nodes around a position, including those in overlays that don't
+    directly cover the position. This method gives you an iterator
+    that will produce all nodes, from small to big, around the given
+    position.
+    */
+    resolveStack(pos: number, side?: -1 | 0 | 1): NodeIterator;
+    /**
+    Iterate over the tree and its children, calling `enter` for any
+    node that touches the `from`/`to` region (if given) before
+    running over such a node's children, and `leave` (if given) when
+    leaving the node. When `enter` returns `false`, that node will
+    not have its children iterated over (or `leave` called).
+    */
     iterate(spec: {
         enter(node: SyntaxNodeRef): boolean | void;
         leave?(node: SyntaxNodeRef): void;
@@ -1673,97 +2206,449 @@ declare class Tree {
         to?: number;
         mode?: IterMode;
     }): void;
+    /**
+    Get the value of the given [node prop](#common.NodeProp) for this
+    node. Works with both per-node and per-type props.
+    */
     prop<T>(prop: NodeProp<T>): T | undefined;
+    /**
+    Returns the node's [per-node props](#common.NodeProp.perNode) in a
+    format that can be passed to the [`Tree`](#common.Tree)
+    constructor.
+    */
     get propValues(): readonly [NodeProp<any> | number, any][];
+    /**
+    Balance the direct children of this tree, producing a copy of
+    which may have children grouped into subtrees with type
+    [`NodeType.none`](#common.NodeType^none).
+    */
     balance(config?: {
+        /**
+        Function to create the newly balanced subtrees.
+        */
         makeTree?: (children: readonly (Tree | TreeBuffer)[], positions: readonly number[], length: number) => Tree;
     }): Tree;
+    /**
+    Build a tree from a postfix-ordered buffer of node information,
+    or a cursor over such a buffer.
+    */
     static build(data: BuildData): Tree;
 }
+/**
+Represents a sequence of nodes.
+*/
+type NodeIterator = {
+    node: SyntaxNode;
+    next: NodeIterator | null;
+};
 type BuildData = {
+    /**
+    The buffer or buffer cursor to read the node data from.
+    
+    When this is an array, it should contain four values for every
+    node in the tree.
+    
+     - The first holds the node's type, as a node ID pointing into
+       the given `NodeSet`.
+     - The second holds the node's start offset.
+     - The third the end offset.
+     - The fourth the amount of space taken up in the array by this
+       node and its children. Since there's four values per node,
+       this is the total number of nodes inside this node (children
+       and transitive children) plus one for the node itself, times
+       four.
+    
+    Parent nodes should appear _after_ child nodes in the array. As
+    an example, a node of type 10 spanning positions 0 to 4, with
+    two children, of type 11 and 12, might look like this:
+    
+        [11, 0, 1, 4, 12, 2, 4, 4, 10, 0, 4, 12]
+    */
     buffer: BufferCursor | readonly number[];
+    /**
+    The node types to use.
+    */
     nodeSet: NodeSet;
+    /**
+    The id of the top node type.
+    */
     topID: number;
+    /**
+    The position the tree should start at. Defaults to 0.
+    */
     start?: number;
+    /**
+    The position in the buffer where the function should stop
+    reading. Defaults to 0.
+    */
     bufferStart?: number;
+    /**
+    The length of the wrapping node. The end offset of the last
+    child is used when not provided.
+    */
     length?: number;
+    /**
+    The maximum buffer length to use. Defaults to
+    [`DefaultBufferLength`](#common.DefaultBufferLength).
+    */
     maxBufferLength?: number;
+    /**
+    An optional array holding reused nodes that the buffer can refer
+    to.
+    */
     reused?: readonly Tree[];
+    /**
+    The first node type that indicates repeat constructs in this
+    grammar.
+    */
     minRepeatType?: number;
 };
+/**
+This is used by `Tree.build` as an abstraction for iterating over
+a tree buffer. A cursor initially points at the very last element
+in the buffer. Every time `next()` is called it moves on to the
+previous one.
+*/
 interface BufferCursor {
+    /**
+    The current buffer position (four times the number of nodes
+    remaining).
+    */
     pos: number;
+    /**
+    The node ID of the next node in the buffer.
+    */
     id: number;
+    /**
+    The start position of the next node in the buffer.
+    */
     start: number;
+    /**
+    The end position of the next node.
+    */
     end: number;
+    /**
+    The size of the next node (the number of nodes inside, counting
+    the node itself, times 4).
+    */
     size: number;
+    /**
+    Moves `this.pos` down by 4.
+    */
     next(): void;
+    /**
+    Create a copy of this cursor.
+    */
     fork(): BufferCursor;
 }
+/**
+Tree buffers contain (type, start, end, endIndex) quads for each
+node. In such a buffer, nodes are stored in prefix order (parents
+before children, with the endIndex of the parent indicating which
+children belong to it).
+*/
 declare class TreeBuffer {
+    /**
+    The buffer's content.
+    */
     readonly buffer: Uint16Array;
+    /**
+    The total length of the group of nodes in the buffer.
+    */
     readonly length: number;
+    /**
+    The node set used in this buffer.
+    */
     readonly set: NodeSet;
-    constructor(buffer: Uint16Array, length: number, set: NodeSet);
+    /**
+    Create a tree buffer.
+    */
+    constructor(
+    /**
+    The buffer's content.
+    */
+    buffer: Uint16Array, 
+    /**
+    The total length of the group of nodes in the buffer.
+    */
+    length: number, 
+    /**
+    The node set used in this buffer.
+    */
+    set: NodeSet);
 }
+/**
+The set of properties provided by both [`SyntaxNode`](#common.SyntaxNode)
+and [`TreeCursor`](#common.TreeCursor). Note that, if you need
+an object that is guaranteed to stay stable in the future, you
+need to use the [`node`](#common.SyntaxNodeRef.node) accessor.
+*/
 interface SyntaxNodeRef {
+    /**
+    The start position of the node.
+    */
     readonly from: number;
+    /**
+    The end position of the node.
+    */
     readonly to: number;
+    /**
+    The type of the node.
+    */
     readonly type: NodeType;
+    /**
+    The name of the node (`.type.name`).
+    */
     readonly name: string;
+    /**
+    Get the [tree](#common.Tree) that represents the current node,
+    if any. Will return null when the node is in a [tree
+    buffer](#common.TreeBuffer).
+    */
     readonly tree: Tree | null;
+    /**
+    Retrieve a stable [syntax node](#common.SyntaxNode) at this
+    position.
+    */
     readonly node: SyntaxNode;
+    /**
+    Test whether the node matches a given context—a sequence of
+    direct parent nodes. Empty strings in the context array act as
+    wildcards, other strings must match the ancestor node's name.
+    */
     matchContext(context: readonly string[]): boolean;
 }
+/**
+A syntax node provides an immutable pointer to a given node in a
+tree. When iterating over large amounts of nodes, you may want to
+use a mutable [cursor](#common.TreeCursor) instead, which is more
+efficient.
+*/
 interface SyntaxNode extends SyntaxNodeRef {
+    /**
+    The node's parent node, if any.
+    */
     parent: SyntaxNode | null;
+    /**
+    The first child, if the node has children.
+    */
     firstChild: SyntaxNode | null;
+    /**
+    The node's last child, if available.
+    */
     lastChild: SyntaxNode | null;
+    /**
+    The first child that ends after `pos`.
+    */
     childAfter(pos: number): SyntaxNode | null;
+    /**
+    The last child that starts before `pos`.
+    */
     childBefore(pos: number): SyntaxNode | null;
+    /**
+    Enter the child at the given position. If side is -1 the child
+    may end at that position, when 1 it may start there.
+    
+    This will by default enter
+    [overlaid](#common.MountedTree.overlay)
+    [mounted](#common.NodeProp^mounted) trees. You can set
+    `overlays` to false to disable that.
+    
+    Similarly, when `buffers` is false this will not enter
+    [buffers](#common.TreeBuffer), only [nodes](#common.Tree) (which
+    is mostly useful when looking for props, which cannot exist on
+    buffer-allocated nodes).
+    */
     enter(pos: number, side: -1 | 0 | 1, mode?: IterMode): SyntaxNode | null;
+    /**
+    This node's next sibling, if any.
+    */
     nextSibling: SyntaxNode | null;
+    /**
+    This node's previous sibling.
+    */
     prevSibling: SyntaxNode | null;
+    /**
+    A [tree cursor](#common.TreeCursor) starting at this node.
+    */
     cursor(mode?: IterMode): TreeCursor;
+    /**
+    Find the node around, before (if `side` is -1), or after (`side`
+    is 1) the given position. Will look in parent nodes if the
+    position is outside this node.
+    */
     resolve(pos: number, side?: -1 | 0 | 1): SyntaxNode;
+    /**
+    Similar to `resolve`, but enter
+    [overlaid](#common.MountedTree.overlay) nodes.
+    */
     resolveInner(pos: number, side?: -1 | 0 | 1): SyntaxNode;
+    /**
+    Move the position to the innermost node before `pos` that looks
+    like it is unfinished (meaning it ends in an error node or has a
+    child ending in an error node right at its end).
+    */
     enterUnfinishedNodesBefore(pos: number): SyntaxNode;
+    /**
+    Get a [tree](#common.Tree) for this node. Will allocate one if it
+    points into a buffer.
+    */
     toTree(): Tree;
+    /**
+    Get the first child of the given type (which may be a [node
+    name](#common.NodeType.name) or a [group
+    name](#common.NodeProp^group)). If `before` is non-null, only
+    return children that occur somewhere after a node with that name
+    or group. If `after` is non-null, only return children that
+    occur somewhere before a node with that name or group.
+    */
     getChild(type: string | number, before?: string | number | null, after?: string | number | null): SyntaxNode | null;
+    /**
+    Like [`getChild`](#common.SyntaxNode.getChild), but return all
+    matching children, not just the first.
+    */
     getChildren(type: string | number, before?: string | number | null, after?: string | number | null): SyntaxNode[];
-    matchContext(context: readonly string[]): boolean;
 }
+/**
+A tree cursor object focuses on a given node in a syntax tree, and
+allows you to move to adjacent nodes.
+*/
 declare class TreeCursor implements SyntaxNodeRef {
+    /**
+    The node's type.
+    */
     type: NodeType;
+    /**
+    Shorthand for `.type.name`.
+    */
     get name(): string;
+    /**
+    The start source offset of this node.
+    */
     from: number;
+    /**
+    The end source offset.
+    */
     to: number;
     private stack;
     private bufferNode;
     private yieldNode;
     private yieldBuf;
     private yield;
+    /**
+    Move the cursor to this node's first child. When this returns
+    false, the node has no child, and the cursor has not been moved.
+    */
     firstChild(): boolean;
+    /**
+    Move the cursor to this node's last child.
+    */
     lastChild(): boolean;
+    /**
+    Move the cursor to the first child that ends after `pos`.
+    */
     childAfter(pos: number): boolean;
+    /**
+    Move to the last child that starts before `pos`.
+    */
     childBefore(pos: number): boolean;
+    /**
+    Move the cursor to the child around `pos`. If side is -1 the
+    child may end at that position, when 1 it may start there. This
+    will also enter [overlaid](#common.MountedTree.overlay)
+    [mounted](#common.NodeProp^mounted) trees unless `overlays` is
+    set to false.
+    */
     enter(pos: number, side: -1 | 0 | 1, mode?: IterMode): boolean;
+    /**
+    Move to the node's parent node, if this isn't the top node.
+    */
     parent(): boolean;
+    /**
+    Move to this node's next sibling, if any.
+    */
     nextSibling(): boolean;
+    /**
+    Move to this node's previous sibling, if any.
+    */
     prevSibling(): boolean;
     private atLastNode;
     private move;
+    /**
+    Move to the next node in a
+    [pre-order](https://en.wikipedia.org/wiki/Tree_traversal#Pre-order,_NLR)
+    traversal, going from a node to its first child or, if the
+    current node is empty or `enter` is false, its next sibling or
+    the next sibling of the first parent node that has one.
+    */
     next(enter?: boolean): boolean;
+    /**
+    Move to the next node in a last-to-first pre-order traveral. A
+    node is followed by its last child or, if it has none, its
+    previous sibling or the previous sibling of the first parent
+    node that has one.
+    */
     prev(enter?: boolean): boolean;
+    /**
+    Move the cursor to the innermost node that covers `pos`. If
+    `side` is -1, it will enter nodes that end at `pos`. If it is 1,
+    it will enter nodes that start at `pos`.
+    */
     moveTo(pos: number, side?: -1 | 0 | 1): this;
+    /**
+    Get a [syntax node](#common.SyntaxNode) at the cursor's current
+    position.
+    */
     get node(): SyntaxNode;
+    /**
+    Get the [tree](#common.Tree) that represents the current node, if
+    any. Will return null when the node is in a [tree
+    buffer](#common.TreeBuffer).
+    */
     get tree(): Tree | null;
+    /**
+    Iterate over the current node and all its descendants, calling
+    `enter` when entering a node and `leave`, if given, when leaving
+    one. When `enter` returns `false`, any children of that node are
+    skipped, and `leave` isn't called for it.
+    */
     iterate(enter: (node: SyntaxNodeRef) => boolean | void, leave?: (node: SyntaxNodeRef) => void): void;
+    /**
+    Test whether the current node matches a given context—a sequence
+    of direct parent node names. Empty strings in the context array
+    are treated as wildcards.
+    */
     matchContext(context: readonly string[]): boolean;
 }
 
+/**
+Objects returned by the function passed to
+[`parseMixed`](#common.parseMixed) should conform to this
+interface.
+*/
 interface NestedParse {
+    /**
+    The parser to use for the inner region.
+    */
     parser: Parser;
+    /**
+    When this property is not given, the entire node is parsed with
+    this parser, and it is [mounted](#common.NodeProp^mounted) as a
+    non-overlay node, replacing its host node in tree iteration.
+    
+    When an array of ranges is given, only those ranges are parsed,
+    and the tree is mounted as an
+    [overlay](#common.MountedTree.overlay).
+    
+    When a function is given, that function will be called for
+    descendant nodes of the target node, not including child nodes
+    that are covered by another nested parse, to determine the
+    overlay ranges. When it returns true, the entire descendant is
+    included, otherwise just the range given. The mixed parser will
+    optimize range-finding in reused nodes, which means it's a good
+    idea to use a function here when the target node is expected to
+    have a large, deep structure.
+    */
     overlay?: readonly {
         from: number;
         to: number;
@@ -1772,79 +2657,293 @@ interface NestedParse {
         to: number;
     } | boolean);
 }
+/**
+Create a parse wrapper that, after the inner parse completes,
+scans its tree for mixed language regions with the `nest`
+function, runs the resulting [inner parses](#common.NestedParse),
+and then [mounts](#common.NodeProp^mounted) their results onto the
+tree.
+*/
 declare function parseMixed(nest: (node: SyntaxNodeRef, input: Input) => NestedParse | null): ParseWrapper;
 
+/**
+A parse stack. These are used internally by the parser to track
+parsing progress. They also provide some properties and methods
+that external code such as a tokenizer can use to get information
+about the parse state.
+*/
 declare class Stack {
+    /**
+    The input position up to which this stack has parsed.
+    */
     pos: number;
+    /**
+    The stack's current [context](#lr.ContextTracker) value, if
+    any. Its type will depend on the context tracker's type
+    parameter, or it will be `null` if there is no context
+    tracker.
+    */
     get context(): any;
+    /**
+    Check if the given term would be able to be shifted (optionally
+    after some reductions) on this stack. This can be useful for
+    external tokenizers that want to make sure they only provide a
+    given token when it applies.
+    */
     canShift(term: number): boolean;
+    /**
+    Get the parser used by this stack.
+    */
     get parser(): LRParser;
+    /**
+    Test whether a given dialect (by numeric ID, as exported from
+    the terms file) is enabled.
+    */
     dialectEnabled(dialectID: number): boolean;
     private shiftContext;
     private reduceContext;
     private updateContext;
 }
 
+/**
+[Tokenizers](#lr.ExternalTokenizer) interact with the input
+through this interface. It presents the input as a stream of
+characters, tracking lookahead and hiding the complexity of
+[ranges](#common.Parser.parse^ranges) from tokenizer code.
+*/
 declare class InputStream {
+    /**
+    Backup chunk
+    */
     private chunk2;
     private chunk2Pos;
+    /**
+    The character code of the next code unit in the input, or -1
+    when the stream is at the end of the input.
+    */
     next: number;
+    /**
+    The current position of the stream. Note that, due to parses
+    being able to cover non-contiguous
+    [ranges](#common.Parser.startParse), advancing the stream does
+    not always mean its position moves a single unit.
+    */
     pos: number;
     private rangeIndex;
     private range;
-    peek(offset: number): any;
+    /**
+    Look at a code unit near the stream position. `.peek(0)` equals
+    `.next`, `.peek(-1)` gives you the previous character, and so
+    on.
+    
+    Note that looking around during tokenizing creates dependencies
+    on potentially far-away content, which may reduce the
+    effectiveness incremental parsing—when looking forward—or even
+    cause invalid reparses when looking backward more than 25 code
+    units, since the library does not track lookbehind.
+    */
+    peek(offset: number): number;
+    /**
+    Accept a token. By default, the end of the token is set to the
+    current stream position, but you can pass an offset (relative to
+    the stream position) to change that.
+    */
     acceptToken(token: number, endOffset?: number): void;
     private getChunk;
     private readNext;
+    /**
+    Move the stream forward N (defaults to 1) code units. Returns
+    the new value of [`next`](#lr.InputStream.next).
+    */
     advance(n?: number): number;
     private setDone;
 }
 interface ExternalOptions {
+    /**
+    When set to true, mark this tokenizer as depending on the
+    current parse stack, which prevents its result from being cached
+    between parser actions at the same positions.
+    */
     contextual?: boolean;
+    /**
+    By defaults, when a tokenizer returns a token, that prevents
+    tokenizers with lower precedence from even running. When
+    `fallback` is true, the tokenizer is allowed to run when a
+    previous tokenizer returned a token that didn't match any of the
+    current state's actions.
+    */
     fallback?: boolean;
+    /**
+    When set to true, tokenizing will not stop after this tokenizer
+    has produced a token. (But it will still fail to reach this one
+    if a higher-precedence tokenizer produced a token.)
+    */
     extend?: boolean;
 }
+/**
+`@external tokens` declarations in the grammar should resolve to
+an instance of this class.
+*/
 declare class ExternalTokenizer {
-    constructor(token: (input: InputStream, stack: Stack) => void, options?: ExternalOptions);
+    /**
+    Create a tokenizer. The first argument is the function that,
+    given an input stream, scans for the types of tokens it
+    recognizes at the stream's position, and calls
+    [`acceptToken`](#lr.InputStream.acceptToken) when it finds
+    one.
+    */
+    constructor(
+    /**
+    @internal
+    */
+    token: (input: InputStream, stack: Stack) => void, options?: ExternalOptions);
 }
 
+/**
+Context trackers are used to track stateful context (such as
+indentation in the Python grammar, or parent elements in the XML
+grammar) needed by external tokenizers. You declare them in a
+grammar file as `@context exportName from "module"`.
+
+Context values should be immutable, and can be updated (replaced)
+on shift or reduce actions.
+
+The export used in a `@context` declaration should be of this
+type.
+*/
 declare class ContextTracker<T> {
+    /**
+    Define a context tracker.
+    */
     constructor(spec: {
+        /**
+        The initial value of the context at the start of the parse.
+        */
         start: T;
+        /**
+        Update the context when the parser executes a
+        [shift](https://en.wikipedia.org/wiki/LR_parser#Shift_and_reduce_actions)
+        action.
+        */
         shift?(context: T, term: number, stack: Stack, input: InputStream): T;
+        /**
+        Update the context when the parser executes a reduce action.
+        */
         reduce?(context: T, term: number, stack: Stack, input: InputStream): T;
+        /**
+        Update the context when the parser reuses a node from a tree
+        fragment.
+        */
         reuse?(context: T, node: Tree, stack: Stack, input: InputStream): T;
+        /**
+        Reduce a context value to a number (for cheap storage and
+        comparison). Only needed for strict contexts.
+        */
         hash?(context: T): number;
+        /**
+        By default, nodes can only be reused during incremental
+        parsing if they were created in the same context as the one in
+        which they are reused. Set this to false to disable that
+        check (and the overhead of storing the hashes).
+        */
         strict?: boolean;
     });
 }
+/**
+Configuration options when
+[reconfiguring](#lr.LRParser.configure) a parser.
+*/
 interface ParserConfig {
+    /**
+    Node prop values to add to the parser's node set.
+    */
     props?: readonly NodePropSource[];
+    /**
+    The name of the `@top` declaration to parse from. If not
+    specified, the first top rule declaration in the grammar is
+    used.
+    */
     top?: string;
+    /**
+    A space-separated string of dialects to enable.
+    */
     dialect?: string;
+    /**
+    Replace the given external tokenizers with new ones.
+    */
     tokenizers?: {
         from: ExternalTokenizer;
         to: ExternalTokenizer;
     }[];
+    /**
+    Replace external specializers with new ones.
+    */
     specializers?: {
         from: (value: string, stack: Stack) => number;
         to: (value: string, stack: Stack) => number;
     }[];
+    /**
+    Replace the context tracker with a new one.
+    */
     contextTracker?: ContextTracker<any>;
+    /**
+    When true, the parser will raise an exception, rather than run
+    its error-recovery strategies, when the input doesn't match the
+    grammar.
+    */
     strict?: boolean;
+    /**
+    Add a wrapper, which can extend parses created by this parser
+    with additional logic (usually used to add
+    [mixed-language](#common.parseMixed) parsing).
+    */
     wrap?: ParseWrapper;
+    /**
+    The maximum length of the TreeBuffers generated in the output
+    tree. Defaults to 1024.
+    */
     bufferLength?: number;
 }
+/**
+Holds the parse tables for a given grammar, as generated by
+`lezer-generator`, and provides [methods](#common.Parser) to parse
+content with.
+*/
 declare class LRParser extends Parser {
+    /**
+    The nodes used in the trees emitted by this parser.
+    */
     readonly nodeSet: NodeSet;
     createParse(input: Input, fragments: readonly TreeFragment[], ranges: readonly {
         from: number;
         to: number;
     }[]): PartialParse;
+    /**
+    Configure the parser. Returns a new parser instance that has the
+    given settings modified. Settings not provided in `config` are
+    kept from the original parser.
+    */
     configure(config: ParserConfig): LRParser;
+    /**
+    Tells you whether any [parse wrappers](#lr.ParserConfig.wrap)
+    are registered for this parser.
+    */
     hasWrappers(): boolean;
+    /**
+    Returns the name associated with a given term. This will only
+    work for all terms when the parser was generated with the
+    `--names` option. By default, only the names of tagged terms are
+    stored.
+    */
     getName(term: number): string;
+    /**
+    The type of top node produced by the parser.
+    */
     get topNode(): NodeType;
+    /**
+    Used by the output of the parser generator. Not available to
+    user code. @hide
+    */
     static deserialize(spec: any): LRParser;
 }
 
@@ -1853,7 +2952,11 @@ declare class StyleModule {
     finish?(sel: string): string
   })
   getRules(): string
-  static mount(root: Document | ShadowRoot | DocumentOrShadowRoot, module: StyleModule | ReadonlyArray<StyleModule>): void
+  static mount(
+    root: Document | ShadowRoot | DocumentOrShadowRoot,
+    module: StyleModule | ReadonlyArray<StyleModule>,
+    options?: {nonce?: string}
+  ): void
   static newName(): string
 }
 
@@ -1861,7 +2964,47 @@ type StyleSpec = {
   [propOrSelector: string]: string | number | StyleSpec | null
 }
 
-declare type Attrs = {
+/**
+Used to indicate [text direction](https://codemirror.net/6/docs/ref/#view.EditorView.textDirection).
+*/
+declare enum Direction {
+    /**
+    Left-to-right.
+    */
+    LTR = 0,
+    /**
+    Right-to-left.
+    */
+    RTL = 1
+}
+/**
+Represents a contiguous range of text that has a single direction
+(as in left-to-right or right-to-left).
+*/
+declare class BidiSpan {
+    /**
+    The start of the span (relative to the start of the line).
+    */
+    readonly from: number;
+    /**
+    The end of the span.
+    */
+    readonly to: number;
+    /**
+    The ["bidi
+    level"](https://unicode.org/reports/tr9/#Basic_Display_Algorithm)
+    of the span (in this context, 0 means
+    left-to-right, 1 means right-to-left, 2 means left-to-right
+    number inside right-to-left text).
+    */
+    readonly level: number;
+    /**
+    The direction of this span.
+    */
+    get dir(): Direction;
+}
+
+type Attrs = {
     [name: string]: string;
 };
 
@@ -1874,7 +3017,7 @@ interface Rect {
     readonly top: number;
     readonly bottom: number;
 }
-declare type ScrollStrategy = "nearest" | "start" | "end" | "center";
+type ScrollStrategy = "nearest" | "start" | "end" | "center";
 
 interface MarkDecorationSpec {
     /**
@@ -1912,6 +3055,12 @@ interface MarkDecorationSpec {
     */
     tagName?: string;
     /**
+    When using sets of decorations in
+    [`bidiIsolatedRanges`](https://codemirror.net/6/docs/ref/##view.EditorView^bidiIsolatedRanges),
+    this property provides the direction of the isolates.
+    */
+    bidiIsolate?: Direction;
+    /**
     Decoration specs allow extra properties, which can be retrieved
     through the decoration's [`spec`](https://codemirror.net/6/docs/ref/#view.Decoration.spec)
     property.
@@ -1929,10 +3078,20 @@ interface WidgetDecorationSpec {
     cursor is on the same position. Otherwise, it'll be drawn before
     it. When multiple widgets sit at the same position, their `side`
     values will determine their ordering—those with a lower value
-    come first. Defaults to 0.
+    come first. Defaults to 0. May not be more than 10000 or less
+    than -10000.
     */
     side?: number;
     /**
+    By default, to avoid unintended mixing of block and inline
+    widgets, block widgets with a positive `side` are always drawn
+    after all inline widgets at that position, and those with a
+    non-positive side before inline widgets. Setting this option to
+    `true` for a block widget will turn this off and cause it to be
+    rendered between the inline widgets, ordered by `side`.
+    */
+    inlineOrder?: boolean;
+    /**
     Determines whether this is a block widgets, which will be drawn
     between lines, or an inline widget (the default) which is drawn
     between the surrounding text.
@@ -2033,6 +3192,13 @@ declare abstract class WidgetType {
     */
     get estimatedHeight(): number;
     /**
+    For inline widgets that are displayed inline (as opposed to
+    `inline-block`) and introduce line breaks (through `<br>` tags
+    or textual newlines), this must indicate the amount of line
+    breaks they introduce. Defaults to 0.
+    */
+    get lineBreaks(): number;
+    /**
     Can be used to configure which kinds of events inside the widget
     should be ignored by the editor. The default is to ignore all
     events.
@@ -2057,7 +3223,7 @@ A decoration set represents a collection of decorated ranges,
 organized for efficient access and mapping. See
 [`RangeSet`](https://codemirror.net/6/docs/ref/#state.RangeSet) for its methods.
 */
-declare type DecorationSet = RangeSet<Decoration>;
+type DecorationSet = RangeSet<Decoration>;
 /**
 The different types of blocks that can occur in an editor view.
 */
@@ -2156,7 +3322,7 @@ apply to the editor, and if it can, perform it as a side effect
 (which usually means [dispatching](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch) a
 transaction) and return `true`.
 */
-declare type Command = (target: EditorView) => boolean;
+type Command = (target: EditorView) => boolean;
 /**
 This is the interface plugin objects conform to.
 */
@@ -2191,6 +3357,12 @@ interface PluginSpec<V extends PluginValue> {
     */
     eventHandlers?: DOMEventHandlers<V>;
     /**
+    Registers [event observers](https://codemirror.net/6/docs/ref/#view.EditorView^domEventObservers)
+    for the plugin. Will, when called, have their `this` bound to
+    the plugin value.
+    */
+    eventObservers?: DOMEventHandlers<V>;
+    /**
     Specify that the plugin provides additional extensions when
     added to an editor configuration.
     */
@@ -2245,7 +3417,7 @@ interface MeasureRequest<T> {
     */
     key?: any;
 }
-declare type AttrSource = Attrs | ((view: EditorView) => Attrs | null);
+type AttrSource = Attrs | ((view: EditorView) => Attrs | null);
 /**
 View [plugins](https://codemirror.net/6/docs/ref/#view.ViewPlugin) are given instances of this
 class, which describe what happened, whenever the view is updated.
@@ -2334,7 +3506,7 @@ interface MouseSelectionStyle {
     */
     update: (update: ViewUpdate) => boolean | void;
 }
-declare type MakeSelectionStyle = (view: EditorView, event: MouseEvent) => MouseSelectionStyle | null;
+type MakeSelectionStyle = (view: EditorView, event: MouseEvent) => MouseSelectionStyle | null;
 
 /**
 Record used to represent information about a block-level element
@@ -2362,7 +3534,7 @@ declare class BlockInfo {
     The type of element this is. When querying lines, this may be
     an array of all the blocks that make up the line.
     */
-    readonly type: BlockType | readonly BlockInfo[];
+    get type(): BlockType | readonly BlockInfo[];
     /**
     The end of the element as a document position.
     */
@@ -2371,46 +3543,16 @@ declare class BlockInfo {
     The bottom position of the element.
     */
     get bottom(): number;
-}
-
-/**
-Used to indicate [text direction](https://codemirror.net/6/docs/ref/#view.EditorView.textDirection).
-*/
-declare enum Direction {
     /**
-    Left-to-right.
+    If this is a widget block, this will return the widget
+    associated with it.
     */
-    LTR = 0,
+    get widget(): WidgetType | null;
     /**
-    Right-to-left.
+    If this is a textblock, this holds the number of line breaks
+    that appear in widgets inside the block.
     */
-    RTL = 1
-}
-/**
-Represents a contiguous range of text that has a single direction
-(as in left-to-right or right-to-left).
-*/
-declare class BidiSpan {
-    /**
-    The start of the span (relative to the start of the line).
-    */
-    readonly from: number;
-    /**
-    The end of the span.
-    */
-    readonly to: number;
-    /**
-    The ["bidi
-    level"](https://unicode.org/reports/tr9/#Basic_Display_Algorithm)
-    of the span (in this context, 0 means
-    left-to-right, 1 means right-to-left, 2 means left-to-right
-    number inside right-to-left text).
-    */
-    readonly level: number;
-    /**
-    The direction of this span.
-    */
-    get dir(): Direction;
+    get widgetLineBreaks(): number;
 }
 
 /**
@@ -2440,13 +3582,18 @@ interface EditorViewConfig extends EditorStateConfig {
     */
     root?: Document | ShadowRoot;
     /**
-    Override the transaction [dispatch
-    function](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch) for this editor view, which
-    is the way updates get routed to the view. Your implementation,
-    if provided, should probably call the view's [`update`
-    method](https://codemirror.net/6/docs/ref/#view.EditorView.update).
+    Override the way transactions are
+    [dispatched](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch) for this editor view.
+    Your implementation, if provided, should probably call the
+    view's [`update` method](https://codemirror.net/6/docs/ref/#view.EditorView.update).
+    */
+    dispatchTransactions?: (trs: readonly Transaction[], view: EditorView) => void;
+    /**
+    **Deprecated** single-transaction version of
+    `dispatchTransactions`. Will force transactions to be dispatched
+    one at a time when used.
     */
-    dispatch?: (tr: Transaction) => void;
+    dispatch?: (tr: Transaction, view: EditorView) => void;
 }
 /**
 An editor view represents the editor's user interface. It holds
@@ -2500,7 +3647,7 @@ declare class EditorView {
     composition there.
     */
     get compositionStarted(): boolean;
-    private _dispatch;
+    private dispatchTransactions;
     private _root;
     /**
     The document or shadow root that the view lives in.
@@ -2540,14 +3687,19 @@ declare class EditorView {
     constructor(config?: EditorViewConfig);
     /**
     All regular editor state updates should go through this. It
-    takes a transaction or transaction spec and updates the view to
-    show the new state produced by that transaction. Its
-    implementation can be overridden with an
-    [option](https://codemirror.net/6/docs/ref/#view.EditorView.constructor^config.dispatch). This
-    function is bound to the view instance, so it does not have to
-    be called as a method.
+    takes a transaction, array of transactions, or transaction spec
+    and updates the view to show the new state produced by that
+    transaction. Its implementation can be overridden with an
+    [option](https://codemirror.net/6/docs/ref/#view.EditorView.constructor^config.dispatchTransactions).
+    This function is bound to the view instance, so it does not have
+    to be called as a method.
+    
+    Note that when multiple `TransactionSpec` arguments are
+    provided, these define a single transaction (the specs will be
+    merged), not a sequence of transactions.
     */
     dispatch(tr: Transaction): void;
+    dispatch(trs: readonly Transaction[]): void;
     dispatch(...specs: TransactionSpec[]): void;
     /**
     Update the view for the given array of transactions. This will
@@ -2605,6 +3757,16 @@ declare class EditorView {
         bottom: number;
     };
     /**
+    If the editor is transformed with CSS, this provides the scale
+    along the X axis. Otherwise, it will just be 1. Note that
+    transforms other than translation and scaling are not supported.
+    */
+    get scaleX(): number;
+    /**
+    Provide the CSS transformed scale along the Y axis.
+    */
+    get scaleY(): number;
+    /**
     Find the text line or block widget at the given vertical
     position (which is interpreted as relative to the [top of the
     document](https://codemirror.net/6/docs/ref/#view.EditorView.documentTop)).
@@ -2726,6 +3888,14 @@ declare class EditorView {
     */
     coordsAtPos(pos: number, side?: -1 | 1): Rect | null;
     /**
+    Return the rectangle around a given character. If `pos` does not
+    point in front of a character that is in the viewport and
+    rendered (i.e. not replaced, not a line break), this will return
+    null. For space characters that are a line wrap point, this will
+    return the position before the line break.
+    */
+    coordsForChar(pos: number): Rect | null;
+    /**
     The default width of a character in the editor. May not
     accurately reflect the width of all characters (given variable
     width fonts or styling of invididual ranges).
@@ -2841,13 +4011,26 @@ declare class EditorView {
     */
     static domEventHandlers(handlers: DOMEventHandlers<any>): Extension;
     /**
+    Create an extension that registers DOM event observers. Contrary
+    to event [handlers](https://codemirror.net/6/docs/ref/#view.EditorView^domEventHandlers),
+    observers can't be prevented from running by a higher-precedence
+    handler returning true. They also don't prevent other handlers
+    and observers from running when they return true, and should not
+    call `preventDefault`.
+    */
+    static domEventObservers(observers: DOMEventHandlers<any>): Extension;
+    /**
     An input handler can override the way changes to the editable
     DOM content are handled. Handlers are passed the document
     positions between which the change was found, and the new
     content. When one returns true, no further input handlers are
     called and the default behavior is prevented.
+    
+    The `insert` argument can be used to get the default transaction
+    that would be applied for this input. This can be useful when
+    dispatching the custom behavior as a separate transaction.
     */
-    static inputHandler: Facet<(view: EditorView, from: number, to: number, text: string) => boolean, readonly ((view: EditorView, from: number, to: number, text: string) => boolean)[]>;
+    static inputHandler: Facet<(view: EditorView, from: number, to: number, text: string, insert: () => Transaction) => boolean, readonly ((view: EditorView, from: number, to: number, text: string, insert: () => Transaction) => boolean)[]>;
     /**
     This facet can be used to provide functions that create effects
     to be dispatched when the editor's focus state changes.
@@ -2933,6 +4116,16 @@ declare class EditorView {
     */
     static atomicRanges: Facet<(view: EditorView) => RangeSet<any>, readonly ((view: EditorView) => RangeSet<any>)[]>;
     /**
+    When range decorations add a `unicode-bidi: isolate` style, they
+    should also include a
+    [`bidiIsolate`](https://codemirror.net/6/docs/ref/#view.MarkDecorationSpec.bidiIsolate) property
+    in their decoration spec, and be exposed through this facet, so
+    that the editor can compute the proper text order. (Other values
+    for `unicode-bidi`, except of course `normal`, are not
+    supported.)
+    */
+    static bidiIsolatedRanges: Facet<DecorationSet | ((view: EditorView) => DecorationSet), readonly (DecorationSet | ((view: EditorView) => DecorationSet))[]>;
+    /**
     Facet that allows extensions to provide additional scroll
     margins (space around the sides of the scrolling element that
     should be considered invisible). This can be useful when the
@@ -2981,6 +4174,12 @@ declare class EditorView {
         [selector: string]: StyleSpec;
     }): Extension;
     /**
+    Provides a Content Security Policy nonce to use when creating
+    the style sheets for the editor. Holds the empty string when no
+    nonce has been provided.
+    */
+    static cspNonce: Facet<string, string>;
+    /**
     Facet that provides additional DOM attributes for the editor's
     editable DOM element.
     */
@@ -3024,7 +4223,7 @@ to hold the appropriate event object type. For unknown events, it
 is inferred to `any`, and should be explicitly set if you want type
 checking.
 */
-declare type DOMEventHandlers<This> = {
+type DOMEventHandlers<This> = {
     [event in keyof DOMEventMap]?: (this: This, event: DOMEventMap[event], view: EditorView) => boolean | void;
 };
 
@@ -3109,6 +4308,13 @@ interface KeyBinding {
     selection can be undone).
     */
     preventDefault?: boolean;
+    /**
+    When set to true, `stopPropagation` will be called on keyboard
+    events that have their `preventDefault` called in response to
+    this key binding (see also
+    [`preventDefault`](https://codemirror.net/6/docs/ref/#view.KeyBinding.preventDefault)).
+    */
+    stopPropagation?: boolean;
 }
 /**
 Facet used for registering keymaps.
@@ -3120,7 +4326,7 @@ for a given key, no further handlers are called.
 */
 declare const keymap: Facet<readonly KeyBinding[], readonly (readonly KeyBinding[])[]>;
 
-declare type SelectionConfig = {
+type SelectionConfig = {
     /**
     The length of a full cursor blink cycle, in milliseconds.
     Defaults to 1200. Can be set to 0 to disable blinking.
@@ -3205,12 +4411,152 @@ that was dragged over will be selected, as one selection
 */
 declare function rectangularSelection(options?: {
     /**
-    A custom predicate function, which takes a `mousedown` event and
-    returns true if it should be used for rectangular selection.
+    A custom predicate function, which takes a `mousedown` event and
+    returns true if it should be used for rectangular selection.
+    */
+    eventFilter?: (event: MouseEvent) => boolean;
+}): Extension;
+
+/**
+Creates an extension that configures tooltip behavior.
+*/
+declare function tooltips(config?: {
+    /**
+    By default, tooltips use `"fixed"`
+    [positioning](https://developer.mozilla.org/en-US/docs/Web/CSS/position),
+    which has the advantage that tooltips don't get cut off by
+    scrollable parent elements. However, CSS rules like `contain:
+    layout` can break fixed positioning in child nodes, which can be
+    worked about by using `"absolute"` here.
+    
+    On iOS, which at the time of writing still doesn't properly
+    support fixed positioning, the library always uses absolute
+    positioning.
+    
+    If the tooltip parent element sits in a transformed element, the
+    library also falls back to absolute positioning.
+    */
+    position?: "fixed" | "absolute";
+    /**
+    The element to put the tooltips into. By default, they are put
+    in the editor (`cm-editor`) element, and that is usually what
+    you want. But in some layouts that can lead to positioning
+    issues, and you need to use a different parent to work around
+    those.
+    */
+    parent?: HTMLElement;
+    /**
+    By default, when figuring out whether there is room for a
+    tooltip at a given position, the extension considers the entire
+    space between 0,0 and `innerWidth`,`innerHeight` to be available
+    for showing tooltips. You can provide a function here that
+    returns an alternative rectangle.
+    */
+    tooltipSpace?: (view: EditorView) => Rect;
+}): Extension;
+/**
+Describes a tooltip. Values of this type, when provided through
+the [`showTooltip`](https://codemirror.net/6/docs/ref/#view.showTooltip) facet, control the
+individual tooltips on the editor.
+*/
+interface Tooltip {
+    /**
+    The document position at which to show the tooltip.
+    */
+    pos: number;
+    /**
+    The end of the range annotated by this tooltip, if different
+    from `pos`.
+    */
+    end?: number;
+    /**
+    A constructor function that creates the tooltip's [DOM
+    representation](https://codemirror.net/6/docs/ref/#view.TooltipView).
+    */
+    create(view: EditorView): TooltipView;
+    /**
+    Whether the tooltip should be shown above or below the target
+    position. Not guaranteed to be respected for hover tooltips
+    since all hover tooltips for the same range are always
+    positioned together. Defaults to false.
+    */
+    above?: boolean;
+    /**
+    Whether the `above` option should be honored when there isn't
+    enough space on that side to show the tooltip inside the
+    viewport. Defaults to false.
+    */
+    strictSide?: boolean;
+    /**
+    When set to true, show a triangle connecting the tooltip element
+    to position `pos`.
+    */
+    arrow?: boolean;
+}
+/**
+Describes the way a tooltip is displayed.
+*/
+interface TooltipView {
+    /**
+    The DOM element to position over the editor.
+    */
+    dom: HTMLElement;
+    /**
+    Adjust the position of the tooltip relative to its anchor
+    position. A positive `x` value will move the tooltip
+    horizontally along with the text direction (so right in
+    left-to-right context, left in right-to-left). A positive `y`
+    will move the tooltip up when it is above its anchor, and down
+    otherwise.
+    */
+    offset?: {
+        x: number;
+        y: number;
+    };
+    /**
+    By default, a tooltip's screen position will be based on the
+    text position of its `pos` property. This method can be provided
+    to make the tooltip view itself responsible for finding its
+    screen position.
     */
-    eventFilter?: (event: MouseEvent) => boolean;
-}): Extension;
-declare type Handlers$1 = {
+    getCoords?: (pos: number) => Rect;
+    /**
+    By default, tooltips are moved when they overlap with other
+    tooltips. Set this to `true` to disable that behavior for this
+    tooltip.
+    */
+    overlap?: boolean;
+    /**
+    Called after the tooltip is added to the DOM for the first time.
+    */
+    mount?(view: EditorView): void;
+    /**
+    Update the DOM element for a change in the view's state.
+    */
+    update?(update: ViewUpdate): void;
+    /**
+    Called when the tooltip is removed from the editor or the editor
+    is destroyed.
+    */
+    destroy?(): void;
+    /**
+    Called when the tooltip has been (re)positioned. The argument is
+    the [space](https://codemirror.net/6/docs/ref/#view.tooltips^config.tooltipSpace) available to the
+    tooltip.
+    */
+    positioned?(space: Rect): void;
+    /**
+    By default, the library will restrict the size of tooltips so
+    that they don't stick out of the available space. Set this to
+    false to disable that.
+    */
+    resize?: boolean;
+}
+/**
+Facet to which an extension can add a value to show a tooltip.
+*/
+declare const showTooltip: Facet<Tooltip | null, readonly (Tooltip | null)[]>;
+type Handlers$1 = {
     [event: string]: (view: EditorView, line: BlockInfo, event: Event) => boolean;
 };
 interface LineNumberConfig {
@@ -3961,7 +5307,7 @@ Default fold-related key bindings.
  - Ctrl-Alt-]: [`unfoldAll`](https://codemirror.net/6/docs/ref/#language.unfoldAll).
 */
 declare const foldKeymap: readonly KeyBinding[];
-declare type Handlers = {
+type Handlers = {
     [event: string]: (view: EditorView, line: BlockInfo, event: Event) => boolean;
 };
 interface FoldGutterConfig {
@@ -4158,7 +5504,7 @@ interface MatchResult {
     matched: boolean;
 }
 
-declare type JuliaLanguageConfig = {
+type JuliaLanguageConfig = {
     /** Enable keyword completion */
     enableKeywordCompletion?: boolean;
 };
@@ -4229,120 +5575,24 @@ The default keymap. Includes all bindings from
 */
 declare const defaultKeymap: readonly KeyBinding[];
 
-interface CompletionConfig {
-    /**
-    When enabled (defaults to true), autocompletion will start
-    whenever the user types something that can be completed.
-    */
-    activateOnTyping?: boolean;
-    /**
-    By default, when completion opens, the first option is selected
-    and can be confirmed with
-    [`acceptCompletion`](https://codemirror.net/6/docs/ref/#autocomplete.acceptCompletion). When this
-    is set to false, the completion widget starts with no completion
-    selected, and the user has to explicitly move to a completion
-    before you can confirm one.
-    */
-    selectOnOpen?: boolean;
-    /**
-    Override the completion sources used. By default, they will be
-    taken from the `"autocomplete"` [language
-    data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) (which should hold
-    [completion sources](https://codemirror.net/6/docs/ref/#autocomplete.CompletionSource) or arrays
-    of [completions](https://codemirror.net/6/docs/ref/#autocomplete.Completion)).
-    */
-    override?: readonly CompletionSource[] | null;
-    /**
-    Determines whether the completion tooltip is closed when the
-    editor loses focus. Defaults to true.
-    */
-    closeOnBlur?: boolean;
-    /**
-    The maximum number of options to render to the DOM.
-    */
-    maxRenderedOptions?: number;
-    /**
-    Set this to false to disable the [default completion
-    keymap](https://codemirror.net/6/docs/ref/#autocomplete.completionKeymap). (This requires you to
-    add bindings to control completion yourself. The bindings should
-    probably have a higher precedence than other bindings for the
-    same keys.)
-    */
-    defaultKeymap?: boolean;
-    /**
-    By default, completions are shown below the cursor when there is
-    space. Setting this to true will make the extension put the
-    completions above the cursor when possible.
-    */
-    aboveCursor?: boolean;
-    /**
-    When given, this may return an additional CSS class to add to
-    the completion dialog element.
-    */
-    tooltipClass?: (state: EditorState) => string;
-    /**
-    This can be used to add additional CSS classes to completion
-    options.
-    */
-    optionClass?: (completion: Completion) => string;
-    /**
-    By default, the library will render icons based on the
-    completion's [type](https://codemirror.net/6/docs/ref/#autocomplete.Completion.type) in front of
-    each option. Set this to false to turn that off.
-    */
-    icons?: boolean;
-    /**
-    This option can be used to inject additional content into
-    options. The `render` function will be called for each visible
-    completion, and should produce a DOM node to show. `position`
-    determines where in the DOM the result appears, relative to
-    other added widgets and the standard content. The default icons
-    have position 20, the label position 50, and the detail position
-    80.
-    */
-    addToOptions?: {
-        render: (completion: Completion, state: EditorState) => Node | null;
-        position: number;
-    }[];
-    /**
-    By default, [info](https://codemirror.net/6/docs/ref/#autocomplet.Completion.info) tooltips are
-    placed to the side of the selected. This option can be used to
-    override that. It will be given rectangles for the list of
-    completions, the selected option, the info element, and the
-    availble [tooltip space](https://codemirror.net/6/docs/ref/#view.tooltips^config.tooltipSpace),
-    and should return style and/or class strings for the info
-    element.
-    */
-    positionInfo?: (view: EditorView, list: Rect, option: Rect, info: Rect, space: Rect) => {
-        style?: string;
-        class?: string;
-    };
-    /**
-    The comparison function to use when sorting completions with the same
-    match score. Defaults to using
-    [`localeCompare`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/localeCompare).
-    */
-    compareCompletions?: (a: Completion, b: Completion) => number;
-    /**
-    By default, commands relating to an open completion only take
-    effect 75 milliseconds after the completion opened, so that key
-    presses made before the user is aware of the tooltip don't go to
-    the tooltip. This option can be used to configure that delay.
-    */
-    interactionDelay?: number;
-}
-
 /**
 Objects type used to represent individual completions.
 */
 interface Completion {
     /**
     The label to show in the completion picker. This is what input
-    is matched agains to determine whether a completion matches (and
+    is matched against to determine whether a completion matches (and
     how well it matches).
     */
     label: string;
     /**
+    An optional override for the completion's visible label. When
+    using this, matched characters will only be highlighted if you
+    provide a [`getMatch`](https://codemirror.net/6/docs/ref/#autocomplete.CompletionResult.getMatch)
+    function.
+    */
+    displayLabel?: string;
+    /**
     An optional short piece of information to show (with a different
     style) after the label.
     */
@@ -4352,7 +5602,7 @@ interface Completion {
     a plain string or a function that'll render the DOM structure to
     show when invoked.
     */
-    info?: string | ((completion: Completion) => (Node | null | Promise<Node | null>));
+    info?: string | ((completion: Completion) => CompletionInfo | Promise<CompletionInfo>);
     /**
     How to apply the completion. The default is to replace it with
     its [label](https://codemirror.net/6/docs/ref/#autocomplete.Completion.label). When this holds a
@@ -4392,6 +5642,16 @@ interface Completion {
     section?: string | CompletionSection;
 }
 /**
+The type returned from
+[`Completion.info`](https://codemirror.net/6/docs/ref/#autocomplete.Completion.info). May be a DOM
+node, null to indicate there is no info, or an object with an
+optional `destroy` method that cleans up the node.
+*/
+type CompletionInfo = Node | null | {
+    dom: Node;
+    destroy?(): void;
+};
+/**
 Object used to describe a completion
 [section](https://codemirror.net/6/docs/ref/#autocomplete.Completion.section). It is recommended to
 create a shared object used by all the completions in a given
@@ -4508,7 +5768,7 @@ may return its [result](https://codemirror.net/6/docs/ref/#autocomplete.Completi
 synchronously or as a promise. Returning null indicates no
 completions are available.
 */
-declare type CompletionSource = (context: CompletionContext) => CompletionResult | null | Promise<CompletionResult | null>;
+type CompletionSource = (context: CompletionContext) => CompletionResult | null | Promise<CompletionResult | null>;
 /**
 Interface for objects returned by completion sources.
 */
@@ -4549,12 +5809,15 @@ interface CompletionResult {
     filter?: boolean;
     /**
     When [`filter`](https://codemirror.net/6/docs/ref/#autocomplete.CompletionResult.filter) is set to
-    `false`, this may be provided to compute the ranges on the label
-    that match the input. Should return an array of numbers where
-    each pair of adjacent numbers provide the start and end of a
-    range.
+    `false` or a completion has a
+    [`displayLabel`](https://codemirror.net/6/docs/ref/#autocomplete.Completion.displayLabel), this
+    may be provided to compute the ranges on the label that match
+    the input. Should return an array of numbers where each pair of
+    adjacent numbers provide the start and end of a range. The
+    second argument, the match found by the library, is only passed
+    when `filter` isn't `false`.
     */
-    getMatch?: (completion: Completion) => readonly number[];
+    getMatch?: (completion: Completion, matched?: readonly number[]) => readonly number[];
     /**
     Synchronously update the completion result after typing or
     deletion. If given, this should not do any expensive work, since
@@ -4577,6 +5840,116 @@ selection range that has the same text in front of it.
 */
 declare function insertCompletionText(state: EditorState, text: string, from: number, to: number): TransactionSpec;
 
+interface CompletionConfig {
+    /**
+    When enabled (defaults to true), autocompletion will start
+    whenever the user types something that can be completed.
+    */
+    activateOnTyping?: boolean;
+    /**
+    By default, when completion opens, the first option is selected
+    and can be confirmed with
+    [`acceptCompletion`](https://codemirror.net/6/docs/ref/#autocomplete.acceptCompletion). When this
+    is set to false, the completion widget starts with no completion
+    selected, and the user has to explicitly move to a completion
+    before you can confirm one.
+    */
+    selectOnOpen?: boolean;
+    /**
+    Override the completion sources used. By default, they will be
+    taken from the `"autocomplete"` [language
+    data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) (which should hold
+    [completion sources](https://codemirror.net/6/docs/ref/#autocomplete.CompletionSource) or arrays
+    of [completions](https://codemirror.net/6/docs/ref/#autocomplete.Completion)).
+    */
+    override?: readonly CompletionSource[] | null;
+    /**
+    Determines whether the completion tooltip is closed when the
+    editor loses focus. Defaults to true.
+    */
+    closeOnBlur?: boolean;
+    /**
+    The maximum number of options to render to the DOM.
+    */
+    maxRenderedOptions?: number;
+    /**
+    Set this to false to disable the [default completion
+    keymap](https://codemirror.net/6/docs/ref/#autocomplete.completionKeymap). (This requires you to
+    add bindings to control completion yourself. The bindings should
+    probably have a higher precedence than other bindings for the
+    same keys.)
+    */
+    defaultKeymap?: boolean;
+    /**
+    By default, completions are shown below the cursor when there is
+    space. Setting this to true will make the extension put the
+    completions above the cursor when possible.
+    */
+    aboveCursor?: boolean;
+    /**
+    When given, this may return an additional CSS class to add to
+    the completion dialog element.
+    */
+    tooltipClass?: (state: EditorState) => string;
+    /**
+    This can be used to add additional CSS classes to completion
+    options.
+    */
+    optionClass?: (completion: Completion) => string;
+    /**
+    By default, the library will render icons based on the
+    completion's [type](https://codemirror.net/6/docs/ref/#autocomplete.Completion.type) in front of
+    each option. Set this to false to turn that off.
+    */
+    icons?: boolean;
+    /**
+    This option can be used to inject additional content into
+    options. The `render` function will be called for each visible
+    completion, and should produce a DOM node to show. `position`
+    determines where in the DOM the result appears, relative to
+    other added widgets and the standard content. The default icons
+    have position 20, the label position 50, and the detail position
+    80.
+    */
+    addToOptions?: {
+        render: (completion: Completion, state: EditorState) => Node | null;
+        position: number;
+    }[];
+    /**
+    By default, [info](https://codemirror.net/6/docs/ref/#autocomplete.Completion.info) tooltips are
+    placed to the side of the selected completion. This option can
+    be used to override that. It will be given rectangles for the
+    list of completions, the selected option, the info element, and
+    the availble [tooltip
+    space](https://codemirror.net/6/docs/ref/#view.tooltips^config.tooltipSpace), and should return
+    style and/or class strings for the info element.
+    */
+    positionInfo?: (view: EditorView, list: Rect, option: Rect, info: Rect, space: Rect) => {
+        style?: string;
+        class?: string;
+    };
+    /**
+    The comparison function to use when sorting completions with the same
+    match score. Defaults to using
+    [`localeCompare`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/localeCompare).
+    */
+    compareCompletions?: (a: Completion, b: Completion) => number;
+    /**
+    By default, commands relating to an open completion only take
+    effect 75 milliseconds after the completion opened, so that key
+    presses made before the user is aware of the tooltip don't go to
+    the tooltip. This option can be used to configure that delay.
+    */
+    interactionDelay?: number;
+    /**
+    When there are multiple asynchronous completion sources, this
+    controls how long the extension waits for a slow source before
+    displaying results from faster sources. Defaults to 100
+    milliseconds.
+    */
+    updateSyncTime?: number;
+}
+
 /**
 Convert a snippet template to a function that can
 [apply](https://codemirror.net/6/docs/ref/#autocomplete.Completion.apply) it. Snippets are written
@@ -4610,7 +5983,7 @@ interpreted as indicating a placeholder.
 declare function snippet(template: string): (editor: {
     state: EditorState;
     dispatch: (tr: Transaction) => void;
-}, completion: Completion, from: number, to: number) => void;
+}, completion: Completion | null, from: number, to: number) => void;
 /**
 A command that clears the active snippet, if any.
 */
@@ -4624,6 +5997,16 @@ Move to the previous snippet field, if available.
 */
 declare const prevSnippetField: StateCommand;
 /**
+Check if there is an active snippet with a next field for
+`nextSnippetField` to move to.
+*/
+declare function hasNextSnippetField(state: EditorState): boolean;
+/**
+Returns true if there is an active snippet and a previous field
+for `prevSnippetField` to move to.
+*/
+declare function hasPrevSnippetField(state: EditorState): boolean;
+/**
 A facet that can be used to configure the key bindings used by
 snippets. The default binds Tab to
 [`nextSnippetField`](https://codemirror.net/6/docs/ref/#autocomplete.nextSnippetField), Shift-Tab to
@@ -4764,6 +6147,7 @@ type index_d_CloseBracketConfig = CloseBracketConfig;
 type index_d_Completion = Completion;
 type index_d_CompletionContext = CompletionContext;
 declare const index_d_CompletionContext: typeof CompletionContext;
+type index_d_CompletionInfo = CompletionInfo;
 type index_d_CompletionResult = CompletionResult;
 type index_d_CompletionSection = CompletionSection;
 type index_d_CompletionSource = CompletionSource;
@@ -4779,6 +6163,8 @@ declare const index_d_completionKeymap: typeof completionKeymap;
 declare const index_d_completionStatus: typeof completionStatus;
 declare const index_d_currentCompletions: typeof currentCompletions;
 declare const index_d_deleteBracketPair: typeof deleteBracketPair;
+declare const index_d_hasNextSnippetField: typeof hasNextSnippetField;
+declare const index_d_hasPrevSnippetField: typeof hasPrevSnippetField;
 declare const index_d_ifIn: typeof ifIn;
 declare const index_d_ifNotIn: typeof ifNotIn;
 declare const index_d_insertBracket: typeof insertBracket;
@@ -4799,6 +6185,7 @@ declare namespace index_d {
     index_d_CloseBracketConfig as CloseBracketConfig,
     index_d_Completion as Completion,
     index_d_CompletionContext as CompletionContext,
+    index_d_CompletionInfo as CompletionInfo,
     index_d_CompletionResult as CompletionResult,
     index_d_CompletionSection as CompletionSection,
     index_d_CompletionSource as CompletionSource,
@@ -4814,6 +6201,8 @@ declare namespace index_d {
     index_d_completionStatus as completionStatus,
     index_d_currentCompletions as currentCompletions,
     index_d_deleteBracketPair as deleteBracketPair,
+    index_d_hasNextSnippetField as hasNextSnippetField,
+    index_d_hasPrevSnippetField as hasPrevSnippetField,
     index_d_ifIn as ifIn,
     index_d_ifNotIn as ifNotIn,
     index_d_insertBracket as insertBracket,
@@ -4832,7 +6221,7 @@ declare namespace index_d {
   };
 }
 
-declare type HighlightOptions = {
+type HighlightOptions = {
     /**
     Determines whether, when nothing is selected, the word around
     the cursor is matched instead. Defaults to false.
@@ -4895,7 +6284,7 @@ declare class Line {
     countIndent(to: number, from?: number, indent?: number): number;
     findColumn(goal: number): number;
 }
-declare type BlockResult = boolean | null;
+type BlockResult = boolean | null;
 declare class BlockContext implements PartialParse {
     readonly parser: MarkdownParser;
     private line;
@@ -4956,7 +6345,7 @@ interface MarkdownConfig {
     remove?: readonly string[];
     wrap?: ParseWrapper;
 }
-declare type MarkdownExtension = MarkdownConfig | readonly MarkdownExtension[];
+type MarkdownExtension = MarkdownConfig | readonly MarkdownExtension[];
 declare class MarkdownParser extends Parser {
     readonly nodeSet: NodeSet;
     createParse(input: Input, fragments: readonly TreeFragment[], ranges: readonly {
@@ -5035,6 +6424,12 @@ declare function markdown(config?: {
     [`commonmarkLanguage`](https://codemirror.net/6/docs/ref/#lang-markdown.commonmarkLanguage).
     */
     base?: Language;
+    /**
+    By default, the extension installs an autocompletion source that
+    completes HTML tags when a `<` is typed. Set this to false to
+    disable this.
+    */
+    completeHTMLTags?: boolean;
 }): LanguageSupport;
 
 /**
@@ -5058,14 +6453,14 @@ interface TagSpec {
     children?: readonly string[];
 }
 
-declare type NestedLang = {
+type NestedLang = {
     tag: string;
     attrs?: (attrs: {
         [attr: string]: string;
     }) => boolean;
     parser: Parser;
 };
-declare type NestedAttr = {
+type NestedAttr = {
     name: string;
     tagName?: string;
     parser: Parser;
@@ -5117,6 +6512,7 @@ declare function html(config?: {
     nestedAttributes?: NestedAttr[];
 }): LanguageSupport;
 
+type Severity = "hint" | "info" | "warning" | "error";
 /**
 Describes a problem or hint for a piece of code.
 */
@@ -5134,7 +6530,12 @@ interface Diagnostic {
     The severity of the problem. This will influence how it is
     displayed.
     */
-    severity: "info" | "warning" | "error";
+    severity: Severity;
+    /**
+    When given, add an extra CSS class to parts of the code that
+    this diagnostic applies to.
+    */
+    markClass?: string;
     /**
     An optional source string indicating where the diagnostic is
     coming from. You can put the name of your linter here, if
@@ -5171,7 +6572,7 @@ interface Action {
     */
     apply: (view: EditorView, from: number, to: number) => void;
 }
-declare type DiagnosticFilter = (diagnostics: readonly Diagnostic[]) => Diagnostic[];
+type DiagnosticFilter = (diagnostics: readonly Diagnostic[]) => Diagnostic[];
 interface LintConfig {
     /**
     Time to wait (in milliseconds) after a change before running
@@ -5204,7 +6605,7 @@ declare function setDiagnostics(state: EditorState, diagnostics: readonly Diagno
 /**
 The type of a function that produces diagnostics.
 */
-declare type LintSource = (view: EditorView) => readonly Diagnostic[] | Promise<readonly Diagnostic[]>;
+type LintSource = (view: EditorView) => readonly Diagnostic[] | Promise<readonly Diagnostic[]>;
 /**
 Given a diagnostic source, this function returns an extension that
 enables linting with that source. It will be called whenever the
@@ -5238,6 +6639,9 @@ Language support for CSS.
 */
 declare function css(): LanguageSupport;
 
+/**
+Configuration for an [SQL Dialect](https://codemirror.net/6/docs/ref/#lang-sql.SQLDialect).
+*/
 declare type SQLDialectSpec = {
     /**
     A space-separated list of keywords for the dialect.
@@ -5283,6 +6687,11 @@ declare type SQLDialectSpec = {
     */
     charSetCasts?: boolean;
     /**
+    Enables string quoting syntax like `q'[str]'`, as used in
+    PL/SQL.
+    */
+    plsqlQuotingMechanism?: boolean;
+    /**
     The set of characters that make up operators. Defaults to
     `"*+\-%<>!=&|~^/"`.
     */
@@ -5302,6 +6711,10 @@ declare type SQLDialectSpec = {
     to false.
     */
     unquotedBitLiterals?: boolean;
+    /**
+    Controls whether bit values can contain other characters than 0 and 1.
+    Defaults to false.
+    */
     treatBitsAsBytes?: boolean;
 };
 /**
@@ -5312,6 +6725,10 @@ declare class SQLDialect {
     The language for this dialect.
     */
     readonly language: LRLanguage;
+    /**
+    The spec used to define this dialect.
+    */
+    readonly spec: SQLDialectSpec;
     private constructor();
     /**
     Returns the language for this dialect as an extension.
@@ -5389,7 +6806,27 @@ Python language support.
 */
 declare function python(): LanguageSupport;
 
-declare type CollabConfig = {
+/**
+An update is a set of changes and effects.
+*/
+interface Update {
+    /**
+    The changes made by this update.
+    */
+    changes: ChangeSet;
+    /**
+    The effects in this update. There'll only ever be effects here
+    when you configure your collab extension with a
+    [`sharedEffects`](https://codemirror.net/6/docs/ref/#collab.collab^config.sharedEffects) option.
+    */
+    effects?: readonly StateEffect<any>[];
+    /**
+    The [ID](https://codemirror.net/6/docs/ref/#collab.collab^config.clientID) of the client who
+    created this update.
+    */
+    clientID: string;
+}
+type CollabConfig = {
     /**
     The starting document version. Defaults to 0.
     */
@@ -5413,5 +6850,32 @@ declare type CollabConfig = {
 Create an instance of the collaborative editing plugin.
 */
 declare function collab(config?: CollabConfig): Extension;
+/**
+Create a transaction that represents a set of new updates received
+from the authority. Applying this transaction moves the state
+forward to adjust to the authority's view of the document.
+*/
+declare function receiveUpdates(state: EditorState, updates: readonly Update[]): Transaction;
+/**
+Returns the set of locally made updates that still have to be sent
+to the authority. The returned objects will also have an `origin`
+property that points at the transaction that created them. This
+may be useful if you want to send along metadata like timestamps.
+(But note that the updates may have been mapped in the meantime,
+whereas the transaction is just the original transaction that
+created them.)
+*/
+declare function sendableUpdates(state: EditorState): readonly (Update & {
+    origin: Transaction;
+})[];
+/**
+Get the version up to which the collab plugin has synced with the
+central authority.
+*/
+declare function getSyncedVersion(state: EditorState): number;
+/**
+Get this editor's collaborative editing client ID.
+*/
+declare function getClientID(state: EditorState): string;
 
-export { Annotation, Compartment, Decoration, Diagnostic, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, Text, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index_d as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, completionKeymap, css, cssLanguage, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, keymap, lineNumbers, linter, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, rectangularSelection, searchKeymap, selectNextOccurrence, setDiagnostics, sql, syntaxHighlighting, syntaxTree, syntaxTreeAvailable, tags };
+export { Annotation, ChangeSet, Compartment, Decoration, Diagnostic, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, Text, Tooltip, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index_d as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, completionKeymap, css, cssLanguage, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, getClientID, getSyncedVersion, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, keymap, lineNumbers, linter, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, receiveUpdates, rectangularSelection, searchKeymap, selectNextOccurrence, sendableUpdates, setDiagnostics, showTooltip, sql, syntaxHighlighting, syntaxTree, syntaxTreeAvailable, tags, tooltips };
diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index da54f20909..8c3111405d 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -62,7 +62,7 @@ import {
     linter,
     setDiagnostics,
     //@ts-ignore
-} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@1234.0.0/dist/index.es.min.js"
+} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@1234.1.0/dist/index.es.min.js"
 
 export {
     linter,
diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 67edc5c82a..aa6c3c5366 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -620,11 +620,16 @@ function explore_try!(ex::Expr, scopestate::ScopeState)
     # Handle the try block
     union!(symstate, explore_inner_scoped(ex.args[1], scopestate))
 
-    # Finally, handle finally
-    if length(ex.args) == 4
+    # Handle finally
+    if 4 <= length(ex.args) <= 5 && ex.args[4] isa Expr
         union!(symstate, explore_inner_scoped(ex.args[4], scopestate))
     end
 
+    # Finally, handle else
+    if length(ex.args) == 5
+        union!(symstate, explore_inner_scoped(ex.args[5], scopestate))
+    end
+
     return symstate
 end
 
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index aa086d6eb4..f0e85bfb3d 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -260,13 +260,21 @@ Some of these @test_broken lines are commented out to prevent printing to the te
         @test testee(:(for k in 1:2, r in 3:4; global z = k + r; end), [], [:z], [:+, :(:)], [])
         @test testee(:(while k < 2; r = w; global z = k + r; end), [:k, :w], [:z], [:+, :(<)], [])
     end
-    @testset "`try` & `catch`" begin
+    @testset "`try` & `catch` & `else` & `finally`" begin
         @test testee(:(try a = b + 1 catch; end), [:b], [], [:+], [])
         @test testee(:(try a() catch e; e end), [], [], [:a], [])
         @test testee(:(try a() catch; e end), [:e], [], [:a], [])
         @test testee(:(try a + 1 catch a; a end), [:a], [], [:+], [])
         @test testee(:(try 1 catch e; e finally a end), [:a], [], [], [])
         @test testee(:(try 1 finally a end), [:a], [], [], [])
+
+        # try catch else was introduced in 1.8
+        @static if VERSION >= v"1.8.0"
+            @test testee(Meta.parse("try 1 catch else x = 1; x finally a; end"), [:a], [], [], [])
+            @test testee(Meta.parse("try 1 catch else x = j; x finally a; end"), [:a, :j], [], [], [])
+            @test testee(Meta.parse("try x = 2 catch else x finally a; end"), [:a, :x], [], [], [])
+            @test testee(Meta.parse("try x = 2 catch else x end"), [:x], [], [], [])
+        end
     end
     @testset "Comprehensions" begin
         @test testee(:([sqrt(s) for s in 1:n]), [:n], [], [:sqrt, :(:)], [])

From eaba2bf9ff8fa7d31a0d7b4b1aa29dfc1f149c3a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 27 Oct 2023 13:29:53 +0200
Subject: [PATCH 726/821] More security tests for the secret cookie

---
 test/Configuration.jl | 59 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 49 insertions(+), 10 deletions(-)

diff --git a/test/Configuration.jl b/test/Configuration.jl
index 3cabe2a942..eba1b6ee6d 100644
--- a/test/Configuration.jl
+++ b/test/Configuration.jl
@@ -70,11 +70,41 @@ end
 
     local_url(suffix) = "http://$host:$port/$suffix"
     withsecret(url) = occursin('?', url) ? "$url&secret=$secret" : "$url?secret=$secret"
-    @test HTTP.get(local_url("favicon.ico")).status == 200
 
-    function requeststatus(url, method)
-        r = HTTP.request(method, url, nothing, method == "POST" ? read(basic_nb_path) : UInt8[]; status_exception=false, redirect=false)
-        r.status
+    function request(url, method)
+        HTTP.request(method, url, nothing, method == "POST" ? read(basic_nb_path) : UInt8[]; status_exception=false, redirect=false)
+    end
+    
+    function shares_secret(response)
+        any(occursin(secret, y) for (x,y) in response.headers)
+    end
+    
+    public_routes = [
+        ("favicon.ico", "GET"),
+        ("possible_binder_token_please", "GET"),
+        ("index.css", "GET"),
+        ("index.js", "GET"),
+        ("img/favicon-32x32.png", "GET"),
+    ]
+    
+    broken_routes = [
+        ("../tsconfig.json", "GET"),
+        ("/img/", "GET"),
+        ("open.png?url=$(URIs.escapeuri("https://raw.githubusercontent.com/fonsp/Pluto.jl/v0.14.5/sample/Basic.jl"))", "GET"),
+    ]
+    
+    for (suffix, method) in public_routes
+        url = local_url(suffix)
+        r = request(url, method)
+        @test r.status == 200
+        @test !shares_secret(r)
+    end
+    
+    for (suffix, method) in broken_routes
+        url = local_url(suffix)
+        r = request(url, method)
+        @test r.status ∈ 400:499
+        @test !shares_secret(r)
     end
     
 
@@ -83,6 +113,7 @@ end
     simple_routes = [
         ("", "GET"),
         ("edit?id=$(nb.notebook_id)", "GET"),
+        ("editor.html", "GET"),
         ("notebookfile?id=$(nb.notebook_id)", "GET"),
         ("notebookexport?id=$(nb.notebook_id)", "GET"),
         ("statefile?id=$(nb.notebook_id)", "GET"),
@@ -109,24 +140,32 @@ end
         ("notebookupload?execution_allowed=asdf", "POST"),
     ]
 
-    for (suffix, method) in simple_routes ∪ effect_routes
+    @testset "simple w/o auth $suffix $method" for (suffix, method) in simple_routes ∪ effect_routes
         url = local_url(suffix)
-        @test requeststatus(url, method) == 403
+        r = request(url, method)
+        @test r.status == 403
+        @test !shares_secret(r)
     end
 
     # no notebooks were opened
     @test length(🍭.notebooks) == 1
+    
+    @test shares_secret(request(local_url(""), "GET"))
 
-    for (suffix, method) in simple_routes
+    @testset "simple w/ auth $suffix $method" for (suffix, method) in simple_routes
         url = local_url(suffix) |> withsecret
-        @test requeststatus(url, method)  ∈ 200:299
+        r = request(url, method)
+        @test r.status  ∈ 200:299
+        @test shares_secret(r)
     end
 
-    for (suffix, method) in effect_routes
+    @testset "effect w/ auth $suffix $method" for (suffix, method) in effect_routes
         old_ids = collect(keys(🍭.notebooks))
         
         url = local_url(suffix) |> withsecret
-        @test requeststatus(url, method) ∈ 200:399 # 3xx are redirects
+        r = request(url, method)
+        @test r.status ∈ 200:399 # 3xx are redirects
+        @test shares_secret(r) # see reasoning in of https://github.com/fonsp/Pluto.jl/commit/20515dd46678a49ca90e042fcfa3eab1e5c8e162
         
         new_ids = collect(keys(🍭.notebooks))
         nb = 🍭.notebooks[only(setdiff(new_ids, old_ids))]

From f1884958965d938068d136f9eaddd77a1613cd54 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 27 Oct 2023 13:30:35 +0200
Subject: [PATCH 727/821] Downloads.download deprecated

---
 Project.toml              | 1 +
 src/webserver/data_url.jl | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 4ea06c228f..9d3783bba5 100644
--- a/Project.toml
+++ b/Project.toml
@@ -8,6 +8,7 @@ version = "0.19.30"
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 Configurations = "5218b696-f38b-4ac9-8b61-a12ec717816d"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
+Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 FileWatching = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
 FuzzyCompletions = "fb4132e2-a121-4a70-b8a1-d5b831dcdcc2"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
diff --git a/src/webserver/data_url.jl b/src/webserver/data_url.jl
index 04be62a041..0d77f89bd4 100644
--- a/src/webserver/data_url.jl
+++ b/src/webserver/data_url.jl
@@ -51,6 +51,7 @@ random_data = rand(UInt8, 30)
 begin
 	import HTTP.URIs
 	import Base64
+	import Downloads
 end
 
 # ╔═╡ a85c0c0b-47d0-4377-bc22-3c87239a67b3
@@ -86,7 +87,7 @@ function download_cool(url::AbstractString, path::AbstractString=tempname())
 		write(path, data)
 		path
 	else
-		download(url, path)
+		Downloads.download(url, path)
 	end
 end
 

From 3e46cc107414044b952d1a21e3a2b10c889a1633 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 27 Oct 2023 13:30:53 +0200
Subject: [PATCH 728/821] featured URL tweak

---
 frontend/components/welcome/FeaturedCard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/welcome/FeaturedCard.js b/frontend/components/welcome/FeaturedCard.js
index 98424a5626..b0d05c9192 100644
--- a/frontend/components/welcome/FeaturedCard.js
+++ b/frontend/components/welcome/FeaturedCard.js
@@ -32,7 +32,7 @@ export const FeaturedCard = ({ entry, source_url, direct_html_links }) => {
     // `direct_html_links` means that we will navigate you directly to the exported HTML file. Otherwise, we use our local editor, with the exported state as parameters. This lets users run the featured notebooks locally.
     const href = direct_html_links
         ? u(entry.html_path)
-        : with_query_params(`editor.html`, {
+        : with_query_params(`edit`, {
               statefile: u(entry.statefile_path),
               notebookfile: u(entry.notebookfile_path),
               notebookfile_integrity: `sha256-${base64url_to_base64(entry.hash)}`,

From 292c8817897449c7feeef269ed46f6d600cabceb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 27 Oct 2023 16:14:18 +0200
Subject: [PATCH 729/821] More security tests

---
 test/Configuration.jl | 56 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 49 insertions(+), 7 deletions(-)

diff --git a/test/Configuration.jl b/test/Configuration.jl
index eba1b6ee6d..37630b3847 100644
--- a/test/Configuration.jl
+++ b/test/Configuration.jl
@@ -71,8 +71,8 @@ end
     local_url(suffix) = "http://$host:$port/$suffix"
     withsecret(url) = occursin('?', url) ? "$url&secret=$secret" : "$url?secret=$secret"
 
-    function request(url, method)
-        HTTP.request(method, url, nothing, method == "POST" ? read(basic_nb_path) : UInt8[]; status_exception=false, redirect=false)
+    function request(url, method; kwargs...)
+        HTTP.request(method, url, nothing, method == "POST" ? read(basic_nb_path) : UInt8[]; status_exception=false, redirect=false, cookies=false, kwargs...)
     end
     
     function shares_secret(response)
@@ -140,7 +140,7 @@ end
         ("notebookupload?execution_allowed=asdf", "POST"),
     ]
 
-    @testset "simple w/o auth $suffix $method" for (suffix, method) in simple_routes ∪ effect_routes
+    @testset "simple & effect w/o auth $suffix $method" for (suffix, method) in simple_routes ∪ effect_routes
         url = local_url(suffix)
         r = request(url, method)
         @test r.status == 403
@@ -150,12 +150,54 @@ end
     # no notebooks were opened
     @test length(🍭.notebooks) == 1
     
-    @test shares_secret(request(local_url(""), "GET"))
+    @testset "require secret only for open links" begin
+        @test !shares_secret(request(local_url(""), "GET"))
+        jar = HTTP.Cookies.CookieJar()
+        
+        # Let's test the config
+        # require_secret_for_access = false
+        # require_secret_for_open_links = true
+        🍭.options.security.require_secret_for_access = false
+        
+        # Effectful paths should not work without a secret.
+        @testset "simple & effect w/o auth 1 $suffix $method" for (suffix, method) in effect_routes
+            url = local_url(suffix)
+            r = request(url, method; cookies=true, jar)
+            @test r.status == 403
+            @test !shares_secret(r)
+        end
+        
+        # With this config, the / path should work and share the secret, even when requested without a secret.
+        r = request(local_url(""), "GET"; cookies=true, jar)
+        @test r.status == 200
+        @test shares_secret(r)
+        
+        # Now, the other effectful paths should work bc of the secret.
+        @testset "simple w/o auth 2 $suffix $method" for (suffix, method) in simple_routes
+            url = local_url(suffix)
+            r = request(url, method; cookies=true, jar)
+            @test r.status ∈ 200:299 # 2xx is OK
+            @test shares_secret(r)
+        end
+        
+        🍭.options.security.require_secret_for_access = true
+    end
+    
+    jar = HTTP.Cookies.CookieJar()
+    
+    @test shares_secret(request(local_url("") |> withsecret, "GET"; cookies=true, jar))
+    
 
     @testset "simple w/ auth $suffix $method" for (suffix, method) in simple_routes
-        url = local_url(suffix) |> withsecret
-        r = request(url, method)
-        @test r.status  ∈ 200:299
+        # should work because of cookie
+        url = local_url(suffix)
+        r = request(url, method; cookies=true, jar)
+        @test r.status ∈ 200:299 # 2xx is OK
+        @test shares_secret(r) # see reasoning in of https://github.com/fonsp/Pluto.jl/commit/20515dd46678a49ca90e042fcfa3eab1e5c8e162
+
+        # Without cookies, but with secret in URL
+        r = request(url |> withsecret, method)
+        @test r.status ∈ 200:299 # 2xx is OK
         @test shares_secret(r)
     end
 

From e97616f3eefc58da5e4ad4ff7e6eb7181960ad52 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 27 Oct 2023 16:19:39 +0200
Subject: [PATCH 730/821] Fix #2675

---
 src/evaluation/Run.jl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 7fb349082c..29b87ccf52 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -132,7 +132,7 @@ function run_reactive_core!(
         relay_reactivity_error!(cell, error)
     end
 
-	# Save the notebook. This is the only time that we save the notebook, so any state changes that influence the file contents (like `depends_on_disabled_cells`) should be behind this point.
+	# Save the notebook. In most cases, this is the only time that we save the notebook, so any state changes that influence the file contents (like `depends_on_disabled_cells`) should be behind this point. (More saves might happen if a macro expansion or package using happens.)
 	save && save_notebook(session, notebook)
 
     # Send intermediate updates to the clients at most 20 times / second during a reactive run. (The effective speed of a slider is still unbounded, because the last update is not throttled.)
@@ -220,7 +220,7 @@ function run_reactive_core!(
 
             # update cache and save notebook because the dependencies might have changed after expanding macros
             update_dependency_cache!(notebook)
-            save_notebook(session, notebook)
+            save && save_notebook(session, notebook)
 
             return run_reactive_core!(session, notebook, new_topology, new_new_topology, to_run; save, deletion_hook, user_requested_run, already_run = to_run[1:i])
         elseif !isempty(implicit_usings)
@@ -229,7 +229,7 @@ function run_reactive_core!(
 
             # update cache and save notebook because the dependencies might have changed after expanding macros
             update_dependency_cache!(notebook)
-            save_notebook(session, notebook)
+            save && save_notebook(session, notebook)
 
             return run_reactive_core!(session, notebook, new_topology, new_new_topology, to_run; save, deletion_hook, user_requested_run, already_run = to_run[1:i])
         end

From effe84d0e6678aebae075718a0365a08c1eb151f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 27 Oct 2023 19:46:45 +0200
Subject: [PATCH 731/821] Swap "Restart notebook" and "Share" buttons in top
 nav

---
 frontend/components/Editor.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index d5fd127593..f612b23eab 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1510,9 +1510,6 @@ patch: ${JSON.stringify(
                                       />`)
                             }
                             <div class="flex_grow_2"></div>
-                            <button class="toggle_export" title="Export..." onClick=${() => {
-                                this.setState({ export_menu_open: !export_menu_open })
-                            }}><span></span></button>
                             <div id="process_status">${
                                 status.binder && status.loading
                                     ? "Loading binder..."
@@ -1532,6 +1529,9 @@ patch: ${JSON.stringify(
                                     ? html`${restart_button("Run notebook code", true)}`
                                     : null
                             }</div>
+                            <button class="toggle_export" title="Export..." onClick=${() => {
+                                this.setState({ export_menu_open: !export_menu_open })
+                            }}><span></span></button>
                         </nav>
                     </header>
                     

From 925f2436e4f777c84db72284164fb9f17a9048e7 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 27 Oct 2023 19:52:34 +0200
Subject: [PATCH 732/821] Use <dialog> for binder EditOrRun modal (#2681)

---
 frontend/binder.css                     |  2 --
 frontend/common/useDialog.js            | 41 +++++++++++++++++++++++
 frontend/components/EditOrRunButton.js  | 43 +++++++------------------
 frontend/components/FrontmatterInput.js | 11 ++-----
 4 files changed, 55 insertions(+), 42 deletions(-)
 create mode 100644 frontend/common/useDialog.js

diff --git a/frontend/binder.css b/frontend/binder.css
index 48fe14cbef..3cb16e35a1 100644
--- a/frontend/binder.css
+++ b/frontend/binder.css
@@ -133,13 +133,11 @@ body.wiggle_binder .edit_or_run > button {
 .binder_help_text {
     --width: min(85vw, 570px);
     position: fixed;
-    top: 5rem;
     max-height: calc(100vh - 4rem);
     overflow: auto;
     width: var(--width);
     padding: 16px;
     border-radius: 8px;
-    left: calc(50vw - var(--width) / 2);
     background-color: white;
     color: black;
     color-scheme: light;
diff --git a/frontend/common/useDialog.js b/frontend/common/useDialog.js
new file mode 100644
index 0000000000..7f52138f7a
--- /dev/null
+++ b/frontend/common/useDialog.js
@@ -0,0 +1,41 @@
+//@ts-ignore
+import dialogPolyfill from "https://cdn.jsdelivr.net/npm/dialog-polyfill@0.5.6/dist/dialog-polyfill.esm.min.js"
+
+import { useEffect, useLayoutEffect, useRef } from "../imports/Preact.js"
+
+/**
+ * @returns {[import("../imports/Preact.js").Ref<HTMLDialogElement?>, () => void, () => void, () => void]}
+ */
+export const useDialog = ({ light_dismiss = false } = {}) => {
+    const dialog_ref = useRef(/** @type {HTMLDialogElement?} */ (null))
+
+    useLayoutEffect(() => {
+        if (dialog_ref.current != null) dialogPolyfill.registerDialog(dialog_ref.current)
+    }, [dialog_ref.current])
+
+    //@ts-ignore
+    const open = () => dialog_ref.current.showModal()
+    //@ts-ignore
+    const close = () => dialog_ref.current.close()
+    //@ts-ignore
+    const toggle = () => (dialog_ref.current.open ? dialog_ref.current?.close() : dialog_ref.current?.showModal())
+
+    useEffect(() => {
+        if (light_dismiss) {
+            const handleclick = (e) => {
+                if (dialog_ref.current?.open && dialog_ref.current.contains(e.target)) {
+                    close()
+                    // Avoid activating whatever was below
+                    e.stopPropagation()
+                    e.preventDefault()
+                }
+            }
+            document.body.addEventListener("click", handleclick)
+            return () => {
+                document.body.removeEventListener("click", handleclick)
+            }
+        }
+    }, [dialog_ref.current])
+
+    return [dialog_ref, open, close, toggle]
+}
diff --git a/frontend/components/EditOrRunButton.js b/frontend/components/EditOrRunButton.js
index 77632e0ac4..c6282d4127 100644
--- a/frontend/components/EditOrRunButton.js
+++ b/frontend/components/EditOrRunButton.js
@@ -1,6 +1,9 @@
 import _ from "../imports/lodash.js"
 import { BackendLaunchPhase } from "../common/Binder.js"
-import { html, useEffect, useState, useRef } from "../imports/Preact.js"
+import { html, useEffect, useState, useRef, useLayoutEffect } from "../imports/Preact.js"
+
+import { has_ctrl_or_cmd_pressed } from "../common/KeyboardShortcuts.js"
+import { useDialog } from "../common/useDialog.js"
 
 export const RunLocalButton = ({ show, start_local }) => {
     //@ts-ignore
@@ -30,36 +33,14 @@ export const RunLocalButton = ({ show, start_local }) => {
  * }} props
  * */
 export const BinderButton = ({ offer_binder, start_binder, notebookfile, notebook }) => {
-    const [popupOpen, setPopupOpen] = useState(false)
+    const [dialog_ref, openModal, closeModal, toggleModal] = useDialog({ light_dismiss: true })
+
     const [showCopyPopup, setShowCopyPopup] = useState(false)
     const notebookfile_ref = useRef("")
     notebookfile_ref.current = notebookfile ?? ""
 
     //@ts-ignore
-    window.open_edit_or_run_popup = () => {
-        setPopupOpen(true)
-    }
-
-    useEffect(() => {
-        const handlekeyup = (e) => {
-            e.key === "Escape" && setPopupOpen(false)
-        }
-        const handleclick = (e) => {
-            if (popupOpen && !e.target?.closest(".binder_help_text")) {
-                setPopupOpen(false)
-                // Avoid activating whatever was below
-                e.stopPropagation()
-                e.preventDefault()
-            }
-        }
-        document.body.addEventListener("keyup", handlekeyup)
-        document.body.addEventListener("click", handleclick)
-
-        return () => {
-            document.body.removeEventListener("keyup", handlekeyup)
-            document.body.removeEventListener("click", handleclick)
-        }
-    }, [popupOpen])
+    window.open_edit_or_run_popup = openModal
 
     useEffect(() => {
         //@ts-ignore
@@ -73,19 +54,19 @@ export const BinderButton = ({ offer_binder, start_binder, notebookfile, noteboo
 
     const recommend_download = notebookfile_ref.current.startsWith("data:")
     const runtime_str = expected_runtime_str(notebook)
+
     return html`<div class="edit_or_run">
         <button
             onClick=${(e) => {
+                toggleModal()
                 e.stopPropagation()
                 e.preventDefault()
-                setPopupOpen(!popupOpen)
             }}
         >
             <b>Edit</b> or <b>run</b> this notebook
         </button>
-        ${popupOpen &&
-        html`<div class="binder_help_text">
-            <span onClick=${() => setPopupOpen(false)} class="close"></span>
+        <dialog ref=${dialog_ref} class="binder_help_text">
+            <span onClick=${closeModal} class="close"></span>
             ${offer_binder
                 ? html`
                       <p style="text-align: center;">
@@ -162,7 +143,7 @@ export const BinderButton = ({ offer_binder, start_binder, notebookfile, noteboo
                           `}
                 </li>
             </ol>
-        </div>`}
+        </dialog>
     </div>`
 }
 
diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index a60f4b5b6a..69fe2cc3b1 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -7,6 +7,7 @@ import "https://cdn.jsdelivr.net/gh/fonsp/rebel-tag-input@1.0.6/lib/rebel-tag-in
 //@ts-ignore
 import dialogPolyfill from "https://cdn.jsdelivr.net/npm/dialog-polyfill@0.5.6/dist/dialog-polyfill.esm.min.js"
 import immer from "../imports/immer.js"
+import { useDialog } from "../common/useDialog.js"
 
 /**
  * @param {{
@@ -32,15 +33,7 @@ export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter })
             })
         )
 
-    const dialog_ref = useRef(/** @type {HTMLDialogElement?} */ (null))
-    useLayoutEffect(() => {
-        dialogPolyfill.registerDialog(dialog_ref.current)
-    })
-
-    //@ts-ignore
-    const open = () => dialog_ref.current.showModal()
-    //@ts-ignore
-    const close = () => dialog_ref.current.close()
+    const [dialog_ref, open, close, _toggle] = useDialog({ light_dismiss: false })
 
     const cancel = () => {
         set_frontmatter(remote_frontmatter ?? {})

From 1e981cb6ee943d7afcd44b66371fb0b5cae00827 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 10:47:29 +0100
Subject: [PATCH 733/821] Bump browserify-sign from 4.2.1 to 4.2.2 in
 /frontend-bundler (#2682)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend-bundler/package-lock.json | 195 +++++++----------------------
 1 file changed, 48 insertions(+), 147 deletions(-)

diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index a9b30f6cff..b03f0b9d44 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -2137,23 +2137,10 @@
                 "readable-stream": "^3.4.0"
             }
         },
-        "node_modules/bl/node_modules/readable-stream": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-            "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/bn.js": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
-            "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw=="
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+            "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
         },
         "node_modules/boolbase": {
             "version": "1.0.0",
@@ -2234,32 +2221,22 @@
             }
         },
         "node_modules/browserify-sign": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-            "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+            "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
             "dependencies": {
-                "bn.js": "^5.1.1",
-                "browserify-rsa": "^4.0.1",
+                "bn.js": "^5.2.1",
+                "browserify-rsa": "^4.1.0",
                 "create-hash": "^1.2.0",
                 "create-hmac": "^1.1.7",
-                "elliptic": "^6.5.3",
+                "elliptic": "^6.5.4",
                 "inherits": "^2.0.4",
-                "parse-asn1": "^5.1.5",
-                "readable-stream": "^3.6.0",
-                "safe-buffer": "^5.2.0"
-            }
-        },
-        "node_modules/browserify-sign/node_modules/readable-stream": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-            "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
+                "parse-asn1": "^5.1.6",
+                "readable-stream": "^3.6.2",
+                "safe-buffer": "^5.2.1"
             },
             "engines": {
-                "node": ">= 6"
+                "node": ">= 4"
             }
         },
         "node_modules/browserify-zlib": {
@@ -3649,19 +3626,6 @@
                 "node": ">=4"
             }
         },
-        "node_modules/hash-base/node_modules/readable-stream": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-            "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/hash.js": {
             "version": "1.1.7",
             "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
@@ -5953,6 +5917,19 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/readable-stream": {
+            "version": "3.6.2",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+            "dependencies": {
+                "inherits": "^2.0.3",
+                "string_decoder": "^1.1.1",
+                "util-deprecate": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
         "node_modules/regenerator-runtime": {
             "version": "0.13.9",
             "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
@@ -6323,19 +6300,6 @@
                 "readable-stream": "^3.5.0"
             }
         },
-        "node_modules/stream-browserify/node_modules/readable-stream": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-            "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/stream-http": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz",
@@ -6347,19 +6311,6 @@
                 "xtend": "^4.0.2"
             }
         },
-        "node_modules/stream-http/node_modules/readable-stream": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-            "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/string_decoder": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -8535,24 +8486,12 @@
                 "buffer": "^5.5.0",
                 "inherits": "^2.0.4",
                 "readable-stream": "^3.4.0"
-            },
-            "dependencies": {
-                "readable-stream": {
-                    "version": "3.6.0",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-                    "requires": {
-                        "inherits": "^2.0.3",
-                        "string_decoder": "^1.1.1",
-                        "util-deprecate": "^1.0.1"
-                    }
-                }
             }
         },
         "bn.js": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
-            "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw=="
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+            "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
         },
         "boolbase": {
             "version": "1.0.0",
@@ -8630,31 +8569,19 @@
             }
         },
         "browserify-sign": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-            "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+            "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
             "requires": {
-                "bn.js": "^5.1.1",
-                "browserify-rsa": "^4.0.1",
+                "bn.js": "^5.2.1",
+                "browserify-rsa": "^4.1.0",
                 "create-hash": "^1.2.0",
                 "create-hmac": "^1.1.7",
-                "elliptic": "^6.5.3",
+                "elliptic": "^6.5.4",
                 "inherits": "^2.0.4",
-                "parse-asn1": "^5.1.5",
-                "readable-stream": "^3.6.0",
-                "safe-buffer": "^5.2.0"
-            },
-            "dependencies": {
-                "readable-stream": {
-                    "version": "3.6.0",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-                    "requires": {
-                        "inherits": "^2.0.3",
-                        "string_decoder": "^1.1.1",
-                        "util-deprecate": "^1.0.1"
-                    }
-                }
+                "parse-asn1": "^5.1.6",
+                "readable-stream": "^3.6.2",
+                "safe-buffer": "^5.2.1"
             }
         },
         "browserify-zlib": {
@@ -9707,18 +9634,6 @@
                 "inherits": "^2.0.4",
                 "readable-stream": "^3.6.0",
                 "safe-buffer": "^5.2.0"
-            },
-            "dependencies": {
-                "readable-stream": {
-                    "version": "3.6.0",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-                    "requires": {
-                        "inherits": "^2.0.3",
-                        "string_decoder": "^1.1.1",
-                        "util-deprecate": "^1.0.1"
-                    }
-                }
             }
         },
         "hash.js": {
@@ -11333,6 +11248,16 @@
             "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.9.0.tgz",
             "integrity": "sha512-Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ=="
         },
+        "readable-stream": {
+            "version": "3.6.2",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+            "requires": {
+                "inherits": "^2.0.3",
+                "string_decoder": "^1.1.1",
+                "util-deprecate": "^1.0.1"
+            }
+        },
         "regenerator-runtime": {
             "version": "0.13.9",
             "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
@@ -11594,18 +11519,6 @@
             "requires": {
                 "inherits": "~2.0.4",
                 "readable-stream": "^3.5.0"
-            },
-            "dependencies": {
-                "readable-stream": {
-                    "version": "3.6.0",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-                    "requires": {
-                        "inherits": "^2.0.3",
-                        "string_decoder": "^1.1.1",
-                        "util-deprecate": "^1.0.1"
-                    }
-                }
             }
         },
         "stream-http": {
@@ -11617,18 +11530,6 @@
                 "inherits": "^2.0.4",
                 "readable-stream": "^3.6.0",
                 "xtend": "^4.0.2"
-            },
-            "dependencies": {
-                "readable-stream": {
-                    "version": "3.6.0",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-                    "requires": {
-                        "inherits": "^2.0.3",
-                        "string_decoder": "^1.1.1",
-                        "util-deprecate": "^1.0.1"
-                    }
-                }
             }
         },
         "string_decoder": {

From a07774c93032bf29c33a6ce7fbc54a2511b0a3dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 10:47:49 +0100
Subject: [PATCH 734/821] Bump @babel/traverse from 7.15.4 to 7.23.2 in
 /frontend-bundler (#2664)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend-bundler/package-lock.json | 301 +++++++++++++++--------------
 1 file changed, 157 insertions(+), 144 deletions(-)

diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index b03f0b9d44..ae21d126ec 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -28,11 +28,12 @@
             }
         },
         "node_modules/@babel/code-frame": {
-            "version": "7.15.8",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
-            "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
+            "version": "7.22.13",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+            "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
             "dependencies": {
-                "@babel/highlight": "^7.14.5"
+                "@babel/highlight": "^7.22.13",
+                "chalk": "^2.4.2"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -84,13 +85,14 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.15.8",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
-            "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+            "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
             "dependencies": {
-                "@babel/types": "^7.15.6",
-                "jsesc": "^2.5.1",
-                "source-map": "^0.5.0"
+                "@babel/types": "^7.23.0",
+                "@jridgewell/gen-mapping": "^0.3.2",
+                "@jridgewell/trace-mapping": "^0.3.17",
+                "jsesc": "^2.5.1"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -121,36 +123,32 @@
                 "semver": "bin/semver.js"
             }
         },
-        "node_modules/@babel/helper-function-name": {
-            "version": "7.15.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
-            "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
-            "dependencies": {
-                "@babel/helper-get-function-arity": "^7.15.4",
-                "@babel/template": "^7.15.4",
-                "@babel/types": "^7.15.4"
-            },
+        "node_modules/@babel/helper-environment-visitor": {
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+            "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
-        "node_modules/@babel/helper-get-function-arity": {
-            "version": "7.15.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
-            "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
+        "node_modules/@babel/helper-function-name": {
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+            "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
             "dependencies": {
-                "@babel/types": "^7.15.4"
+                "@babel/template": "^7.22.15",
+                "@babel/types": "^7.23.0"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-hoist-variables": {
-            "version": "7.15.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
-            "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+            "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
             "dependencies": {
-                "@babel/types": "^7.15.4"
+                "@babel/types": "^7.22.5"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -241,20 +239,28 @@
             }
         },
         "node_modules/@babel/helper-split-export-declaration": {
-            "version": "7.15.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
-            "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
+            "version": "7.22.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+            "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
             "dependencies": {
-                "@babel/types": "^7.15.4"
+                "@babel/types": "^7.22.5"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
+        "node_modules/@babel/helper-string-parser": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+            "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
         "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.15.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-            "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+            "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
             "engines": {
                 "node": ">=6.9.0"
             }
@@ -281,12 +287,12 @@
             }
         },
         "node_modules/@babel/highlight": {
-            "version": "7.14.5",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-            "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+            "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.14.5",
-                "chalk": "^2.0.0",
+                "@babel/helper-validator-identifier": "^7.22.20",
+                "chalk": "^2.4.2",
                 "js-tokens": "^4.0.0"
             },
             "engines": {
@@ -294,9 +300,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.15.8",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
-            "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+            "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
             "bin": {
                 "parser": "bin/babel-parser.js"
             },
@@ -334,30 +340,31 @@
             }
         },
         "node_modules/@babel/template": {
-            "version": "7.15.4",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
-            "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+            "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
             "dependencies": {
-                "@babel/code-frame": "^7.14.5",
-                "@babel/parser": "^7.15.4",
-                "@babel/types": "^7.15.4"
+                "@babel/code-frame": "^7.22.13",
+                "@babel/parser": "^7.22.15",
+                "@babel/types": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.15.4",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
-            "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
-            "dependencies": {
-                "@babel/code-frame": "^7.14.5",
-                "@babel/generator": "^7.15.4",
-                "@babel/helper-function-name": "^7.15.4",
-                "@babel/helper-hoist-variables": "^7.15.4",
-                "@babel/helper-split-export-declaration": "^7.15.4",
-                "@babel/parser": "^7.15.4",
-                "@babel/types": "^7.15.4",
+            "version": "7.23.2",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+            "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+            "dependencies": {
+                "@babel/code-frame": "^7.22.13",
+                "@babel/generator": "^7.23.0",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/helper-hoist-variables": "^7.22.5",
+                "@babel/helper-split-export-declaration": "^7.22.6",
+                "@babel/parser": "^7.23.0",
+                "@babel/types": "^7.23.0",
                 "debug": "^4.1.0",
                 "globals": "^11.1.0"
             },
@@ -374,11 +381,12 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.15.6",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz",
-            "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+            "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.14.9",
+                "@babel/helper-string-parser": "^7.22.5",
+                "@babel/helper-validator-identifier": "^7.22.20",
                 "to-fast-properties": "^2.0.0"
             },
             "engines": {
@@ -429,12 +437,12 @@
             "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
         },
         "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.14",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
-            "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
+            "version": "0.3.19",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+            "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
             "dependencies": {
-                "@jridgewell/resolve-uri": "^3.0.3",
-                "@jridgewell/sourcemap-codec": "^1.4.10"
+                "@jridgewell/resolve-uri": "^3.1.0",
+                "@jridgewell/sourcemap-codec": "^1.4.14"
             }
         },
         "node_modules/@lezer/common": {
@@ -2431,7 +2439,7 @@
         "node_modules/color-name": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
         },
         "node_modules/colord": {
             "version": "2.8.0",
@@ -3150,7 +3158,7 @@
         "node_modules/escape-string-regexp": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
             "engines": {
                 "node": ">=0.8.0"
             }
@@ -3583,7 +3591,7 @@
         "node_modules/has-flag": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
             "engines": {
                 "node": ">=4"
             }
@@ -7051,11 +7059,12 @@
     },
     "dependencies": {
         "@babel/code-frame": {
-            "version": "7.15.8",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
-            "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
+            "version": "7.22.13",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+            "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
             "requires": {
-                "@babel/highlight": "^7.14.5"
+                "@babel/highlight": "^7.22.13",
+                "chalk": "^2.4.2"
             }
         },
         "@babel/compat-data": {
@@ -7093,13 +7102,14 @@
             }
         },
         "@babel/generator": {
-            "version": "7.15.8",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
-            "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+            "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
             "requires": {
-                "@babel/types": "^7.15.6",
-                "jsesc": "^2.5.1",
-                "source-map": "^0.5.0"
+                "@babel/types": "^7.23.0",
+                "@jridgewell/gen-mapping": "^0.3.2",
+                "@jridgewell/trace-mapping": "^0.3.17",
+                "jsesc": "^2.5.1"
             }
         },
         "@babel/helper-compilation-targets": {
@@ -7120,30 +7130,26 @@
                 }
             }
         },
-        "@babel/helper-function-name": {
-            "version": "7.15.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
-            "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
-            "requires": {
-                "@babel/helper-get-function-arity": "^7.15.4",
-                "@babel/template": "^7.15.4",
-                "@babel/types": "^7.15.4"
-            }
+        "@babel/helper-environment-visitor": {
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+            "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
         },
-        "@babel/helper-get-function-arity": {
-            "version": "7.15.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
-            "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
+        "@babel/helper-function-name": {
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+            "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
             "requires": {
-                "@babel/types": "^7.15.4"
+                "@babel/template": "^7.22.15",
+                "@babel/types": "^7.23.0"
             }
         },
         "@babel/helper-hoist-variables": {
-            "version": "7.15.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
-            "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+            "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
             "requires": {
-                "@babel/types": "^7.15.4"
+                "@babel/types": "^7.22.5"
             }
         },
         "@babel/helper-member-expression-to-functions": {
@@ -7210,17 +7216,22 @@
             }
         },
         "@babel/helper-split-export-declaration": {
-            "version": "7.15.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
-            "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
+            "version": "7.22.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+            "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
             "requires": {
-                "@babel/types": "^7.15.4"
+                "@babel/types": "^7.22.5"
             }
         },
+        "@babel/helper-string-parser": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+            "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
+        },
         "@babel/helper-validator-identifier": {
-            "version": "7.15.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-            "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+            "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
         },
         "@babel/helper-validator-option": {
             "version": "7.14.5",
@@ -7238,19 +7249,19 @@
             }
         },
         "@babel/highlight": {
-            "version": "7.14.5",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-            "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+            "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
             "requires": {
-                "@babel/helper-validator-identifier": "^7.14.5",
-                "chalk": "^2.0.0",
+                "@babel/helper-validator-identifier": "^7.22.20",
+                "chalk": "^2.4.2",
                 "js-tokens": "^4.0.0"
             }
         },
         "@babel/parser": {
-            "version": "7.15.8",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
-            "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA=="
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+            "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
         },
         "@babel/plugin-syntax-flow": {
             "version": "7.14.5",
@@ -7270,27 +7281,28 @@
             }
         },
         "@babel/template": {
-            "version": "7.15.4",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
-            "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+            "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
             "requires": {
-                "@babel/code-frame": "^7.14.5",
-                "@babel/parser": "^7.15.4",
-                "@babel/types": "^7.15.4"
+                "@babel/code-frame": "^7.22.13",
+                "@babel/parser": "^7.22.15",
+                "@babel/types": "^7.22.15"
             }
         },
         "@babel/traverse": {
-            "version": "7.15.4",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
-            "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
-            "requires": {
-                "@babel/code-frame": "^7.14.5",
-                "@babel/generator": "^7.15.4",
-                "@babel/helper-function-name": "^7.15.4",
-                "@babel/helper-hoist-variables": "^7.15.4",
-                "@babel/helper-split-export-declaration": "^7.15.4",
-                "@babel/parser": "^7.15.4",
-                "@babel/types": "^7.15.4",
+            "version": "7.23.2",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+            "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+            "requires": {
+                "@babel/code-frame": "^7.22.13",
+                "@babel/generator": "^7.23.0",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/helper-hoist-variables": "^7.22.5",
+                "@babel/helper-split-export-declaration": "^7.22.6",
+                "@babel/parser": "^7.23.0",
+                "@babel/types": "^7.23.0",
                 "debug": "^4.1.0",
                 "globals": "^11.1.0"
             },
@@ -7303,11 +7315,12 @@
             }
         },
         "@babel/types": {
-            "version": "7.15.6",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz",
-            "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+            "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
             "requires": {
-                "@babel/helper-validator-identifier": "^7.14.9",
+                "@babel/helper-string-parser": "^7.22.5",
+                "@babel/helper-validator-identifier": "^7.22.20",
                 "to-fast-properties": "^2.0.0"
             }
         },
@@ -7346,12 +7359,12 @@
             "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
         },
         "@jridgewell/trace-mapping": {
-            "version": "0.3.14",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
-            "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
+            "version": "0.3.19",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+            "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
             "requires": {
-                "@jridgewell/resolve-uri": "^3.0.3",
-                "@jridgewell/sourcemap-codec": "^1.4.10"
+                "@jridgewell/resolve-uri": "^3.1.0",
+                "@jridgewell/sourcemap-codec": "^1.4.14"
             }
         },
         "@lezer/common": {
@@ -8721,7 +8734,7 @@
         "color-name": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
         },
         "colord": {
             "version": "2.8.0",
@@ -9290,7 +9303,7 @@
         "escape-string-regexp": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
         },
         "escodegen": {
             "version": "1.14.3",
@@ -9611,7 +9624,7 @@
         "has-flag": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
         "has-symbols": {
             "version": "1.0.2",

From ebc3631b347f19fd66354af55308ea2220f8eb1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 11:02:08 +0100
Subject: [PATCH 735/821] Bump @babel/traverse from 7.17.12 to 7.23.2 in
 /test/frontend (#2665)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 test/frontend/package-lock.json | 337 +++++++++++++++++---------------
 1 file changed, 176 insertions(+), 161 deletions(-)

diff --git a/test/frontend/package-lock.json b/test/frontend/package-lock.json
index 9f056296f2..2e2862d5a8 100644
--- a/test/frontend/package-lock.json
+++ b/test/frontend/package-lock.json
@@ -35,12 +35,13 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.16.7"
+        "@babel/highlight": "^7.22.13",
+        "chalk": "^2.4.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -86,13 +87,14 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.12.tgz",
-      "integrity": "sha512-V49KtZiiiLjH/CnIW6OjJdrenrGoyh6AmKQ3k2AZFKozC1h846Q4NYlZ5nqAigPDUXfGzC88+LOUuG8yKd2kCw==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.17.12",
-        "@jridgewell/gen-mapping": "^0.3.0",
+        "@babel/types": "^7.23.0",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
       },
       "engines": {
@@ -100,12 +102,12 @@
       }
     },
     "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
-      "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/set-array": "^1.0.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
         "@jridgewell/trace-mapping": "^0.3.9"
       },
@@ -213,13 +215,10 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
       "engines": {
         "node": ">=6.9.0"
       }
@@ -237,25 +236,25 @@
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -380,21 +379,30 @@
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -439,13 +447,13 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
-      "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
       "engines": {
@@ -453,9 +461,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.12.tgz",
-      "integrity": "sha512-FLzHmN9V3AJIrWfOpvRlZCeVg/WLdicSnTMsLur6uDj9TT8ymUlG9XxURdW/XvuygK+2CW0poOJABdA4m/YKxA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1569,33 +1577,33 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.12.tgz",
-      "integrity": "sha512-zULPs+TbCvOkIFd4FrG53xrpxvCBwLIgo6tO0tJorY7YV2IWFxUfS/lXDJbGgfyYt9ery/Gxj2niwttNnB0gIw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.12",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.12",
-        "@babel/types": "^7.17.12",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1604,12 +1612,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.12.tgz",
-      "integrity": "sha512-rH8i29wcZ6x9xjzI5ILHL/yZkbQnCERdHlogKuIb4PUr7do4iT8DPekrTbBLWTnRQm6U0GYABbTMSzijmEqlAg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -2269,9 +2278,9 @@
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
-      "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
       "dev": true,
       "engines": {
         "node": ">=6.0.0"
@@ -2287,19 +2296,19 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
-      "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==",
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz",
-      "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==",
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "node_modules/@sinonjs/commons": {
@@ -3296,7 +3305,7 @@
     "node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true
     },
     "node_modules/combined-stream": {
@@ -3618,7 +3627,7 @@
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
       "engines": {
         "node": ">=0.8.0"
@@ -4231,7 +4240,7 @@
     "node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -9276,12 +9285,13 @@
       }
     },
     "@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.16.7"
+        "@babel/highlight": "^7.22.13",
+        "chalk": "^2.4.2"
       }
     },
     "@babel/compat-data": {
@@ -9314,23 +9324,24 @@
       }
     },
     "@babel/generator": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.12.tgz",
-      "integrity": "sha512-V49KtZiiiLjH/CnIW6OjJdrenrGoyh6AmKQ3k2AZFKozC1h846Q4NYlZ5nqAigPDUXfGzC88+LOUuG8yKd2kCw==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.17.12",
-        "@jridgewell/gen-mapping": "^0.3.0",
+        "@babel/types": "^7.23.0",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
       },
       "dependencies": {
         "@jridgewell/gen-mapping": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
-          "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+          "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
           "dev": true,
           "requires": {
-            "@jridgewell/set-array": "^1.0.0",
+            "@jridgewell/set-array": "^1.0.1",
             "@jridgewell/sourcemap-codec": "^1.4.10",
             "@jridgewell/trace-mapping": "^0.3.9"
           }
@@ -9410,13 +9421,10 @@
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.16.7"
-      }
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+      "dev": true
     },
     "@babel/helper-explode-assignable-expression": {
       "version": "7.16.7",
@@ -9428,22 +9436,22 @@
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-member-expression-to-functions": {
@@ -9538,18 +9546,24 @@
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.22.5"
       }
     },
+    "@babel/helper-string-parser": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "dev": true
+    },
     "@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true
     },
     "@babel/helper-validator-option": {
@@ -9582,20 +9596,20 @@
       }
     },
     "@babel/highlight": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
-      "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.12.tgz",
-      "integrity": "sha512-FLzHmN9V3AJIrWfOpvRlZCeVg/WLdicSnTMsLur6uDj9TT8ymUlG9XxURdW/XvuygK+2CW0poOJABdA4m/YKxA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
       "dev": true
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
@@ -10340,41 +10354,42 @@
       }
     },
     "@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       }
     },
     "@babel/traverse": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.12.tgz",
-      "integrity": "sha512-zULPs+TbCvOkIFd4FrG53xrpxvCBwLIgo6tO0tJorY7YV2IWFxUfS/lXDJbGgfyYt9ery/Gxj2niwttNnB0gIw==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.12",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.12",
-        "@babel/types": "^7.17.12",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.12.tgz",
-      "integrity": "sha512-rH8i29wcZ6x9xjzI5ILHL/yZkbQnCERdHlogKuIb4PUr7do4iT8DPekrTbBLWTnRQm6U0GYABbTMSzijmEqlAg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -10883,9 +10898,9 @@
       }
     },
     "@jridgewell/resolve-uri": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
-      "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
       "dev": true
     },
     "@jridgewell/set-array": {
@@ -10895,19 +10910,19 @@
       "dev": true
     },
     "@jridgewell/sourcemap-codec": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
-      "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==",
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
     "@jridgewell/trace-mapping": {
-      "version": "0.3.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz",
-      "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==",
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
       "dev": true,
       "requires": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "@sinonjs/commons": {
@@ -11690,7 +11705,7 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true
     },
     "combined-stream": {
@@ -11946,7 +11961,7 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true
     },
     "escodegen": {
@@ -12415,7 +12430,7 @@
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true
     },
     "has-property-descriptors": {

From a1f17aef9c2bb4f2a53af55730796d54bed2002b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 30 Oct 2023 11:43:42 +0100
Subject: [PATCH 736/821] css tweak

---
 frontend/binder.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/binder.css b/frontend/binder.css
index 3cb16e35a1..4d6f1c6646 100644
--- a/frontend/binder.css
+++ b/frontend/binder.css
@@ -143,6 +143,7 @@ body.wiggle_binder .edit_or_run > button {
     color-scheme: light;
     box-shadow: 0px 0px 0px 100vmax #0000004a;
     font-family: var(--sans-serif-font-stack);
+    border: 0;
 }
 .binder_help_text a {
     color: black;

From c698e1c25f1f73dded841b8c87ed16bc03de12ab Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 30 Oct 2023 11:44:01 +0100
Subject: [PATCH 737/821] HTML cell output: respect integrity attribute for
 script elements loaded from src attribute

---
 frontend/components/CellOutput.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 0b65b7dcc7..aec811e078 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -331,6 +331,7 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
 
             if (script_el == undefined) {
                 script_el = document.createElement("script")
+                script_el.integrity = node.integrity
                 script_el.src = node.src
                 script_el.type = node.type === "module" ? "module" : "text/javascript"
                 // @ts-ignore

From 42c52584eb23edd01182e28123c58ba1a0e95522 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 30 Oct 2023 11:51:22 +0100
Subject: [PATCH 738/821] HTML cell output: respect all atributed of script
 element

---
 frontend/components/CellOutput.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index aec811e078..5fe2304202 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -331,9 +331,14 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
 
             if (script_el == undefined) {
                 script_el = document.createElement("script")
+                script_el.referrerPolicy = node.referrerPolicy
+                script_el.crossOrigin = node.crossOrigin
                 script_el.integrity = node.integrity
+                script_el.noModule = node.noModule
+                script_el.nonce = node.nonce
+                script_el.type = node.type
                 script_el.src = node.src
-                script_el.type = node.type === "module" ? "module" : "text/javascript"
+                // Not copying defer or async because this script is not included in the initial HTML document, so it has no effect.
                 // @ts-ignore
                 script_el.pluto_is_loading_me = true
             }

From 3b3d56c2d6ec4f96096d070e00af4227e0dbc47d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 30 Oct 2023 12:33:27 +0100
Subject: [PATCH 739/821] Show error message when statefile fails to load
 (#2686)

---
 frontend/editor.js | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/frontend/editor.js b/frontend/editor.js
index 6fb9826699..c1c201247c 100644
--- a/frontend/editor.js
+++ b/frontend/editor.js
@@ -140,15 +140,29 @@ const EditorLoader = ({ launch_params }) => {
     const [statefile_download_progress, set_statefile_download_progress] = useState(null)
 
     const initial_notebook_state_ref = useRef(empty_notebook_state(launch_params))
+    const [error_banner, set_error_banner] = useState(/** @type {import("./imports/Preact.js").ReactElement?} */ (null))
     const [ready_for_editor, set_ready_for_editor] = useState(!static_preview)
 
     useEffect(() => {
         if (!ready_for_editor && static_preview) {
-            get_statefile(launch_params, set_statefile_download_progress).then((state) => {
-                console.log({ state })
-                initial_notebook_state_ref.current = state
-                set_ready_for_editor(true)
-            })
+            get_statefile(launch_params, set_statefile_download_progress)
+                .then((state) => {
+                    console.log({ state })
+                    initial_notebook_state_ref.current = state
+                    set_ready_for_editor(true)
+                })
+                .catch((e) => {
+                    console.error(e)
+                    set_error_banner(html`
+                        <main style="font-family: system-ui, sans-serif;">
+                            <h2>Failed to load notebook</h2>
+                            <p>The statefile failed to download. Original error message:</p>
+                            <pre style="overflow: auto;"><code>${e.toString()}</code></pre>
+                            <p>Launch parameters:</p>
+                            <pre style="overflow: auto;"><code>${JSON.stringify(launch_params, null, 2)}</code></pre>
+                        </main>
+                    `)
+                })
         }
     }, [ready_for_editor, static_preview, statefile])
 
@@ -160,7 +174,9 @@ const EditorLoader = ({ launch_params }) => {
         ? html`<${RawHTMLContainer} body=${launch_params.preamble_html} className=${"preamble"} sanitize_html=${preamble_html_comes_from_url_params} />`
         : null
 
-    return ready_for_editor
+    return error_banner != null
+        ? error_banner
+        : ready_for_editor
         ? html`<${Editor} initial_notebook_state=${initial_notebook_state_ref.current} launch_params=${launch_params} preamble_element=${preamble_element} />`
         : // todo: show preamble html
           html`

From 74b497aa76b683f7caaa4d7d17dc757392750550 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 30 Oct 2023 12:35:04 +0100
Subject: [PATCH 740/821] Support slider_server_url in pluto_export.json
 (#2667)

---
 frontend/components/welcome/Featured.js     | 5 +++--
 frontend/components/welcome/FeaturedCard.js | 9 ++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/frontend/components/welcome/Featured.js b/frontend/components/welcome/Featured.js
index 08f9a4e84b..e9970001c3 100644
--- a/frontend/components/welcome/Featured.js
+++ b/frontend/components/welcome/Featured.js
@@ -35,6 +35,8 @@ import { FeaturedCard } from "./FeaturedCard.js"
  *   source_url?: String,
  *   title?: String,
  *   description?: String,
+ *   binder_url?: String,
+ *   slider_server_url?: String,
  * }}
  */
 
@@ -197,8 +199,7 @@ export const Featured = ({ sources, direct_html_links }) => {
                                       <p>${coll.description}</p>
                                       <div class="card-list">
                                           ${collection(Object.values(data.notebooks), coll.tags ?? []).map(
-                                              (entry) =>
-                                                  html`<${FeaturedCard} entry=${entry} source_url=${data.source_url} direct_html_links=${direct_html_links} />`
+                                              (entry) => html`<${FeaturedCard} entry=${entry} source_manifest=${data} direct_html_links=${direct_html_links} />`
                                           )}
                                       </div>
                                   </div>
diff --git a/frontend/components/welcome/FeaturedCard.js b/frontend/components/welcome/FeaturedCard.js
index b0d05c9192..00a33d9efd 100644
--- a/frontend/components/welcome/FeaturedCard.js
+++ b/frontend/components/welcome/FeaturedCard.js
@@ -9,14 +9,16 @@ const str_to_degree = (s) => ([...s].reduce((a, b) => a + b.charCodeAt(0), 0) *
 
 /**
  * @param {{
+ *  source_manifest: import("./Featured.js").SourceManifest,
  *  entry: import("./Featured.js").SourceManifestNotebookEntry,
- *  source_url?: string,
  *  direct_html_links: boolean,
  * }} props
  */
-export const FeaturedCard = ({ entry, source_url, direct_html_links }) => {
+export const FeaturedCard = ({ entry, source_manifest, direct_html_links }) => {
     const title = entry.frontmatter?.title
 
+    const { source_url } = source_manifest
+
     const u = (/** @type {string | null | undefined} */ x) =>
         source_url == null
             ? x
@@ -37,8 +39,9 @@ export const FeaturedCard = ({ entry, source_url, direct_html_links }) => {
               notebookfile: u(entry.notebookfile_path),
               notebookfile_integrity: `sha256-${base64url_to_base64(entry.hash)}`,
               disable_ui: `true`,
-              pluto_server_url: `.`,
               name: title == null ? null : `sample ${title}`,
+              pluto_server_url: `.`,
+              slider_server_url: u(source_manifest.slider_server_url),
           })
 
     const author = author_info(entry.frontmatter)

From 01dcdbb5af006a2a3df4bd052dc3e97ac36d41df Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 12:37:10 +0100
Subject: [PATCH 741/821] CompatHelper: add new compat entry for TOML at
 version 1, (keep existing compat) (#2684)

Co-authored-by: CompatHelper Julia <compathelper_noreply@julialang.org>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 Project.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Project.toml b/Project.toml
index 9d3783bba5..3c11321923 100644
--- a/Project.toml
+++ b/Project.toml
@@ -47,6 +47,7 @@ PrecompileTools = "1"
 RegistryInstances = "0.1"
 RelocatableFolders = "0.1, 0.2, 0.3, 1"
 Scratch = "1.1"
+TOML = "1"
 Tables = "1"
 URIs = "1.3"
 julia = "^1.6"

From d1ebeada65dc3587e955948c5b3e74a177763255 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 12:37:19 +0100
Subject: [PATCH 742/821] CompatHelper: add new compat entry for Downloads at
 version 1, (keep existing compat) (#2683)

Co-authored-by: CompatHelper Julia <compathelper_noreply@julialang.org>
Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
---
 Project.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Project.toml b/Project.toml
index 3c11321923..21e0363437 100644
--- a/Project.toml
+++ b/Project.toml
@@ -35,6 +35,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
 Configurations = "0.15, 0.16, 0.17"
+Downloads = "1"
 FuzzyCompletions = "0.3, 0.4, 0.5"
 HTTP = "^1.5.2"
 HypertextLiteral = "0.7, 0.8, 0.9"

From abba9f046de7ce9b9b1fcb76bdab49081a71d5eb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 30 Oct 2023 13:39:32 +0100
Subject: [PATCH 743/821] fix dialog bug

---
 frontend/common/useDialog.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/frontend/common/useDialog.js b/frontend/common/useDialog.js
index 7f52138f7a..176c5a99a0 100644
--- a/frontend/common/useDialog.js
+++ b/frontend/common/useDialog.js
@@ -13,12 +13,9 @@ export const useDialog = ({ light_dismiss = false } = {}) => {
         if (dialog_ref.current != null) dialogPolyfill.registerDialog(dialog_ref.current)
     }, [dialog_ref.current])
 
-    //@ts-ignore
-    const open = () => dialog_ref.current.showModal()
-    //@ts-ignore
-    const close = () => dialog_ref.current.close()
-    //@ts-ignore
-    const toggle = () => (dialog_ref.current.open ? dialog_ref.current?.close() : dialog_ref.current?.showModal())
+    const open = () => dialog_ref.current?.showModal()
+    const close = () => dialog_ref.current?.close()
+    const toggle = () => (dialog_ref.current?.open === true ? dialog_ref.current?.close() : dialog_ref.current?.showModal())
 
     useEffect(() => {
         if (light_dismiss) {

From 52e471d37b5281ac3fbac1e59d8537b75f190de6 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 30 Oct 2023 13:55:27 +0100
Subject: [PATCH 744/821] =?UTF-8?q?=F0=9F=93=B0=20Preview=20in=20frontmatt?=
 =?UTF-8?q?er=20editor=20(#2688)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/common/useDialog.js                |   9 +-
 frontend/components/Editor.js               |   3 +-
 frontend/components/FrontmatterInput.js     |  21 ++-
 frontend/components/welcome/FeaturedCard.js |  19 ++-
 frontend/editor.css                         |  15 +++
 frontend/featured-card.css                  | 142 ++++++++++++++++++++
 frontend/index.css                          | 123 +----------------
 frontend/welcome.css                        |  22 ---
 8 files changed, 195 insertions(+), 159 deletions(-)
 create mode 100644 frontend/featured-card.css

diff --git a/frontend/common/useDialog.js b/frontend/common/useDialog.js
index 7f52138f7a..176c5a99a0 100644
--- a/frontend/common/useDialog.js
+++ b/frontend/common/useDialog.js
@@ -13,12 +13,9 @@ export const useDialog = ({ light_dismiss = false } = {}) => {
         if (dialog_ref.current != null) dialogPolyfill.registerDialog(dialog_ref.current)
     }, [dialog_ref.current])
 
-    //@ts-ignore
-    const open = () => dialog_ref.current.showModal()
-    //@ts-ignore
-    const close = () => dialog_ref.current.close()
-    //@ts-ignore
-    const toggle = () => (dialog_ref.current.open ? dialog_ref.current?.close() : dialog_ref.current?.showModal())
+    const open = () => dialog_ref.current?.showModal()
+    const close = () => dialog_ref.current?.close()
+    const toggle = () => (dialog_ref.current?.open === true ? dialog_ref.current?.close() : dialog_ref.current?.showModal())
 
     useEffect(() => {
         if (light_dismiss) {
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index f612b23eab..0260e3acc6 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1562,7 +1562,8 @@ patch: ${JSON.stringify(
                             )}
                     />
                     <${EditorLaunchBackendButton} editor=${this} launch_params=${launch_params} status=${status} />
-                    <${FrontMatterInput} 
+                    <${FrontMatterInput}
+                        filename=${notebook.shortpath}
                         remote_frontmatter=${notebook.metadata?.frontmatter} 
                         set_remote_frontmatter=${(newval) =>
                             this.actions.update_notebook((nb) => {
diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index 69fe2cc3b1..194e9dae83 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -8,14 +8,16 @@ import "https://cdn.jsdelivr.net/gh/fonsp/rebel-tag-input@1.0.6/lib/rebel-tag-in
 import dialogPolyfill from "https://cdn.jsdelivr.net/npm/dialog-polyfill@0.5.6/dist/dialog-polyfill.esm.min.js"
 import immer from "../imports/immer.js"
 import { useDialog } from "../common/useDialog.js"
+import { FeaturedCard } from "./welcome/FeaturedCard.js"
 
 /**
  * @param {{
+ *  filename: String,
  *  remote_frontmatter: Record<String,any>?,
  *  set_remote_frontmatter: (newval: Record<String,any>) => Promise<void>,
  * }} props
  * */
-export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter }) => {
+export const FrontMatterInput = ({ filename, remote_frontmatter, set_remote_frontmatter }) => {
     const [frontmatter, set_frontmatter] = useState(remote_frontmatter ?? {})
 
     useEffect(() => {
@@ -138,6 +140,19 @@ export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter })
             If you are publishing this notebook on the web, you can set the parameters below to provide HTML metadata. This is useful for search engines and
             social media.
         </p>
+        <div class="card-preview">
+            <h2>Preview</h2>
+            <${FeaturedCard}
+                entry=${
+                    /** @type {import("./welcome/Featured.js").SourceManifestNotebookEntry} */ ({
+                        id: filename.replace(/\.jl$/, ""),
+                        hash: "xx",
+                        frontmatter,
+                    })
+                }
+                disable_links=${true}
+            />
+        </div>
         <div class="fm-table">
             ${entries_input(frontmatter_with_defaults, ``)}
             ${!_.isArray(frontmatter_with_defaults.author)
@@ -205,11 +220,13 @@ const Input = ({ value, on_value, type, id }) => {
         }
     }, [input_ref.current])
 
+    const placeholder = type === "url" ? "https://..." : undefined
+
     return type === "tags"
         ? html`<rbl-tag-input id=${id} ref=${input_ref} />`
         : type === "license"
         ? LicenseInput({ ref: input_ref, id })
-        : html`<input type=${type} id=${id} ref=${input_ref} />`
+        : html`<input type=${type} id=${id} ref=${input_ref} placeholder=${placeholder} />`
 }
 
 // https://choosealicense.com/licenses/
diff --git a/frontend/components/welcome/FeaturedCard.js b/frontend/components/welcome/FeaturedCard.js
index 00a33d9efd..3c957c4f59 100644
--- a/frontend/components/welcome/FeaturedCard.js
+++ b/frontend/components/welcome/FeaturedCard.js
@@ -9,19 +9,22 @@ const str_to_degree = (s) => ([...s].reduce((a, b) => a + b.charCodeAt(0), 0) *
 
 /**
  * @param {{
- *  source_manifest: import("./Featured.js").SourceManifest,
+ *  source_manifest?: import("./Featured.js").SourceManifest,
  *  entry: import("./Featured.js").SourceManifestNotebookEntry,
  *  direct_html_links: boolean,
+ *  disable_links: boolean,
  * }} props
  */
-export const FeaturedCard = ({ entry, source_manifest, direct_html_links }) => {
+export const FeaturedCard = ({ entry, source_manifest, direct_html_links, disable_links }) => {
     const title = entry.frontmatter?.title
 
-    const { source_url } = source_manifest
+    const { source_url } = source_manifest ?? {}
 
     const u = (/** @type {string | null | undefined} */ x) =>
         source_url == null
-            ? x
+            ? _.isEmpty(x)
+                ? null
+                : x
             : x == null
             ? null
             : // URLs are relative to the source URL...
@@ -32,7 +35,9 @@ export const FeaturedCard = ({ entry, source_manifest, direct_html_links }) => {
               ).href
 
     // `direct_html_links` means that we will navigate you directly to the exported HTML file. Otherwise, we use our local editor, with the exported state as parameters. This lets users run the featured notebooks locally.
-    const href = direct_html_links
+    const href = disable_links
+        ? "#"
+        : direct_html_links
         ? u(entry.html_path)
         : with_query_params(`edit`, {
               statefile: u(entry.statefile_path),
@@ -41,7 +46,7 @@ export const FeaturedCard = ({ entry, source_manifest, direct_html_links }) => {
               disable_ui: `true`,
               name: title == null ? null : `sample ${title}`,
               pluto_server_url: `.`,
-              slider_server_url: u(source_manifest.slider_server_url),
+              slider_server_url: u(source_manifest?.slider_server_url),
           })
 
     const author = author_info(entry.frontmatter)
@@ -96,7 +101,7 @@ const author_info_item = (x) => {
     } else if (x instanceof Object) {
         let { name, image, url } = x
 
-        if (image == null && url != null) {
+        if (image == null && !_.isEmpty(url)) {
             image = url + ".png?size=48"
         }
 
diff --git a/frontend/editor.css b/frontend/editor.css
index e349ee748e..5ac2ebe9b8 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -23,6 +23,8 @@
 @import url("./light_color.css");
 @import url("./dark_color.css");
 
+@import url("./featured-card.css");
+
 /* VARIABLES */
 
 :root {
@@ -3501,6 +3503,19 @@ pluto-cell.hooked_up pluto-output {
     padding: 1em 1.5em;
 }
 
+.pluto-frontmatter .card-preview {
+    background: var(--white);
+    padding: 1.2rem 1.1rem;
+    margin: 1rem 0;
+    box-shadow: inset 0px 0px 15px -4px #00000054;
+    border-radius: 1rem;
+}
+
+.pluto-frontmatter .card-preview > h2 {
+    margin-block-start: 0;
+    color: var(--black);
+}
+
 .pluto-frontmatter button {
     cursor: pointer;
     background-color: var(--frontmatter-button-bg-color);
diff --git a/frontend/featured-card.css b/frontend/featured-card.css
new file mode 100644
index 0000000000..e00e2319e7
--- /dev/null
+++ b/frontend/featured-card.css
@@ -0,0 +1,142 @@
+:root {
+    --card-width: 15rem;
+}
+
+featured-card {
+    --card-color: hsl(var(--card-color-hue), 77%, 82%);
+    --card-border-radius: 10px;
+    --card-border-width: 3px;
+
+    display: block;
+    /* width: var(--card-width); */
+    border: var(--card-border-width) solid var(--card-color);
+    border-radius: var(--card-border-radius);
+    margin: 10px;
+    padding-bottom: 0.3rem;
+    box-shadow: 0px 2px 6px 0px #00000014;
+    font-family: var(--inter-ui-font-stack);
+    position: relative;
+    word-break: break-word;
+    hyphens: auto;
+    background: var(--index-card-bg);
+    max-width: var(--card-width);
+}
+
+featured-card .banner img {
+    --zz: calc(var(--card-border-radius) - var(--card-border-width));
+    width: 100%;
+    /* height: 8rem; */
+    aspect-ratio: 3/2;
+    object-fit: cover;
+    /* background-color: hsl(16deg 100% 66%); */
+    background: var(--card-color);
+    border-radius: var(--zz) var(--zz) 0 0;
+    flex: 1 1 200px;
+    min-width: 0;
+}
+
+featured-card a {
+    text-decoration: none;
+    /* font-weight: 800; */
+}
+
+featured-card a.banner {
+    display: flex;
+}
+
+featured-card .author {
+    font-weight: 600;
+}
+
+featured-card .author {
+    position: absolute;
+    top: 0.3em;
+    right: 0.3em;
+    background: var(--welcome-card-author-backdrop);
+    /* background: hsl(var(--card-color-hue) 34% 46% / 59%); */
+    backdrop-filter: blur(15px);
+    color: black;
+    border-radius: 117px;
+    /* height: 2.5em; */
+    padding: 0.3em;
+    padding-right: 0.8em;
+    display: flex;
+}
+
+featured-card .author img {
+    --size: 1.6em;
+    /* margin: 0.4em 0.4em; */
+    /* margin-bottom: -0.4em; */
+    width: var(--size);
+    height: var(--size);
+    object-fit: cover;
+    border-radius: 100%;
+    background: #b6b6b6;
+    display: inline-block;
+    overflow: hidden;
+}
+
+featured-card .author a {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 0.4ch;
+}
+
+featured-card h3 a {
+    padding: 0.6em;
+    padding-bottom: 0;
+    -webkit-line-clamp: 2;
+    display: inline-block;
+    display: -webkit-inline-box;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    background: var(--index-card-bg);
+    border-radius: 0.6em;
+    /* border-top-left-radius: 0; */
+}
+
+featured-card p {
+    margin: 0.3rem 0.8rem;
+    /* padding-top: 0; */
+    /* margin-block: 0; */
+    color: #838383;
+    -webkit-line-clamp: 4;
+    display: inline-block;
+    display: -webkit-inline-box;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+}
+
+featured-card h3 {
+    margin: -1.1rem 0rem 0rem 0rem;
+}
+
+featured-card.big {
+    grid-column-end: span 2;
+    grid-row-end: span 2;
+    /* width: 2000px; */
+}
+
+featured-card.big .banner img {
+    height: 16rem;
+}
+
+featured-card.special::before {
+    content: "New!";
+    font-size: 1.4rem;
+    font-weight: 700;
+    text-transform: uppercase;
+    font-style: italic;
+    display: block;
+    background: #fcf492;
+    color: #833bc6;
+    text-shadow: 0 0 1px #ff6767;
+    position: absolute;
+    transform: translateY(calc(-100% - -15px)) rotate(-5deg);
+    padding: 2px 19px;
+    left: -9px;
+    /* right: 51px; */
+    /* border: 2px solid #ffca62; */
+    pointer-events: none;
+}
diff --git a/frontend/index.css b/frontend/index.css
index a4ae4b25e2..562862c38a 100644
--- a/frontend/index.css
+++ b/frontend/index.css
@@ -7,6 +7,8 @@
 @import url("light_color.css");
 @import url("dark_color.css");
 
+@import url("featured-card.css");
+
 * {
     box-sizing: border-box;
 }
@@ -316,30 +318,6 @@ body.loading loading-bar {
     }
 }
 
-:root {
-    --card-width: 15rem;
-}
-
-featured-card {
-    --card-color: hsl(var(--card-color-hue), 77%, 82%);
-    --card-border-radius: 10px;
-    --card-border-width: 3px;
-
-    display: block;
-    /* width: var(--card-width); */
-    border: var(--card-border-width) solid var(--card-color);
-    border-radius: var(--card-border-radius);
-    margin: 10px;
-    padding-bottom: 0.3rem;
-    box-shadow: 0px 2px 6px 0px #00000014;
-    font-family: var(--inter-ui-font-stack);
-    position: relative;
-    word-break: break-word;
-    hyphens: auto;
-    background: var(--index-card-bg);
-    max-width: var(--card-width);
-}
-
 .card-list {
     display: grid;
     /* grid-auto-columns: 50px; */
@@ -350,103 +328,6 @@ featured-card {
     justify-items: stretch;
 }
 
-featured-card .banner img {
-    --zz: calc(var(--card-border-radius) - var(--card-border-width));
-    width: 100%;
-    /* height: 8rem; */
-    aspect-ratio: 3/2;
-    object-fit: cover;
-    /* background-color: hsl(16deg 100% 66%); */
-    background: var(--card-color);
-    border-radius: var(--zz) var(--zz) 0 0;
-    flex: 1 1 200px;
-    min-width: 0;
-}
-
-featured-card .author img {
-    --size: 1.6em;
-    /* margin: 0.4em 0.4em; */
-    /* margin-bottom: -0.4em; */
-    width: var(--size);
-    height: var(--size);
-    object-fit: cover;
-    border-radius: 100%;
-    background: #b6b6b6;
-    display: inline-block;
-    overflow: hidden;
-}
-
-featured-card a {
-    text-decoration: none;
-    /* font-weight: 800; */
-}
-
-featured-card a.banner {
-    display: flex;
-}
-
-featured-card .author {
-    font-weight: 600;
-}
-
-featured-card h3 a {
-    padding: 0.6em;
-    padding-bottom: 0;
-    -webkit-line-clamp: 2;
-    display: inline-block;
-    display: -webkit-inline-box;
-    -webkit-box-orient: vertical;
-    overflow: hidden;
-    background: var(--index-card-bg);
-    border-radius: 0.6em;
-    /* border-top-left-radius: 0; */
-}
-
-featured-card p {
-    margin: 0.3rem 0.8rem;
-    /* padding-top: 0; */
-    /* margin-block: 0; */
-    color: #838383;
-    -webkit-line-clamp: 4;
-    display: inline-block;
-    display: -webkit-inline-box;
-    -webkit-box-orient: vertical;
-    overflow: hidden;
-}
-
-featured-card h3 {
-    margin: -1.1rem 0rem 0rem 0rem;
-}
-
-featured-card.big {
-    grid-column-end: span 2;
-    grid-row-end: span 2;
-    /* width: 2000px; */
-}
-
-featured-card.big .banner img {
-    height: 16rem;
-}
-
-featured-card.special::before {
-    content: "New!";
-    font-size: 1.4rem;
-    font-weight: 700;
-    text-transform: uppercase;
-    font-style: italic;
-    display: block;
-    background: #fcf492;
-    color: #833bc6;
-    text-shadow: 0 0 1px #ff6767;
-    position: absolute;
-    transform: translateY(calc(-100% - -15px)) rotate(-5deg);
-    padding: 2px 19px;
-    left: -9px;
-    /* right: 51px; */
-    /* border: 2px solid #ffca62; */
-    pointer-events: none;
-}
-
 .navigating-away-banner {
     width: 100vw;
     min-height: 70vh;
diff --git a/frontend/welcome.css b/frontend/welcome.css
index 87436e1cea..0aa2f54aef 100644
--- a/frontend/welcome.css
+++ b/frontend/welcome.css
@@ -222,28 +222,6 @@ h1 {
     color: #757575;
 }
 
-.author {
-    position: absolute;
-    top: 0.3em;
-    right: 0.3em;
-    background: var(--welcome-card-author-backdrop);
-    /* background: hsl(var(--card-color-hue) 34% 46% / 59%); */
-    backdrop-filter: blur(15px);
-    color: black;
-    border-radius: 117px;
-    /* height: 2.5em; */
-    padding: 0.3em;
-    padding-right: 0.8em;
-    display: flex;
-}
-
-.author a {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    gap: 0.4ch;
-}
-
 #github img {
     aspect-ratio: 1;
     filter: var(--image-filters);

From 62feafb07f50d245def1d98269d27b4e6567a11b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 30 Oct 2023 14:06:11 +0100
Subject: [PATCH 745/821] frontmatter preview tweak

---
 frontend/components/FrontmatterInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index 194e9dae83..ca99e40da8 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -147,7 +147,7 @@ export const FrontMatterInput = ({ filename, remote_frontmatter, set_remote_fron
                     /** @type {import("./welcome/Featured.js").SourceManifestNotebookEntry} */ ({
                         id: filename.replace(/\.jl$/, ""),
                         hash: "xx",
-                        frontmatter,
+                        frontmatter: clean_data(frontmatter) ?? {},
                     })
                 }
                 disable_links=${true}

From a64ddd27735e213349345078a6e514c34fb27ba5 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 30 Oct 2023 14:21:38 +0100
Subject: [PATCH 746/821] Project.toml: compat entries for stdlibs (#2687)

---
 Project.toml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Project.toml b/Project.toml
index 21e0363437..406c998e8c 100644
--- a/Project.toml
+++ b/Project.toml
@@ -34,23 +34,33 @@ URIs = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
+Base64 = "1"
 Configurations = "0.15, 0.16, 0.17"
+Dates = "1"
 Downloads = "1"
+FileWatching = "1"
 FuzzyCompletions = "0.3, 0.4, 0.5"
 HTTP = "^1.5.2"
 HypertextLiteral = "0.7, 0.8, 0.9"
+InteractiveUtils = "1"
+Logging = "1"
 LoggingExtras = "0.4, 1"
 MIMEs = "0.1"
 Malt = "1.1"
+Markdown = "1"
 MsgPack = "1.1"
+Pkg = "1"
 PrecompileSignatures = "3"
 PrecompileTools = "1"
+REPL = "1"
 RegistryInstances = "0.1"
 RelocatableFolders = "0.1, 0.2, 0.3, 1"
 Scratch = "1.1"
+Sockets = "1"
 TOML = "1"
 Tables = "1"
 URIs = "1.3"
+UUIDs = "1"
 julia = "^1.6"
 
 [extras]

From 3b699e088fd580023ed36131302f376aded16796 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 30 Oct 2023 15:37:16 +0100
Subject: [PATCH 747/821] Fix safe preview in ExperimentalLayout and
 embed_display (#2689)

---
 frontend/components/TreeView.js | 5 +++--
 src/runner/PlutoRunner.jl       | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/components/TreeView.js b/frontend/components/TreeView.js
index 48ae5ddedd..ccd1645b63 100644
--- a/frontend/components/TreeView.js
+++ b/frontend/components/TreeView.js
@@ -199,8 +199,9 @@ export const TableView = ({ mime, body, cell_id, persist_js_state }) => {
     </table>`
 }
 
-export let DivElement = ({ cell_id, style, classname, children, persist_js_state = false }) => {
-    const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${cell_id} mime=${pair[1]} body=${pair[0]} persist_js_state=${persist_js_state} />`
+export let DivElement = ({ cell_id, style, classname, children, persist_js_state = false, sanitize_html = true }) => {
+    const mimepair_output = (pair) =>
+        html`<${SimpleOutputBody} cell_id=${cell_id} mime=${pair[1]} body=${pair[0]} persist_js_state=${persist_js_state} sanitize_html=${sanitize_html} />`
 
     return html`<div style=${style} class=${classname}>${children.map(mimepair_output)}</div>`
 }
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index fdc891be03..6cce83afa7 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -2401,6 +2401,7 @@ function Base.show(io::IO, m::MIME"text/html", e::EmbeddableDisplay)
         const display = create_new ? currentScript.previousElementSibling : this;
         
         display.persist_js_state = true;
+        display.sanitize_html = false;
         display.body = body;
         if(create_new) {
             // only set the mime if necessary, it triggers a second preact update

From f4eefec0bff4a1096b58eb9d153aed3198728fd3 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 30 Oct 2023 18:19:50 +0100
Subject: [PATCH 748/821] Use featured.plutojl.org as the featured source for
 interactive previews! (#2666)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Παναγιώτης Γεωργακόπουλος <pankgeorg@gmail.com>
---
 frontend/components/welcome/FeaturedCard.js |  3 ++-
 frontend/featured_sources.js                | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend/components/welcome/FeaturedCard.js b/frontend/components/welcome/FeaturedCard.js
index 3c957c4f59..3204a00fcc 100644
--- a/frontend/components/welcome/FeaturedCard.js
+++ b/frontend/components/welcome/FeaturedCard.js
@@ -46,7 +46,8 @@ export const FeaturedCard = ({ entry, source_manifest, direct_html_links, disabl
               disable_ui: `true`,
               name: title == null ? null : `sample ${title}`,
               pluto_server_url: `.`,
-              slider_server_url: u(source_manifest?.slider_server_url),
+              // Little monkey patch because we don't want to use the slider server when for the CDN source, only for the featured.plutojl.org source. But both sources have the same pluto_export.json so this is easiest.
+              slider_server_url: source_url?.includes("cdn.jsdelivr.net/gh/JuliaPluto/featured") ? null : u(source_manifest?.slider_server_url),
           })
 
     const author = author_info(entry.frontmatter)
diff --git a/frontend/featured_sources.js b/frontend/featured_sources.js
index e0dd1b0822..acdb80aa8b 100644
--- a/frontend/featured_sources.js
+++ b/frontend/featured_sources.js
@@ -2,8 +2,14 @@ export default {
     // check out https://github.com/JuliaPluto/pluto-developer-instructions/blob/main/How%20to%20update%20the%20featured%20notebooks.md to learn more
     sources: [
         {
-            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@v3/pluto_export.json",
-            integrity: "sha256-y2E/niS8Em5a4wfSupsmDi0JaTrKSI0WF9DBkfEiQYQ=",
+            url: "https://featured.plutojl.org/pluto_export.json",
+            valid_until: "2024-10",
+            id: "featured pluto",
+        },
+        {
+            id: "featured pluto",
+            url: "https://cdn.jsdelivr.net/gh/JuliaPluto/featured@v4/pluto_export.json",
+            integrity: "sha256-YT5Msj4Iy4cJIuHQi09h3+AwxzreK46WS6EySbPPmJM=",
         },
     ],
 }

From 32ca16f5f1585dbe8691ba023ecd0d2300c85e90 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 30 Oct 2023 18:20:07 +0100
Subject: [PATCH 749/821] New Markdown offline sample (#2690)

Co-authored-by: Luka van der Plas <43678097+lukavdplas@users.noreply.github.com>
---
 frontend/components/welcome/Featured.js |  13 +-
 sample/Markdown.jl                      | 340 ++++++++++++++++++++++++
 2 files changed, 347 insertions(+), 6 deletions(-)
 create mode 100644 sample/Markdown.jl

diff --git a/frontend/components/welcome/Featured.js b/frontend/components/welcome/Featured.js
index e9970001c3..730a4d1ed8 100644
--- a/frontend/components/welcome/Featured.js
+++ b/frontend/components/welcome/Featured.js
@@ -65,12 +65,13 @@ const offline_html = html`
         <p>Here are a couple of notebooks to get started with Pluto.jl:</p>
         <ul>
             <li>1. <a href="sample/Getting%20started.jl">Getting started</a></li>
-            <li>2. <a href="sample/Basic%20mathematics.jl">Basic mathematics</a></li>
-            <li>3. <a href="sample/Interactivity.jl">Interactivity</a></li>
-            <li>4. <a href="sample/PlutoUI.jl.jl">PlutoUI.jl</a></li>
-            <li>5. <a href="sample/Plots.jl.jl">Plots.jl</a></li>
-            <li>6. <a href="sample/Tower%20of%20Hanoi.jl">Tower of Hanoi</a></li>
-            <li>7. <a href="sample/JavaScript.jl">JavaScript</a></li>
+            <li>2. <a href="sample/Markdown.jl">Markdown</a></li>
+            <li>3. <a href="sample/Basic%20mathematics.jl">Basic mathematics</a></li>
+            <li>4. <a href="sample/Interactivity.jl">Interactivity</a></li>
+            <li>5. <a href="sample/PlutoUI.jl.jl">PlutoUI.jl</a></li>
+            <li>6. <a href="sample/Plots.jl.jl">Plots.jl</a></li>
+            <li>7. <a href="sample/Tower%20of%20Hanoi.jl">Tower of Hanoi</a></li>
+            <li>8. <a href="sample/JavaScript.jl">JavaScript</a></li>
         </ul>
         <br />
         <br />
diff --git a/sample/Markdown.jl b/sample/Markdown.jl
new file mode 100644
index 0000000000..ed629e7d47
--- /dev/null
+++ b/sample/Markdown.jl
@@ -0,0 +1,340 @@
+### A Pluto.jl notebook ###
+# v0.19.30
+
+#> [frontmatter]
+#> image = "https://upload.wikimedia.org/wikipedia/commons/a/a0/Textformatting.svg"
+#> order = "1.5"
+#> title = "Markdown"
+#> tags = ["markdown", "basic"]
+#> license = "Unlicense"
+#> description = "Learn to write text cells with Markdown."
+#> 
+#>     [[frontmatter.author]]
+#>     name = "Pluto.jl"
+#>     url = "https://github.com/JuliaPluto"
+
+using Markdown
+using InteractiveUtils
+
+# ╔═╡ ce092665-e18d-4314-a43e-51a04e25cd30
+md"""
+# How to use Markdown in Pluto
+
+If a Pluto cell starts with `md"` and ends with `"`, it is a markdown cell!
+"""
+
+# ╔═╡ 02b26da6-40d1-4b3c-a594-aff8016b0945
+
+
+# ╔═╡ 1adedccd-db89-40ec-ab77-a92c2976fc2c
+md"Hello *Markdown*"
+
+# ╔═╡ 2f8d4781-a364-4803-ba5f-69f85ef1c055
+
+
+# ╔═╡ 50891330-1c60-4020-b4f6-f1200ca2b71d
+md"""
+!!! info "Julia cells and Markdown cells"
+	Some notebook environments have different **cell types**: a *code* cell and a *Markdown* cell.
+
+	In Pluto, there is **only one cell type**: a Julia cell. But you can use the Julia string macro `md"` to write Markdown inside of Julia! 🤯
+"""
+
+# ╔═╡ 57e3bfde-b692-44e6-a764-7459626a8919
+
+
+# ╔═╡ 50fa8a8b-2c55-45b6-b4e0-8f510294586c
+
+
+# ╔═╡ 76b5db23-8174-445d-927e-ef2d92bbf32f
+
+
+# ╔═╡ e548c2ce-0e77-43b2-acaa-97005d67801f
+md"""
+# Keyboard shortcut
+
+Instead of typing `md"` by hand, you can press **`Ctrl + M`** (or **`Cmd + M`** on Mac) to do it automatically.
+
+👉 Try it yourself! In the cell below, press **`Ctrl/Cmd + M`**, type a message, and run the cell.
+"""
+
+# ╔═╡ f953ef79-b3a5-4adb-8467-b92b5f5bfbce
+
+
+# ╔═╡ c16b0170-5b0b-4618-b028-b6278bd6319d
+
+
+# ╔═╡ 4dbbfcee-37d0-4361-9058-ea3f9354e2de
+
+
+# ╔═╡ 49fd22a1-63d7-48c3-a1de-67087b77e347
+
+
+# ╔═╡ 9a7e812e-f6bd-47b8-ac36-124a2a233354
+md"""
+> 🐤 This is how all the text cells in this notebook are made! You can show the code on any of them to see how they are written.
+"""
+
+# ╔═╡ 838cb47d-db5e-4182-b7a1-164f0552bd02
+
+
+# ╔═╡ 9cae62be-7591-4ebe-9fbc-c39be4e479c4
+md"""
+---
+"""
+
+# ╔═╡ dfb656e4-94bc-4b3b-bd09-979d937246b8
+
+
+# ╔═╡ af97612d-832e-431a-b096-be8d7c94228f
+md"""
+# Markdown syntax
+
+We've seen one bit of markdown syntax already: a single `*` for italics. There are more! Here is a quick reference to get you started:
+"""
+
+# ╔═╡ 99f3bca7-5314-4e86-8f28-bb5a6358bdbd
+md"""
+Text in *italics* or **bold**
+"""
+
+# ╔═╡ cd5b10ac-0618-4220-b7e3-b1beeea43eff
+md"""
+Headers:
+
+# Biggest header
+## Big header
+### Medium header
+#### Small header
+##### Smaller header
+"""
+
+# ╔═╡ 8b622d0d-def6-4a2c-af3b-fdf91240fb90
+md"""
+Bullet points:
+
+- something
+- something else
+"""
+
+# ╔═╡ 5a399dae-5756-4614-a64f-214e812ee069
+md"""
+Numbered lists:
+
+1. First item
+2. Second item
+"""
+
+# ╔═╡ cca6c895-7974-4c3e-9170-ed85ae127478
+md"""
+If you're familiar with writing LaTeX formulas, you can do that too: ``i = \sqrt{-1}``.
+"""
+
+# ╔═╡ 65b31de3-fe0b-4e2a-97ad-39e4cd17962f
+md"""
+Text blocks are often describing code, so it's important that we can write code neatly!
+
+You can use `ticks` when you want to talk about variables or expressions.
+"""
+
+# ╔═╡ 3b8ae605-025f-485e-a5a2-1f823319a67a
+md"""
+For longer pieces of code, you can use three ticks:
+
+```
+x = 1
+```
+
+If you're writing code in a specific language, you can also specify it to get nice formatting:
+
+```julia
+function square(x)
+	x^2
+end
+```
+
+Neat!
+"""
+
+# ╔═╡ 6e315f3b-1a46-483e-86bc-931023a8ac54
+md"""
+You can add links like so: [read about Julia](https://julialang.org). 
+"""
+
+# ╔═╡ cb3b24f4-10d1-4de9-bd82-813af622f79b
+md"""
+If you want to include an image from the web, it looks a lot like adding a a link. Adding a `!` at the start means that we want to *show* the image instead of linking to it.
+
+![julia logo](https://julialang.org/assets/infra/logo.svg)
+
+For images, the text between the `[]` is used as *alt text*: a text description that can be used when the image can't be shown. This is useful for people with impaired vision, but it's also useful if the link doesn't work.
+
+![julia logo](https://broken.link)
+"""
+
+# ╔═╡ dd004d6c-54f6-4dd7-9aea-910adf0b22a5
+md"""
+What if you want to add an image that isn't on the internet? You can also link to your own filesystem:
+
+![cute picture of my dog](C:/Users/Luka/Pictures/Hannes_playing_in_the_snow.jpg)
+
+Oops, you probably can't see that one! That's the trouble with linking to files: it doesn't always work. There are ways around that, but if you're new to all this, linking to online images is the way to go. We recommend uploading your image to the web (with `imgur.com` for example) to get a URL.
+"""
+
+# ╔═╡ 5b08043c-302b-4b9b-982d-4ba1da41ff9f
+md"""
+Those are the basics! There is more you can do in markdown, like adding tables or footnotes: see the links at the bottom if you want to learn more.
+"""
+
+# ╔═╡ e7626671-ff5d-45f1-b8df-853d1d9bc1ac
+
+
+# ╔═╡ 4428fe55-7d65-487b-864b-b566e7ecee9e
+md"""
+## Dynamic content
+
+Writing some text is nice, what's really neat is if the text can **respond to code**. A simple way to do this is with an `if`/`else` block. Here we make a statement based on the value of `x`:
+
+👉 Try changing the value of `x` to `-5`, and watch how the text changes.
+"""
+
+# ╔═╡ 7e5644fd-75ff-4f70-9981-ddb7d9ad470c
+x = 1
+
+# ╔═╡ 445eddb1-ccee-45d9-be5b-3f5fec9e2c7a
+if x > 0
+	md"`x` is positive"
+elseif x < 0
+	md"`x` is negative"
+else
+	md"`x` is zero"
+end
+
+# ╔═╡ 51e38551-742c-48dd-aaea-ffe479b9621b
+md"""
+### Interpolating values
+
+You can also use **`$`** (the dollar sign) to include expressions in your text. 
+
+For example, your text can include the value of a variable:
+"""
+
+# ╔═╡ 1a2f37ec-9be2-4fd5-8f0b-b6579a241b55
+md"""
+The value of `x` is $(x), which is $(x > 100 ? "a lot!" : "not very high.")
+"""
+
+# ╔═╡ d2451923-6487-497c-a169-9815702c42fc
+md"""
+## Useful links
+
+- [Markdown Guide](https://www.markdownguide.org/)
+- [Documentation of Julia's Markdown library](https://docs.julialang.org/en/v1/stdlib/Markdown/) 
+
+"""
+
+# ╔═╡ 64a23ad5-0fa1-48dd-9786-dcfbc73a3b52
+
+
+# ╔═╡ d6def1a3-cc96-4eb9-bfce-949d29ffe31f
+function pluto_icon(name, alt=name)
+
+	# It would be better to use HypertextLiteral.jl instead of just the HTML function, but this means that the notebook works without any packages, which can be a problem when reading this notebook without internet.
+	HTML("""<img 
+		src="https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/$(name)-outline.svg"
+		class="pluto-button-inline-icon"
+		alt="$(alt)"
+		title="$(alt)"
+		style="width: 1em; height: 1em; margin-bottom: -.2em;">
+	""")
+end
+
+# ╔═╡ 8f45d098-4041-4449-83c3-79280232691e
+md"""
+👉 Try it yourself! In the cell below, write some markdown text, and run the cell with the $(pluto_icon("caret-forward-circle", "play")) button on the bottom right of the cell (or **`Shift + Enter`**).
+"""
+
+# ╔═╡ 688a8ea9-1bff-45c5-8942-f8e96ed0ef79
+md"""
+When you are done, **hide the code** by clicking the $(pluto_icon("eye")) button on the left of the cell.
+"""
+
+# ╔═╡ e392d442-5c83-4711-bc45-c2dbedf62b7f
+md"""
+## Helper function
+
+We wrote a helper function to show Pluto's GUI buttons in the introduction text, like $(pluto_icon("eye")) and $(pluto_icon("caret-forward-circle")). A bit too advanced for this notebook, but hopefully it made the text easier to read!
+"""
+
+# ╔═╡ 58eb1225-6521-45ef-827a-78cdafbaf784
+pluto_icon_style = html"""
+<style>
+	@media (prefers-color-scheme: dark) {
+	.pluto-button-inline-icon {
+        filter: invert(1) hue-rotate(180deg) contrast(0.8);
+	}
+	}
+</style>
+"""
+
+# ╔═╡ 00000000-0000-0000-0000-000000000001
+PLUTO_PROJECT_TOML_CONTENTS = """
+[deps]
+"""
+
+# ╔═╡ 00000000-0000-0000-0000-000000000002
+PLUTO_MANIFEST_TOML_CONTENTS = """
+# This file is machine-generated - editing it directly is not advised
+
+julia_version = "1.8.3"
+manifest_format = "2.0"
+project_hash = "da39a3ee5e6b4b0d3255bfef95601890afd80709"
+
+[deps]
+"""
+
+# ╔═╡ Cell order:
+# ╟─ce092665-e18d-4314-a43e-51a04e25cd30
+# ╟─02b26da6-40d1-4b3c-a594-aff8016b0945
+# ╠═1adedccd-db89-40ec-ab77-a92c2976fc2c
+# ╟─2f8d4781-a364-4803-ba5f-69f85ef1c055
+# ╟─50891330-1c60-4020-b4f6-f1200ca2b71d
+# ╟─8f45d098-4041-4449-83c3-79280232691e
+# ╠═57e3bfde-b692-44e6-a764-7459626a8919
+# ╟─688a8ea9-1bff-45c5-8942-f8e96ed0ef79
+# ╟─50fa8a8b-2c55-45b6-b4e0-8f510294586c
+# ╟─76b5db23-8174-445d-927e-ef2d92bbf32f
+# ╟─e548c2ce-0e77-43b2-acaa-97005d67801f
+# ╠═f953ef79-b3a5-4adb-8467-b92b5f5bfbce
+# ╟─c16b0170-5b0b-4618-b028-b6278bd6319d
+# ╟─4dbbfcee-37d0-4361-9058-ea3f9354e2de
+# ╟─49fd22a1-63d7-48c3-a1de-67087b77e347
+# ╟─9a7e812e-f6bd-47b8-ac36-124a2a233354
+# ╟─838cb47d-db5e-4182-b7a1-164f0552bd02
+# ╟─9cae62be-7591-4ebe-9fbc-c39be4e479c4
+# ╟─dfb656e4-94bc-4b3b-bd09-979d937246b8
+# ╟─af97612d-832e-431a-b096-be8d7c94228f
+# ╠═99f3bca7-5314-4e86-8f28-bb5a6358bdbd
+# ╠═cd5b10ac-0618-4220-b7e3-b1beeea43eff
+# ╠═8b622d0d-def6-4a2c-af3b-fdf91240fb90
+# ╠═5a399dae-5756-4614-a64f-214e812ee069
+# ╠═cca6c895-7974-4c3e-9170-ed85ae127478
+# ╠═65b31de3-fe0b-4e2a-97ad-39e4cd17962f
+# ╠═3b8ae605-025f-485e-a5a2-1f823319a67a
+# ╠═6e315f3b-1a46-483e-86bc-931023a8ac54
+# ╠═cb3b24f4-10d1-4de9-bd82-813af622f79b
+# ╠═dd004d6c-54f6-4dd7-9aea-910adf0b22a5
+# ╟─5b08043c-302b-4b9b-982d-4ba1da41ff9f
+# ╟─e7626671-ff5d-45f1-b8df-853d1d9bc1ac
+# ╟─4428fe55-7d65-487b-864b-b566e7ecee9e
+# ╠═7e5644fd-75ff-4f70-9981-ddb7d9ad470c
+# ╠═445eddb1-ccee-45d9-be5b-3f5fec9e2c7a
+# ╟─51e38551-742c-48dd-aaea-ffe479b9621b
+# ╠═1a2f37ec-9be2-4fd5-8f0b-b6579a241b55
+# ╟─d2451923-6487-497c-a169-9815702c42fc
+# ╟─64a23ad5-0fa1-48dd-9786-dcfbc73a3b52
+# ╟─e392d442-5c83-4711-bc45-c2dbedf62b7f
+# ╟─d6def1a3-cc96-4eb9-bfce-949d29ffe31f
+# ╟─58eb1225-6521-45ef-827a-78cdafbaf784
+# ╟─00000000-0000-0000-0000-000000000001
+# ╟─00000000-0000-0000-0000-000000000002

From 6a33102b954575f8023500b0566c91e5b247e8bb Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Mon, 30 Oct 2023 18:22:03 +0100
Subject: [PATCH 750/821] Fix: Don't drop disabled cells (#2677)

---
 src/analysis/Topology.jl           | 12 ++++++---
 src/evaluation/Run.jl              |  4 +--
 src/notebook/saving and loading.jl | 12 ++++++---
 test/cell_disabling.jl             | 43 ++++++++++++++++++++++++++++++
 4 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/src/analysis/Topology.jl b/src/analysis/Topology.jl
index eb441f098b..d08ee7d5c0 100644
--- a/src/analysis/Topology.jl
+++ b/src/analysis/Topology.jl
@@ -58,12 +58,18 @@ function set_unresolved(topology::NotebookTopology, unresolved_cells::Vector{Cel
 end
 
 
-function Base.setdiff(topology::NotebookTopology, cells::Vector{Cell})
+"""
+    exclude_roots(topology::NotebookTopology, roots_to_exclude)::NotebookTopology
+
+Returns a new topology as if `topology` was created with all code for `roots_to_exclude`
+being empty, preserving disabled cells and cell order.
+"""
+function exclude_roots(topology::NotebookTopology, cells::Vector{Cell})
     NotebookTopology(
         nodes=setdiffkeys(topology.nodes, cells),
         codes=setdiffkeys(topology.codes, cells),
         unresolved_cells=ImmutableSet{Cell}(setdiff(topology.unresolved_cells.c, cells); skip_copy=true),
-        cell_order=ImmutableVector{Cell}(setdiff(topology.cell_order.c, cells); skip_copy=true),
-        disabled_cells=ImmutableSet{Cell}(setdiff(topology.disabled_cells.c, cells); skip_copy=true),
+        cell_order=topology.cell_order,
+        disabled_cells=topology.disabled_cells,
     )
 end
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 29b87ccf52..e74f0d8c4d 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -100,8 +100,8 @@ function run_reactive_core!(
         cell.queued = false
         cell.depends_on_disabled_cells = true
     end
-	
-	new_topology = setdiff(new_topology, indirectly_deactivated)
+
+	new_topology = exclude_roots(new_topology, indirectly_deactivated)
 
     # save the old topological order - we'll delete variables assigned from its
     # and re-evalutate its cells unless the cells have already run previously in the reactive run
diff --git a/src/notebook/saving and loading.jl b/src/notebook/saving and loading.jl
index b081d8c749..1dd696e72e 100644
--- a/src/notebook/saving and loading.jl	
+++ b/src/notebook/saving and loading.jl	
@@ -56,10 +56,16 @@ function save_notebook(io::IO, notebook::Notebook)
     println(io)
 
     cells_ordered = collect(topological_order(notebook))
-    
+    # TODO: add test for this case
+    if length(cells_ordered) != length(notebook.cells)
+        cells = notebook.cells
+        updated_topo = updated_topology(notebook.topology, notebook, cells)
+        cells_ordered = collect(topological_order(updated_topo, cells))
+    end
+
     for c in cells_ordered
         println(io, _cell_id_delimiter, string(c.cell_id))
-        
+
         let metadata_toml = strip(sprint(TOML.print, get_metadata_no_default(c)))
             if metadata_toml != ""
                 for line in split(metadata_toml, "\n")
@@ -67,7 +73,7 @@ function save_notebook(io::IO, notebook::Notebook)
                 end
             end
         end
-        
+
         if must_be_commented_in_file(c)
             print(io, _disabled_prefix)
             print(io, replace(c.code, _cell_id_delimiter => "# "))
diff --git a/test/cell_disabling.jl b/test/cell_disabling.jl
index 3c8e8f498b..8865e57f6b 100644
--- a/test/cell_disabling.jl
+++ b/test/cell_disabling.jl
@@ -345,3 +345,46 @@ end
 
     WorkspaceManager.unmake_workspace((🍭, notebook))
 end
+
+@testset "Disabled cells should stay in the topology (#2676)" begin
+    🍭 = ServerSession()
+    notebook = Notebook(Cell.([
+        "using Dates",
+        "b = 2; December",
+        "b",
+    ]))
+
+    disabled_cell = notebook.cells[end]
+    Pluto.set_disabled(disabled_cell, true)
+    @test is_disabled(disabled_cell)
+
+    old_topo = notebook.topology
+    @test count(Pluto.is_disabled, notebook.cells) == 1
+    order = update_run!(🍭, notebook, notebook.cells)
+
+    # Disabled
+    @test length(order.input_topology.disabled_cells) == 1
+    @test disabled_cell ∈ order.input_topology.disabled_cells
+    runned_cells = collect(order)
+    @test length(runned_cells) == 2
+    @test disabled_cell ∉ runned_cells
+
+    topo = notebook.topology
+    @test old_topo !== topo # topology was updated
+
+    order = Pluto.topological_order(notebook)
+
+    @test length(order.input_topology.disabled_cells) == 1
+    @test disabled_cell ∈ order.input_topology.disabled_cells
+    saved_cells = collect(order)
+    @test length(saved_cells) == length(notebook.cells)
+    @test issetequal(saved_cells, notebook.cells)
+
+    io = IOBuffer()
+    Pluto.save_notebook(io, notebook)
+    seekstart(io)
+    notebook2 = Pluto.load_notebook_nobackup(io, "mynotebook.jl")
+    @test length(notebook2.cells) == length(notebook.cells)
+
+    WorkspaceManager.unmake_workspace((🍭, notebook))
+end

From 557263dd593652f384600d3bc861d77a453bc628 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 30 Oct 2023 18:22:49 +0100
Subject: [PATCH 751/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 406c998e8c..a7a3ff9cef 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.30"
+version = "0.19.31"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 4a8e79ada879d2e65e7ef10ff15ca332287c18bf Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Tue, 31 Oct 2023 00:15:06 +0100
Subject: [PATCH 752/821] add comment about losing cells in save_notebook
 (#2692)

---
 src/notebook/saving and loading.jl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/notebook/saving and loading.jl b/src/notebook/saving and loading.jl
index 1dd696e72e..f0a44aaf35 100644
--- a/src/notebook/saving and loading.jl	
+++ b/src/notebook/saving and loading.jl	
@@ -56,8 +56,13 @@ function save_notebook(io::IO, notebook::Notebook)
     println(io)
 
     cells_ordered = collect(topological_order(notebook))
-    # TODO: add test for this case
-    if length(cells_ordered) != length(notebook.cells)
+    
+    # NOTE: the notebook topological is cached on every update_dependency! call
+    # ....  so it is possible that a cell was added/removed since this last update.
+    # ....  in this case, it will not contain that cell since it is build from its
+    # ....  store notebook topology. therefore, we compute an updated topological
+    # ....  order in this unlikely case.
+    if length(cells_ordered) != length(notebook.cells_dict)
         cells = notebook.cells
         updated_topo = updated_topology(notebook.topology, notebook, cells)
         cells_ordered = collect(topological_order(updated_topo, cells))

From bb5c14229644b9db1419738f6f812a062b43bf94 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 31 Oct 2023 13:03:30 +0100
Subject: [PATCH 753/821] Fix embed_display again: handle attributes as string
 values properly (#2696)

---
 frontend/components/CellOutput.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 5fe2304202..dec24341b1 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -116,7 +116,21 @@ export let PlutoImage = ({ body, mime }) => {
     return html`<img ref=${imgref} type=${mime} src=${""} />`
 }
 
+/**
+ * @param {{
+ *  mime: string,
+ * body: any,
+ * cell_id: string,
+ * persist_js_state: boolean | string,
+ * last_run_timestamp: number,
+ * sanitize_html?: boolean | string,
+ * }} args
+ */
 export const OutputBody = ({ mime, body, cell_id, persist_js_state = false, last_run_timestamp, sanitize_html = true }) => {
+    // These two arguments might have been passed as strings if OutputBody was used as the custom HTML element <pluto-display>, with string attributes as arguments.
+    sanitize_html = sanitize_html !== "false" && sanitize_html !== false
+    persist_js_state = persist_js_state === "true" || persist_js_state === true
+
     switch (mime) {
         case "image/png":
         case "image/jpg":

From abe220b3e03ff2bf3d284b1b4e9138f862ee889c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 31 Oct 2023 13:03:42 +0100
Subject: [PATCH 754/821] Enable Malt on Windows by default (#2695)

---
 src/Configuration.jl               | 2 +-
 src/evaluation/WorkspaceManager.jl | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Configuration.jl b/src/Configuration.jl
index 9fd22cbb58..bc0dc8104c 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -159,7 +159,7 @@ These options are not intended to be changed during normal use.
 
 - `run_notebook_on_load::Bool = $RUN_NOTEBOOK_ON_LOAD_DEFAULT` When running a notebook (not in Safe mode), should all cells evaluate immediately? Warning: this is only for internal testing, and using it will lead to unexpected behaviour and hard-to-reproduce notebooks. It's not the Pluto way!
 - `workspace_use_distributed::Bool = $WORKSPACE_USE_DISTRIBUTED_DEFAULT` Whether to start notebooks in a separate process.
-- `workspace_use_distributed_stdlib::Bool? = $WORKSPACE_USE_DISTRIBUTED_STDLIB_DEFAULT` Should we use the Distributed stdlib to run processes? Distributed will be replaced by Malt.jl, you can use this option to already get the old behaviour. `nothing` means: determine automatically (which is currently the same as `true`).
+- `workspace_use_distributed_stdlib::Bool? = $WORKSPACE_USE_DISTRIBUTED_STDLIB_DEFAULT` Should we use the Distributed stdlib to run processes? Distributed will be replaced by Malt.jl, you can use this option to already get the old behaviour. `nothing` means: determine automatically (which is currently `false` on Windows, `true` otherwise).
 - `lazy_workspace_creation::Bool = $LAZY_WORKSPACE_CREATION_DEFAULT`
 - `capture_stdout::Bool = $CAPTURE_STDOUT_DEFAULT`
 - `workspace_custom_startup_expr::Union{Nothing,String} = $WORKSPACE_CUSTOM_STARTUP_EXPR_DEFAULT` An expression to be evaluated in the workspace process before running notebook code.
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index d993c0d7a2..12fbee2dd9 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -56,8 +56,7 @@ function make_workspace((session, notebook)::SN; is_offline_renderer::Bool=false
         Malt.InProcessWorker
     elseif something(
         session.options.evaluation.workspace_use_distributed_stdlib, 
-        true
-        # VERSION < v"1.8.0-0"
+        Sys.iswindows() ? false : true
     )
         Malt.DistributedStdlibWorker
     else

From 513f28d6466cddca128ce8f07cfbaece5131c19f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 31 Oct 2023 15:23:58 +0100
Subject: [PATCH 755/821] future proof tweak

---
 src/analysis/ExpressionExplorer.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index aa6c3c5366..9b2153ccf3 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -307,7 +307,7 @@ function macro_has_special_heuristic_inside(; symstate::SymbolsState, expr::Expr
         cell_order = Pluto.ImmutableVector([fake_cell]),
     )
 
-    return Pluto.cell_precedence_heuristic(fake_topology, fake_cell) < 9
+    return Pluto.cell_precedence_heuristic(fake_topology, fake_cell) < Pluto.DEFAULT_PRECEDENCE_HEURISTIC
 end
 # Having written this... I know I said I was lazy... I was wrong
 end

From 620176aa9003c66cfda4cc2bc670eb2d8a0c171b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 31 Oct 2023 16:34:15 +0100
Subject: [PATCH 756/821] Don't rerender cell output when only
 `persist_js_state` changed (#2697)

---
 frontend/components/CellOutput.js          |   2 +-
 test/frontend/__tests__/wind_directions.js | 111 +++
 test/frontend/fixtures/wind_directions.jl  | 936 +++++++++++++++++++++
 test/frontend/helpers/common.js            |   2 +-
 4 files changed, 1049 insertions(+), 2 deletions(-)
 create mode 100644 test/frontend/__tests__/wind_directions.js
 create mode 100644 test/frontend/fixtures/wind_directions.jl

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index dec24341b1..c1000af7dd 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -610,7 +610,7 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
             js_init_set?.delete(container)
             invalidate_scripts.current?.()
         }
-    }, [body, persist_js_state, last_run_timestamp, pluto_actions, sanitize_html])
+    }, [body, last_run_timestamp, pluto_actions, sanitize_html])
 
     return html`<div class="raw-html-wrapper ${className}" ref=${container_ref}></div>`
 }
diff --git a/test/frontend/__tests__/wind_directions.js b/test/frontend/__tests__/wind_directions.js
new file mode 100644
index 0000000000..b7a06bb688
--- /dev/null
+++ b/test/frontend/__tests__/wind_directions.js
@@ -0,0 +1,111 @@
+import puppeteer from "puppeteer"
+import { saveScreenshot, waitForContentToBecome, createPage, paste } from "../helpers/common"
+import {
+    createNewNotebook,
+    waitForNoUpdateOngoing,
+    getPlutoUrl,
+    shutdownCurrentNotebook,
+    setupPlutoBrowser,
+    waitForPlutoToCalmDown,
+    runAllChanged,
+    importNotebook,
+} from "../helpers/pluto"
+
+describe("wind_directions", () => {
+    /**
+     * Launch a shared browser instance for all tests.
+     * I don't use jest-puppeteer because it takes away a lot of control and works buggy for me,
+     * so I need to manually create the shared browser.
+     * @type {puppeteer.Browser}
+     */
+    let browser = null
+    /** @type {puppeteer.Page} */
+    let page = null
+    beforeAll(async () => {
+        browser = await setupPlutoBrowser()
+        page = await createPage(browser)
+        await page.goto(getPlutoUrl(), { waitUntil: "networkidle0" })
+
+        await importNotebook(page, "wind_directions.jl", { permissionToRunCode: true, timeout: 180 * 1000 })
+        await page.waitForTimeout(1000)
+        await waitForPlutoToCalmDown(page)
+    })
+    beforeEach(async () => {})
+    afterEach(async () => {
+        await saveScreenshot(page)
+    })
+    afterAll(async () => {
+        await shutdownCurrentNotebook(page)
+        await page.close()
+        page = null
+
+        await browser.close()
+        browser = null
+    })
+
+    const get_cell_id_that_defines = async (page, variable_name) => {
+        return await page.evaluate((variable_name) => {
+            return document.querySelector(`pluto-cell > #${variable_name}`).parentElement.id
+        }, variable_name)
+    }
+
+    let button_selector = (variable_name, value) => `pluto-cell[id="${variable_name}"] button[data-value="${value}"]`
+    let slide_selector = (variable_name, value) => `pluto-cell[id="${variable_name}"] .carousel-slide:nth-child(${value})`
+
+    it("🎠 You can move the carousel", async () => {
+        const xoxob = await get_cell_id_that_defines(page, "xoxob")
+        const xoxob_again = await get_cell_id_that_defines(page, "xoxob_again")
+
+        expect(await page.evaluate((sel) => document.querySelector(sel).disabled, button_selector(xoxob, -1))).toBe(true)
+        expect(await page.evaluate((sel) => document.querySelector(sel).disabled, button_selector(xoxob, 1))).toBe(false)
+        expect(await page.evaluate((sel) => document.querySelector(sel).disabled, button_selector(xoxob_again, -1))).toBe(true)
+        expect(await page.evaluate((sel) => document.querySelector(sel).disabled, button_selector(xoxob_again, 1))).toBe(false)
+
+        await page.click(button_selector(xoxob, 1))
+        await waitForPlutoToCalmDown(page)
+
+        expect(await page.evaluate((sel) => document.querySelector(sel).disabled, button_selector(xoxob, -1))).toBe(false)
+        expect(await page.evaluate((sel) => document.querySelector(sel).disabled, button_selector(xoxob, 1))).toBe(false)
+        expect(await page.evaluate((sel) => document.querySelector(sel).disabled, button_selector(xoxob_again, -1))).toBe(false)
+        expect(await page.evaluate((sel) => document.querySelector(sel).disabled, button_selector(xoxob_again, 1))).toBe(false)
+
+        await page.click(button_selector(xoxob_again, 1))
+        await page.click(button_selector(xoxob_again, 1))
+        await waitForPlutoToCalmDown(page)
+
+        expect(await page.evaluate((sel) => document.querySelector(sel).disabled, button_selector(xoxob, -1))).toBe(false)
+        expect(await page.evaluate((sel) => document.querySelector(sel).disabled, button_selector(xoxob, 1))).toBe(true)
+        expect(await page.evaluate((sel) => document.querySelector(sel).disabled, button_selector(xoxob_again, -1))).toBe(false)
+        expect(await page.evaluate((sel) => document.querySelector(sel).disabled, button_selector(xoxob_again, 1))).toBe(true)
+    })
+
+    it("🎏 Wind directions UI", async () => {
+        const big_input = await get_cell_id_that_defines(page, "big_input")
+
+        expect(await page.evaluate((sel) => document.querySelector(sel).disabled, button_selector(big_input, -1))).toBe(true)
+        expect(await page.evaluate((sel) => document.querySelector(sel).disabled, button_selector(big_input, 1))).toBe(false)
+
+        let checkbox_selector = (i) => `${slide_selector(big_input, 1)} div:nth-child(${i + 1}) > input`
+        await page.click(checkbox_selector(0))
+        await waitForPlutoToCalmDown(page)
+
+        let expect_chosen_directions = async (expected) => {
+            expect(
+                await waitForContentToBecome(page, `pluto-cell[id="${await get_cell_id_that_defines(page, "chosen_directions_copy")}"] pluto-output`, expected)
+            ).toBe(expected)
+        }
+
+        await expect_chosen_directions('chosen_directions_copy\n"North"')
+
+        expect(await page.evaluate((sel) => document.querySelector(sel).checked, checkbox_selector(0))).toBe(true)
+
+        await page.click(checkbox_selector(2))
+        await waitForPlutoToCalmDown(page)
+
+        await expect_chosen_directions('chosen_directions_copy\n"North"\n"South"')
+
+        expect(await page.evaluate((sel) => document.querySelector(sel).checked, checkbox_selector(0))).toBe(true)
+        expect(await page.evaluate((sel) => document.querySelector(sel).checked, checkbox_selector(1))).toBe(false)
+        expect(await page.evaluate((sel) => document.querySelector(sel).checked, checkbox_selector(2))).toBe(true)
+    })
+})
diff --git a/test/frontend/fixtures/wind_directions.jl b/test/frontend/fixtures/wind_directions.jl
new file mode 100644
index 0000000000..7f3d48f700
--- /dev/null
+++ b/test/frontend/fixtures/wind_directions.jl
@@ -0,0 +1,936 @@
+### A Pluto.jl notebook ###
+# v0.19.31
+
+using Markdown
+using InteractiveUtils
+
+# This Pluto notebook uses @bind for interactivity. When running this notebook outside of Pluto, the following 'mock version' of @bind gives bound variables a default value (instead of an error).
+macro bind(def, element)
+    quote
+        local iv = try Base.loaded_modules[Base.PkgId(Base.UUID("6e696c72-6542-2067-7265-42206c756150"), "AbstractPlutoDingetjes")].Bonds.initial_value catch; b -> missing; end
+        local el = $(esc(element))
+        global $(esc(def)) = Core.applicable(Base.get, el) ? Base.get(el) : iv(el)
+        el
+    end
+end
+
+# ╔═╡ 2e54b8fc-7852-11ec-27d7-df0bfe7f344a
+using PlutoUI
+
+# ╔═╡ 257ee9b0-d955-43d2-9c94-245716708a2d
+using HypertextLiteral
+
+# ╔═╡ 82c316c7-a279-4728-b16a-921d7fc52886
+
+
+# ╔═╡ 0b19e53d-eb7a-42b6-a7db-d95bc8c63eae
+import MarkdownLiteral: @mdx
+
+# ╔═╡ 0c0bab41-a020-41a0-83ad-0c57b4699ffa
+const Layout = PlutoUI.ExperimentalLayout
+
+# ╔═╡ c097b477-e154-47eb-b7d9-a4d2981dcf0e
+padded(x) = Layout.Div([x]; style=Dict("padding" => "0em 1em"))
+
+# ╔═╡ ddccf592-0d0f-475c-81ae-067c37ba3f7e
+const all_directions = ["North", "East", "South", "West"]
+
+# ╔═╡ d441b495-a00c-4de3-a232-7c75f55fc95b
+function Carousel2(
+		elementsList;
+		wraparound::Bool=false,
+		peek::Bool=true,
+	)
+	
+	@assert peek
+	
+    carouselHTML = map(elementsList) do element
+		Layout.Div([element]; class="carousel-slide")
+    end
+
+	h = Layout.Div([
+		@htl("""
+		<style>
+	    .carousel-box{
+	        width: 100%;
+	        overflow: hidden;
+	    }
+	    .carousel-container{
+	        top: 0;
+	        left: 0;
+	        display: flex;
+	        width: 100%;
+	        flex-flow: row nowrap;
+	        transform: translate(10%, 0px);
+	        transition: transform 200ms ease-in-out;
+	    }
+	    .carousel-controls{
+	        display: flex;
+	        justify-content: center;
+	        align-items: center;
+	    }
+	    .carousel-controls button{
+	        margin: 8px;
+	        width: 6em;
+	    }
+	    .carousel-slide {
+	        min-width: 80%;
+			overflow-x: auto;
+	    }
+	    </style>
+		"""),
+		
+		Layout.Div([
+			Layout.Div(carouselHTML; class="carousel-container")
+		]; class="carousel-box"),
+		@htl("""
+		<div class="carousel-controls">
+	        <button data-value="-1">Previous</button>
+	        <button data-value="1">Next</button>
+	    </div>
+		"""),
+		@htl("""
+		<script>
+		// Here is a little trick!
+		// We include the number of elements inside the code, which will make this script re-run whenever it changes. Pluto only re-renders HTML when it changed.
+		const max = $(length(elementsList))
+
+        let div = currentScript.closest(".carousel-wrapper")
+		let bound_element = div.parentElement.tagName === "PLUTO-DISPLAY" ? div.parentElement : div
+		bound_element.value = 1
+		let count = 0
+
+		let buttons = div.querySelectorAll("button")
+
+		const update_ui = () => {
+			buttons[0].disabled = !$(wraparound) && count === 0
+			buttons[1].disabled = !$(wraparound) && count === max - 1
+		
+			div.querySelector(".carousel-container").style = `transform: translate(\${10-count*80}%, 0px)`;
+		}
+
+		Object.defineProperty(bound_element, "value", {
+			get: () => count + 1,
+			set: (new_value) => {
+				count = new_value - 1
+				update_ui()
+			}
+		})
+
+
+		const mod = (n, m) => ((n % m) + m) % m
+		const clamp = (x, a, b) => Math.max(Math.min(x, b), a)
+		
+		const onclick = (e) => {
+			const new_count = count + parseInt(e.target.dataset.value)
+			if($(wraparound)){
+				count = mod(new_count, max)
+			} else {
+				count = clamp(new_count, 0, max - 1)
+			}
+			
+            
+			bound_element.dispatchEvent(new CustomEvent("input"))
+			update_ui()
+            e.preventDefault()
+        }
+
+		// This code is in a requestIdleCallback because we need the buttons to be rendered before we can select them.
+		requestIdleCallback(() => {
+        	buttons = div.querySelectorAll("button")
+	        buttons.forEach(button => button.addEventListener("click", onclick))
+			update_ui()
+		})
+		
+	    </script>
+		"""),
+	]; class="carousel-wrapper")
+	
+	# BondDefault(h,1)
+	h
+end
+
+# ╔═╡ fa0b6647-6911-4c27-a1a6-240d215331d1
+function Carousel(
+		elementsList;
+		wraparound::Bool=false,
+		peek::Bool=true,
+	)
+	
+	@assert peek
+	
+    carouselHTML = map(elementsList) do element
+        @htl("""<div class="carousel-slide">
+            $(element)
+        </div>""")
+    end
+	
+    h = @htl("""
+<div>
+    <style>
+    .carousel-box{
+        width: 100%;
+        overflow: hidden;
+    }
+    .carousel-container{
+        top: 0;
+        left: 0;
+        display: flex;
+        width: 100%;
+        flex-flow: row nowrap;
+        transform: translate(10%, 0px);
+        transition: transform 200ms ease-in-out;
+    }
+    .carousel-controls{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+    .carousel-controls button{
+        margin: 8px;
+        width: 6em;
+    }
+    .carousel-slide {
+        min-width: 80%;
+    }
+    </style>
+		
+    <script>
+        const div = currentScript.parentElement
+        const buttons = div.querySelectorAll("button")
+		
+		const max = $(length(elementsList))
+
+		let count = 0
+		
+		const mod = (n, m) => ((n % m) + m) % m
+		const clamp = (x, a, b) => Math.max(Math.min(x, b), a)
+		
+		const update_ui = (count) => {
+			buttons[0].disabled = !$(wraparound) && count === 0
+			buttons[1].disabled = !$(wraparound) && count === max - 1
+		
+			div.querySelector(".carousel-container").style = `transform: translate(\${10-count*80}%, 0px)`;
+		}
+		
+		const onclick = (e) => {
+			const new_count = count + parseInt(e.target.dataset.value)
+			if($(wraparound)){
+				count = mod(new_count, max)
+			} else {
+				count = clamp(new_count, 0, max - 1)
+			}
+			
+            
+			div.value = count + 1
+			div.dispatchEvent(new CustomEvent("input"))
+			update_ui(div.value - 1)
+            e.preventDefault()
+        }
+        buttons.forEach(button => button.addEventListener("click", onclick))
+        div.value = count + 1
+		update_ui(div.value - 1)
+    </script>
+		
+    <div class="carousel-box">
+        <div class="carousel-container">
+            $(carouselHTML)
+        </div>
+    </div>
+		
+    <div class="carousel-controls">
+        <button data-value="-1">Previous</button>
+        <button data-value="1">Next</button>
+    </div>
+</div>
+    """)
+	
+	# BondDefault(h,1)
+	h
+end
+
+# ╔═╡ 6c84a84f-9ead-4091-819e-0de088e2dd4d
+function wind_speeds(directions)
+	PlutoUI.combine() do Child
+		@htl("""
+		<h6>Wind speeds</h6>
+		<ul>
+		$([
+			@htl("<li>$(name): $(Child(name, Slider(1:100)))</li>")
+			for name in directions
+		])
+		</ul>
+		""")
+	end
+end
+
+
+# ╔═╡ e866282e-7c63-4364-b344-46f4c6ad165c
+dogscats() = PlutoUI.combine() do Child
+	md"""
+	# Hi there!
+
+	I have $(
+		Child(Slider(1:10))
+	) dogs and $(
+		Child(Slider(5:100))
+	) cats.
+
+	Would you like to see them? $(Child(CheckBox(true)))
+	"""
+end
+
+# ╔═╡ cd3b9ad1-8efc-4f92-96d0-b9b038d8cfae
+md"""
+## MultiCheckBox copy
+
+This is a version of MultiCheckBox from PlutoUI that did not support synchronizing multiple bonds, i.e. it doesn't have `Object.defineProperty(wrapper, "input", {get, set})`.
+
+This means that this won't work be synced:
+
+```julia
+bond = @bind value MultiCheckbox([1,2])
+```
+
+```julia
+bond
+```
+
+We need this for the test to be extra sensitive.
+"""
+
+# ╔═╡ 79b6ac0f-4d0b-485f-8fb0-9849932dc34e
+import AbstractPlutoDingetjes.Bonds
+
+# ╔═╡ eaad4fed-ea22-4132-a84a-429f486ddce2
+subarrays(x) = (
+	x[collect(I)]
+	for I in Iterators.product(Iterators.repeated([true,false],length(x))...) |> collect |> vec
+)
+
+# ╔═╡ 146474b5-9aa6-4000-867d-ba91e4061d9b
+begin
+    local result = begin
+    """
+    ```julia
+    MultiCheckBox(options::Vector; [default::Vector], [orientation ∈ [:row, :column]], [select_all::Bool])
+    ```
+    
+    A group of checkboxes - the user can choose which of the `options` to return.
+    The value returned via `@bind` is a list containing the currently checked items.
+
+    See also: [`MultiSelect`](@ref).
+
+    `options` can also be an array of pairs `key::Any => value::String`. The `key` is returned via `@bind`; the `value` is shown.
+
+    # Keyword arguments
+    - `defaults` specifies which options should be checked initally.
+    - `orientation` specifies whether the options should be arranged in `:row`'s `:column`'s.
+    - `select_all` specifies whether or not to include a "Select All" checkbox.
+
+    # Examples
+    ```julia
+    @bind snacks MultiCheckBox(["🥕", "🐟", "🍌"]))
+    
+    if "🥕" ∈ snacks
+        "Yum yum!"
+    end
+    ```
+    
+    ```julia
+    @bind functions MultiCheckBox([sin, cos, tan])
+    
+    [f(0.5) for f in functions]
+    ```
+
+    ```julia
+    @bind snacks MultiCheckBox(["🥕" => "🐰", "🐟" => "🐱", "🍌" => "🐵"]; default=["🥕", "🍌"])
+    ```
+
+    ```julia
+    @bind animals MultiCheckBox(["🐰", "🐱" , "🐵", "🐘", "🦝", "🐿️" , "🐝",  "🐪"]; orientation=:column, select_all=true)
+    ```
+    """
+    struct MultiCheckBox{BT,DT}
+        options::AbstractVector{Pair{BT,DT}}
+        default::Union{Missing,AbstractVector{BT}}
+        orientation::Symbol
+        select_all::Bool
+    end
+    end
+
+    MultiCheckBox(options::AbstractVector{<:Pair{BT,DT}}; default=missing, orientation=:row, select_all=false) where {BT,DT} = MultiCheckBox(options, default, orientation, select_all)
+        
+    MultiCheckBox(options::AbstractVector{BT}; default=missing, orientation=:row, select_all=false) where BT = MultiCheckBox{BT,BT}(Pair{BT,BT}[o => o for o in options], default, orientation, select_all)
+
+    function Base.show(io::IO, m::MIME"text/html", mc::MultiCheckBox)
+        @assert mc.orientation == :column || mc.orientation == :row "Invalid orientation $(mc.orientation). Orientation should be :row or :column"
+
+        defaults = coalesce(mc.default, [])
+
+		# Old:
+		# checked = [k in defaults for (k,v) in mc.options]
+		# 
+		# More complicated to fix https://github.com/JuliaPluto/PlutoUI.jl/issues/106
+		defaults_copy = copy(defaults)
+		checked = [
+			let
+				i = findfirst(isequal(k), defaults_copy)
+				if i === nothing
+					false
+				else
+					deleteat!(defaults_copy, i)
+					true
+				end
+			end
+		for (k,v) in mc.options]
+		
+        show(io, m, @htl("""
+        <plj-multi-checkbox style="flex-direction: $(mc.orientation);"></plj-multi-checkbox>
+        <script type="text/javascript">
+		const labels = $([string(v) for (k,v) in mc.options]);
+		const values = $(1:length(mc.options));
+		const checked = $(checked);
+		const includeSelectAll = $(mc.select_all);
+
+		const container = (currentScript ? currentScript : this.currentScript).previousElementSibling
+		
+		const my_id = crypto.getRandomValues(new Uint32Array(1))[0].toString(36)
+		
+		// Add checkboxes
+		const inputEls = []
+		for (let i = 0; i < labels.length; i++) {
+			const boxId = `\${my_id}-box-\${i}`
+		
+			const item = document.createElement('div')
+		
+			const checkbox = document.createElement('input')
+			checkbox.type = 'checkbox'
+			checkbox.id = boxId
+			checkbox.name = labels[i]
+			checkbox.value = values[i]
+			checkbox.checked = checked[i]
+			inputEls.push(checkbox)
+			item.appendChild(checkbox)
+		
+			const label = document.createElement('label')
+			label.htmlFor = boxId
+			label.innerText = labels[i]
+			item.appendChild(label)
+		
+			container.appendChild(item)
+		}
+		
+		function setValue() {
+			container.value = inputEls.filter((o) => o.checked).map((o) => o.value)
+		}
+		// Add listeners
+		function sendEvent() {
+			setValue()
+			container.dispatchEvent(new CustomEvent('input'))
+		}
+		
+		function updateSelectAll() {}
+		
+		if (includeSelectAll) {
+			// Add select-all checkbox.
+			const selectAllItem = document.createElement('div')
+			selectAllItem.classList.add(`select-all`)
+		
+			const selectID = `\${my_id}-select-all`
+		
+			const selectAllInput = document.createElement('input')
+			selectAllInput.type = 'checkbox'
+			selectAllInput.id = selectID
+			selectAllItem.appendChild(selectAllInput)
+		
+			const selectAllLabel = document.createElement('label')
+			selectAllLabel.htmlFor = selectID
+			selectAllLabel.innerText = 'Select All'
+			selectAllItem.appendChild(selectAllLabel)
+		
+			container.prepend(selectAllItem)
+		
+			function onSelectAllClick(event) {
+				event.stopPropagation()
+				inputEls.forEach((o) => (o.checked = this.checked))
+				sendEvent()
+			}
+			selectAllInput.addEventListener('click', onSelectAllClick)
+            selectAllInput.addEventListener('input', e => e.stopPropagation())
+		
+			/// Taken from: https://stackoverflow.com/questions/10099158/how-to-deal-with-browser-differences-with-indeterminate-checkbox
+			/// Determine the checked state to give to a checkbox
+			/// with indeterminate state, so that it becomes checked
+			/// on click on IE, Chrome and Firefox 5+
+			function getCheckedStateForIndeterminate() {
+				// Create a unchecked checkbox with indeterminate state
+				const test = document.createElement('input')
+				test.type = 'checkbox'
+				test.checked = false
+				test.indeterminate = true
+		
+				// Try to click the checkbox
+				const body = document.body
+				body.appendChild(test) // Required to work on FF
+				test.click()
+				body.removeChild(test) // Required to work on FF
+		
+				// Check if the checkbox is now checked and cache the result
+				if (test.checked) {
+					getCheckedStateForIndeterminate = function () {
+						return false
+					}
+					return false
+				} else {
+					getCheckedStateForIndeterminate = function () {
+						return true
+					}
+					return true
+				}
+			}
+		
+			updateSelectAll = function () {
+				const checked = inputEls.map((o) => o.checked)
+				if (checked.every((x) => x)) {
+					selectAllInput.checked = true
+					selectAllInput.indeterminate = false
+				} else if (checked.some((x) => x)) {
+					selectAllInput.checked = getCheckedStateForIndeterminate()
+					selectAllInput.indeterminate = true
+				} else {
+					selectAllInput.checked = false
+					selectAllInput.indeterminate = false
+				}
+			}
+			// Call once at the beginning to initialize.
+			updateSelectAll()
+		}
+		
+		function onItemClick(event) {
+			event.stopPropagation()
+			updateSelectAll()
+			sendEvent()
+		}
+		setValue()
+		inputEls.forEach((el) => el.addEventListener('click', onItemClick))
+		inputEls.forEach((el) => el.addEventListener('input', e => e.stopPropagation()))
+		
+        </script>
+        <style type="text/css">
+		plj-multi-checkbox {
+			display: flex;
+			flex-wrap: wrap;
+			/* max-height: 8em; */
+		}
+		
+		plj-multi-checkbox * {
+			display: flex;
+		}
+		
+		plj-multi-checkbox > div {
+			margin: 0.1em 0.3em;
+			align-items: center;
+		}
+		
+		plj-multi-checkbox label,
+		plj-multi-checkbox input {
+			cursor: pointer;
+		}
+		
+		plj-multi-checkbox .select-all {
+			font-style: italic;
+			color: hsl(0, 0%, 25%, 0.7);
+		}
+		</style>
+        """))
+    end
+
+    Base.get(select::MultiCheckBox) = Bonds.initial_value(select)
+    Bonds.initial_value(select::MultiCheckBox{BT,DT}) where {BT,DT} = 
+        ismissing(select.default) ? BT[] : select.default
+    Bonds.possible_values(select::MultiCheckBox) = 
+        subarrays(map(string, 1:length(select.options)))
+    
+    function Bonds.transform_value(select::MultiCheckBox{BT,DT}, val_from_js) where {BT,DT}
+        # val_from_js will be a vector of Strings, but let's allow Integers as well, there's no harm in that
+        @assert val_from_js isa Vector
+        
+        val_nums = (
+            v isa Integer ? v : tryparse(Int64, v)
+            for v in val_from_js
+        )
+        
+        BT[select.options[v].first for v in val_nums]
+    end
+    
+    function Bonds.validate_value(select::MultiCheckBox, val)
+        val isa Vector && all(val_from_js) do v
+            val_num = v isa Integer ? v : tryparse(Int64, v)
+            1 ≤ val_num ≤ length(select.options)
+        end
+    end
+    result
+end
+
+# ╔═╡ 67e2cb97-e224-47ca-96ba-2e89d94959e7
+ppp = @bind opop Slider(1:10);
+
+# ╔═╡ b1c0d12c-f383-44fb-bcfe-4157a2801b9a
+Layout.Div([
+	ppp,
+	@htl("""$(opop)""")
+])
+
+# ╔═╡ a060f034-b540-4b1e-a87f-7e6185e15646
+directions_bond = @bind chosen_directions MultiCheckBox(all_directions);
+
+# ╔═╡ 466bf852-144c-47df-98e1-89935754f5f1
+chosen_directions_copy = chosen_directions
+
+# ╔═╡ 6e26a930-1b49-4ff5-8704-9149d3cab7e9
+speeds_bond = @bind speeds wind_speeds(chosen_directions);
+
+# ╔═╡ ede20024-1aea-4d80-a19a-8a5ec88a00ac
+data = map(speeds) do s
+	rand(50) .+ s
+end
+
+# ╔═╡ acb08d1f-30f9-4e01-8216-3440c82714c7
+pairs(speeds) |> collect
+
+# ╔═╡ fffd6402-d508-48a6-abc6-3de333497787
+big_input = Carousel2([
+	md"""
+	## Step 1: *directions*
+	$(directions_bond)
+	""" |> identity,
+	
+	md"""
+	## Step 2: *speeds*
+	$(speeds_bond)
+	""" |> identity,
+
+	md"""
+	## Step 3: 🎉
+	$(embed_display(
+		data
+	))
+	""" |> identity,
+	
+	# md"""
+	# ## Step 4: 📉
+	# $(embed_display(
+	# 	let
+	# 		p = plot()
+			
+	# 		for (n,v) in pairs(data)
+	# 			plot!(p, v; label=string(n))
+	# 		end
+	# 		p
+	# 	end
+	# ))
+	# """ |> padded,
+])
+
+# ╔═╡ 0cb7b599-cec5-4391-9485-4e1c63cd9ff2
+speeds_copy = speeds
+
+# ╔═╡ ab108b97-4dd5-49e4-845c-2f0fab131f8a
+Layout.vbox([
+	directions_bond,
+	speeds_bond,
+	speeds
+])
+
+# ╔═╡ 596dbead-63ce-432a-8a0b-b3ea361e279e
+xoxob = @bind xoxo Carousel2([md"# a",md"# b",3,rand(4)])
+
+# ╔═╡ 8c96934c-3e23-45ed-b945-dce344bfb6eb
+xoxob_again = xoxob
+
+# ╔═╡ af1ad32b-af53-4865-9807-ba8d0fba2a8c
+xoxo
+
+# ╔═╡ 00000000-0000-0000-0000-000000000001
+PLUTO_PROJECT_TOML_CONTENTS = """
+[deps]
+AbstractPlutoDingetjes = "6e696c72-6542-2067-7265-42206c756150"
+HypertextLiteral = "ac1192a8-f4b3-4bfe-ba22-af5b92cd3ab2"
+MarkdownLiteral = "736d6165-7244-6769-4267-6b50796e6954"
+PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
+
+[compat]
+AbstractPlutoDingetjes = "~1.2.0"
+HypertextLiteral = "~0.9.4"
+MarkdownLiteral = "~0.1.1"
+PlutoUI = "~0.7.52"
+"""
+
+# ╔═╡ 00000000-0000-0000-0000-000000000002
+PLUTO_MANIFEST_TOML_CONTENTS = """
+# This file is machine-generated - editing it directly is not advised
+
+[[AbstractPlutoDingetjes]]
+deps = ["Pkg"]
+git-tree-sha1 = "91bd53c39b9cbfb5ef4b015e8b582d344532bd0a"
+uuid = "6e696c72-6542-2067-7265-42206c756150"
+version = "1.2.0"
+
+[[ArgTools]]
+uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
+
+[[Artifacts]]
+uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+
+[[Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+
+[[ColorTypes]]
+deps = ["FixedPointNumbers", "Random"]
+git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4"
+uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
+version = "0.11.4"
+
+[[CommonMark]]
+deps = ["Crayons", "JSON", "PrecompileTools", "URIs"]
+git-tree-sha1 = "532c4185d3c9037c0237546d817858b23cf9e071"
+uuid = "a80b9123-70ca-4bc0-993e-6e3bcb318db6"
+version = "0.8.12"
+
+[[Crayons]]
+git-tree-sha1 = "249fe38abf76d48563e2f4556bebd215aa317e15"
+uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f"
+version = "4.1.1"
+
+[[Dates]]
+deps = ["Printf"]
+uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
+
+[[Downloads]]
+deps = ["ArgTools", "LibCURL", "NetworkOptions"]
+uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
+
+[[FixedPointNumbers]]
+deps = ["Statistics"]
+git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc"
+uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
+version = "0.8.4"
+
+[[Hyperscript]]
+deps = ["Test"]
+git-tree-sha1 = "8d511d5b81240fc8e6802386302675bdf47737b9"
+uuid = "47d2ed2b-36de-50cf-bf87-49c2cf4b8b91"
+version = "0.0.4"
+
+[[HypertextLiteral]]
+deps = ["Tricks"]
+git-tree-sha1 = "c47c5fa4c5308f27ccaac35504858d8914e102f9"
+uuid = "ac1192a8-f4b3-4bfe-ba22-af5b92cd3ab2"
+version = "0.9.4"
+
+[[IOCapture]]
+deps = ["Logging", "Random"]
+git-tree-sha1 = "d75853a0bdbfb1ac815478bacd89cd27b550ace6"
+uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89"
+version = "0.2.3"
+
+[[InteractiveUtils]]
+deps = ["Markdown"]
+uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+
+[[JSON]]
+deps = ["Dates", "Mmap", "Parsers", "Unicode"]
+git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a"
+uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
+version = "0.21.4"
+
+[[LibCURL]]
+deps = ["LibCURL_jll", "MozillaCACerts_jll"]
+uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
+
+[[LibCURL_jll]]
+deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
+uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
+
+[[LibGit2]]
+deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
+uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
+
+[[LibSSH2_jll]]
+deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
+uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
+
+[[Libdl]]
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
+[[LinearAlgebra]]
+deps = ["Libdl"]
+uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+
+[[Logging]]
+uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
+
+[[MIMEs]]
+git-tree-sha1 = "65f28ad4b594aebe22157d6fac869786a255b7eb"
+uuid = "6c6e2e6c-3030-632d-7369-2d6c69616d65"
+version = "0.1.4"
+
+[[Markdown]]
+deps = ["Base64"]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+
+[[MarkdownLiteral]]
+deps = ["CommonMark", "HypertextLiteral"]
+git-tree-sha1 = "0d3fa2dd374934b62ee16a4721fe68c418b92899"
+uuid = "736d6165-7244-6769-4267-6b50796e6954"
+version = "0.1.1"
+
+[[MbedTLS_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
+
+[[Mmap]]
+uuid = "a63ad114-7e13-5084-954f-fe012c677804"
+
+[[MozillaCACerts_jll]]
+uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
+
+[[NetworkOptions]]
+uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
+
+[[Parsers]]
+deps = ["Dates", "PrecompileTools", "UUIDs"]
+git-tree-sha1 = "716e24b21538abc91f6205fd1d8363f39b442851"
+uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
+version = "2.7.2"
+
+[[Pkg]]
+deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
+uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+
+[[PlutoUI]]
+deps = ["AbstractPlutoDingetjes", "Base64", "ColorTypes", "Dates", "FixedPointNumbers", "Hyperscript", "HypertextLiteral", "IOCapture", "InteractiveUtils", "JSON", "Logging", "MIMEs", "Markdown", "Random", "Reexport", "URIs", "UUIDs"]
+git-tree-sha1 = "e47cd150dbe0443c3a3651bc5b9cbd5576ab75b7"
+uuid = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
+version = "0.7.52"
+
+[[PrecompileTools]]
+deps = ["Preferences"]
+git-tree-sha1 = "03b4c25b43cb84cee5c90aa9b5ea0a78fd848d2f"
+uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
+version = "1.2.0"
+
+[[Preferences]]
+deps = ["TOML"]
+git-tree-sha1 = "00805cd429dcb4870060ff49ef443486c262e38e"
+uuid = "21216c6a-2e73-6563-6e65-726566657250"
+version = "1.4.1"
+
+[[Printf]]
+deps = ["Unicode"]
+uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[[REPL]]
+deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
+uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+
+[[Random]]
+deps = ["Serialization"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[Reexport]]
+git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b"
+uuid = "189a3867-3050-52da-a836-e630ba90ab69"
+version = "1.2.2"
+
+[[SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+
+[[Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[Sockets]]
+uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
+
+[[SparseArrays]]
+deps = ["LinearAlgebra", "Random"]
+uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[[Statistics]]
+deps = ["LinearAlgebra", "SparseArrays"]
+uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+
+[[TOML]]
+deps = ["Dates"]
+uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
+
+[[Tar]]
+deps = ["ArgTools", "SHA"]
+uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
+
+[[Test]]
+deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
+uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[[Tricks]]
+git-tree-sha1 = "eae1bb484cd63b36999ee58be2de6c178105112f"
+uuid = "410a4b4d-49e4-4fbc-ab6d-cb71b17b3775"
+version = "0.1.8"
+
+[[URIs]]
+git-tree-sha1 = "67db6cc7b3821e19ebe75791a9dd19c9b1188f2b"
+uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
+version = "1.5.1"
+
+[[UUIDs]]
+deps = ["Random", "SHA"]
+uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
+[[Unicode]]
+uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
+
+[[Zlib_jll]]
+deps = ["Libdl"]
+uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
+
+[[nghttp2_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
+
+[[p7zip_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
+"""
+
+# ╔═╡ Cell order:
+# ╠═67e2cb97-e224-47ca-96ba-2e89d94959e7
+# ╠═b1c0d12c-f383-44fb-bcfe-4157a2801b9a
+# ╠═82c316c7-a279-4728-b16a-921d7fc52886
+# ╠═ede20024-1aea-4d80-a19a-8a5ec88a00ac
+# ╠═acb08d1f-30f9-4e01-8216-3440c82714c7
+# ╠═c097b477-e154-47eb-b7d9-a4d2981dcf0e
+# ╠═0b19e53d-eb7a-42b6-a7db-d95bc8c63eae
+# ╠═2e54b8fc-7852-11ec-27d7-df0bfe7f344a
+# ╠═0c0bab41-a020-41a0-83ad-0c57b4699ffa
+# ╠═257ee9b0-d955-43d2-9c94-245716708a2d
+# ╟─ddccf592-0d0f-475c-81ae-067c37ba3f7e
+# ╠═fffd6402-d508-48a6-abc6-3de333497787
+# ╠═a060f034-b540-4b1e-a87f-7e6185e15646
+# ╠═466bf852-144c-47df-98e1-89935754f5f1
+# ╠═6e26a930-1b49-4ff5-8704-9149d3cab7e9
+# ╠═0cb7b599-cec5-4391-9485-4e1c63cd9ff2
+# ╠═ab108b97-4dd5-49e4-845c-2f0fab131f8a
+# ╠═596dbead-63ce-432a-8a0b-b3ea361e279e
+# ╠═8c96934c-3e23-45ed-b945-dce344bfb6eb
+# ╠═af1ad32b-af53-4865-9807-ba8d0fba2a8c
+# ╠═d441b495-a00c-4de3-a232-7c75f55fc95b
+# ╟─fa0b6647-6911-4c27-a1a6-240d215331d1
+# ╟─6c84a84f-9ead-4091-819e-0de088e2dd4d
+# ╟─e866282e-7c63-4364-b344-46f4c6ad165c
+# ╟─cd3b9ad1-8efc-4f92-96d0-b9b038d8cfae
+# ╠═79b6ac0f-4d0b-485f-8fb0-9849932dc34e
+# ╟─eaad4fed-ea22-4132-a84a-429f486ddce2
+# ╟─146474b5-9aa6-4000-867d-ba91e4061d9b
+# ╟─00000000-0000-0000-0000-000000000001
+# ╟─00000000-0000-0000-0000-000000000002
diff --git a/test/frontend/helpers/common.js b/test/frontend/helpers/common.js
index 42c7a73766..c0578974b4 100644
--- a/test/frontend/helpers/common.js
+++ b/test/frontend/helpers/common.js
@@ -211,7 +211,7 @@ export const createPage = async (browser) => {
   return page
 };
 
-let testname = () => expect.getState().currentTestName.replace(/ /g, "_");
+let testname = () => expect.getState()?.currentTestName?.replace(/ /g, "_") ?? "unnkown";
 
 export const lastElement = (arr) => arr[arr.length - 1];
 

From 82f14dee992adfbe43e9fb89b62930307281dc0e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 31 Oct 2023 16:34:59 +0100
Subject: [PATCH 757/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index a7a3ff9cef..1a70200cf0 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.31"
+version = "0.19.32"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 84b08cb5d4777f9c7c7187f77289c0331ea3b2ac Mon Sep 17 00:00:00 2001
From: sebibek <sebibek@gmail.com>
Date: Sat, 4 Nov 2023 13:31:02 +0100
Subject: [PATCH 758/821] augment PutUpdates

---
 src/webserver/PutUpdates.jl | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/webserver/PutUpdates.jl b/src/webserver/PutUpdates.jl
index 97365c2408..4256cf520e 100644
--- a/src/webserver/PutUpdates.jl
+++ b/src/webserver/PutUpdates.jl
@@ -1,4 +1,20 @@
 
+function serialize_message_to_stream(io::IO, message::UpdateMessage)
+    to_send = Dict(:type => message.type, :message => message.message)
+    if message.notebook !== nothing
+        to_send[:notebook_id] = message.notebook.notebook_id
+    end
+    if message.cell !== nothing
+        to_send[:cell_id] = message.cell.cell_id
+    end
+    if message.initiator !== nothing
+        to_send[:initiator_id] = message.initiator.client_id
+        to_send[:request_id] = message.initiator.request_id
+    end
+
+    pack(io, to_send)
+end
+
 function serialize_message_to_stream(io::IO, message::UpdateMessage, recipient::ClientSession)
     to_send = Dict{Symbol,Any}(
         :type => message.type, 
@@ -25,6 +41,10 @@ function serialize_message(message::UpdateMessage)
     take!(io)
 end
 
+function serialize_message(message::UpdateMessage, recipient::ClientSession)
+    sprint(serialize_message_to_stream, message, recipient)
+end
+
 "Send `messages` to all clients connected to the `notebook`."
 function putnotebookupdates!(session::ServerSession, notebook::Notebook, messages::UpdateMessage...; flush::Bool=true)
     listeners = filter(collect(values(session.connected_clients))) do c
@@ -134,4 +154,4 @@ end
 
 function flushallclients(session::ServerSession)
     flushallclients(session, values(session.connected_clients))
-end
+end
\ No newline at end of file

From 7903b6cf69de7b16163e22434975287fe81c489e Mon Sep 17 00:00:00 2001
From: sebibek <sebibek@gmail.com>
Date: Sat, 4 Nov 2023 15:02:49 +0100
Subject: [PATCH 759/821] fix default_path/Bundle-Web-Assets

---
 frontend/components/Editor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 9ef6e685ff..e69bef0345 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -39,7 +39,7 @@ import { get_environment } from "../common/Environment.js"
 import { ProcessStatus } from "../common/ProcessStatus.js"
 import { SafePreviewUI } from "./SafePreviewUI.js"
 
-const default_path = "..."
+export const default_path = ""
 import { alert, confirm } from "../common/alert_confirm.js"
 
 const DEBUG_DIFFING = false
@@ -325,7 +325,7 @@ export class Editor extends Component {
         const { launch_params, initial_notebook_state } = this.props
 
         this.state = {
-            notebook: /** @type {NotebookData} */ initial_notebook(),
+            notebook: /** @type {NotebookData} */ initial_notebook_state,
             cell_inputs_local: /** @type {{ [id: string]: CellInputData }} */ vscode.load_cell_inputs_from_vscode_state(),
             desired_doc_query: null,
             recently_deleted: /** @type {Array<{ index: number, cell: CellInputData }>} */ ([]),

From 794a5f4a965dff3ab0e1a076e51ce52acf8b1721 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sun, 5 Nov 2023 14:02:24 +0100
Subject: [PATCH 760/821] error log tweak

---
 frontend/components/Editor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 0260e3acc6..1cb178ba6b 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1267,7 +1267,8 @@ patch: ${JSON.stringify(
                 const serialized = this.serialize_selected()
                 if (serialized) {
                     navigator.clipboard.writeText(serialized).catch((err) => {
-                        alert(`Error copying cells: ${e}`)
+                        console.error("Error copying cells", e, err)
+                        alert(`Error copying cells: ${err}`)
                     })
                 }
             }

From 4da72bc02170c466810f2cda9381ebe439dd9ffc Mon Sep 17 00:00:00 2001
From: sebibek <sebibek@gmail.com>
Date: Sun, 5 Nov 2023 14:40:01 +0100
Subject: [PATCH 761/821] not override send_notebook_changes

---
 src/webserver/Dynamic.jl | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 566b66d57b..b2a20a64b5 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -179,36 +179,6 @@ const current_state_for_clients_lock = ReentrantLock()
 """
 Update the local state of all clients connected to this notebook.
 """
-function send_notebook_changes!(🙋::ClientRequest; commentary::Any=nothing)
-    notebook_dict = notebook_to_js(🙋.notebook)
-    # @info "Connected clients" length(🙋.session.connected_clients) Set(c -> c.stream for c in 🙋.session.connected_clients)
-    for (_, client) in 🙋.session.connected_clients
-        if client.connected_notebook !== nothing && client.connected_notebook.notebook_id == 🙋.notebook.notebook_id
-            current_dict = get(current_state_for_clients, client, :empty)
-            patches = Firebasey.diff(current_dict, notebook_dict)
-            patches_as_dicts::Array{Dict} = patches
-            current_state_for_clients[client] = deep_enough_copy(notebook_dict)
-
-            # Make sure we do send a confirmation to the client who made the request, even without changes
-            is_response = 🙋.initiator !== nothing && client == 🙋.initiator.client
-            # @info "Responding" is_response (🙋.initiator !== nothing) (commentary === nothing)    
-
-            if !skip_send && (!isempty(patches) || is_response)
-                response = Dict(
-                    :patches => patches_as_dicts,
-                    :response => is_response ? commentary : nothing
-                )
-                push!(outbox, (client, UpdateMessage(:notebook_diff, response, 🙋.notebook, nothing, 🙋.initiator)))
-            end
-            end
-        end
-
-    for (client, msg) in outbox
-        putclientupdates!(client, msg)
-    end
-    try_event_call(🙋.session, FileEditEvent(🙋.notebook))
-end
-
 
 function send_notebook_changes!(🙋::ClientRequest; commentary::Any=nothing, skip_send::Bool=false)
     outbox = Set{Tuple{ClientSession,UpdateMessage}}()

From 3f68e7f4c30defc39701f3f47776f34b17190472 Mon Sep 17 00:00:00 2001
From: sebibek <sebibek@gmail.com>
Date: Sun, 12 Nov 2023 09:37:46 +0100
Subject: [PATCH 762/821] PlutoConnection

---
 frontend/common/PlutoConnection.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/common/PlutoConnection.js b/frontend/common/PlutoConnection.js
index 59425a0ad5..d8c2739048 100644
--- a/frontend/common/PlutoConnection.js
+++ b/frontend/common/PlutoConnection.js
@@ -199,7 +199,7 @@ const create_vscode_connection = (address, { on_message, on_socket_close }, time
                         const message = unpack(new Uint8Array(buffer))
 
                         try {
-                            window.DEBUG && console.info("message received!", message)
+                            console.info("message received!", message)
                             on_message(message)
                         } catch (process_err) {
                             console.error("Failed to process message from websocket", process_err, { message })
@@ -217,7 +217,7 @@ const create_vscode_connection = (address, { on_message, on_socket_close }, time
         })
 
         const send_encoded = async (message) => {
-            window.DEBUG && console.log("Sending message!", message)
+            console.log("Sending message!", message)
             const encoded = pack(message)
             await vscode_api.postMessage({ type: "ws_proxy", base64_encoded: await base64_arraybuffer(encoded) })
         }
@@ -332,7 +332,9 @@ export const create_pluto_connection = async ({
     connect_metadata = {},
     ws_address = default_ws_address(),
 }) => {
-    let ws_connection = null // will be defined later i promise
+    let ws_connection = /** @type {WebsocketConnection?} */ (null) // will be defined later i promise
+
+    /** @type {PlutoConnection} */
     const client = {
         send: null,
         session_options: null,

From 1903e385af4d05e8b904732d96720ffe55c856b3 Mon Sep 17 00:00:00 2001
From: sebibek <sebibek@gmail.com>
Date: Sun, 12 Nov 2023 10:07:38 +0100
Subject: [PATCH 763/821] rm old welcome files

---
 frontend/components/LiveDocs.js | 159 --------------
 frontend/components/PkgPopup.js | 150 -------------
 frontend/components/Welcome.js  | 358 --------------------------------
 3 files changed, 667 deletions(-)
 delete mode 100644 frontend/components/LiveDocs.js
 delete mode 100644 frontend/components/PkgPopup.js
 delete mode 100644 frontend/components/Welcome.js

diff --git a/frontend/components/LiveDocs.js b/frontend/components/LiveDocs.js
deleted file mode 100644
index 0ee3d8acf7..0000000000
--- a/frontend/components/LiveDocs.js
+++ /dev/null
@@ -1,159 +0,0 @@
-import { html, useState, useRef, useLayoutEffect, useEffect, useMemo, useContext } from "../imports/Preact.js"
-import immer from "../imports/immer.js"
-import observablehq from "../common/SetupCellEnvironment.js"
-import { cl } from "../common/ClassTable.js"
-import { alert, confirm } from "../common/alert_confirm.js"
-
-import { RawHTMLContainer, highlight } from "./CellOutput.js"
-import { PlutoContext } from "../common/PlutoContext.js"
-
-const without_workspace_stuff = (str) =>
-    str
-        .replace(/Main\.workspace\#\d+\./g, "") // remove workspace modules from variable names
-        .replace(/ in Main\.workspace\#\d+/g, "") // remove workspace modules from method lists
-        .replace(/#&#61;&#61;#[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\:\d+/g, "") // remove UUIDs from filenames
-
-export let LiveDocs = ({ desired_doc_query, on_update_doc_query, notebook }) => {
-    let pluto_actions = useContext(PlutoContext)
-    let container_ref = useRef()
-    let live_doc_search_ref = useRef()
-    let [state, set_state] = useState({
-        shown_query: null,
-        searched_query: null,
-        body: "<p>Welcome to the <b>Live docs</b>! Keep this little window open while you work on the notebook, and you will get documentation of everything you type!</p><p>You can also type a query above.</p><hr><p><em>Still stuck? Here are <a href='https://julialang.org/about/help/' target='_blank'>some tips</a>.</em></p>",
-        hidden: true,
-        loading: false,
-    })
-    let update_state = (mutation) => set_state(immer((state) => mutation(state)))
-
-    // Open docs when "open_live_docs" event is triggered
-    useEffect(() => {
-        let handler = () => {
-            // https://github.com/fonsp/Pluto.jl/issues/321
-            update_state((state) => {
-                state.hidden = false
-            })
-            if (window.getComputedStyle(container_ref.current).display === "none") {
-                alert("This browser window is too small to show docs.\n\nMake the window bigger, or try zooming out.")
-            }
-        }
-        window.addEventListener("open_live_docs", handler)
-        return () => window.removeEventListener("open_live_docs", handler)
-    }, [])
-
-    // Apply syntax highlighting to code blocks:
-    // In the standard HTML container we already do this for code.language-julia blocks,
-    // but in the docs it's safe to extend to to all highlighting I think
-    useLayoutEffect(() => {
-        // Actually, showing the jldoctest stuff wasn't as pretty... should make a mode for that sometimes
-        // for (let code_element of container_ref.current.querySelectorAll("code.language-jldoctest")) {
-        //     highlight(code_element, "julia")
-        // }
-        for (let code_element of container_ref.current.querySelectorAll("code:not([class])")) {
-            highlight(code_element, "julia")
-        }
-    }, [state.body])
-
-    useEffect(() => {
-        if (state.hidden || state.loading) {
-            return
-        }
-        if (!/[^\s]/.test(desired_doc_query)) {
-            // only whitespace
-            return
-        }
-
-        if (state.searched_query !== desired_doc_query) {
-            fetch_docs(desired_doc_query)
-        }
-    }, [desired_doc_query, state.hidden, state.loading, state.searched_query])
-
-    let fetch_docs = (new_query) => {
-        update_state((state) => {
-            state.loading = true
-            state.searched_query = new_query
-        })
-        Promise.race([
-            observablehq.Promises.delay(2000, false),
-            pluto_actions.send("docs", { query: new_query.replace(/^\?/, "") }, { notebook_id: notebook.notebook_id }).then((u) => {
-                if (u.message.status === "⌛") {
-                    return false
-                }
-                if (u.message.status === "👍") {
-                    update_state((state) => {
-                        state.shown_query = new_query
-                        state.body = u.message.doc
-                    })
-                    return true
-                }
-            }),
-        ]).then(() => {
-            update_state((state) => {
-                state.loading = false
-            })
-        })
-    }
-
-    let docs_element = useMemo(() => html` <${RawHTMLContainer} body=${without_workspace_stuff(state.body)} /> `, [state.body])
-    let no_docs_found = state.loading === false && state.searched_query !== "" && state.searched_query !== state.shown_query
-
-    return html`
-        <aside id="helpbox-wrapper" ref=${container_ref}>
-            <pluto-helpbox class=${cl({ hidden: state.hidden, loading: state.loading, notfound: no_docs_found })}>
-                <header
-                    translate=${false}
-                    onClick=${() => {
-                        if (state.hidden) {
-                            set_state((state) => ({ ...state, hidden: false }))
-                            // wait for next event loop
-                            setTimeout(
-                                () =>
-                                    live_doc_search_ref.current &&
-                                    live_doc_search_ref.current.focus({
-                                        preventScroll: true,
-                                    }),
-                                0
-                            )
-                        }
-                    }}
-                >
-                    ${state.hidden
-                        ? "Live docs"
-                        : html`
-                        <input
-                            title=${no_docs_found ? `"${state.searched_query}" not found` : ""}
-                            id="live-docs-search"
-                            placeholder="Search docs..."
-                            ref=${live_doc_search_ref}
-                            onInput=${(e) => on_update_doc_query(e.target.value)}
-                            value=${desired_doc_query}
-                            type="text"
-                        ></input>
-                        <button onClick=${(e) => {
-                            set_state((state) => ({ ...state, hidden: true }))
-                            e.stopPropagation()
-                            setTimeout(() => live_doc_search_ref.current && live_doc_search_ref.current.focus(), 0)
-                        }}><span></span></button>
-                    `}
-                </header>
-                <section ref=${(ref) => ref != null && resolve_doc_reference_links(ref, on_update_doc_query)}>
-                    <h1><code>${state.shown_query}</code></h1>
-                    ${docs_element}
-                </section>
-            </pluto-helpbox>
-        </aside>
-    `
-}
-
-const resolve_doc_reference_links = (node, on_update_doc_query) => {
-    for (let anchor of node.querySelectorAll("a")) {
-        const href = anchor.getAttribute("href")
-        if (href != null && href.startsWith("@ref")) {
-            const query = href.length > 4 ? href.substr(5) : anchor.textContent
-            anchor.onclick = (e) => {
-                on_update_doc_query(query)
-                e.preventDefault()
-            }
-        }
-    }
-}
diff --git a/frontend/components/PkgPopup.js b/frontend/components/PkgPopup.js
deleted file mode 100644
index 67cd25358d..0000000000
--- a/frontend/components/PkgPopup.js
+++ /dev/null
@@ -1,150 +0,0 @@
-import { html, useState, useRef, useLayoutEffect, useEffect, useMemo, useContext } from "../imports/Preact.js"
-import immer from "../imports/immer.js"
-import observablehq from "../common/SetupCellEnvironment.js"
-import { cl } from "../common/ClassTable.js"
-
-import { RawHTMLContainer, highlight } from "./CellOutput.js"
-import { PlutoContext } from "../common/PlutoContext.js"
-import { package_status, nbpkg_fingerprint_without_terminal } from "./PkgStatusMark.js"
-import { PkgTerminalView } from "./PkgTerminalView.js"
-import { useDebouncedTruth } from "./RunArea.js"
-import { alert, confirm } from "../common/alert_confirm.js"
-
-export const PkgPopup = ({ notebook }) => {
-    let pluto_actions = useContext(PlutoContext)
-
-    const [recent_event, set_recent_event] = useState(null)
-    const [pkg_status, set_pkg_status] = useState(null)
-    const pos_ref = useRef("")
-
-    const open = (e) => {
-        const el = e.detail.status_mark_element
-
-        pos_ref.current = `top: ${el.getBoundingClientRect().top - document.body.getBoundingClientRect().top}px; left: min(max(0px,100vw - 251px - 30px), ${
-            el.getBoundingClientRect().left - document.body.getBoundingClientRect().left
-        }px);`
-        set_recent_event(e.detail)
-    }
-
-    useEffect(() => {
-        const onpointerdown = (e) => {
-            if (e.target?.closest("pkg-popup") == null && e.target?.closest("pkg-status-mark") == null) {
-                set_recent_event(null)
-            }
-        }
-        const onkeydown = (e) => {
-            if (e.key === "Escape") {
-                set_recent_event(null)
-            }
-        }
-        window.addEventListener("open nbpkg popup", open)
-        window.addEventListener("pointerdown", onpointerdown)
-        document.addEventListener("keydown", onkeydown)
-
-        return () => {
-            window.removeEventListener("open nbpkg popup", open)
-            window.removeEventListener("pointerdown", onpointerdown)
-            document.removeEventListener("keydown", onkeydown)
-        }
-    }, [])
-
-    useEffect(() => {
-        let still_valid = true
-        if (recent_event == null) {
-            set_pkg_status(null)
-        } else {
-            ;(pluto_actions.get_avaible_versions({ package_name: recent_event.package_name, notebook_id: notebook.notebook_id }) ?? Promise.resolve([])).then(
-                (versions) => {
-                    if (still_valid) {
-                        set_pkg_status(
-                            package_status({
-                                nbpkg: notebook.nbpkg,
-                                package_name: recent_event.package_name,
-                                is_disable_pkg: recent_event.is_disable_pkg,
-                                available_versions: versions,
-                            })
-                        )
-                    }
-                }
-            )
-        }
-        return () => {
-            still_valid = false
-        }
-    }, [recent_event, ...nbpkg_fingerprint_without_terminal(notebook.nbpkg)])
-
-    // hide popup when nbpkg is switched on/off
-    useEffect(() => {
-        set_recent_event(null)
-    }, [notebook.nbpkg?.enabled ?? true])
-
-    const [showterminal, set_showterminal] = useState(false)
-
-    const busy = recent_event != null && ((notebook.nbpkg?.busy_packages ?? []).includes(recent_event.package_name) || (notebook.nbpkg?.instantiating ?? false))
-
-    const debounced_busy = useDebouncedTruth(busy, 2)
-    useEffect(() => {
-        set_showterminal(debounced_busy)
-    }, [debounced_busy])
-
-    const terminal_value = notebook.nbpkg?.terminal_outputs == null ? "Loading..." : notebook.nbpkg?.terminal_outputs[recent_event?.package_name] ?? ""
-
-    const showupdate = pkg_status?.offer_update ?? false
-
-    // This funny thing is a way to tell parcel to bundle these files..
-    // Eventually I'll write a plugin that is able to parse html`...`, but this is it for now.
-    // https://parceljs.org/languages/javascript/#url-dependencies
-    const circle_outline_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/arrow-up-circle-outline.svg", import.meta.url)
-    const document_text_outline_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/document-text-outline.svg", import.meta.url)
-    const help_circle_outline_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/help-circle-outline.svg", import.meta.url)
-
-    // <header>${recent_event?.package_name}</header>
-    return html`<pkg-popup
-        class=${cl({
-            visible: recent_event != null,
-            busy,
-            showterminal: showterminal,
-            showupdate,
-        })}
-        style="${pos_ref.current}"
-    >
-        ${pkg_status?.hint ?? "Loading..."}
-        <div class="pkg-buttons">
-            <a
-                class="pkg-update"
-                target="_blank"
-                title="Update packages"
-                style=${(!!showupdate ? "" : "opacity: .4;") + (recent_event?.is_disable_pkg ? "display: none;" : "")}
-                href="#"
-                onClick=${async (e) => {
-                    if (busy) {
-                        alert("Pkg is currently busy with other packages... come back later!")
-                    } else {
-                        if (await confirm("Would you like to check for updates and install them? A backup of the notebook file will be created.")) {
-                            console.warn("Pkg.updating!")
-                            pluto_actions.send("pkg_update", {}, { notebook_id: notebook.notebook_id })
-                        }
-                    }
-                    e.preventDefault()
-                }}
-                ><img alt="i" src=${circle_outline_icon} width="17"
-            /></a>
-            <a
-                class="toggle-terminal"
-                target="_blank"
-                title="Show/hide Pkg terminal output"
-                style=${!!terminal_value ? "" : "display: none;"}
-                href="#"
-                onClick=${(e) => {
-                    set_showterminal(!showterminal)
-                    e.preventDefault()
-                }}
-                ><img alt="i" src=${document_text_outline_icon} width="17"
-            /></a>
-            <a class="help" target="_blank" title="Go to help page" href="https://github.com/fonsp/Pluto.jl/wiki/%F0%9F%8E%81-Package-management"
-                ><img alt="i" src=${help_circle_outline_icon} width="17"
-            /></a>
-        </div>
-        <${PkgTerminalView} value=${terminal_value ?? "Loading..."} />
-    </pkg-popup>`
-}
diff --git a/frontend/components/Welcome.js b/frontend/components/Welcome.js
deleted file mode 100644
index f06d8a9c01..0000000000
--- a/frontend/components/Welcome.js
+++ /dev/null
@@ -1,358 +0,0 @@
-import _ from "../imports/lodash.js"
-import { html, Component } from "../imports/Preact.js"
-
-import { FilePicker } from "./FilePicker.js"
-import { create_pluto_connection, fetch_pluto_releases } from "../common/PlutoConnection.js"
-import { cl } from "../common/ClassTable.js"
-import { PasteHandler } from "./PasteHandler.js"
-import { alert, confirm } from "../common/alert_confirm.js"
-
-/**
- * @typedef CombinedNotebook
- * @type {{
- *    path: String,
- *    transitioning: Boolean,
- *    notebook_id: String?,
- * }}
- */
-
-/**
- *
- * @param {string} path
- * @param {string?} notebook_id
- * @returns {CombinedNotebook}
- */
-
-const create_empty_notebook = (path, notebook_id = null) => {
-    return {
-        transitioning: false, // between running and being shut down
-        notebook_id: notebook_id, // null means that it is not running
-        path: path,
-    }
-}
-
-const split_at_level = (path, level) => path.split(/\/|\\/).slice(-level).join("/")
-
-const shortest_path = (path, allpaths) => {
-    let level = 1
-    for (const otherpath of allpaths) {
-        if (otherpath !== path) {
-            while (split_at_level(path, level) === split_at_level(otherpath, level)) {
-                level++
-            }
-        }
-    }
-    return split_at_level(path, level)
-}
-
-// should strip characters similar to how github converts filenames into the #file-... URL hash.
-// test on: https://gist.github.com/fonsp/f7d230da4f067a11ad18de15bff80470
-const gist_normalizer = (str) =>
-    str
-        .toLowerCase()
-        .normalize("NFD")
-        .replace(/[^a-z1-9]/g, "")
-
-export const process_path_or_url = async (path_or_url) => {
-    try {
-        const u = new URL(path_or_url)
-        if (!["http:", "https:", "ftp:", "ftps:"].includes(u.protocol)) {
-            throw "Not a web URL"
-        }
-        if (u.host === "gist.github.com") {
-            console.log("Gist URL detected")
-            const parts = u.pathname.substring(1).split("/")
-            const gist_id = parts[1]
-            const gist = await (
-                await fetch(`https://api.github.com/gists/${gist_id}`, {
-                    headers: { Accept: "application/vnd.github.v3+json" },
-                })
-            ).json()
-            console.log(gist)
-            const files = Object.values(gist.files)
-
-            const selected = files.find((f) => gist_normalizer("#file-" + f.filename) === gist_normalizer(u.hash))
-            if (selected != null) {
-                return {
-                    type: "url",
-                    path_or_url: selected.raw_url,
-                }
-            }
-
-            return {
-                type: "url",
-                path_or_url: files[0].raw_url,
-            }
-        } else if (u.host === "github.com") {
-            u.searchParams.set("raw", "true")
-        }
-        return {
-            type: "url",
-            path_or_url: u.href,
-        }
-    } catch (ex) {
-        /* Remove eventual single/double quotes from the path if they surround it, see
-          https://github.com/fonsp/Pluto.jl/issues/1639 */
-        if (path_or_url[path_or_url.length - 1] === '"' && path_or_url[0] === '"') {
-            path_or_url = path_or_url.slice(1, -1) /* Remove first and last character */
-        }
-        return {
-            type: "path",
-            path_or_url: path_or_url,
-        }
-    }
-}
-
-// /open will execute a script from your hard drive, so we include a token in the URL to prevent a mean person from getting a bad file on your computer _using another hypothetical intrusion_, and executing it using Pluto
-export const link_open_path = (path) => "open?" + new URLSearchParams({ path: path }).toString()
-export const link_open_url = (url) => "open?" + new URLSearchParams({ url: url }).toString()
-export const link_edit = (notebook_id) => "edit?id=" + notebook_id
-
-export class Welcome extends Component {
-    constructor() {
-        super()
-
-        this.state = {
-            // running_notebooks: null,
-            // recent_notebooks: null,
-            combined_notebooks: /** @type {Array<CombinedNotebook>} */ (null), // will become an array
-            connected: false,
-        }
-        const set_notebook_state = (this.set_notebook_state = (path, new_state_props) => {
-            this.setState((prevstate) => {
-                return {
-                    combined_notebooks: prevstate.combined_notebooks.map((nb) => {
-                        return nb.path == path ? { ...nb, ...new_state_props } : nb
-                    }),
-                }
-            })
-        })
-
-        const on_update = ({ message, type }) => {
-            if (type === "notebook_list") {
-                // a notebook list updates happened while the welcome screen is open, because a notebook started running for example
-                // the list has already been generated and rendered to the page. We try to maintain order as much as possible, to prevent the list order "jumping around" while you are interacting with it.
-                // You can always get a neatly sorted list by refreshing the page.
-
-                const new_running = message.notebooks
-
-                // already rendered notebooks will be added to this list:
-                const rendered_and_running = []
-
-                const new_combined_notebooks = this.state.combined_notebooks.map((nb) => {
-                    // try to find a matching notebook in the remote list
-                    let running_version = null
-
-                    if (nb.notebook_id) {
-                        // match notebook_ids to handle a path change
-                        running_version = new_running.find((rnb) => rnb.notebook_id == nb.notebook_id)
-                    } else {
-                        // match paths to handle a notebook bootup
-                        running_version = new_running.find((rnb) => rnb.path == nb.path)
-                    }
-
-                    if (running_version == null) {
-                        return create_empty_notebook(nb.path)
-                    } else {
-                        const new_notebook = create_empty_notebook(running_version.path, running_version.notebook_id)
-                        rendered_and_running.push(running_version)
-                        return new_notebook
-                    }
-                })
-
-                const not_rendered_but_running = new_running.filter((rnb) => !rendered_and_running.includes(rnb))
-                this.setState({
-                    combined_notebooks: [...not_rendered_but_running, ...new_combined_notebooks],
-                })
-            }
-        }
-
-        const on_connection_status = (val) => this.setState({ connected: val })
-
-        this.client = {}
-        this.client_promise = create_pluto_connection({
-            on_unrequested_update: on_update,
-            on_connection_status: on_connection_status,
-            on_reconnect: () => true,
-        })
-        this.client_promise.then((client) => {
-            Object.assign(this.client, client)
-
-            this.client.send("get_all_notebooks", {}, {}).then(({ message }) => {
-                const running = message.notebooks.map((nb) => create_empty_notebook(nb.path, nb.notebook_id))
-
-                const recent_notebooks = get_stored_recent_notebooks()
-
-                // show running notebooks first, in the order defined by the recent notebooks, then recent notebooks
-                const combined_notebooks = [
-                    ..._.sortBy(running, [(nb) => _.findIndex([...recent_notebooks, ...running], (r) => r.path === nb.path)]),
-                    ..._.differenceBy(recent_notebooks, running, (nb) => nb.path),
-                ]
-
-                this.setState({ combined_notebooks: combined_notebooks })
-
-                document.body.classList.remove("loading")
-            })
-
-            fetch_pluto_releases()
-                .then((releases) => {
-                    const local = this.client.version_info.pluto
-                    const latest = releases[releases.length - 1].tag_name
-                    console.log(`Pluto version ${local}`)
-                    const local_index = releases.findIndex((r) => r.tag_name === local)
-                    if (local_index !== -1) {
-                        const updates = releases.slice(local_index + 1)
-                        const recommended_updates = updates.filter((r) => r.body.toLowerCase().includes("recommended update"))
-                        if (recommended_updates.length > 0) {
-                            console.log(`Newer version ${latest} is available`)
-                            if (!this.client.version_info.dismiss_update_notification) {
-                                alert(
-                                    "A new version of Pluto.jl is available! 🎉\n\n    You have " +
-                                        local +
-                                        ", the latest is " +
-                                        latest +
-                                        '.\n\nYou can update Pluto.jl using the julia package manager:\n    import Pkg; Pkg.update("Pluto")\nAfterwards, exit Pluto.jl and restart julia.'
-                                )
-                            }
-                        }
-                    }
-                })
-                .catch(() => {
-                    // Having this as a uncaught promise broke the frontend tests for me
-                    // so I'm just swallowing the error explicitly - DRAL
-                })
-
-            // to start JIT'ting
-            this.client.send(
-                "completepath",
-                {
-                    query: "nothinginparticular",
-                },
-                {}
-            )
-        })
-
-        this.on_open_path = async (new_path) => {
-            const processed = await process_path_or_url(new_path)
-            if (processed.type === "path") {
-                document.body.classList.add("loading")
-                window.location.href = link_open_path(processed.path_or_url)
-            } else {
-                if (await confirm("Are you sure? This will download and run the file at\n\n" + processed.path_or_url)) {
-                    document.body.classList.add("loading")
-                    window.location.href = link_open_url(processed.path_or_url)
-                }
-            }
-        }
-
-        this.on_session_click = async (nb) => {
-            if (nb.transitioning) {
-                return
-            }
-            const running = nb.notebook_id != null
-            if (running) {
-                if (await confirm("Shut down notebook process?")) {
-                    set_notebook_state(nb.path, {
-                        running: false,
-                        transitioning: true,
-                    })
-                    this.client.send(
-                        "shutdown_notebook",
-                        {
-                            keep_in_session: false,
-                        },
-                        {
-                            notebook_id: nb.notebook_id,
-                        },
-                        false
-                    )
-                }
-            } else {
-                set_notebook_state(nb.path, {
-                    transitioning: true,
-                })
-                fetch(link_open_path(nb.path), {
-                    method: "GET",
-                })
-                    .then((r) => {
-                        if (!r.redirected) {
-                            throw new Error("file not found maybe? try opening the notebook directly")
-                        }
-                    })
-                    .catch((e) => {
-                        console.error("Failed to start notebook in background")
-                        console.error(e)
-                        set_notebook_state(nb.path, {
-                            transitioning: false,
-                            notebook_id: null,
-                        })
-                    })
-            }
-        }
-    }
-
-    componentDidMount() {
-        this.componentDidUpdate()
-    }
-
-    componentDidUpdate() {
-        document.body.classList.toggle("nosessions", !(this.state.combined_notebooks == null || this.state.combined_notebooks.length > 0))
-    }
-
-    render() {
-        let recents = null
-        if (this.state.combined_notebooks == null) {
-            recents = html`<li><em>Loading...</em></li>`
-        } else {
-            const all_paths = this.state.combined_notebooks.map((nb) => nb.path)
-            recents = this.state.combined_notebooks.map((nb) => {
-                const running = nb.notebook_id != null
-                return html`<li
-                    key=${nb.path}
-                    class=${cl({
-                        running: running,
-                        recent: !running,
-                        transitioning: nb.transitioning,
-                    })}
-                >
-                    <button onclick=${() => this.on_session_click(nb)} title=${running ? "Shut down notebook" : "Start notebook in background"}>
-                        <span></span>
-                    </button>
-                    <a
-                        href=${running ? link_edit(nb.notebook_id) : link_open_path(nb.path)}
-                        title=${nb.path}
-                        onClick=${(e) => {
-                            document.body.classList.add("loading")
-                            this.set_notebook_state(nb.path, {
-                                transitioning: true,
-                            })
-                        }}
-                        >${shortest_path(nb.path, all_paths)}</a
-                    >
-                </li>`
-            })
-        }
-
-        return html`<p>New session:</p>
-            <${PasteHandler} />
-            <ul id="new">
-                <li>Open a <a href="sample">sample notebook</a></li>
-                <li>Create a <a href="new">new notebook</a></li>
-                <li>
-                    Open from file:
-                    <${FilePicker} client=${this.client} value="" on_submit=${this.on_open_path} button_label="Open" placeholder="Enter path or URL..." />
-                </li>
-            </ul>
-            <br />
-            <p>Recent sessions:</p>
-            <ul id="recent">
-                ${recents}
-            </ul>`
-    }
-}
-
-const get_stored_recent_notebooks = () => {
-    const storedString = localStorage.getItem("recent notebooks")
-    const storedList = storedString != null ? JSON.parse(storedString) : []
-    return storedList.map((path) => create_empty_notebook(path))
-}

From 417b905d0240de3ebe4dd9c77edc46c994e7891f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 14 Nov 2023 13:54:47 +0100
Subject: [PATCH 764/821] =?UTF-8?q?=F0=9F=93=B0=20Simpler=20PDF=20title,?=
 =?UTF-8?q?=20fix=20#2703?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Editor.js       |  1 +
 frontend/components/ExportBanner.js | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 1cb178ba6b..f04aa98dea 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1465,6 +1465,7 @@ patch: ${JSON.stringify(
                     <header id="pluto-nav" className=${export_menu_open ? "show_export" : ""}>
                         <${ExportBanner}
                             notebook_id=${this.state.notebook.notebook_id}
+                            notebook_shortpath=${this.state.notebook.shortpath}
                             notebookfile_url=${this.export_url("notebookfile")}
                             notebookexport_url=${this.export_url("notebookexport")}
                             open=${export_menu_open}
diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index dff5a1fb43..34ee367202 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -1,4 +1,4 @@
-import { html } from "../imports/Preact.js"
+import { html, useEffect, useRef } from "../imports/Preact.js"
 
 const Circle = ({ fill }) => html`
     <svg
@@ -44,7 +44,7 @@ export const WarnForVisisblePasswords = () => {
     }
 }
 
-export const ExportBanner = ({ notebook_id, open, onClose, notebookfile_url, notebookexport_url, start_recording }) => {
+export const ExportBanner = ({ notebook_id, notebook_shortpath, open, onClose, notebookfile_url, notebookexport_url, start_recording }) => {
     // @ts-ignore
     const isDesktop = !!window.plutoDesktop
 
@@ -55,6 +55,24 @@ export const ExportBanner = ({ notebook_id, open, onClose, notebookfile_url, not
         }
     }
 
+    let print_old_title_ref = useRef("")
+    useEffect(() => {
+        let a = () => {
+            console.log("beforeprint")
+            print_old_title_ref.current = document.title
+            document.title = notebook_shortpath.replace(/\.jl$/, "").replace(/\.plutojl$/, "")
+        }
+        let b = () => {
+            document.title = print_old_title_ref.current
+        }
+        window.addEventListener("beforeprint", a)
+        window.addEventListener("afterprint", b)
+        return () => {
+            window.removeEventListener("beforeprint", a)
+            window.removeEventListener("afterprint", b)
+        }
+    }, [notebook_shortpath])
+
     return html`
         <aside id="export" inert=${!open}>
             <div id="container">

From 4726a20691e5ad7ebf4a4d9718734dba2258d99e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 14 Nov 2023 14:17:46 +0100
Subject: [PATCH 765/821] Update README.md

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 39ba98b02b..e601339c0f 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,12 @@
 <p align="center"><a href="https://www.youtube.com/watch?v=HiI4jgDyDhY">🌐 Pluto – one year later (25 min) at <b>Juliacon 2021</b> 🌐</a></p>
 
 <br>
+<p align="center"><a href="https://www.youtube.com/watch?v=Rg3r3gG4nQo">🪐 Pluto – reactive and reproducible (25 min) at <b>JupyterCon 2023</b> 🪐</a></p>
+
+<br>
+
+
+
 
 
 <h1><img alt="Pluto.jl" src="https://raw.githubusercontent.com/fonsp/Pluto.jl/dd0ead4caa2d29a3a2cfa1196d31e3114782d363/frontend/img/logo_white_contour.svg" width=300 height=74 ></h1>

From 912f31fa4bd4560ae593c4b2a08d2fb000e38eb1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 14 Nov 2023 14:20:14 +0100
Subject: [PATCH 766/821] Fix #2693 and sanitization in Live Docs (#2709)

---
 frontend/components/BottomRightPanel.js | 12 +++++++++++-
 frontend/components/CellOutput.js       |  5 +++--
 frontend/components/Editor.js           |  2 +-
 frontend/components/LiveDocsTab.js      | 10 +++++++---
 frontend/components/TreeView.js         |  4 ++--
 test/frontend/__tests__/safe_preview.js |  4 ++--
 test/frontend/fixtures/safe_preview.jl  |  4 ++--
 7 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/frontend/components/BottomRightPanel.js b/frontend/components/BottomRightPanel.js
index 25bbbb2649..f7ade801c4 100644
--- a/frontend/components/BottomRightPanel.js
+++ b/frontend/components/BottomRightPanel.js
@@ -21,9 +21,18 @@ export const open_bottom_right_panel = (/** @type {PanelTabName} */ tab) => wind
  * connected: boolean,
  * backend_launch_phase: number?,
  * backend_launch_logs: string?,
+ * sanitize_html?: boolean,
  * }} props
  */
-export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, notebook, connected, backend_launch_phase, backend_launch_logs }) => {
+export let BottomRightPanel = ({
+    desired_doc_query,
+    on_update_doc_query,
+    notebook,
+    connected,
+    backend_launch_phase,
+    backend_launch_logs,
+    sanitize_html = true,
+}) => {
     let container_ref = useRef()
 
     const focus_docs_on_open_ref = useRef(false)
@@ -125,6 +134,7 @@ export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, noteboo
                           desired_doc_query=${desired_doc_query}
                           on_update_doc_query=${on_update_doc_query}
                           notebook=${notebook}
+                          sanitize_html=${sanitize_html}
                       />`
                     : open_tab === "process"
                     ? html`<${ProcessTab}
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index c1000af7dd..007f096582 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -493,7 +493,7 @@ let declarative_shadow_dom_polyfill = (template) => {
     }
 }
 
-export let RawHTMLContainer = ({ body, className = "", persist_js_state = false, last_run_timestamp, sanitize_html = true }) => {
+export let RawHTMLContainer = ({ body, className = "", persist_js_state = false, last_run_timestamp, sanitize_html = true, sanitize_html_message = true }) => {
     let pluto_actions = useContext(PlutoActionsContext)
     let pluto_bonds = useContext(PlutoBondsContext)
     let js_init_set = useContext(PlutoJSInitializingContext)
@@ -525,13 +525,14 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
         let html_content_to_set = sanitize_html
             ? DOMPurify.sanitize(body, {
                   FORBID_TAGS: ["style"],
+                  ADD_ATTR: ["target"],
               })
             : body
 
         // Actually "load" the html
         container.innerHTML = html_content_to_set
 
-        if (html_content_to_set !== body) {
+        if (sanitize_html_message && html_content_to_set !== body) {
             // DOMPurify also resolves HTML entities, which can give a false positive. To fix this, we use DOMParser to parse both strings, and we compare the innerHTML of the resulting documents.
             const parser = new DOMParser()
             const p1 = parser.parseFromString(body, "text/html")
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index f04aa98dea..4aa9bef518 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -29,7 +29,6 @@ import { slider_server_actions, nothing_actions } from "../common/SliderServerCl
 import { ProgressBar } from "./ProgressBar.js"
 import { NonCellOutput } from "./NonCellOutput.js"
 import { IsolatedCell } from "./Cell.js"
-import { RawHTMLContainer } from "./CellOutput.js"
 import { RecordingPlaybackUI, RecordingUI } from "./RecordingUI.js"
 import { HijackExternalLinksToOpenInNewTab } from "./HackySideStuff/HijackExternalLinksToOpenInNewTab.js"
 import { FrontMatterInput } from "./FrontmatterInput.js"
@@ -1630,6 +1629,7 @@ patch: ${JSON.stringify(
                         backend_launch_phase=${this.state.backend_launch_phase}
                         backend_launch_logs=${this.state.backend_launch_logs}
                         notebook=${this.state.notebook}
+                        sanitize_html=${status.sanitize_html}
                     />
                     <${Popup} 
                         notebook=${this.state.notebook}
diff --git a/frontend/components/LiveDocsTab.js b/frontend/components/LiveDocsTab.js
index 156297445f..b26c1e27bc 100644
--- a/frontend/components/LiveDocsTab.js
+++ b/frontend/components/LiveDocsTab.js
@@ -12,9 +12,10 @@ import { cl } from "../common/ClassTable.js"
  * desired_doc_query: string?,
  * on_update_doc_query: (query: string) => void,
  * notebook: import("./Editor.js").NotebookData,
+ * sanitize_html?: boolean,
  * }} props
  */
-export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_query, notebook }) => {
+export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_query, notebook, sanitize_html = true }) => {
     let pluto_actions = useContext(PlutoActionsContext)
     let live_doc_search_ref = useRef(/** @type {HTMLInputElement?} */ (null))
 
@@ -22,7 +23,7 @@ export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_quer
     let [state, set_state] = useState({
         shown_query: null,
         searched_query: null,
-        body: "<p>Welcome to the <b>Live docs</b>! Keep this little window open while you work on the notebook, and you will get documentation of everything you type!</p><p>You can also type a query above.</p><hr><p><em>Still stuck? Here are <a href='https://julialang.org/about/help/' target='_blank'>some tips</a>.</em></p>",
+        body: `<p>Welcome to the <b>Live docs</b>! Keep this little window open while you work on the notebook, and you will get documentation of everything you type!</p><p>You can also type a query above.</p><hr><p><em>Still stuck? Here are <a target="_blank" href="https://julialang.org/about/help/">some tips</a>.</em></p>`,
         loading: false,
     })
     let update_state = (mutation) => set_state(immer((state) => mutation(state)))
@@ -74,7 +75,10 @@ export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_quer
         })
     }
 
-    let docs_element = useMemo(() => html`<${RawHTMLContainer} body=${without_workspace_stuff(state.body)} />`, [state.body])
+    let docs_element = useMemo(
+        () => html`<${RawHTMLContainer} body=${without_workspace_stuff(state.body)} sanitize_html=${sanitize_html} sanitize_html_message=${false} />`,
+        [state.body, sanitize_html]
+    )
     let no_docs_found = state.loading === false && state.searched_query !== "" && state.searched_query !== state.shown_query
 
     return html`
diff --git a/frontend/components/TreeView.js b/frontend/components/TreeView.js
index ccd1645b63..c15e0c2822 100644
--- a/frontend/components/TreeView.js
+++ b/frontend/components/TreeView.js
@@ -1,6 +1,6 @@
 import { html, useRef, useState, useContext } from "../imports/Preact.js"
 
-import { OutputBody, PlutoImage, RawHTMLContainer } from "./CellOutput.js"
+import { OutputBody, PlutoImage } from "./CellOutput.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
 
 // this is different from OutputBody because:
@@ -24,7 +24,7 @@ export const SimpleOutputBody = ({ mime, body, cell_id, persist_js_state, saniti
         case "text/plain":
             return html`<pre class="no-block">${body}</pre>`
         case "application/vnd.pluto.tree+object":
-            return html`<${TreeView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} />`
+            return html`<${TreeView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} sanitize_html=${sanitize_html} />`
             break
         default:
             return OutputBody({ mime, body, cell_id, persist_js_state, sanitize_html, last_run_timestamp: null })
diff --git a/test/frontend/__tests__/safe_preview.js b/test/frontend/__tests__/safe_preview.js
index e8b37b1d03..b6c8995371 100644
--- a/test/frontend/__tests__/safe_preview.js
+++ b/test/frontend/__tests__/safe_preview.js
@@ -200,7 +200,7 @@ Hello
         let cell_contents = await getAllCellOutputs(page)
 
         expect(cell_contents[0]).toBe("one")
-        expect(cell_contents[1]).toBe("Scripts and styles not rendered in Safe preview\ni should not be red\ntwo\nsafe")
+        expect(cell_contents[1]).toBe("Scripts and styles not rendered in Safe preview\n\ni should not be red\n\n\n\ntwo\n\n\nsafe")
         expect(cell_contents[2]).toBe("three")
         expect(cell_contents[3]).toBe("Code not executed in Safe preview")
         expect(cell_contents[4]).toBe("Code not executed in Safe preview")
@@ -234,7 +234,7 @@ Hello
         cell_contents = await getAllCellOutputs(page)
 
         expect(cell_contents[0]).toBe("one")
-        expect(cell_contents[1]).toBe("i should not be red\ntwo\nsafe\nDANGER")
+        expect(cell_contents[1]).toBe("\ni should not be red\n\ntwo\nsafe\nDANGER")
         expect(cell_contents[2]).toBe("three")
         expect(cell_contents[3]).toBe("123")
         expect(cell_contents[4]).toBe("")
diff --git a/test/frontend/fixtures/safe_preview.jl b/test/frontend/fixtures/safe_preview.jl
index 7fb6014e80..ffc7439aef 100644
--- a/test/frontend/fixtures/safe_preview.jl
+++ b/test/frontend/fixtures/safe_preview.jl
@@ -10,7 +10,7 @@ one
 """
 
 # ╔═╡ ef63b97e-700d-11ee-2997-7bf929019c2d
-html"""
+[[html"""
 <div class="zo">
 i should not be red
 </div>
@@ -31,7 +31,7 @@ return html`<div style="color: red;">DANGER</div>`
 	color: red;
 }
 </style>
-"""
+"""]]
 
 # ╔═╡ 99e2bfea-4e5d-4d94-bd96-77be7b04811d
 html"three"

From 1ee8d5be0873936b1af7404376d10f6e5e88c111 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Tue, 14 Nov 2023 22:11:21 +0100
Subject: [PATCH 767/821] Match `module` with `end` in block matcher plugin
 (#2712)

---
 frontend/components/CellInput/block_matcher_plugin.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/frontend/components/CellInput/block_matcher_plugin.js b/frontend/components/CellInput/block_matcher_plugin.js
index b6d05bbee8..14e77e8f33 100644
--- a/frontend/components/CellInput/block_matcher_plugin.js
+++ b/frontend/components/CellInput/block_matcher_plugin.js
@@ -223,6 +223,16 @@ function match_block(node) {
         return match_try_node(node)
     }
 
+    if (node.name === "module" || node.name === "baremodule") {
+        let possibly_end = node.parent.lastChild
+        let did_match = possibly_end.name === "end"
+        if (!did_match) return null
+
+        return [
+            { from: node.from, to: node.to },
+            { from: possibly_end.from, to: possibly_end.to },
+        ]
+    }
 
     return null
 }

From a45427c21748d0e6d71faab81f07d9bd65f0d9b2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Nov 2023 13:10:35 +0100
Subject: [PATCH 768/821] Turn ExpressionExplorer.jl into its own package
 (#2698)

Co-authored-by: Paul Berg <paul@plutojl.org>
---
 Project.toml                       |    2 +
 src/Pluto.jl                       |    1 -
 src/analysis/Errors.jl             |    2 +-
 src/analysis/ExpressionExplorer.jl | 1352 ++--------------------------
 src/analysis/MoreAnalysis.jl       |    4 +-
 src/analysis/ReactiveNode.jl       |   78 --
 src/analysis/Topology.jl           |    2 +-
 src/analysis/TopologyUpdate.jl     |    7 +-
 src/analysis/is_just_text.jl       |    2 +-
 src/evaluation/MacroAnalysis.jl    |   17 +-
 src/evaluation/Run.jl              |    3 +-
 src/evaluation/RunBonds.jl         |    2 +-
 src/evaluation/WorkspaceManager.jl |    4 +-
 src/notebook/Cell.jl               |    1 -
 src/runner/PlutoRunner.jl          |    6 +-
 test/ExpressionExplorer.jl         | 1044 +++++----------------
 test/MoreAnalysis.jl               |   42 +-
 test/helpers.jl                    |  110 +--
 test/runtests.jl                   |    2 +-
 test/webserver.jl                  |   13 +
 20 files changed, 407 insertions(+), 2287 deletions(-)
 delete mode 100644 src/analysis/ReactiveNode.jl

diff --git a/Project.toml b/Project.toml
index 1a70200cf0..b712a39db6 100644
--- a/Project.toml
+++ b/Project.toml
@@ -9,6 +9,7 @@ Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 Configurations = "5218b696-f38b-4ac9-8b61-a12ec717816d"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
+ExpressionExplorer = "21656369-7473-754a-2065-74616d696c43"
 FileWatching = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
 FuzzyCompletions = "fb4132e2-a121-4a70-b8a1-d5b831dcdcc2"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
@@ -38,6 +39,7 @@ Base64 = "1"
 Configurations = "0.15, 0.16, 0.17"
 Dates = "1"
 Downloads = "1"
+ExpressionExplorer = "0.5, 0.6, 1"
 FileWatching = "1"
 FuzzyCompletions = "0.3, 0.4, 0.5"
 HTTP = "^1.5.2"
diff --git a/src/Pluto.jl b/src/Pluto.jl
index 8898d058f2..07ed7cd285 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -49,7 +49,6 @@ include("./evaluation/Throttled.jl")
 include("./runner/PlutoRunner.jl")
 include("./analysis/ExpressionExplorer.jl")
 include("./analysis/FunctionDependencies.jl")
-include("./analysis/ReactiveNode.jl")
 include("./packages/PkgCompat.jl")
 include("./webserver/Status.jl")
 
diff --git a/src/analysis/Errors.jl b/src/analysis/Errors.jl
index eb63f550f0..d849160f8b 100644
--- a/src/analysis/Errors.jl
+++ b/src/analysis/Errors.jl
@@ -1,5 +1,5 @@
 import Base: showerror
-import .ExpressionExplorer: FunctionName, join_funcname_parts
+import .ExpressionExplorer: FunctionName
 
 abstract type ReactivityError <: Exception end
 
diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 9b2153ccf3..e4d64526a6 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -1,292 +1,74 @@
-module ExpressionExplorer
+using ExpressionExplorer
 
-export compute_symbolreferences, try_compute_symbolreferences, compute_usings_imports, SymbolsState, FunctionName, join_funcname_parts
+@deprecate ReactiveNode_from_expr(args...; kwargs...) ExpressionExplorer.compute_reactive_node(args...; kwargs...)
 
+module ExpressionExplorerExtras
+import ..Pluto
 import ..PlutoRunner
-import Markdown
-import Base: union, union!, ==, push!
-
-###
-# TWO STATE OBJECTS
-###
-
-const FunctionName = Vector{Symbol}
-
-"""
-For an expression like `function Base.sqrt(x::Int)::Int x; end`, it has the following fields:
-- `name::FunctionName`: the name, `[:Base, :sqrt]`
-- `signature_hash::UInt`: a `UInt` that is unique for the type signature of the method declaration, ignoring argument names. In the example, this is equals `hash(ExpressionExplorer.canonalize( :(Base.sqrt(x::Int)::Int) ))`, see [`canonalize`](@ref) for more details.
-"""
-struct FunctionNameSignaturePair
-    name::FunctionName
-    signature_hash::UInt
-end
-
-Base.:(==)(a::FunctionNameSignaturePair, b::FunctionNameSignaturePair) = a.name == b.name && a.signature_hash == b.signature_hash
-Base.hash(a::FunctionNameSignaturePair, h::UInt) = hash(a.name, hash(a.signature_hash, h))
-
-"SymbolsState trickles _down_ the ASTree: it carries referenced and defined variables from endpoints down to the root."
-Base.@kwdef mutable struct SymbolsState
-    references::Set{Symbol} = Set{Symbol}()
-    assignments::Set{Symbol} = Set{Symbol}()
-    funccalls::Set{FunctionName} = Set{FunctionName}()
-    funcdefs::Dict{FunctionNameSignaturePair,SymbolsState} = Dict{FunctionNameSignaturePair,SymbolsState}()
-    macrocalls::Set{FunctionName} = Set{FunctionName}()
-end
-
-
-"ScopeState moves _up_ the ASTree: it carries scope information up towards the endpoints."
-mutable struct ScopeState
-    inglobalscope::Bool
-    exposedglobals::Set{Symbol}
-    hiddenglobals::Set{Symbol}
-    definedfuncs::Set{Symbol}
-end
-ScopeState() = ScopeState(true, Set{Symbol}(), Set{Symbol}(), Set{Symbol}())
-
-# The `union` and `union!` overloads define how two `SymbolsState`s or two `ScopeState`s are combined.
-
-function union(a::Dict{FunctionNameSignaturePair,SymbolsState}, bs::Dict{FunctionNameSignaturePair,SymbolsState}...)
-    union!(Dict{FunctionNameSignaturePair,SymbolsState}(), a, bs...)
-end
-
-function union!(a::Dict{FunctionNameSignaturePair,SymbolsState}, bs::Dict{FunctionNameSignaturePair,SymbolsState}...)
-    for b in bs
-        for (k, v) in b
-            if haskey(a, k)
-                a[k] = union!(a[k], v)
-            else
-                a[k] = v
-            end
-        end
-        a
-    end
-    return a
-end
-
-function union(a::SymbolsState, b::SymbolsState)
-    SymbolsState(a.references ∪ b.references, a.assignments ∪ b.assignments, a.funccalls ∪ b.funccalls, a.funcdefs ∪ b.funcdefs, a.macrocalls ∪ b.macrocalls)
-end
-
-function union!(a::SymbolsState, bs::SymbolsState...)
-    union!(a.references, (b.references for b in bs)...)
-    union!(a.assignments, (b.assignments for b in bs)...)
-    union!(a.funccalls, (b.funccalls for b in bs)...)
-    union!(a.funcdefs, (b.funcdefs for b in bs)...)
-    union!(a.macrocalls, (b.macrocalls for b in bs)...)
-    return a
-end
-
-function union!(a::Tuple{FunctionName,SymbolsState}, bs::Tuple{FunctionName,SymbolsState}...)
-    a[1], union!(a[2], (b[2] for b in bs)...)
-end
-
-function union(a::ScopeState, b::ScopeState)
-    SymbolsState(a.inglobalscope && b.inglobalscope, a.exposedglobals ∪ b.exposedglobals, a.hiddenglobals ∪ b.hiddenglobals)
-end
-
-function union!(a::ScopeState, bs::ScopeState...)
-    a.inglobalscope &= all((b.inglobalscope for b in bs)...)
-    union!(a.exposedglobals, (b.exposedglobals for b in bs)...)
-    union!(a.hiddenglobals, (b.hiddenglobals for b in bs)...)
-    union!(a.definedfuncs, (b.definedfuncs for b in bs)...)
-    return a
-end
-
-function ==(a::SymbolsState, b::SymbolsState)
-    a.references == b.references && a.assignments == b.assignments && a.funccalls == b.funccalls && a.funcdefs == b.funcdefs && a.macrocalls == b.macrocalls
-end
-
-Base.push!(x::Set) = x
-
-###
-# HELPER FUNCTIONS
-###
-
-# from the source code: https://github.com/JuliaLang/julia/blob/master/src/julia-parser.scm#L9
-const modifiers = [:(+=), :(-=), :(*=), :(/=), :(//=), :(^=), :(÷=), :(%=), :(<<=), :(>>=), :(>>>=), :(&=), :(⊻=), :(≔), :(⩴), :(≕)]
-const modifiers_dotprefixed = [Symbol('.' * String(m)) for m in modifiers]
-
-function will_assign_global(assignee::Symbol, scopestate::ScopeState)::Bool
-    (scopestate.inglobalscope || assignee ∈ scopestate.exposedglobals) && (assignee ∉ scopestate.hiddenglobals || assignee ∈ scopestate.definedfuncs)
-end
-
-function will_assign_global(assignee::Vector{Symbol}, scopestate::ScopeState)::Bool
-    if length(assignee) == 0
-        false
-    elseif length(assignee) > 1
-        scopestate.inglobalscope
-    else
-        will_assign_global(assignee[1], scopestate)
-    end
-end
-
-function get_global_assignees(assignee_exprs, scopestate::ScopeState)::Set{Symbol}
-    global_assignees = Set{Symbol}()
-    for ae in assignee_exprs
-        if isa(ae, Symbol)
-            will_assign_global(ae, scopestate) && push!(global_assignees, ae)
-        else
-            if ae.head == :(::)
-                will_assign_global(ae.args[1], scopestate) && push!(global_assignees, ae.args[1])
-            else
-                @warn "Unknown assignee expression" ae
+using ExpressionExplorer
+using ExpressionExplorer: ScopeState
+
+
+"""
+ExpressionExplorer does not explore inside macro calls, i.e. the arguments of a macrocall (like `a+b` in `@time a+b`) are ignored.
+Normally, you would macroexpand an expression before giving it to ExpressionExplorer, but in Pluto we sometimes need to explore expressions *before* executing code.
+
+In those cases, we want most accurate result possible. Our extra needs are:
+1. Macros included in Julia base, Markdown and `@bind` can be expanded statically. (See `maybe_macroexpand_pluto`.)
+2. If a macrocall argument contains a "special heuristic" like `Pkg.activate()` or `using Something`, we need to surface this to be visible to ExpressionExplorer and Pluto. We do this by placing the macrocall in a block, and copying the argument after to the macrocall.
+3. If a macrocall argument contains other macrocalls, we need these nested macrocalls to be visible. We do this by placing the macrocall in a block, and creating new macrocall expressions with the nested macrocall names, but without arguments.
+"""
+function pretransform_pluto(ex)
+    if Meta.isexpr(ex, :macrocall)
+        to_add = Expr[]
+        
+        maybe_expanded = maybe_macroexpand_pluto(ex)
+        if maybe_expanded === ex
+            # we were not able to expand statically
+            for arg in ex.args[begin+1:end]
+                arg_transformed = pretransform_pluto(arg)
+                macro_arg_symstate = ExpressionExplorer.compute_symbols_state(arg_transformed)
+                
+                # When this macro has something special inside like `Pkg.activate()`, we're going to make sure that ExpressionExplorer treats it as normal code, not inside a macrocall. (so these heuristics trigger later)
+                if arg isa Expr && macro_has_special_heuristic_inside(symstate = macro_arg_symstate, expr = arg_transformed)
+                    # then the whole argument expression should be added
+                    push!(to_add, arg_transformed)
+                else
+                    for fn in macro_arg_symstate.macrocalls
+                        push!(to_add, Expr(:macrocall, fn))
+                        # fn is a FunctionName
+                        # normally this would not be a legal expression, but ExpressionExplorer handles it correctly so it's all cool
+                    end
+                end
             end
-        end
-    end
-    return global_assignees
-end
-
-function get_assignees(ex::Expr)::FunctionName
-    if ex.head == :tuple
-        if length(ex.args) == 1 && Meta.isexpr(only(ex.args), :parameters)
-            # e.g. (x, y) in the ex (; x, y) = (x = 5, y = 6, z = 7)
-            args = only(ex.args).args
+            
+            Expr(
+                :block,
+                # the original expression, not expanded. ExpressionExplorer will just explore the name of the macro, and nothing else.
+                ex, 
+                # any expressions that we need to sneakily add
+                to_add...
+            )
         else
-            # e.g. (x, y) in the ex (x, y) = (1, 23)
-            args = ex.args
-        end
-        mapfoldl(get_assignees, union!, args; init=Symbol[])
-        # filter(s->s isa Symbol, ex.args)
-    elseif ex.head == :(::)
-        # TODO: type is referenced
-        get_assignees(ex.args[1])
-    elseif ex.head == :ref || ex.head == :(.)
-        Symbol[]
-    elseif ex.head == :...
-        # Handles splat assignments. e.g. _, y... = 1:5
-        args = ex.args
-        mapfoldl(get_assignees, union!, args; init=Symbol[])
-    else
-        @warn "unknown use of `=`. Assignee is unrecognised." ex
-        Symbol[]
-    end
-end
-
-# e.g. x = 123, but ignore _ = 456
-get_assignees(ex::Symbol) = all_underscores(ex) ? Symbol[] : Symbol[ex]
-
-# When you assign to a datatype like Int, String, or anything bad like that
-# e.g. 1 = 2
-# This is parsable code, so we have to treat it
-get_assignees(::Any) = Symbol[]
-
-all_underscores(s::Symbol) = all(isequal('_'), string(s))
-
-# TODO: this should return a FunctionName, and use `split_funcname`.
-"Turn :(A{T}) into :A."
-function uncurly!(ex::Expr, scopestate::ScopeState)::Tuple{Symbol,SymbolsState}
-    @assert ex.head == :curly
-    symstate = SymbolsState()
-    for curly_arg in ex.args[2:end]
-        arg_name, arg_symstate = explore_funcdef!(curly_arg, scopestate)
-        push!(scopestate.hiddenglobals, join_funcname_parts(arg_name))
-        union!(symstate, arg_symstate)
-    end
-    Symbol(ex.args[1]), symstate
-end
-
-uncurly!(ex::Expr)::Tuple{Symbol,SymbolsState} = ex.args[1], SymbolsState()
-
-uncurly!(s::Symbol, scopestate = nothing)::Tuple{Symbol,SymbolsState} = s, SymbolsState()
-
-"Turn `:(Base.Submodule.f)` into `[:Base, :Submodule, :f]` and `:f` into `[:f]`."
-function split_funcname(funcname_ex::Expr)::FunctionName
-    if funcname_ex.head == :(.)
-        out = FunctionName()
-        args = funcname_ex.args
-        for arg in args
-            push!(out, split_funcname(arg)...)
+            Expr(
+                :block,
+                # We were able to expand the macro, so let's recurse on the result.
+                pretransform_pluto(maybe_expanded), 
+                # the name of the macro that got expanded
+                Expr(:macrocall, ex.args[1]),
+            )
         end
-        return out
-    else
-        # a call to a function that's not a global, like calling an array element: `funcs[12]()`
-        # TODO: explore symstate!
-        return Symbol[]
-    end
-end
-
-function split_funcname(funcname_ex::QuoteNode)::FunctionName
-    split_funcname(funcname_ex.value)
-end
-function split_funcname(funcname_ex::GlobalRef)::FunctionName
-    split_funcname(funcname_ex.name)
-end
-
-function split_funcname(funcname_ex::Symbol)::FunctionName
-    Symbol[funcname_ex|>without_dotprefix|>without_dotsuffix]
-end
-
-# this includes GlobalRef - it's fine that we don't recognise it, because you can't assign to a globalref?
-function split_funcname(::Any)::FunctionName
-    Symbol[]
-end
-
-"Allows comparing tuples to vectors since having constant vectors can be slower"
-all_iters_eq(a, b) = length(a) == length(b) && all((aa == bb for (aa, bb) in zip(a, b)))
-
-function is_just_dots(ex::Expr)
-    ex.head == :(.) && all(is_just_dots, ex.args)
-end
-is_just_dots(::Union{QuoteNode,Symbol,GlobalRef}) = true
-is_just_dots(::Any) = false
-
-"""Turn `Symbol(".+")` into `:(+)`"""
-function without_dotprefix(funcname::Symbol)::Symbol
-    fn_str = String(funcname)
-    if length(fn_str) > 0 && fn_str[1] == '.'
-        Symbol(fn_str[2:end])
-    else
-        funcname
-    end
-end
-
-"""Turn `Symbol("sqrt.")` into `:sqrt`"""
-function without_dotsuffix(funcname::Symbol)::Symbol
-    fn_str = String(funcname)
-    if length(fn_str) > 0 && fn_str[end] == '.'
-        Symbol(fn_str[1:end-1])
+    elseif Meta.isexpr(ex, :module)
+        ex
+    elseif ex isa Expr
+        # recurse
+        Expr(ex.head, (pretransform_pluto(a) for a in ex.args)...)
     else
-        funcname
+        ex
     end
 end
 
-"""Generates a vector of all possible variants from a function name
-
-```
-julia> generate_funcnames([:Base, :Foo, :bar])
-3-element Vector{Symbol}:
- Symbol("Base.Foo.bar")
- Symbol("Foo.bar")
- :bar
-```
 
-"""
-function generate_funcnames(funccall::FunctionName)
-    calls = Vector{FunctionName}(undef, length(funccall) - 1)
-    for i = length(funccall):-1:2
-        calls[i-1] = funccall[i:end]
-    end
-    calls
-end
-
-"""
-Turn `Symbol[:Module, :func]` into Symbol("Module.func").
-
-This is **not** the same as the expression `:(Module.func)`, but is used to identify the function name using a single `Symbol` (like normal variables).
-This means that it is only the inverse of `ExpressionExplorer.split_funcname` iff `length(parts) ≤ 1`.
-"""
-join_funcname_parts(parts::FunctionName) = Symbol(join(parts, '.'))
-
-# this is stupid -- désolé
-function is_joined_funcname(joined::Symbol)
-    joined !== :.. #= .. is a valid identifier 😐 =# && occursin('.', String(joined))
-end
-
-"Module so I don't pollute the whole ExpressionExplorer scope"
-module MacroHasSpecialHeuristicInside
-import ...Pluto
-import ..ExpressionExplorer, ..SymbolsState
 
 """
 Uses `cell_precedence_heuristic` to determine if we need to include the contents of this macro in the symstate.
@@ -296,742 +78,19 @@ function macro_has_special_heuristic_inside(; symstate::SymbolsState, expr::Expr
     # Also, because I'm lazy and don't want to copy any code, imma use cell_precedence_heuristic here.
     # Sad part is, that this will also include other symbols used in this macro... but come'on
     local fake_cell = Pluto.Cell()
-    local fake_reactive_node = Pluto.ReactiveNode(symstate)
+    local fake_reactive_node = ReactiveNode(symstate)
     local fake_expranalysiscache = Pluto.ExprAnalysisCache(
         parsedcode = expr,
         module_usings_imports = ExpressionExplorer.compute_usings_imports(expr),
     )
     local fake_topology = Pluto.NotebookTopology(
-        nodes = Pluto.ImmutableDefaultDict(Pluto.ReactiveNode, Dict(fake_cell => fake_reactive_node)),
+        nodes = Pluto.ImmutableDefaultDict(ReactiveNode, Dict(fake_cell => fake_reactive_node)),
         codes = Pluto.ImmutableDefaultDict(Pluto.ExprAnalysisCache, Dict(fake_cell => fake_expranalysiscache)),
         cell_order = Pluto.ImmutableVector([fake_cell]),
     )
 
     return Pluto.cell_precedence_heuristic(fake_topology, fake_cell) < Pluto.DEFAULT_PRECEDENCE_HEURISTIC
 end
-# Having written this... I know I said I was lazy... I was wrong
-end
-
-
-###
-# MAIN RECURSIVE FUNCTION
-###
-
-# Spaghetti code for a spaghetti problem 🍝
-
-# Possible leaf: value
-# Like: a = 1
-# 1 is a value (Int64)
-function explore!(@nospecialize(value), scopestate::ScopeState)::SymbolsState
-    # includes: LineNumberNode, Int64, String, Markdown.LaTeX, DataType and more.
-    return SymbolsState()
-end
-
-# Possible leaf: symbol
-# Like a = x
-# x is a symbol
-# We handle the assignment separately, and explore!(:a, ...) will not be called.
-# Therefore, this method only handles _references_, which are added to the symbolstate, depending on the scopestate.
-function explore!(sym::Symbol, scopestate::ScopeState)::SymbolsState
-    if sym ∈ scopestate.hiddenglobals
-        SymbolsState()
-    else
-        SymbolsState(references = Set([sym]))
-    end
-end
-
-"""
-Returns whether or not an assignment Expr(:(=),...) is assigning to a new function
-  * f(x) = ...
-  * f(x)::V = ...
-  * f(::T) where {T} = ...
-"""
-is_function_assignment(ex::Expr)::Bool = ex.args[1] isa Expr && (ex.args[1].head == :call || ex.args[1].head == :where || (ex.args[1].head == :(::) && ex.args[1].args[1] isa Expr && ex.args[1].args[1].head == :call))
-
-anonymous_name() = Symbol("anon", rand(UInt64))
-
-function explore_assignment!(ex::Expr, scopestate::ScopeState)::SymbolsState
-    # Does not create scope
-
-    if is_function_assignment(ex)
-        # f(x, y) = x + y
-        # Rewrite to:
-        # function f(x, y) x + y end
-        return explore!(Expr(:function, ex.args...), scopestate)
-    end
-
-    val = ex.args[2]
-    # Handle generic types assignments A{B} = C{B, Int}
-    if ex.args[1] isa Expr && ex.args[1].head::Symbol == :curly
-        assignees, symstate = explore_funcdef!(ex.args[1], scopestate)::Tuple{Vector{Symbol}, SymbolsState}
-        innersymstate = union!(symstate, explore!(val, scopestate))
-    else
-        assignees = get_assignees(ex.args[1])
-        symstate = innersymstate = explore!(val, scopestate)
-    end
-
-    global_assignees = get_global_assignees(assignees, scopestate)
-
-    # If we are _not_ assigning a global variable, then this symbol hides any global definition with that name
-    union!(scopestate.hiddenglobals, setdiff(assignees, global_assignees))
-    assigneesymstate = explore!(ex.args[1], scopestate)
-
-    union!(scopestate.hiddenglobals, global_assignees)
-    union!(symstate.assignments, global_assignees)
-    union!(symstate.references, setdiff(assigneesymstate.references, global_assignees))
-    union!(symstate.funccalls, filter!(call -> length(call) != 1 || only(call) ∉ global_assignees, assigneesymstate.funccalls))
-    filter!(!all_underscores, symstate.references)  # Never record _ as a reference
-
-    return symstate
-end
-
-function explore_modifiers!(ex::Expr, scopestate::ScopeState)
-    # We change: a[1] += 123
-    # to:        a[1] = a[1] + 123
-    # We transform the modifier back to its operator
-    # for when users redefine the + function
-
-    operator = let
-        s = string(ex.head)
-        Symbol(s[1:prevind(s, lastindex(s))])
-    end
-    expanded_expr = Expr(:(=), ex.args[1], Expr(:call, operator, ex.args[1], ex.args[2]))
-    return explore!(expanded_expr, scopestate)
-end
-
-function explore_dotprefixed_modifiers!(ex::Expr, scopestate::ScopeState)
-    # We change: a[1] .+= 123
-    # to:        a[1] .= a[1] + 123
-
-    operator = Symbol(string(ex.head)[2:end-1])
-    expanded_expr = Expr(:(.=), ex.args[1], Expr(:call, operator, ex.args[1], ex.args[2]))
-    return explore!(expanded_expr, scopestate)
-end
-
-"Unspecialized mapfoldl."
-function umapfoldl(@nospecialize(f::Function), itr::Vector; init=SymbolsState())
-    if isempty(itr)
-        return init
-    else
-        out = init
-        for e in itr
-            union!(out, f(e))
-        end
-        return out
-    end
-end
-
-function explore_inner_scoped(ex::Expr, scopestate::ScopeState)::SymbolsState
-    # Because we are entering a new scope, we create a copy of the current scope state, and run it through the expressions.
-    innerscopestate = deepcopy(scopestate)
-    innerscopestate.inglobalscope = false
-
-    return umapfoldl(a -> explore!(a, innerscopestate), ex.args)
-end
-
-function explore_filter!(ex::Expr, scopestate::ScopeState)
-    # In a filter, the assignment is the second expression, the condition the first
-    args = collect(reverse(ex.args))
-    umapfoldl(a -> explore!(a, scopestate), args)::SymbolsState
-end
-
-function explore_generator!(ex::Expr, scopestate::ScopeState)
-    # Creates local scope
-
-    # In a `generator`, a single expression is followed by the iterator assignments.
-    # In a `for`, this expression comes at the end.
-
-    # This is not strictly the normal form of a `for` but that's okay
-    return explore!(Expr(:for, Iterators.reverse(ex.args[2:end])..., ex.args[1]), scopestate)
-end
-
-function explore_macrocall!(ex::Expr, scopestate::ScopeState)
-    # Early stopping, this expression will have to be re-explored once
-    # the macro is expanded in the notebook process.
-    macro_name = split_funcname(ex.args[1])
-    symstate = SymbolsState(macrocalls = Set{FunctionName}([macro_name]))
-
-    # Because it sure wouldn't break anything,
-    # I'm also going to blatantly assume that any macros referenced in here...
-    # will end up in the code after the macroexpansion 🤷‍♀️
-    # "You should make a new function for that" they said, knowing I would take the lazy route.
-    for arg in ex.args[begin+1:end]
-        macro_symstate = explore!(arg, ScopeState())
-
-        # Also, when this macro has something special inside like `Pkg.activate()`,
-        # we're going to treat it as normal code (so these heuristics trigger later)
-        # (Might want to also not let this to @eval macro, as an extra escape hatch if you
-        #    really don't want pluto to see your Pkg.activate() call)
-        if arg isa Expr && MacroHasSpecialHeuristicInside.macro_has_special_heuristic_inside(symstate = macro_symstate, expr = arg)
-            union!(symstate, macro_symstate)
-        else
-            union!(symstate, SymbolsState(macrocalls = macro_symstate.macrocalls))
-        end
-    end
-
-    # Some macros can be expanded on the server process
-    if join_funcname_parts(macro_name) ∈ can_macroexpand
-        new_ex = maybe_macroexpand(ex)
-        union!(symstate, explore!(new_ex, scopestate))
-    end
-
-    return symstate
-end
-
-function funcname_symstate!(funcname::FunctionName, scopestate::ScopeState)::SymbolsState
-    if length(funcname) == 0
-        explore!(ex.args[1], scopestate)
-    elseif length(funcname) == 1
-        if funcname[1] ∈ scopestate.hiddenglobals
-            SymbolsState()
-        else
-            SymbolsState(funccalls = Set{FunctionName}([funcname]))
-        end
-    elseif funcname[1] ∈ scopestate.hiddenglobals
-        SymbolsState()
-    else
-        SymbolsState(references = Set{Symbol}([funcname[1]]), funccalls = Set{FunctionName}([funcname]))
-    end
-end
-
-function explore_call!(ex::Expr, scopestate::ScopeState)::SymbolsState
-    # Does not create scope
-
-    if is_just_dots(ex.args[1])
-        funcname = split_funcname(ex.args[1])::FunctionName
-        symstate = funcname_symstate!(funcname, scopestate)
-
-        # Explore code inside function arguments:
-        union!(symstate, explore!(Expr(:block, ex.args[2:end]...), scopestate))
-
-        # Make `@macroexpand` and `Base.macroexpand` reactive by referencing the first macro in the second
-        # argument to the call.
-        if (all_iters_eq((:Base, :macroexpand), funcname) || all_iters_eq((:macroexpand,), funcname)) &&
-           length(ex.args) >= 3 &&
-           ex.args[3] isa QuoteNode &&
-           Meta.isexpr(ex.args[3].value, :macrocall)
-            expanded_macro = split_funcname(ex.args[3].value.args[1])
-            union!(symstate, SymbolsState(macrocalls = Set{FunctionName}([expanded_macro])))
-        elseif all_iters_eq((:BenchmarkTools, :generate_benchmark_definition), funcname) &&
-            length(ex.args) == 10
-            block = Expr(:block,
-                 map(ex.args[[8,7,9]]) do child
-                    if (Meta.isexpr(child, :copyast, 1) && child.args[1] isa QuoteNode && child.args[1].value isa Expr)
-                        child.args[1].value
-                    else
-                        nothing
-                    end
-                end...
-            )
-            union!(symstate, explore_inner_scoped(block, scopestate))
-        end
-
-        return symstate
-    else
-        return explore!(Expr(:block, ex.args...), scopestate)
-    end
-end
-
-function explore_struct!(ex::Expr, scopestate::ScopeState)
-    # Creates local scope
-
-    structnameexpr = ex.args[2]
-    structfields = ex.args[3].args
-
-    equiv_func = Expr(:function, Expr(:call, structnameexpr, structfields...), Expr(:block, nothing))
-
-    # struct should always be in Global state
-    globalscopestate = deepcopy(scopestate)
-    globalscopestate.inglobalscope = true
-
-    # we register struct definitions as both a variable and a function. This is because deleting a struct is trickier than just deleting its methods.
-    # Due to this, outer constructors have to be defined in the same cell where the struct is defined.
-    # See https://github.com/fonsp/Pluto.jl/issues/732 for more details
-    inner_symstate = explore!(equiv_func, globalscopestate)
-
-    structname = first(keys(inner_symstate.funcdefs)).name |> join_funcname_parts
-    push!(inner_symstate.assignments, structname)
-    return inner_symstate
-end
-
-function explore_abstract!(ex::Expr, scopestate::ScopeState)
-    explore_struct!(Expr(:struct, false, ex.args[1], Expr(:block, nothing)), scopestate)
-end
-
-function explore_function_macro!(ex::Expr, scopestate::ScopeState)
-    symstate = SymbolsState()
-    # Creates local scope
-
-    funcroot = ex.args[1]
-
-    # Because we are entering a new scope, we create a copy of the current scope state, and run it through the expressions.
-    innerscopestate = deepcopy(scopestate)
-    innerscopestate.inglobalscope = false
-
-    funcname, innersymstate = explore_funcdef!(funcroot, innerscopestate)::Tuple{FunctionName,SymbolsState}
-
-    # Macro are called using @funcname, but defined with funcname. We need to change that in our scopestate
-    # (The `!= 0` is for when the function named couldn't be parsed)
-    if ex.head == :macro && length(funcname) != 0
-        funcname = Symbol[Symbol('@', funcname[1])]
-        push!(innerscopestate.hiddenglobals, only(funcname))
-    elseif length(funcname) == 1
-        push!(scopestate.definedfuncs, funcname[end])
-        push!(scopestate.hiddenglobals, funcname[end])
-    elseif length(funcname) > 1
-        push!(symstate.references, funcname[end-1]) # reference the module of the extended function
-        push!(scopestate.hiddenglobals, funcname[end-1])
-    end
-
-    union!(innersymstate, explore!(Expr(:block, ex.args[2:end]...), innerscopestate))
-    funcnamesig = FunctionNameSignaturePair(funcname, hash(canonalize(funcroot)))
-
-    if will_assign_global(funcname, scopestate)
-        symstate.funcdefs[funcnamesig] = innersymstate
-    else
-        # The function is not defined globally. However, the function can still modify the global scope or reference globals, e.g.
-
-        # let
-        #     function f(x)
-        #         global z = x + a
-        #     end
-        #     f(2)
-        # end
-
-        # so we insert the function's inner symbol state here, as if it was a `let` block.
-        symstate = innersymstate
-    end
-
-    return symstate
-end
-
-function explore_try!(ex::Expr, scopestate::ScopeState)
-    symstate = SymbolsState()
-
-    # Handle catch first
-    if ex.args[3] != false
-        union!(symstate, explore_inner_scoped(ex.args[3], scopestate))
-        # If we catch a symbol, it could shadow a global reference, remove it
-        if ex.args[2] != false
-            setdiff!(symstate.references, Symbol[ex.args[2]])
-        end
-    end
-
-    # Handle the try block
-    union!(symstate, explore_inner_scoped(ex.args[1], scopestate))
-
-    # Handle finally
-    if 4 <= length(ex.args) <= 5 && ex.args[4] isa Expr
-        union!(symstate, explore_inner_scoped(ex.args[4], scopestate))
-    end
-
-    # Finally, handle else
-    if length(ex.args) == 5
-        union!(symstate, explore_inner_scoped(ex.args[5], scopestate))
-    end
-
-    return symstate
-end
-
-function explore_anonymous_function!(ex::Expr, scopestate::ScopeState)
-    # Creates local scope
-
-    tempname = anonymous_name()
-
-    # We will rewrite this to a normal function definition, with a temporary name
-    funcroot = ex.args[1]
-    args_ex = if funcroot isa Symbol || (funcroot isa Expr && funcroot.head == :(::))
-        [funcroot]
-    elseif funcroot.head == :tuple || funcroot.head == :(...) || funcroot.head == :block
-        funcroot.args
-    else
-        @error "Unknown lambda type"
-    end
-
-    equiv_func = Expr(:function, Expr(:call, tempname, args_ex...), ex.args[2])
-
-    return explore!(equiv_func, scopestate)
-end
-
-function explore_global!(ex::Expr, scopestate::ScopeState)::SymbolsState
-    # Does not create scope
-
-    # global x, y, z
-    if length(ex.args) > 1
-        return umapfoldl(arg -> explore!(Expr(:global, arg), scopestate), ex.args)
-    end
-
-    # We have one of:
-    # global x;
-    # global x = 1;
-    # global x += 1;
-
-    # where x can also be a tuple:
-    # global a,b = 1,2
-
-    globalisee = ex.args[1]
-
-    if isa(globalisee, Symbol)
-        push!(scopestate.exposedglobals, globalisee)
-        return SymbolsState()
-    elseif isa(globalisee, Expr)
-        # temporarily set inglobalscope to true
-        old = scopestate.inglobalscope
-        scopestate.inglobalscope = true
-        result = explore!(globalisee, scopestate)
-        scopestate.inglobalscope = old
-        return result::SymbolsState
-    else
-        @error "unknown global use" ex
-        return explore!(globalisee, scopestate)::SymbolsState
-    end
-end
-
-function explore_local!(ex::Expr, scopestate::ScopeState)::SymbolsState
-    # Does not create scope
-
-    # Turn `local x, y` in `local x; local y
-    if length(ex.args) > 1
-        return umapfoldl(arg -> explore!(Expr(:local, arg), scopestate), ex.args)
-    end
-
-    localisee = ex.args[1]
-
-    if isa(localisee, Symbol)
-        push!(scopestate.hiddenglobals, localisee)
-        return SymbolsState()
-    elseif isa(localisee, Expr) && (localisee.head == :(=) || localisee.head in modifiers)
-        push!(scopestate.hiddenglobals, get_assignees(localisee.args[1])...)
-        return explore!(localisee, scopestate)::SymbolsState
-    else
-        @warn "unknown local use" ex
-        return explore!(localisee, scopestate)::SymbolsState
-    end
-end
-
-function explore_tuple!(ex::Expr, scopestate::ScopeState)::SymbolsState
-    # Does not create scope
-
-    # There are two (legal) cases:
-    # 1. Creating a tuple:
-    #   (a, b, c, 1, f()...)
-    # 2. Creating a named tuple (contains at least one Expr(:(=))):
-    #   (a=1, b=2, c=3, d, f()...)
-
-    # !!! Note that :(a, b = 1, 2) is the definition of a named tuple
-    # with fields :a, :b and :2 and not a multiple assignments to a and b which
-    # would always be a :(=) with tuples for the lhs and/or rhs.
-    # Using Meta.parse() (like Pluto does) or using a quote block
-    # returns the assignment version.
-    #
-    # julia> eval(:(a, b = 1, 2)) # Named tuple
-    # ERROR: syntax: invalid named tuple element "2"
-    #
-    # julia> eval(Meta.parse("a, b = 1, 2")) # Assignment to a and b
-    # (1, 2)
-    #
-    # julia> Meta.parse("a, b = 1, 2").head, :(a, b = 1, 2).head
-    # (:(=), :tuple)
-
-    return umapfoldl(a -> explore!(to_kw(a), scopestate), ex.args)
-end
-
-function explore_broadcast!(ex::Expr, scopestate::ScopeState)
-    # pointwise function call, e.g. sqrt.(nums)
-    # we rewrite to a regular call
-
-    return explore!(Expr(:call, ex.args[1], ex.args[2].args...), scopestate)
-end
-
-function explore_load!(ex::Expr, scopestate::ScopeState)
-    imports = if ex.args[1].head == :(:)
-        ex.args[1].args[2:end]
-    else
-        ex.args
-    end
-
-    packagenames = map(e -> e.args[end], imports)
-
-    return SymbolsState(assignments = Set{Symbol}(packagenames))::SymbolsState
-end
-
-function explore_quote!(ex::Expr, scopestate::ScopeState)
-    # Look through the quote and only returns explore! deeper into :$'s
-    # I thought we need to handle strings in the same way,
-    #   but strings do just fine with the catch all at the end
-    #   and actually strings don't always have a :$ expression, sometimes just
-    #   plain Symbols (which we should then be interpreted as variables,
-    #     which is different to how we handle Symbols in quote'd expressions)
-    return explore_interpolations!(ex.args[1], scopestate)::SymbolsState
-end
-
-function explore_module!(ex::Expr, scopestate::ScopeState)
-    # Does create it's own scope, but can import from outer scope, that's what `explore_module_definition!` is for
-    symstate = explore_module_definition!(ex, scopestate)
-    return union(symstate, SymbolsState(assignments = Set{Symbol}([ex.args[2]])))::SymbolsState
-end
-
-function explore_fallback!(ex::Expr, scopestate::ScopeState)
-    # fallback, includes:
-    # begin, block, do, toplevel, const
-    # (and hopefully much more!)
-
-    # Does not create scope (probably)
-
-    return umapfoldl(a -> explore!(a, scopestate), ex.args)
-end
-
-# General recursive method. Is never a leaf.
-# Modifies the `scopestate`.
-function explore!(ex::Expr, scopestate::ScopeState)::SymbolsState
-    if ex.head == :(=)
-        return explore_assignment!(ex, scopestate)
-    elseif ex.head in modifiers
-        return explore_modifiers!(ex, scopestate)
-    elseif ex.head in modifiers_dotprefixed
-        return explore_dotprefixed_modifiers!(ex, scopestate)
-    elseif ex.head == :let || ex.head == :for || ex.head == :while
-        # Creates local scope
-        return explore_inner_scoped(ex, scopestate)
-    elseif ex.head == :filter
-        return explore_filter!(ex, scopestate)
-    elseif ex.head == :generator
-        return explore_generator!(ex, scopestate)
-    elseif ex.head == :macrocall
-        return explore_macrocall!(ex, scopestate)
-    elseif ex.head == :call
-        return explore_call!(ex, scopestate)
-    elseif Meta.isexpr(ex, :parameters)
-        return umapfoldl(a -> explore!(to_kw(a), scopestate), ex.args)
-    elseif ex.head == :kw
-        return explore!(ex.args[2], scopestate)
-    elseif ex.head == :struct
-        return explore_struct!(ex, scopestate)
-    elseif ex.head == :abstract
-        return explore_abstract!(ex, scopestate)
-    elseif ex.head == :function || ex.head == :macro
-        return explore_function_macro!(ex, scopestate)
-    elseif ex.head == :try
-        return explore_try!(ex, scopestate)
-    elseif ex.head == :(->)
-        return explore_anonymous_function!(ex, scopestate)
-    elseif ex.head == :global
-        return explore_global!(ex, scopestate)
-    elseif ex.head == :local
-        return explore_local!(ex, scopestate)
-    elseif ex.head == :tuple
-        return explore_tuple!(ex, scopestate)
-    elseif Meta.isexpr(ex, :(.), 2) && ex.args[2] isa Expr && ex.args[2].head == :tuple
-        return explore_broadcast!(ex, scopestate)
-    elseif ex.head == :using || ex.head == :import
-        return explore_load!(ex, scopestate)
-    elseif ex.head == :quote
-        return explore_quote!(ex, scopestate)
-    elseif ex.head == :module
-        return explore_module!(ex, scopestate)
-    elseif Meta.isexpr(ex, Symbol("'"), 1)
-        # a' corresponds to adjoint(a)
-        return explore!(Expr(:call, :adjoint, ex.args[1]), scopestate)
-    elseif ex.head == :meta
-        return SymbolsState()
-    else
-        return explore_fallback!(ex, scopestate)
-    end
-end
-
-"""
-Goes through a module definition, and picks out `import ..x`'s, which are references to the outer module.
-We need `module_depth + 1` dots before the specifier, so nested modules can still access Pluto.
-"""
-function explore_module_definition!(ex::Expr, scopestate; module_depth::Number = 0)
-    if ex.head == :using || ex.head == :import
-        # We don't care about anything after the `:` here
-        import_names = if ex.args[1].head == :(:)
-            [ex.args[1].args[1]]
-        else
-            ex.args
-        end
-
-
-        symstate = SymbolsState()
-        for import_name_expr in import_names
-            if (
-                Meta.isexpr(import_name_expr, :., module_depth + 2) &&
-                all(x -> x == :., import_name_expr.args[begin:end-1]) &&
-                import_name_expr.args[end] isa Symbol
-            )
-                # Theoretically it could still use an assigment from the same cell, if it weren't
-                # for the fact that modules need to be top level, and we don't support multiple (toplevel) expressions in a cell yet :D
-                push!(symstate.references, import_name_expr.args[end])
-            end
-
-        end
-
-        return symstate
-    elseif ex.head == :module
-        # Explorer the block inside with one more depth added
-        return explore_module_definition!(ex.args[3], scopestate, module_depth = module_depth + 1)
-    elseif ex.head == :quote
-        # TODO? Explore interpolations, modules can't be in interpolations, but `import`'s can >_>
-        return SymbolsState()
-    else
-        # Go deeper
-        return umapfoldl(a -> explore_module_definition!(a, scopestate, module_depth = module_depth), ex.args)
-    end
-end
-explore_module_definition!(expr, scopestate; module_depth::Number = 1) = SymbolsState()
-
-
-"Go through a quoted expression and use explore! for :\$ expressions"
-function explore_interpolations!(ex::Expr, scopestate)
-    if ex.head == :$
-        return explore!(ex.args[1], scopestate)::SymbolsState
-    else
-        # We are still in a quote, so we do go deeper, but we keep ignoring everything except :$'s
-        return umapfoldl(a -> explore_interpolations!(a, scopestate), ex.args)
-    end
-end
-explore_interpolations!(anything_else, scopestate) = SymbolsState()
-
-function to_kw(ex::Expr)
-    if Meta.isexpr(ex, :(=))
-        Expr(:kw, ex.args...)
-    else
-        ex
-    end
-end
-to_kw(x) = x
-
-"""
-Return the function name and the SymbolsState from argument defaults. Add arguments as hidden globals to the `scopestate`.
-
-Is also used for `struct` and `abstract`.
-"""
-function explore_funcdef!(ex::Expr, scopestate::ScopeState)::Tuple{FunctionName,SymbolsState}
-    if ex.head == :call
-        params_to_explore = ex.args[2:end]
-        # Using the keyword args syntax f(;y) the :parameters node is the first arg in the AST when it should
-        # be explored last. We change from (parameters, ...) to (..., parameters)
-        if length(params_to_explore) >= 2 && params_to_explore[1] isa Expr && params_to_explore[1].head == :parameters
-            params_to_explore = [params_to_explore[2:end]..., params_to_explore[1]]
-        end
-
-        # Handle struct as callables, `(obj::MyType)(a, b) = ...`
-        # or `function (obj::MyType)(a, b) ...; end` by rewriting it as:
-        # function MyType(obj, a, b) ...; end
-        funcroot = ex.args[1]
-        if Meta.isexpr(funcroot, :(::))
-            if last(funcroot.args) isa Symbol
-                return explore_funcdef!(Expr(:call, reverse(funcroot.args)..., params_to_explore...), scopestate)
-            else
-                # Function call as type: (obj::typeof(myotherobject))()
-                symstate = explore!(last(funcroot.args), scopestate)
-                name, declaration_symstate = if length(funcroot.args) == 1
-                    explore_funcdef!(Expr(:call, anonymous_name(), params_to_explore...), scopestate)
-                else
-                    explore_funcdef!(Expr(:call, anonymous_name(), first(funcroot.args), params_to_explore...), scopestate)
-                end
-                return name, union!(symstate, declaration_symstate)
-            end
-        end
-
-        # get the function name
-        name, symstate = explore_funcdef!(funcroot, scopestate)
-        # and explore the function arguments
-        return umapfoldl(a -> explore_funcdef!(a, scopestate), params_to_explore; init=(name, symstate))
-    elseif ex.head == :(::) || ex.head == :kw || ex.head == :(=)
-        # Treat custom struct constructors as a local scope function
-        if ex.head == :(=) && is_function_assignment(ex)
-            symstate = explore!(ex, scopestate)
-            return Symbol[], symstate
-        end
-
-        # account for unnamed params, like in f(::Example) = 1
-        if ex.head == :(::) && length(ex.args) == 1
-            symstate = explore!(ex.args[1], scopestate)
-
-            return Symbol[], symstate
-        end
-
-        # For a() = ... in a struct definition
-        if Meta.isexpr(ex, :(=), 2) && Meta.isexpr(ex.args[1], :call)
-            name, symstate = explore_funcdef!(ex.args[1], scopestate)
-            union!(symstate, explore!(ex.args[2], scopestate))
-            return name, symstate
-        end
-
-        # recurse by starting by the right hand side because f(x=x) references the global variable x
-        rhs_symstate = if length(ex.args) > 1
-            # use `explore!` (not `explore_funcdef!`) to explore the argument's default value - these can contain arbitrary expressions
-            explore!(ex.args[2], scopestate)
-        else
-            SymbolsState()
-        end
-        name, symstate = explore_funcdef!(ex.args[1], scopestate)
-        union!(symstate, rhs_symstate)
-
-        return name, symstate
-
-    elseif ex.head == :where
-        # function(...) where {T, S <: R, U <: A.B}
-        # supertypes `R` and `A.B` are referenced
-        supertypes_symstate = SymbolsState()
-        for a in ex.args[2:end]
-            name, inner_symstate = explore_funcdef!(a, scopestate)
-            if length(name) == 1
-                push!(scopestate.hiddenglobals, name[1])
-            end
-            union!(supertypes_symstate, inner_symstate)
-        end
-        # recurse
-        name, symstate = explore_funcdef!(ex.args[1], scopestate)
-        union!(symstate, supertypes_symstate)
-        return name, symstate
-
-    elseif ex.head == :(<:)
-        # for use in `struct` and `abstract`
-        name, symstate = uncurly!(ex.args[1], scopestate)
-        if length(ex.args) != 1
-            union!(symstate, explore!(ex.args[2], scopestate))
-        end
-        return Symbol[name], symstate
-
-    elseif ex.head == :curly
-        name, symstate = uncurly!(ex, scopestate)
-        return Symbol[name], symstate
-
-    elseif Meta.isexpr(ex, :parameters)
-        init = (Symbol[], SymbolsState())
-        return umapfoldl(a -> explore_funcdef!(to_kw(a), scopestate), ex.args; init)
-
-    elseif ex.head == :tuple
-        init = (Symbol[], SymbolsState())
-        return umapfoldl(a -> explore_funcdef!(a, scopestate), ex.args; init)
-
-    elseif ex.head == :(.)
-        return split_funcname(ex), SymbolsState()
-
-    elseif ex.head == :(...)
-        return explore_funcdef!(ex.args[1], scopestate)
-    else
-        return Symbol[], explore!(ex, scopestate)
-    end
-end
-
-function explore_funcdef!(ex::QuoteNode, scopestate::ScopeState)::Tuple{FunctionName,SymbolsState}
-    explore_funcdef!(ex.value, scopestate)
-end
-
-function explore_funcdef!(ex::Symbol, scopestate::ScopeState)::Tuple{FunctionName,SymbolsState}
-    push!(scopestate.hiddenglobals, ex)
-    Symbol[ex|>without_dotprefix|>without_dotsuffix], SymbolsState()
-end
-
-function explore_funcdef!(::Any, ::ScopeState)::Tuple{FunctionName,SymbolsState}
-    Symbol[], SymbolsState()
-end
-
-
 
 const can_macroexpand_no_bind = Set(Symbol.(["@md_str", "Markdown.@md_str", "@gensym", "Base.@gensym", "@enum", "Base.@enum", "@assert", "Base.@assert", "@cmd"]))
 const can_macroexpand = can_macroexpand_no_bind ∪ Set(Symbol.(["@bind", "PlutoRunner.@bind"]))
@@ -1039,12 +98,11 @@ const can_macroexpand = can_macroexpand_no_bind ∪ Set(Symbol.(["@bind", "Pluto
 """
 If the macro is **known to Pluto**, expand or 'mock expand' it, if not, return the expression. Macros from external packages are not expanded, this is done later in the pipeline. See https://github.com/fonsp/Pluto.jl/pull/1032
 """
-function maybe_macroexpand(ex::Expr; recursive::Bool=false, expand_bind::Bool=true)
+function maybe_macroexpand_pluto(ex::Expr; recursive::Bool=false, expand_bind::Bool=true)
     result::Expr = if ex.head === :macrocall
-        funcname = split_funcname(ex.args[1])
-        funcname_joined = join_funcname_parts(funcname)
+        funcname = ExpressionExplorer.split_funcname(ex.args[1])
 
-        if funcname_joined ∈ (expand_bind ? can_macroexpand : can_macroexpand_no_bind)
+        if funcname.joined ∈ (expand_bind ? can_macroexpand : can_macroexpand_no_bind)
             macroexpand(PlutoRunner, ex; recursive=false)::Expr
         else
             ex
@@ -1057,7 +115,7 @@ function maybe_macroexpand(ex::Expr; recursive::Bool=false, expand_bind::Bool=tr
         # Not using broadcasting because that is expensive compilation-wise for `result.args::Any`.
         expanded = Any[]
         for arg in result.args
-            ex = maybe_macroexpand(arg; recursive, expand_bind)
+            ex = maybe_macroexpand_pluto(arg; recursive, expand_bind)
             push!(expanded, ex)
         end
         return Expr(result.head, expanded...)
@@ -1066,187 +124,28 @@ function maybe_macroexpand(ex::Expr; recursive::Bool=false, expand_bind::Bool=tr
     end
 end
 
-maybe_macroexpand(ex::Any; kwargs...) = ex
-
-
-###
-# CANONICALIZE FUNCTION DEFINITIONS
-###
-
-"""
-Turn a function definition expression (`Expr`) into a "canonical" form, in the sense that two methods that would evaluate to the same method signature have the same canonical form. Part of a solution to https://github.com/fonsp/Pluto.jl/issues/177. Such a canonical form cannot be achieved statically with 100% correctness (impossible), but we can make it good enough to be practical.
-
-
-# Wait, "evaluate to the same method signature"?
-
-In Pluto, you cannot do definitions of **the same global variable** in different cells. This is needed for reactivity to work, and it avoid ambiguous notebooks and stateful stuff. This rule used to also apply to functions: you had to place all methods of a function in one cell. (Go and read more about methods in Julia if you haven't already.) But this is quite annoying, especially because multiple dispatch is so important in Julia code. So we allow methods of the same function to be defined across multiple cells, but we still want to throw errors when you define **multiple methods with the same signature**, because one overrides the other. For example:
-```julia
-julia> f(x) = 1
-f (generic function with 1 method)
-
-julia> f(x) = 2
-f (generic function with 1 method)
-``
-
-After adding the second method, the function still has only 1 method. This is because the second definition overrides the first one, instead of being added to the method table. This example should be illegal in Julia, for the same reason that `f = 1` and `f = 2` is illegal. So our problem is: how do we know that two cells will define overlapping methods? 
-
-Ideally, we would just evaluate the user's code and **count methods** afterwards, letting Julia do the work. Unfortunately, we need to know this info _before_ we run cells, otherwise we don't know in which order to run a notebook! There are ways to break this circle, but it would complicate our process quite a bit.
-
-Instead, we will do _static analysis_ on the function definition expressions to determine whether they overlap. This is non-trivial. For example, `f(x)` and `f(y::Any)` define the same method. Trickier examples are here: https://github.com/fonsp/Pluto.jl/issues/177#issuecomment-645039993
-
-# Wait, "function definition expressions"?
-For example:
-
-```julia
-e = :(function f(x::Int, y::String)
-        x + y
-    end)
-
-dump(e, maxdepth=2)
-
-#=
-gives:
-
-Expr
-  head: Symbol function
-  args: Array{Any}((2,))
-    1: Expr
-    2: Expr
-=#
-```
-
-This first arg is the function head:
-
-```julia
-e.args[1] == :(f(x::Int, y::String))
-```
-
-# Mathematics
-Our problem is to find a way to compute the equivalence relation ~ on `H × H`, with `H` the set of function head expressions, defined as:
-
-`a ~ b` iff evaluating both expressions results in a function with exactly one method.
-
-_(More precisely, evaluating `Expr(:function, x, Expr(:block))` with `x ∈ {a, b}`.)_
-
-The equivalence sets are isomorphic to the set of possible Julia methods.
-
-Instead of finding a closed form algorithm for `~`, we search for a _canonical form_: a function `canonical: H -> H` that chooses one canonical expression per equivalence class. It has the property 
-    
-`canonical(a) = canonical(b)` implies `a ~ b`.
-
-We use this **canonical form** of the function's definition expression as its "signature". We compare these canonical forms when determining whether two function expressions will result in overlapping methods.
-
-# Example
-```julia
-e1 = :(f(x, z::Any))
-e2 = :(g(x, y))
+maybe_macroexpand_pluto(ex::Any; kwargs...) = ex
 
-canonalize(e1) == canonalize(e2)
-```
 
-```julia
-e1 = :(f(x))
-e2 = :(g(x, y))
 
-canonalize(e1) != canonalize(e2)
-```
+###############
 
-```julia
-e1 = :(f(a::X, b::wow(ie), c,      d...; e=f) where T)
-e2 = :(g(z::X, z::wow(ie), z::Any, z...     ) where T)
 
-canonalize(e1) == canonalize(e2)
-```
-"""
-function canonalize(ex::Expr)
-    if ex.head == :where
-        Expr(:where, canonalize(ex.args[1]), ex.args[2:end]...)
-    elseif ex.head == :call || ex.head == :tuple
-        skip_index = ex.head == :call ? 2 : 1
-        # ex.args[1], if ex.head == :call this is the function name, we dont want it
 
-        interesting = filter(ex.args[skip_index:end]) do arg
-            !(arg isa Expr && arg.head == :parameters)
-        end
-
-        hide_argument_name.(interesting)
-    elseif ex.head == :(::)
-        canonalize(ex.args[1])
-    elseif ex.head == :curly || ex.head == :(<:)
-        # for struct definitions, which we hackily treat as functions
-        nothing
-    else
-        @error "Failed to canonalize this strange looking function" ex
-        nothing
-    end
-end
-
-# for `function g end`
-canonalize(::Symbol) = nothing
-
-function hide_argument_name(ex::Expr)
-    if ex.head == :(::) && length(ex.args) > 1
-        Expr(:(::), nothing, ex.args[2:end]...)
-    elseif ex.head == :(...)
-        Expr(:(...), hide_argument_name(ex.args[1]))
-    elseif ex.head == :kw
-        Expr(:kw, hide_argument_name(ex.args[1]), nothing)
+function collect_implicit_usings(ex::Expr)
+    if is_implicit_using(ex)
+        Set{Expr}(Iterators.map(transform_dot_notation, ex.args))
     else
-        ex
-    end
-end
-hide_argument_name(::Symbol) = Expr(:(::), nothing, :Any)
-hide_argument_name(x::Any) = x
-
-###
-# UTILITY FUNCTIONS
-###
-
-function handle_recursive_functions!(symstate::SymbolsState)
-    # We do something special to account for recursive functions:
-    # If a function `f` calls a function `g`, and both are defined inside this cell, the reference to `g` inside the symstate of `f` will be deleted.
-    # The motivitation is that normally, an assignment (or function definition) will add that symbol to a list of 'hidden globals' - any future references to that symbol will be ignored. i.e. the _local definition hides a global_.
-    # In the case of functions, you can reference functions and variables that do not yet exist, and so they won't be in the list of hidden symbols when the function definition is analysed. 
-    # Of course, our method will fail if a referenced function is defined both inside the cell **and** in another cell. However, this will lead to a MultipleDefinitionError before anything bad happens.
-    K = keys(symstate.funcdefs)
-    for (func, inner_symstate) in symstate.funcdefs
-        inner_symstate.references = setdiff(inner_symstate.references, K)
-        inner_symstate.funccalls = setdiff(inner_symstate.funccalls, K)
+        return Set{Expr}()
     end
-    return nothing
-end
-
-"""
-    compute_symbolreferences(ex::Any)::SymbolsState
-
-Return the global references, assignment, function calls and function definitions inside an arbitrary expression.
-Inside Pluto, `ex` is always an `Expr`. However, we still accept `Any` to allow people outside Pluto to use this to do syntax analysis.
-"""
-function compute_symbolreferences(ex::Any)::SymbolsState
-    symstate = explore!(ex, ScopeState())
-    handle_recursive_functions!(symstate)
-    return symstate
 end
 
-function try_compute_symbolreferences(ex::Any)::SymbolsState
-    try
-        compute_symbolreferences(ex)
-    catch e
-        if e isa InterruptException
-            rethrow(e)
-        end
-        @error "Expression explorer failed on: " ex
-        showerror(stderr, e, stacktrace(catch_backtrace()))
-        SymbolsState(references = Set{Symbol}([:fake_reference_to_prevent_it_from_looking_like_a_text_only_cell]))
-    end
-end
+collect_implicit_usings(usings::Union{AbstractSet{Expr},AbstractVector{Expr}}) = mapreduce(collect_implicit_usings, union!, usings; init = Set{Expr}())
+collect_implicit_usings(usings_imports::ExpressionExplorer.UsingsImports) = collect_implicit_usings(usings_imports.usings)
 
-Base.@kwdef struct UsingsImports
-    usings::Set{Expr} = Set{Expr}()
-    imports::Set{Expr} = Set{Expr}()
-end
 
 is_implicit_using(ex::Expr) = Meta.isexpr(ex, :using) && length(ex.args) >= 1 && !Meta.isexpr(ex.args[1], :(:))
+
 function transform_dot_notation(ex::Expr)
     if Meta.isexpr(ex, :(.))
         Expr(:block, ex.args[end])
@@ -1255,103 +154,24 @@ function transform_dot_notation(ex::Expr)
     end
 end
 
-function collect_implicit_usings(ex::Expr)
-    if is_implicit_using(ex)
-        Set{Expr}(Iterators.map(transform_dot_notation, ex.args))
-    else
-        return Set{Expr}()
-    end
-end
 
-collect_implicit_usings(usings::Set{Expr}) = mapreduce(collect_implicit_usings, union!, usings; init = Set{Expr}())
-collect_implicit_usings(usings_imports::UsingsImports) = collect_implicit_usings(usings_imports.usings)
 
-# Performance analysis: https://gist.github.com/fonsp/280f6e883f419fb3a59231b2b1b95cab
-"Preallocated version of [`compute_usings_imports`](@ref)."
-function compute_usings_imports!(out::UsingsImports, ex::Any)
-    if isa(ex, Expr)
-        if ex.head == :using
-            push!(out.usings, ex)
-        elseif ex.head == :import
-            push!(out.imports, ex)
-        elseif ex.head != :quote
-            for a in ex.args
-                compute_usings_imports!(out, a)
-            end
-        end
-    end
-    out
-end
+###############
 
-"""
-Given `:(using Plots, Something.Else, .LocalModule)`, return `Set([:Plots, :Something])`.
-"""
-function external_package_names(ex::Expr)::Set{Symbol}
-    @assert ex.head == :import || ex.head == :using
-    if Meta.isexpr(ex.args[1], :(:))
-        external_package_names(Expr(ex.head, ex.args[1].args[1]))
-    else
-        out = Set{Symbol}()
-        for a in ex.args
-            if Meta.isexpr(a, :as)
-                a = a.args[1]
-            end
-            if Meta.isexpr(a, :(.))
-                if a.args[1] != :(.)
-                    push!(out, a.args[1])
-                end
-            end
-        end
-        out
-    end
-end
-
-function external_package_names(x::UsingsImports)::Set{Symbol}
-    union!(Set{Symbol}(), Iterators.map(external_package_names, x.usings)..., Iterators.map(external_package_names, x.imports)...)
-end
-
-"Get the sets of `using Module` and `import Module` subexpressions that are contained in this expression."
-compute_usings_imports(ex) = compute_usings_imports!(UsingsImports(), ex)
-
-"Return whether the expression is of the form `Expr(:toplevel, LineNumberNode(..), any)`."
-function is_toplevel_expr(ex::Expr)::Bool
-    Meta.isexpr(ex, :toplevel, 2) && (ex.args[1] isa LineNumberNode)
-end
-
-is_toplevel_expr(::Any)::Bool = false
-
-"If the expression is a (simple) assignemnt at its root, return the assignee as `Symbol`, return `nothing` otherwise."
-function get_rootassignee(ex::Expr, recurse::Bool = true)::Union{Symbol,Nothing}
-    if is_toplevel_expr(ex) && recurse
-        get_rootassignee(ex.args[2], false)
-    elseif Meta.isexpr(ex, :macrocall, 3)
-        rooter_assignee = get_rootassignee(ex.args[3], true)
-        if rooter_assignee !== nothing
-            Symbol(string(ex.args[1]) * " " * string(rooter_assignee))
-        else
-            nothing
-        end
-    elseif Meta.isexpr(ex, :const, 1)
-        rooter_assignee = get_rootassignee(ex.args[1], false)
-        if rooter_assignee !== nothing
-            Symbol("const " * string(rooter_assignee))
-        else
-            nothing
-        end
-    elseif ex.head == :(=) && ex.args[1] isa Symbol
-        ex.args[1]
-    else
-        nothing
-    end
-end
 
-get_rootassignee(ex::Any, recuse::Bool = true)::Union{Symbol,Nothing} = nothing
+"""
+```julia
+can_be_function_wrapped(ex)::Bool
+```
 
-"Is this code simple enough that we can wrap it inside a function to boost performance? Look for [`PlutoRunner.Computer`](@ref) to learn more."
+Is this code simple enough that we can wrap it inside a function, and run the function in global scope instead of running the code directly? Look for `Pluto.PlutoRunner.Computer` to learn more.
+"""
 function can_be_function_wrapped(x::Expr)
     if x.head === :global || # better safe than sorry
        x.head === :using ||
        x.head === :import ||
+       x.head === :export ||
+       x.head === :public || # Julia 1.11
        x.head === :module ||
        x.head === :incomplete ||
        # Only bail on named functions, but anonymous functions (args[1].head == :tuple) are fine.
@@ -1363,14 +183,14 @@ function can_be_function_wrapped(x::Expr)
        x.head === :macrocall ||
        x.head === :struct ||
        x.head === :abstract ||
-       (x.head === :(=) && is_function_assignment(x)) || # f(x) = ...
+       (x.head === :(=) && ExpressionExplorer.is_function_assignment(x)) || # f(x) = ...
        (x.head === :call && (x.args[1] === :eval || x.args[1] === :include))
         false
     else
         all(can_be_function_wrapped, x.args)
     end
-
 end
+
 can_be_function_wrapped(x::Any) = true
 
 end
diff --git a/src/analysis/MoreAnalysis.jl b/src/analysis/MoreAnalysis.jl
index 7db3f28b53..1e6dfe989d 100644
--- a/src/analysis/MoreAnalysis.jl
+++ b/src/analysis/MoreAnalysis.jl
@@ -3,12 +3,12 @@ module MoreAnalysis
 export bound_variable_connections_graph
 
 import ..Pluto
-import ..Pluto: Cell, Notebook, NotebookTopology, ExpressionExplorer
+import ..Pluto: Cell, Notebook, NotebookTopology, ExpressionExplorer, ExpressionExplorerExtras
 
 "Find all subexpressions of the form `@bind symbol something`, and extract the `symbol`s."
 function find_bound_variables(expr)
 	found = Set{Symbol}()
-	_find_bound_variables!(found, ExpressionExplorer.maybe_macroexpand(expr; recursive=true, expand_bind=false))
+	_find_bound_variables!(found, ExpressionExplorerExtras.maybe_macroexpand_pluto(expr; recursive=true, expand_bind=false))
 	found
 end
 
diff --git a/src/analysis/ReactiveNode.jl b/src/analysis/ReactiveNode.jl
deleted file mode 100644
index 8fbf6dda99..0000000000
--- a/src/analysis/ReactiveNode.jl
+++ /dev/null
@@ -1,78 +0,0 @@
-import .ExpressionExplorer: SymbolsState, FunctionName, FunctionNameSignaturePair, try_compute_symbolreferences, generate_funcnames
-
-"Every cell is a node in the reactive graph. The nodes/point/vertices are the _cells_, and the edges/lines/arrows are the _dependencies between cells_. In a reactive notebook, these dependencies are the **global variable references and definitions**. (For the mathies: a reactive notebook is represented by a _directed multigraph_. A notebook without reactivity errors is an _acyclic directed multigraph_.) This struct contains the back edges (`references`) and forward edges (`definitions`, `soft_definitions`, `funcdefs_with_signatures`, `funcdefs_without_signatures`) of a single node.
-
-Before 0.12.0, we could have written this struct with just two fields: `references` and `definitions` (both of type `Set{Symbol}`) because we used variable names to form the reactive links. However, to support defining _multiple methods of the same function in different cells_ (https://github.com/fonsp/Pluto.jl/issues/177), we needed to change this. You might want to think about this old behavior first (try it on paper) before reading on.
-
-The essential idea is that edges are still formed by variable names. Simple global variables (`x = 1`) are registered by their name as `Symbol`, but _function definitions_ `f(x::Int) = 5` are sometimes stored in two ways:
-- by their name (`f`) as `Symbol`, in `funcdefs_without_signatures`, and
-- by their name with its method signature as `FunctionNameSignaturePair`, in `funcdefs_with_signatures`.
-
-The name _without_ signature is most important: it is used to find the reactive dependencies between cells. The name _with_ signature is needed to detect multiple cells that define methods with the _same_ signature (`f(x) = 1` and `f(x) = 2`) - this is illegal. This is why we do not collect `definitions`, `funcdefs_with_signatures` and `funcdefs_without_signatures` onto a single pile: we need them separately for different searches.
-"
-Base.@kwdef struct ReactiveNode
-    references::Set{Symbol} = Set{Symbol}()
-    definitions::Set{Symbol} = Set{Symbol}()
-    soft_definitions::Set{Symbol} = Set{Symbol}()
-    funcdefs_with_signatures::Set{FunctionNameSignaturePair} = Set{FunctionNameSignaturePair}()
-    funcdefs_without_signatures::Set{Symbol} = Set{Symbol}()
-    macrocalls::Set{Symbol} = Set{Symbol}()
-end
-
-function Base.union!(a::ReactiveNode, bs::ReactiveNode...)
-	union!(a.references, (b.references for b in bs)...)
-	union!(a.definitions, (b.definitions for b in bs)...)
-	union!(a.soft_definitions, (b.soft_definitions for b in bs)...)
-	union!(a.funcdefs_with_signatures, (b.funcdefs_with_signatures for b in bs)...)
-	union!(a.funcdefs_without_signatures, (b.funcdefs_without_signatures for b in bs)...)
-	union!(a.macrocalls, (b.macrocalls for b in bs)...)
-	return a
-end
-
-"Turn a `SymbolsState` into a `ReactiveNode`. The main differences are:
-- A `SymbolsState` is a nested structure of function definitions inside function definitions inside... This conversion flattens this structure by merging `SymbolsState`s from defined functions.
-- `ReactiveNode` functions as a cache to improve efficienty, by turning the nested structures into multiple `Set{Symbol}`s with fast lookups."
-function ReactiveNode(symstate::SymbolsState)
-	macrocalls = Iterators.map(join_funcname_parts, symstate.macrocalls) |> Set{Symbol}
-	result = ReactiveNode(;
-		references=Set{Symbol}(symstate.references), 
-		definitions=Set{Symbol}(symstate.assignments),
-		macrocalls=macrocalls,
-	)
-
-	# defined functions are 'exploded' into the cell's reactive node
-	for (_, body_symstate) in symstate.funcdefs
-		union!(result, ReactiveNode(body_symstate))
-	end
-	# union!(result, (ReactiveNode(body_symstate) for (_, body_symstate) in symstate.funcdefs)...)
-
-	# now we will add the function names to our edges:
-	funccalls = Set{Symbol}(symstate.funccalls .|> join_funcname_parts)
-	FunctionDependencies.maybe_add_dependent_funccalls!(funccalls)
-	union!(result.references, funccalls)
-
-	union!(result.references, macrocalls)
-
-	for (namesig, body_symstate) in symstate.funcdefs
-		push!(result.funcdefs_with_signatures, namesig)
-		push!(result.funcdefs_without_signatures, join_funcname_parts(namesig.name))
-
-		generated_names = generate_funcnames(namesig.name)
-		generated_names_syms = Iterators.map(join_funcname_parts, generated_names) |> Set{Symbol}
-
-		# add the generated names so that they are added as soft definitions
-		# this means that they will not be used if a cycle is created
-		union!(result.soft_definitions, generated_names_syms)
-
-		filter!(!∈(generated_names_syms), result.references) # don't reference defined functions (simulated recursive calls)
-	end
-
-	return result
-end
-
-# Convenience functions
-ReactiveNode(code::String) = ReactiveNode(try_compute_symbolreferences(Meta.parse(code)))
-ReactiveNode(code::Expr) = error("Use ReactiveNode_from_expr(code) instead.")
-
-# Mot just a method of ReactiveNode because an expression is not necessarily a `Expr`, e.g. `Meta.parse("\"hello!\"") isa String`.
-ReactiveNode_from_expr(expr::Any) = ReactiveNode(try_compute_symbolreferences(expr))
diff --git a/src/analysis/Topology.jl b/src/analysis/Topology.jl
index d08ee7d5c0..6a4ab6ade0 100644
--- a/src/analysis/Topology.jl
+++ b/src/analysis/Topology.jl
@@ -15,7 +15,7 @@ ExprAnalysisCache(notebook, cell::Cell) = let
         code=cell.code,
         parsedcode=parsedcode,
         module_usings_imports=ExpressionExplorer.compute_usings_imports(parsedcode),
-        function_wrapped=ExpressionExplorer.can_be_function_wrapped(parsedcode),
+        function_wrapped=ExpressionExplorerExtras.can_be_function_wrapped(parsedcode),
     )
 end
 
diff --git a/src/analysis/TopologyUpdate.jl b/src/analysis/TopologyUpdate.jl
index 0f81070725..6723087eb5 100644
--- a/src/analysis/TopologyUpdate.jl
+++ b/src/analysis/TopologyUpdate.jl
@@ -1,5 +1,6 @@
 import .ExpressionExplorer
-import .ExpressionExplorer: join_funcname_parts, SymbolsState, FunctionNameSignaturePair
+import .ExpressionExplorerExtras
+import .ExpressionExplorer: SymbolsState, FunctionNameSignaturePair
 
 "Return a copy of `old_topology`, but with recomputed results from `cells` taken into account."
 function updated_topology(old_topology::NotebookTopology, notebook::Notebook, cells)
@@ -11,9 +12,7 @@ function updated_topology(old_topology::NotebookTopology, notebook::Notebook, ce
 		old_code = old_topology.codes[cell]
 		if old_code.code !== cell.code
 			new_code = updated_codes[cell] = ExprAnalysisCache(notebook, cell)
-			new_symstate = new_code.parsedcode |>
-				ExpressionExplorer.try_compute_symbolreferences
-			new_reactive_node = ReactiveNode(new_symstate)
+			new_reactive_node = ExpressionExplorer.compute_reactive_node(ExpressionExplorerExtras.pretransform_pluto(new_code.parsedcode))
 
 			updated_nodes[cell] = new_reactive_node
 		elseif old_code.forced_expr_id !== nothing
diff --git a/src/analysis/is_just_text.jl b/src/analysis/is_just_text.jl
index 38339f68af..525cf27270 100644
--- a/src/analysis/is_just_text.jl
+++ b/src/analysis/is_just_text.jl
@@ -17,7 +17,7 @@ function is_just_text(topology::NotebookTopology, cell::Cell)::Bool
 	 (length(node.references) == 2 &&
 		:PlutoRunner in node.references &&
 		Symbol("PlutoRunner.throw_syntax_error") in node.references)) &&
-		no_loops(ExpressionExplorer.maybe_macroexpand(topology.codes[cell].parsedcode; recursive=true))
+		no_loops(ExpressionExplorerExtras.maybe_macroexpand_pluto(topology.codes[cell].parsedcode; recursive=true))
 end
 
 function no_loops(ex::Expr)
diff --git a/src/evaluation/MacroAnalysis.jl b/src/evaluation/MacroAnalysis.jl
index 3043e3284b..addccd557f 100644
--- a/src/evaluation/MacroAnalysis.jl
+++ b/src/evaluation/MacroAnalysis.jl
@@ -30,7 +30,7 @@ function with_new_soft_definitions(topology::NotebookTopology, cell::Cell, soft_
 	)
 end
 
-collect_implicit_usings(topology::NotebookTopology, cell::Cell) = ExpressionExplorer.collect_implicit_usings(topology.codes[cell].module_usings_imports)
+collect_implicit_usings(topology::NotebookTopology, cell::Cell) = ExpressionExplorerExtras.collect_implicit_usings(topology.codes[cell].module_usings_imports)
 
 function cells_with_deleted_macros(old_topology::NotebookTopology, new_topology::NotebookTopology)
     old_macros = mapreduce(c -> defined_macros(old_topology, c), union!, all_cells(old_topology); init=Set{Symbol}())
@@ -105,15 +105,15 @@ function resolve_topology(
 	end
 
 	function analyze_macrocell(cell::Cell)
-		if unresolved_topology.nodes[cell].macrocalls ⊆ ExpressionExplorer.can_macroexpand
+		if unresolved_topology.nodes[cell].macrocalls ⊆ ExpressionExplorerExtras.can_macroexpand
 			return Skipped()
 		end
 
 		result = macroexpand_cell(cell)
 		if result isa Success
 			(expr, computer_id) = result.result
-			expanded_node = ExpressionExplorer.try_compute_symbolreferences(expr) |> ReactiveNode
-			function_wrapped = ExpressionExplorer.can_be_function_wrapped(expr)
+			expanded_node = ExpressionExplorer.compute_reactive_node(ExpressionExplorerExtras.pretransform_pluto(expr))
+			function_wrapped = ExpressionExplorerExtras.can_be_function_wrapped(expr)
 			Success((expanded_node, function_wrapped, computer_id))
 		else
 			result
@@ -184,8 +184,13 @@ end
 So, the resulting reactive nodes may not be absolutely accurate. If you can run code in a session, use `resolve_topology` instead.
 """
 function static_macroexpand(topology::NotebookTopology, cell::Cell)
-	new_node = ExpressionExplorer.maybe_macroexpand(topology.codes[cell].parsedcode; recursive=true) |>
-		ExpressionExplorer.try_compute_symbolreferences |> ReactiveNode
+	new_node = ExpressionExplorer.compute_reactive_node(
+		ExpressionExplorerExtras.pretransform_pluto(
+			ExpressionExplorerExtras.maybe_macroexpand_pluto(
+				topology.codes[cell].parsedcode; recursive=true
+			)
+		)
+	)
 	union!(new_node.macrocalls, topology.nodes[cell].macrocalls)
 
 	new_node
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index e74f0d8c4d..32cfa7c9fa 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -164,7 +164,8 @@ function run_reactive_core!(
 		)...)
 
     if will_run_code(notebook)
-        deletion_hook((session, notebook), old_workspace_name, nothing, to_delete_vars, to_delete_funcs, to_reimport, cells_to_macro_invalidate; to_run) # `deletion_hook` defaults to `WorkspaceManager.move_vars`
+		to_delete_funcs_simple = Set{Tuple{UUID,Tuple{Vararg{Symbol}}}}((id, name.parts) for (id,name) in to_delete_funcs)
+        deletion_hook((session, notebook), old_workspace_name, nothing, to_delete_vars, to_delete_funcs_simple, to_reimport, cells_to_macro_invalidate; to_run) # `deletion_hook` defaults to `WorkspaceManager.move_vars`
     end
 
 	foreach(v -> delete!(notebook.bonds, v), to_delete_vars)
diff --git a/src/evaluation/RunBonds.jl b/src/evaluation/RunBonds.jl
index 291b6eef85..3371f938ee 100644
--- a/src/evaluation/RunBonds.jl
+++ b/src/evaluation/RunBonds.jl
@@ -41,7 +41,7 @@ function set_bond_values_reactive(;
     bond_value_pairs = zip(syms_to_set, new_values)
 
     syms_to_set_set = Set{Symbol}(syms_to_set)
-    function custom_deletion_hook((session, notebook)::Tuple{ServerSession,Notebook}, old_workspace_name, new_workspace_name, to_delete_vars::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, to_reimport::Set{Expr}, invalidated_cell_uuids::Set{UUID}; to_run::AbstractVector{Cell})
+    function custom_deletion_hook((session, notebook)::Tuple{ServerSession,Notebook}, old_workspace_name, new_workspace_name, to_delete_vars::Set{Symbol}, methods_to_delete, to_reimport, invalidated_cell_uuids; to_run)
         to_delete_vars = union(to_delete_vars, syms_to_set_set) # also delete the bound symbols
         WorkspaceManager.move_vars(
             (session, notebook),
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index 12fbee2dd9..e670d841d3 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -551,7 +551,7 @@ function move_vars(
     old_workspace_name::Symbol,
     new_workspace_name::Union{Nothing,Symbol},
     to_delete::Set{Symbol},
-    methods_to_delete::Set{Tuple{UUID,FunctionName}},
+    methods_to_delete::Set{Tuple{UUID,Tuple{Vararg{Symbol}}}},
     module_imports_to_move::Set{Expr},
     invalidated_cell_uuids::Set{UUID},
     keep_registered::Set{Symbol}=Set{Symbol}();
@@ -574,7 +574,7 @@ function move_vars(
     end)
 end
 
-function move_vars(session_notebook::Union{SN,Workspace}, to_delete::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,FunctionName}}, module_imports_to_move::Set{Expr}, invalidated_cell_uuids::Set{UUID}; kwargs...)
+function move_vars(session_notebook::Union{SN,Workspace}, to_delete::Set{Symbol}, methods_to_delete::Set{Tuple{UUID,Tuple{Vararg{Symbol}}}}, module_imports_to_move::Set{Expr}, invalidated_cell_uuids::Set{UUID}; kwargs...)
     move_vars(session_notebook, bump_workspace_module(session_notebook)..., to_delete, methods_to_delete, module_imports_to_move, invalidated_cell_uuids; kwargs...)
 end
 
diff --git a/src/notebook/Cell.jl b/src/notebook/Cell.jl
index 48f4862bad..c04732764d 100644
--- a/src/notebook/Cell.jl
+++ b/src/notebook/Cell.jl
@@ -1,5 +1,4 @@
 import UUIDs: UUID, uuid1
-import .ExpressionExplorer: SymbolsState, UsingsImports
 
 const METADATA_DISABLED_KEY = "disabled"
 const METADATA_SHOW_LOGS_KEY = "show_logs"
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 6cce83afa7..43b60af19c 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -341,7 +341,7 @@ function get_module_names(workspace_module, module_ex::Expr)
 end
 
 function collect_soft_definitions(workspace_module, modules::Set{Expr})
-  mapreduce(module_ex -> get_module_names(workspace_module, module_ex), union!, modules; init=Set{Symbol}())
+    mapreduce(module_ex -> get_module_names(workspace_module, module_ex), union!, modules; init=Set{Symbol}())
 end
 
 
@@ -688,7 +688,7 @@ function move_vars(
     old_workspace_name::Symbol,
     new_workspace_name::Symbol,
     vars_to_delete::Set{Symbol},
-    methods_to_delete::Set{Tuple{UUID,Vector{Symbol}}},
+    methods_to_delete::Set{Tuple{UUID,Tuple{Vararg{Symbol}}}},
     module_imports_to_move::Set{Expr},
     invalidated_cell_uuids::Set{UUID},
     keep_registered::Set{Symbol},
@@ -829,7 +829,7 @@ end
 #     try_delete_toplevel_methods(workspace, [name])
 # end
 
-function try_delete_toplevel_methods(workspace::Module, (cell_id, name_parts)::Tuple{UUID,Vector{Symbol}})::Bool
+function try_delete_toplevel_methods(workspace::Module, (cell_id, name_parts)::Tuple{UUID,Tuple{Vararg{Symbol}}})::Bool
     try
         val = workspace
         for name in name_parts
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index f0e85bfb3d..7835ba19a7 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -1,818 +1,246 @@
-using Test
-import Pluto: PlutoRunner
-
-#=
-`@test_broken` means that the test doesn't pass right now, but we want it to pass. Feel free to try to fix it and open a PR!
-Some of these @test_broken lines are commented out to prevent printing to the terminal, but we still want them fixed.
-
-# When working on ExpressionExplorer:
-
-- Go to runtests.jl and move `include("ExpressionExplorer.jl")` to the second line, so that they run instantly (after loading the helper functions). Be careful not to commit this change.
-- If you are fixing a `@test_broken`:
-  - uncomment that line if needed
-  - change `@test_broken` to `@test`
-  - remove `verbose=false` at the end of the line
-- If you are fixing something else:
-  - you can add lots of tests! They run super fast, don't worry about duplicates too much
-
--fons =#
-
-@testset "Explore Expressions" begin
-    let
-        EE = Pluto.ExpressionExplorer
-        scopestate = EE.ScopeState()
-
-        @inferred EE.explore_assignment!(:(f(x) = x), scopestate)
-        @inferred EE.explore_modifiers!(:(1 + 1), scopestate)
-        @inferred EE.explore_dotprefixed_modifiers!(:([1] .+ [1]), scopestate)
-        @inferred EE.explore_inner_scoped(:(let x = 1 end), scopestate)
-        @inferred EE.explore_filter!(:(filter(true, a)), scopestate)
-        @inferred EE.explore_generator!(:((x for x in a)), scopestate)
-        @inferred EE.explore_macrocall!(:(@time 1), scopestate)
-        @inferred EE.explore_call!(:(f(x)), scopestate)
-        @inferred EE.explore_struct!(:(struct A end), scopestate)
-        @inferred EE.explore_abstract!(:(abstract type A end), scopestate)
-        @inferred EE.explore_function_macro!(:(function f(x); x; end), scopestate)
-        @inferred EE.explore_try!(:(try nothing catch end), scopestate)
-        @inferred EE.explore_anonymous_function!(:(x -> x), scopestate)
-        @inferred EE.explore_global!(:(global x = 1), scopestate)
-        @inferred EE.explore_local!(:(local x = 1), scopestate)
-        @inferred EE.explore_tuple!(:((a, b)), scopestate)
-        @inferred EE.explore_broadcast!(:(func.(a)), scopestate)
-        @inferred EE.explore_load!(:(using Foo), scopestate)
-        let
-            @inferred EE.explore_interpolations!(:(quote 1 end), scopestate)
-            @inferred EE.explore_quote!(:(quote 1 end), scopestate)
-        end
-        @inferred EE.explore_module!(:(module A end), scopestate)
-        @inferred EE.explore_fallback!(:(1 + 1), scopestate)
-        @inferred EE.explore!(:(1 + 1), scopestate)
 
-        @inferred EE.split_funcname(:(Base.Submodule.f))
-        @inferred EE.maybe_macroexpand(:(@time 1))
-    end
 
-    @testset "Basics" begin
-        # Note that Meta.parse(x) is not always an Expr.
-        @test testee(:(a), [:a], [], [], [])
-        @test testee(Expr(:toplevel, :a), [:a], [], [], [])
-        @test testee(:(1 + 1), [], [], [:+], [])
-        @test testee(:(sqrt(1)), [], [], [:sqrt], [])
-        @test testee(:(x = 3), [], [:x], [], [])
-        @test testee(:(x = x), [:x], [:x], [], [])
-        @test testee(:(x = 1 + y), [:y], [:x], [:+], [])
-        @test testee(:(x = +(a...)), [:a], [:x], [:+], [])
-        @test testee(:(1:3), [], [], [:(:)], [])
-    end
-    @testset "Bad code" begin
-        # @test_nowarn testee(:(begin end = 2), [:+], [], [:+], [], verbose=false)
-        @test testee(:(123 = x), [:x], [], [], [])
-        @test_nowarn testee(:((a = b, c, d = 123,)), [:b], [], [], [], verbose=false)
-        @test_nowarn testee(:((a = b, c[r] = 2, d = 123,)), [:b], [], [], [], verbose=false)
-
-        @test_nowarn testee(:(function f(function g() end) end), [], [], [:+], [], verbose=false)
-        @test_nowarn testee(:(function f() Base.sqrt(x::String) = 2; end), [], [], [:+], [], verbose=false)
-        @test_nowarn testee(:(function f() global g(x) = x; end), [], [], [], [], verbose=false)
-    end
-    @testset "Lists and structs" begin
-        @test testee(:(1:3), [], [], [:(:)], [])
-        @test testee(:(a[1:3,4]), [:a], [], [:(:)], [])
-        @test testee(:(a[b]), [:a, :b], [], [], [])
-        @test testee(:([a[1:3,4]; b[5]]), [:b, :a], [], [:(:)], [])
-        @test testee(:(a.someproperty), [:a], [], [], []) # `a` can also be a module
-        @test testee(:([a..., b]), [:a, :b], [], [], [])
-        @test testee(:(struct a; b; c; end), [], [:a], [], [
-            :a => ([], [], [], [])
-        ])
-        @test testee(:(abstract type a end), [], [:a], [], [
-            :a => ([], [], [], [])
-        ])
-        @test testee(:(let struct a; b; c; end end), [], [:a], [], [
-            :a => ([], [], [], [])
-        ])
-        @test testee(:(let abstract type a end end), [], [:a], [], [
-            :a => ([], [], [], [])
-        ])
-
-        @test testee(:(module a; f(x) = x; z = r end), [], [:a], [], [])
-    end
-    @testset "Types" begin
-        @test testee(:(x::Foo = 3), [:Foo], [:x], [], [])
-        @test testee(:(x::Foo), [:x, :Foo], [], [], [])
-        @test testee(quote
-            a::Foo, b::String = 1, "2"
-        end, [:Foo, :String], [:a, :b], [], [])
-        @test testee(:(Foo[]), [:Foo], [], [], [])
-        @test testee(:(x isa Foo), [:x, :Foo], [], [:isa], [])
-
-        @test testee(quote
-            (x[])::Int = 1
-        end, [:Int, :x], [], [], [])
-        @test testee(quote
-            (x[])::Int, y = 1, 2
-        end, [:Int, :x], [:y], [], [])
-
-        @test testee(:(A{B} = B), [], [:A], [], [])
-        @test testee(:(A{T} = Union{T,Int}), [:Int, :Union], [:A], [], [])
-
-        @test testee(:(abstract type a end), [], [:a], [], [:a => ([], [], [], [])])
-        @test testee(:(abstract type a <: b end), [], [:a], [], [:a => ([:b], [], [], [])])
-        @test testee(:(abstract type a <: b{C} end), [], [:a], [], [:a => ([:b, :C], [], [], [])])
-        @test testee(:(abstract type a{T} end), [], [:a], [], [:a => ([], [], [], [])])
-        @test testee(:(abstract type a{T,S} end), [], [:a], [], [:a => ([], [], [], [])])
-        @test testee(:(abstract type a{T} <: b end), [], [:a], [], [:a => ([:b], [], [], [])])
-        @test testee(:(abstract type a{T} <: b{T} end), [], [:a], [], [:a => ([:b], [], [], [])])
-        @test_nowarn testee(macroexpand(Main, :(@enum a b c)), [], [], [], []; verbose=false)
-
-        e = :(struct a end) # needs to be on its own line to create LineNumberNode
-        @test testee(e, [], [:a], [], [:a => ([], [], [], [])])
-        @test testee(:(struct a <: b; c; d::Foo; end), [], [:a], [], [:a => ([:b, :Foo], [], [], [])])
-        @test testee(:(struct a{T,S}; c::T; d::Foo; end), [], [:a], [], [:a => ([:Foo], [], [], [])])
-        @test testee(:(struct a{T} <: b; c; d::Foo; end), [], [:a], [], [:a => ([:b, :Foo], [], [], [])])
-        @test testee(:(struct a{T} <: b{T}; c; d::Foo; end), [], [:a], [], [:a => ([:b, :Foo], [], [], [])])
-        @test testee(:(struct a; c; a(x=y) = new(x, z); end), [], [:a], [], [:a => ([:y, :z], [], [:new], [])])
-        @test testee(:(struct a{A,B<:C{A}}; i::A; j::B end), [], [:a], [], [:a => ([:C], [], [], [])])
-        @test testee(:(struct a{A,B<:C{<:A}} <: D{A,B}; i::A; j::B end), [], [:a], [], [:a => ([:C, :D], [], [], [])])
-        @test testee(:(struct a{A,DD<:B.C{D.E{A}}} <: K.A{A} i::A; j::DD; k::C end), [], [:a], [], [:a => ([:B, :C, :D, :K], [], [], [])])
-        @test testee(:(struct a; x; a(t::T) where {T} = new(t); end), [], [:a], [], [:a => ([], [], [[:new]], [])])
-        @test testee(:(struct a; x; y; a(t::T) where {T} = new(t, T); end), [], [:a], [], [:a => ([], [], [[:new]], [])])
-        @test testee(:(struct a; f() = a() end), [], [:a], [], [:a => ([], [], [], [])])
-
-        @test testee(:(abstract type a <: b end), [], [:a], [], [:a => ([:b], [], [], [])])
-        @test testee(:(abstract type a{T,S} end), [], [:a], [], [:a => ([], [], [], [])])
-        @test testee(:(abstract type a{T} <: b end), [], [:a], [], [:a => ([:b], [], [], [])])
-        @test testee(:(abstract type a{T} <: b{T} end), [], [:a], [], [:a => ([:b], [], [], [])])
-        @test testee(:(abstract type a end), [], [:a], [], [:a => ([], [], [], [])])
-        @test testee(:(abstract type a{A,B<:C{A}} end), [], [:a], [], [:a => ([:C], [], [], [])])
-        @test testee(:(abstract type a{A,B<:C{<:A}} <: D{A,B} end), [], [:a], [], [:a => ([:C, :D], [], [], [])])
-        @test testee(:(abstract type a{A,DD<:B.C{D.E{A}}} <: K.A{A} end), [], [:a], [], [:a => ([:B, :D, :K], [], [], [])])
-        # @test_broken testee(:(struct a; c; a(x=y) = new(x,z); end), [], [:a], [], [:a => ([:y, :z], [], [], [])], verbose=false)
-    end
-    @testset "Assignment operator & modifiers" begin
-        # https://github.com/JuliaLang/julia/blob/f449765943ba414bd57c3d1a44a73e5a0bb27534/base/docs/basedocs.jl#L239-L244
-        @test testee(:(a = a), [:a], [:a], [], [])
-        @test testee(:(a = a + 1), [:a], [:a], [:+], [])
-        @test testee(:(x = a = a + 1), [:a], [:a, :x], [:+], [])
-        @test testee(:(const a = b), [:b], [:a], [], [])
-        @test testee(:(f(x) = x), [], [], [], [:f => ([], [], [], [])])
-        @test testee(:(a[b,c,:] = d), [:a, :b, :c, :d, :(:)], [], [], [])
-        @test testee(:(a.b = c), [:a, :c], [], [], [])
-        @test testee(:(f(a, b=c, d=e; f=g)), [:a, :c, :e, :g], [], [:f], [])
-
-        @test testee(:(a += 1), [:a], [:a], [:+], [])
-        @test testee(:(a >>>= 1), [:a], [:a], [:>>>], [])
-        @test testee(:(a ⊻= 1), [:a], [:a], [:⊻], [])
-        @test testee(:(a[1] += 1), [:a], [], [:+], [])
-        @test testee(:(x = let a = 1; a += b end), [:b], [:x], [:+], [])
-        @test testee(:(_ = a + 1), [:a], [], [:+], [])
-        @test testee(:(a = _ + 1), [], [:a], [:+], [])
-
-        @test testee(:(f()[] = 1), [], [], [:f], [])
-        @test testee(:(x[f()] = 1), [:x], [], [:f], [])
-    end
-    @testset "Multiple assignments" begin
-        # Note that using the shorthand syntax :(a = 1, b = 2) to create an expression
-        # will automatically return a :tuple Expr and not a multiple assignment
-        # we use quotes instead of this syntax to be sure of what is tested since quotes
-        # would behave the same way as Meta.parse() which Pluto uses to evaluate cell code.
-        ex = quote
-            a, b = 1, 2
+const ObjectID = typeof(objectid("hello computer"))
+
+function Base.show(io::IO, s::SymbolsState)
+    print(io, "SymbolsState([")
+    join(io, s.references, ", ")
+    print(io, "], [")
+    join(io, s.assignments, ", ")
+    print(io, "], [")
+    join(io, s.funccalls, ", ")
+    print(io, "], [")
+    if isempty(s.funcdefs)
+        print(io, "]")
+    else
+        println(io)
+        for (k, v) in s.funcdefs
+            print(io, "    ", k, ": ", v)
+            println(io)
         end
-        @test Meta.isexpr(ex.args[2], :(=))
-
-        @test testee(quote
-            a, b = 1, 2
-        end, [], [:a, :b], [], [])
-        @test testee(quote
-            a, _, c, __ = 1, 2, 3, _d
-        end, [:_d], [:a, :c], [], [])
-        @test testee(quote
-            (a, b) = 1, 2
-        end, [], [:a, :b], [], [])
-        @test testee(quote
-            a = (b, c)
-        end, [:b, :c], [:a], [], [])
-        @test testee(quote
-            a, (b, c) = [e,[f,g]]
-        end, [:e, :f, :g], [:a, :b, :c], [], [])
-        @test testee(quote
-            a, (b, c) = [e,[f,g]]
-        end, [:e, :f, :g], [:a, :b, :c], [], [])
-        @test testee(quote
-            (x, y), a, (b, c) = z, e, (f, g)
-        end, [:z, :e, :f, :g], [:x, :y, :a, :b, :c], [], [])
-        @test testee(quote
-            (x[i], y.r), a, (b, c) = z, e, (f, g)
-        end, [:x, :i, :y, :z, :e, :f, :g], [:a, :b, :c], [], [])
-        @test testee(quote
-            (a[i], b.r) = (c.d, 2)
-        end, [:a, :b, :i, :c], [], [], [])
-        @test testee(quote
-            a, b... = 0:5
-        end, [],[:a, :b], [[:(:)]], [])
-        @test testee(quote
-            a[x], x = 1, 2
-        end, [:a], [:x], [], [])
-        @test testee(quote
-            x, a[x] = 1, 2
-        end, [:a], [:x], [], [])
-        @test testee(quote
-            f, a[f()] = g
-        end, [:g, :a], [:f], [], [])
-        @test testee(quote
-            a[f()], f = g
-        end, [:g, :a], [:f], [], [])
-        @test testee(quote (; a, b) = x end, [:x], [:a, :b], [], [])
-        @test testee(quote a = (b, c) end, [:b, :c], [:a], [], [])
-
-        @test testee(:(const a, b = 1, 2), [], [:a, :b], [], [])
-    end
-    @testset "Tuples" begin
-        ex = :(1, 2, a, b, c)
-        @test Meta.isexpr(ex, :tuple)
-
-        @test testee(:((a, b,)), [:a,:b], [], [], [])
-        @test testee(:((a, b, c, 1, 2, 3, :d, f()..., let y = 3 end)), [:a, :b, :c], [], [:f], [])
-
-        @test testee(:((a = b, c = 2, d = 123,)), [:b], [], [], [])
-        @test testee(:((a = b, c, d, f()..., let x = (;a = e) end...)), [:b, :c, :d, :e], [], [:f], [])
-        @test testee(:((a = b,)), [:b], [], [], [])
-        @test testee(:(a = b, c), [:b, :c], [], [], [])
-        @test testee(:(a, b = c), [:a, :c], [], [], [])
-
-        # Invalid named tuples but still parses just fine
-        @test testee(:((a, b = 1, 2)), [:a], [], [], [])
-        @test testee(:((a, b) = 1, 2), [], [], [], [])
-    end
-    @testset "Broadcasting" begin
-        @test testee(:(a .= b), [:b, :a], [], [], []) # modifies elements, doesn't set `a`
-        @test testee(:(a .+= b), [:b, :a], [], [:+], [])
-        @test testee(:(a[i] .+= b), [:b, :a, :i], [], [:+], [])
-        @test testee(:(a .+ b ./ sqrt.(c, d)), [:a, :b, :c, :d], [], [:+, :/, :sqrt], [])
-
-        # in 1.5 :(.+) is a symbol, in 1.6 its Expr:(:(.), :+)
-        broadcasted_add = :(.+) isa Symbol ? :(.+) : :+
-        @test testee(:(f = .+), [broadcasted_add], [:f], [], [])
-        @test testee(:(reduce(.+, foo)), [broadcasted_add, :foo], [], [:reduce], [])
-    end
-    @testset "`for` & `while`" begin
-        @test testee(:(for k in 1:n; k + s; end), [:n, :s], [], [:+, :(:)], [])
-        @test testee(:(for k in 1:2, r in 3:4; global z = k + r; end), [], [:z], [:+, :(:)], [])
-        @test testee(:(while k < 2; r = w; global z = k + r; end), [:k, :w], [:z], [:+, :(<)], [])
-    end
-    @testset "`try` & `catch` & `else` & `finally`" begin
-        @test testee(:(try a = b + 1 catch; end), [:b], [], [:+], [])
-        @test testee(:(try a() catch e; e end), [], [], [:a], [])
-        @test testee(:(try a() catch; e end), [:e], [], [:a], [])
-        @test testee(:(try a + 1 catch a; a end), [:a], [], [:+], [])
-        @test testee(:(try 1 catch e; e finally a end), [:a], [], [], [])
-        @test testee(:(try 1 finally a end), [:a], [], [], [])
-
-        # try catch else was introduced in 1.8
-        @static if VERSION >= v"1.8.0"
-            @test testee(Meta.parse("try 1 catch else x = 1; x finally a; end"), [:a], [], [], [])
-            @test testee(Meta.parse("try 1 catch else x = j; x finally a; end"), [:a, :j], [], [], [])
-            @test testee(Meta.parse("try x = 2 catch else x finally a; end"), [:a, :x], [], [], [])
-            @test testee(Meta.parse("try x = 2 catch else x end"), [:x], [], [], [])
-        end
-    end
-    @testset "Comprehensions" begin
-        @test testee(:([sqrt(s) for s in 1:n]), [:n], [], [:sqrt, :(:)], [])
-        @test testee(:([sqrt(s + r) for s in 1:n, r in k]), [:n, :k], [], [:sqrt, :(:), :+], [])
-        @test testee(:([s + j + r + m for s in 1:3 for j in 4:5 for (r, l) in [(1, 2)]]), [:m], [], [:+, :(:)], [])
-        @test testee(:([a for a in b if a != 2]), [:b], [], [:(!=)], [])
-        @test testee(:([a for a in f() if g(a)]), [], [], [:f, :g], [])
-        @test testee(:([c(a) for a in f() if g(a)]), [], [], [:c, :f, :g], [])
-        @test testee(:([k for k in P, j in 1:k]), [:k, :P], [], [:(:)], [])
-
-        @test testee(:([a for a in a]), [:a], [], [], [])
-        @test testee(:(for a in a; a; end), [:a], [], [], [])
-        @test testee(:(let a = a; a; end), [:a], [], [], [])
-        @test testee(:(let a = a end), [:a], [], [], [])
-        @test testee(:(let a = b end), [:b], [], [], [])
-        @test testee(:(a = a), [:a], [:a], [], [])
-        @test testee(:(a = [a for a in a]), [:a], [:a], [], [])
-    end
-    @testset "Multiple expressions" begin
-        @test testee(:(x = let r = 1; r + r end), [], [:x], [:+], [])
-        @test testee(:(begin let r = 1; r + r end; r = 2 end), [], [:r], [:+], [])
-        @test testee(:((k = 2; 123)), [], [:k], [], [])
-        @test testee(:((a = 1; b = a + 1)), [], [:a, :b], [:+], [])
-        @test testee(Meta.parse("a = 1; b = a + 1"), [], [:a, :b], [:+], [])
-        @test testee(:((a = b = 1)), [], [:a, :b], [], [])
-        @test testee(:(let k = 2; 123 end), [], [], [], [])
-        @test testee(:(let k() = 2 end), [], [], [], [])
+        print(io, "]")
     end
-    @testset "Functions" begin
-        @test testee(:(function g() r = 2; r end), [], [], [], [
-            :g => ([], [], [], [])
-        ])
-        @test testee(:(function g end), [], [], [], [
-            :g => ([], [], [], [])
-        ])
-        @test testee(:(function f() g(x) = x; end), [], [], [], [
-            :f => ([], [], [], []) # g is not a global def
-        ])
-        @test testee(:(function f(z) g(x) = x; g(z) end), [], [], [], [
-            :f => ([], [], [], [])
-        ])
-        @test testee(:(function f(x, y=1; r, s=3 + 3) r + s + x * y * z end), [], [], [], [
-            :f => ([:z], [], [:+, :*], [])
-        ])
-        @test testee(:(function f(x) x * y * z end), [], [], [], [
-            :f => ([:y, :z], [], [:*], [])
-        ])
-        @test testee(:(function f(x) x = x / 3; x end), [], [], [], [
-            :f => ([], [], [:/], [])
-        ])
-        @test testee(:(function f(x) a end; function f(x, y) b end), [], [], [], [
-            :f => ([:a, :b], [], [], [])
-        ])
-        @test testee(:(function f(x, args...; kwargs...) return [x, y, args..., kwargs...] end), [], [], [], [
-            :f => ([:y], [], [], [])
-        ])
-        @test testee(:(function f(x; y=x) y + x end), [], [], [], [
-            :f => ([], [], [:+], [])
-        ])
-        @test testee(:(function (A::MyType)(x; y=x) y + x end), [], [], [], [
-            :MyType => ([], [], [:+], [])
-        ])
-        @test testee(:(f(x, y=a + 1) = x * y * z), [], [], [], [
-            :f => ([:z, :a], [], [:*, :+], [])
-        ])
-        @test testee(:(f(x, y...) = y),[],[],[],[
-            :f => ([], [], [], [])
-        ])
-        @test testee(:(f((x, y...), z) = y),[],[],[],[
-            :f => ([], [], [], [])
-        ])
-        @test testee(:(begin f() = 1; f end), [], [], [], [
-            :f => ([], [], [], [])
-        ])
-        @test testee(:(begin f() = 1; f() end), [], [], [], [
-            :f => ([], [], [], [])
-        ])
-        @test testee(:(begin
-                f(x) = (global a = √b)
-                f(x, y) = (global c = -d)
-            end), [], [], [], [
-            :f => ([:b, :d], [:a, :c], [:√, :-], [])
-        ])
-        @test testee(:(Base.show() = 0), [:Base], [], [], [
-            [:Base, :show] => ([], [], [], [])
-        ])
-        @test testee(:((x;p) -> f(x+p)), [], [], [], [
-            :anon => ([], [], [:f, :+], [])
-        ])
-        @test testee(:(() -> Date), [], [], [], [
-            :anon => ([:Date], [], [], [])
-        ])
-        @test testee(:(begin x; p end -> f(x+p)), [], [], [], [
-            :anon => ([], [], [:f, :+], [])
-        ])
-        @test testee(:(minimum(x) do (a, b); a + b end), [:x], [], [:minimum], [
-            :anon => ([], [], [:+], [])
-        ])
-        @test testee(:(f = x -> x * y), [], [:f], [], [
-            :anon => ([:y], [], [:*], [])
-        ])
-        @test testee(:(f = (x, y) -> x * y), [], [:f], [], [
-            :anon => ([], [], [:*], [])
-        ])
-        @test testee(:(f = (x, y = a + 1) -> x * y), [], [:f], [], [
-            :anon => ([:a], [], [:*, :+], [])
-        ])
-        @test testee(:((((a, b), c), (d, e)) -> a * b * c * d * e * f), [], [], [], [
-            :anon => ([:f], [], [:*], [])
-        ])
-        @test testee(:((a...) -> f(a...)), [], [], [], [
-            :anon => ([], [], [:f], [])
-        ])
-        @test testee(:(f = (args...) -> [args..., y]), [], [:f], [], [
-            :anon => ([:y], [], [], [])
-        ])
-        @test testee(:(f = (x, args...; kwargs...) -> [x, y, args..., kwargs...]), [], [:f], [], [
-            :anon => ([:y], [], [], [])
-        ])
-        @test testee(:(f = function (a, b) a + b * n end), [:n], [:f], [:+, :*], [])
-        @test testee(:(f = function () a + b end), [:a, :b], [:f], [:+], [])
-
-        @test testee(:(g(; b=b) = b), [], [], [], [:g => ([:b], [], [], [])])
-        @test testee(:(g(b=b) = b), [], [], [], [:g => ([:b], [], [], [])])
-        @test testee(:(f(x = y) = x), [], [], [], [:f => ([:y], [], [], [])])
-        @test testee(:(f(x, g=function(y=x) x + y + z end) = x * g(x)), [], [], [], [
-            :f => ([:z], [], [:+, :*], [])
-        ])
-
-        @test testee(:(func(a)), [:a], [], [:func], [])
-        @test testee(:(func(a; b=c)), [:a, :c], [], [:func], [])
-        @test testee(:(func(a, b=c)), [:a, :c], [], [:func], [])
-        @test testee(:(√ b), [:b], [], [:√], [])
-        @test testee(:(funcs[i](b)), [:funcs, :i, :b], [], [], [])
-        @test testee(:(f(a)(b)), [:a, :b], [], [:f], [])
-        @test testee(:(f(a).b()), [:a], [], [:f], [])
-        @test testee(:(f(a...)),[:a],[],[:f],[])
-        @test testee(:(f(a, b...)),[:a, :b],[],[:f],[])
-
-        @test testee(:(a.b(c)), [:a, :c], [], [[:a,:b]], [])
-        @test testee(:(a.b.c(d)), [:a, :d], [], [[:a,:b,:c]], [])
-        @test testee(:(a.b(c)(d)), [:a, :c, :d], [], [[:a,:b]], [])
-        @test testee(:(a.b(c).d(e)), [:a, :c, :e], [], [[:a,:b]], [])
-        @test testee(:(a.b[c].d(e)), [:a, :c, :e], [], [], [])
-        @test testee(:(let aa = blah; aa.f() end), [:blah], [], [], [])
-        @test testee(:(let aa = blah; aa.f(a, b, c) end), [:blah, :a, :b, :c], [], [], [])
-        @test testee(:(f(a) = a.b()), [], [], [], [:f => ([], [], [], [])])
-
-        @test testee(:(function f()
-            function hello()
-            end
-            hello()
-        end), [], [], [], [:f => ([], [], [], [])])
-        @test testee(:(function a()
-            b() = Test()
-            b()
-        end), [], [], [], [:a => ([], [], [:Test], [])])
-        @test testee(:(begin
-            function f()
-                g() = z
-                g()
-            end
-            g()
-        end), [], [], [:g], [:f => ([:z], [], [], [])])
+    if !isempty(s.macrocalls)
+        print(io, "], [")
+        print(io, s.macrocalls)
+        print(io, "])")
+    else
+        print(io, ")")
     end
-    @testset "Julia lowering" begin
-        @test test_expression_explorer(expr=:(a'b), references=[:a, :b], funccalls=[:*, :adjoint])
-    end
-    @testset "Functions & types" begin
-        @test testee(:(function f(y::Int64=a)::String string(y) end), [], [], [], [
-            :f => ([:String, :Int64, :a], [], [:string], [])
-        ])
-        @test testee(:(f(a::A)::C = a.a;), [], [], [], [
-            :f => ([:A, :C], [], [], [])
-        ])
-        @test testee(:(function f(x::T; k=1) where T return x + 1 end), [], [], [], [
-            :f => ([], [], [:+], [])
-        ])
-        @test testee(:(function f(x::T; k=1) where {T,S <: R} return x + 1 end), [], [], [], [
-            :f => ([:R], [], [:+], [])
-        ])
-        @test testee(:(f(x)::String = x), [], [], [], [
-            :f => ([:String], [], [], [])
-        ])
-        @test testee(:(MIME"text/html"), [], [], [], [], [Symbol("@MIME_str")])
-        @test testee(:(function f(::MIME"text/html") 1 end), [], [], [], [
-            :f => ([], [], [], [], [Symbol("@MIME_str")])
-        ])
-        @test testee(:(a(a::AbstractArray{T}) where T = 5), [], [], [], [
-            :a => ([:AbstractArray], [], [], [])
-        ])
-        @test testee(:(a(a::AbstractArray{T,R}) where {T,S} = a + b), [], [], [], [
-            :a => ([:AbstractArray, :b, :R], [], [:+], [])
-        ])
-        @test testee(:(f(::A) = 1), [], [], [], [
-            :f => ([:A], [], [], [])
-        ])
-        @test testee(:(f(::A, ::B) = 1), [], [], [], [
-            :f => ([:A, :B], [], [], [])
-        ])
-        @test testee(:(f(a::A, ::B, c::C...) = a + c), [], [], [], [
-            :f => ([:A, :B, :C], [], [:+], [])
-        ])
-
-        @test testee(:((obj::MyType)(x,y) = x + z), [], [], [], [
-            :MyType => ([:z], [], [:+], [])
-        ])
-        @test testee(:((obj::MyType)() = 1), [], [], [], [
-            :MyType => ([], [], [], [])
-        ])
-        @test testee(:((obj::MyType)(x, args...; kwargs...) = [x, y, args..., kwargs...]), [], [], [], [
-            :MyType => ([:y], [], [], [])
-        ])
-        @test testee(:(function (obj::MyType)(x, y) x + z end), [], [], [], [
-            :MyType => ([:z], [], [:+], [])
-        ])
-        @test testee(:(begin struct MyType x::String end; (obj::MyType)(y) = obj.x + y; end), [], [:MyType], [], [
-            :MyType => ([:String], [], [:+], [])
-        ])
-        @test testee(:(begin struct MyType x::String end; function(obj::MyType)(y) obj.x + y; end; end), [], [:MyType], [], [
-            :MyType => ([:String], [], [:+], [])
-        ])
-        @test testee(:((::MyType)(x,y) = x + y), [], [], [], [
-            :MyType => ([], [], [:+], [])
-        ])
-        @test testee(:((obj::typeof(Int64[]))(x, y::Float64) = obj + x + y), [], [], [], [
-            :anon => ([:Int64, :Float64], [], [:+, :typeof], [])
-        ])
-        @test testee(:((::Get(MyType))(x, y::OtherType) = y * x + z), [], [], [], [
-            :anon => ([:MyType, :z, :OtherType], [], [:Get, :*, :+], [])
-        ])
-    end
-    @testset "Scope modifiers" begin
-        @test testee(:(let; global a, b = 1, 2 end), [], [:a, :b], [], [])
-        @test_broken testee(:(let; global a = b = 1 end), [], [:a], [], []; verbose=false)
-        @test testee(:(let; global k = 3 end), [], [:k], [], [])
-        @test_broken testee(:(let; global k = r end), [], [:k], [], []; verbose=false)
-        @test testee(:(let; global k = 3; k end), [], [:k], [], [])
-        @test testee(:(let; global k += 3 end), [:k], [:k], [:+], [])
-        @test testee(:(let; global k; k = 4 end), [], [:k], [], [])
-        @test testee(:(let; global k; b = 5 end), [], [], [], [])
-        @test testee(:(let; global x, y, z; b = 5; x = 1; (y,z) = 3 end), [], [:x, :y, :z], [], [])
-        @test testee(:(let; global x, z; b = 5; x = 1; end), [], [:x], [], [])
-        @test testee(:(let a = 1, b = 2; show(a + b) end), [], [], [:show, :+], [])
-        @test_broken testee(:(let a = 1; global a = 2; end), [], [:a], [], []; verbose=false)
-
-        @test testee(:(begin local a, b = 1, 2 end), [], [], [], [])
-        @test testee(:(begin local a = b = 1 end), [], [:b], [], [])
-        @test testee(:(begin local k = 3 end), [], [], [], [])
-        @test testee(:(begin local k = r end), [:r], [], [], [])
-        @test testee(:(begin local k = 3; k; b = 4 end), [], [:b], [], [])
-        @test testee(:(begin local k += 3 end), [], [], [:+], []) # does not reference global k
-        @test testee(:(begin local k; k = 4 end), [], [], [], [])
-        @test testee(:(begin local k; b = 5 end), [], [:b], [], [])
-        @test testee(:(begin local r[1] = 5 end), [:r], [], [], [])
-        @test testee(:(begin local a, b; a = 1; b = 2 end), [], [], [], [])
-        @test testee(:(begin a; local a, b; a = 1; b = 2 end), [:a], [], [], [])
-        @test_broken testee(:(begin begin local a = 2 end; a end), [:a], [], [], []; verbose=false)
-        
-        @test testee(:(function f(x) global k = x end), [], [], [], [
-            :f => ([], [:k], [], [])
-        ])
-        @test testee(:((begin x = 1 end, y)), [:y], [:x], [], [])
-        @test testee(:(x = let; global a += 1 end), [:a], [:x, :a], [:+], [])
-    end
-    @testset "`import` & `using`" begin
-        @test testee(:(using Plots), [], [:Plots], [], [])
-        @test testee(:(using Plots.ExpressionExplorer), [], [:ExpressionExplorer], [], [])
-        @test testee(:(using JSON, UUIDs), [], [:JSON, :UUIDs], [], [])
-        @test testee(:(import Pluto), [], [:Pluto], [], [])
-        @test testee(:(import Pluto: wow, wowie), [], [:wow, :wowie], [], [])
-        @test testee(:(import Pluto.ExpressionExplorer.wow, Plutowie), [], [:wow, :Plutowie], [], [])
-        @test testee(:(import .Pluto: wow), [], [:wow], [], [])
-        @test testee(:(import ..Pluto: wow), [], [:wow], [], [])
-        @test testee(:(let; import Pluto.wow, Dates; end), [], [:wow, :Dates], [], [])
-        @test testee(:(while false; import Pluto.wow, Dates; end), [], [:wow, :Dates], [], [])
-        @test testee(:(try; using Pluto.wow, Dates; catch; end), [], [:wow, :Dates], [], [])
-        @test testee(:(module A; import B end), [], [:A], [], [])
-    end
-    @testset "Foreign macros" begin
-        # parameterizedfunctions
-        @test testee(quote
-        f = @ode_def LotkaVolterra begin
-            dx = a*x - b*x*y
-            dy = -c*y + d*x*y
-          end a b c d
-        end, [], [:f], [], [], [Symbol("@ode_def")])
-        @test testee(quote
-        f = @ode_def begin
-            dx = a*x - b*x*y
-            dy = -c*y + d*x*y
-          end a b c d
-        end, [], [:f], [], [], [Symbol("@ode_def")])
-        # flux
-        @test testee(:(@functor Asdf), [], [], [], [], [Symbol("@functor")])
-        # symbolics
-        @test testee(:(@variables a b c), [], [], [], [], [Symbol("@variables")])
-        @test testee(:(@variables a b[1:2] c(t) d(..)), [], [], [], [], [Symbol("@variables")])
-        @test testee(:(@variables a b[1:x] c[1:10](t) d(..)), [], [], [], [], [Symbol("@variables")])
-        @test_nowarn testee(:(@variables(m, begin
-            x
-            y[i=1:2] >= i, (start = i, base_name = "Y_$i")
-            z, Bin
-        end)), [:m, :Bin], [:x, :y, :z], [Symbol("@variables")], [], verbose=false)
-        # jump
-    #     @test testee(:(@variable(m, x)), [:m], [:x], [Symbol("@variable")], [])
-    #     @test testee(:(@variable(m, 1<=x)), [:m], [:x], [Symbol("@variable")], [])
-    #     @test testee(:(@variable(m, 1<=x<=2)), [:m], [:x], [Symbol("@variable")], [])
-    #     @test testee(:(@variable(m, r <= x[i=keys(asdf)] <= ub[i])), [:m, :r, :asdf, :ub], [:x], [:keys, Symbol("@variable")], [])
-    #     @test testee(:(@variable(m, x, lower_bound=0)), [:m], [:x], [Symbol("@variable")], [])
-    #     @test testee(:(@variable(m, base_name="x", lower_bound=0)), [:m], [], [Symbol("@variable")], [])
-    #     @test testee(:(@variables(m, begin
-    #     x
-    #     y[i=1:2] >= i, (start = i, base_name = "Y_$i")
-    #     z, Bin
-    # end)), [:m, :Bin], [:x, :y, :z], [Symbol("@variables")], [])
-    end
-    @testset "Macros" begin
-        # Macros tests are not just in ExpressionExplorer now
-
-        @test testee(:(@time a = 2), [], [], [], [], [Symbol("@time")])
-        @test testee(:(@f(x; y=z)), [], [], [], [], [Symbol("@f")])
-        @test testee(:(@f(x, y = z)), [], [], [], [], [Symbol("@f")]) # https://github.com/fonsp/Pluto.jl/issues/252
-        @test testee(:(Base.@time a = 2), [], [], [], [], [[:Base, Symbol("@time")]])
-        # @test_nowarn testee(:(@enum a b = d c), [:d], [:a, :b, :c], [Symbol("@enum")], [])
-        # @enum is tested in test/React.jl instead
-        @test testee(:(@gensym a b c), [], [:a, :b, :c], [:gensym], [], [Symbol("@gensym")])
-        @test testee(:(Base.@gensym a b c), [], [:a, :b, :c], [:gensym], [], [[:Base, Symbol("@gensym")]])
-        @test testee(:(Base.@kwdef struct A; x = 1; y::Int = two; z end), [], [], [], [], [[:Base, Symbol("@kwdef")]])
-        @test testee(quote "asdf" f(x) = x end, [], [], [], [], [Symbol("@doc")])
-
-        @test testee(:(@bind a b), [:b, :PlutoRunner, :Base, :Core], [:a], [[:PlutoRunner, :create_bond], [:Core, :applicable], [:Base, :get]], [], [Symbol("@bind")])
-        @test testee(:(PlutoRunner.@bind a b), [:b, :PlutoRunner, :Base, :Core], [:a], [[:PlutoRunner, :create_bond], [:Core, :applicable], [:Base, :get]], [], [[:PlutoRunner, Symbol("@bind")]])
-        @test_broken testee(:(Main.PlutoRunner.@bind a b), [:b, :PlutoRunner, :Base, :Core], [:a], [[:Base, :get], [:Core, :applicable], [:PlutoRunner, :create_bond], [:PlutoRunner, Symbol("@bind")]], [], verbose=false)
-        @test testee(:(let @bind a b end), [:b, :PlutoRunner, :Base, :Core], [:a], [[:PlutoRunner, :create_bond], [:Core, :applicable], [:Base, :get]], [], [Symbol("@bind")])
-
-        @test testee(:(@asdf a = x1 b = x2 c = x3), [], [], [], [], [Symbol("@asdf")]) # https://github.com/fonsp/Pluto.jl/issues/670
-
-        @test testee(:(@einsum a[i,j] := x[i]*y[j]), [], [], [], [], [Symbol("@einsum")])
-        @test testee(:(@tullio a := f(x)[i+2j, k[j]] init=z), [], [], [], [], [Symbol("@tullio")])
-        @test testee(:(Pack.@asdf a[1,k[j]] := log(x[i]/y[j])), [], [], [], [], [[:Pack, Symbol("@asdf")]])
-
-        @test testee(:(`hey $(a = 1) $(b)`), [:b], [], [:cmd_gen], [], [Symbol("@cmd")])
-        @test testee(:(md"hey $(@bind a b) $(a)"), [:b, :PlutoRunner, :Base, :Core], [:a], [[:PlutoRunner, :create_bond], [:Core, :applicable], [:Base, :get], :getindex], [], [Symbol("@md_str"), Symbol("@bind")])
-        @test testee(:(md"hey $(a) $(@bind a b)"), [:a, :b, :PlutoRunner, :Base, :Core], [:a], [[:PlutoRunner, :create_bond], [:Core, :applicable], [:Base, :get], :getindex], [], [Symbol("@md_str"), Symbol("@bind")])
-        @test testee(:(html"a $(b = c)"), [], [], [], [], [Symbol("@html_str")])
-        @test testee(:(md"a $(b = c) $(b)"), [:c], [:b], [:getindex], [], [Symbol("@md_str")])
-        @test testee(:(md"\* $r"), [:r], [], [:getindex], [], [Symbol("@md_str")])
-        @test testee(:(md"a \$(b = c)"), [], [], [:getindex], [], [Symbol("@md_str")])
-        @test testee(:(macro a() end), [], [], [], [
-            Symbol("@a") => ([], [], [], [])
-        ])
-        @test testee(:(macro a(b::Int); b end), [], [], [], [
-            Symbol("@a") => ([:Int], [], [], [])
-        ])
-        @test testee(:(macro a(b::Int=c) end), [], [], [], [
-            Symbol("@a") => ([:Int, :c], [], [], [])
-        ])
-        @test testee(:(macro a(); b = c; return b end), [], [], [], [
-            Symbol("@a") => ([:c], [], [], [])
-        ])
-        @test test_expression_explorer(
-            expr=:(@parent @child 10),
-            macrocalls=[Symbol("@parent"), Symbol("@child")],
-        )
-        @test test_expression_explorer(
-            expr=:(@parent begin @child 1 + @grandchild 10 end),
-            macrocalls=[Symbol("@parent"), Symbol("@child"), Symbol("@grandchild")],
-        )
-        @test testee(macroexpand(Main, :(@noinline f(x) = x)), [], [], [], [
-            Symbol("f") => ([], [], [], [])
-        ])
-    end
-    @testset "Macros and heuristics" begin
-        @test test_expression_explorer(
-            expr=:(@macro import Pkg),
-            macrocalls=[Symbol("@macro")],
-            definitions=[:Pkg],
-        )
-        @test test_expression_explorer(
-            expr=:(@macro Pkg.activate("..")),
-            macrocalls=[Symbol("@macro")],
-            references=[:Pkg],
-            funccalls=[[:Pkg, :activate]],
-        )
-        @test test_expression_explorer(
-            expr=:(@macro Pkg.add("Pluto.jl")),
-            macrocalls=[Symbol("@macro")],
-            references=[:Pkg],
-            funccalls=[[:Pkg, :add]],
-        )
-        @test test_expression_explorer(
-            expr=:(@macro include("Firebasey.jl")),
-            macrocalls=[Symbol("@macro")],
-            funccalls=[[:include]],
-        )
-    end
-    @testset "Module imports" begin
-        @test test_expression_explorer(
-            expr=quote
-                module X
-                    import ..imported_from_outside
-                end
-            end,
-            references=[:imported_from_outside],
-            definitions=[:X],
-        )
-        @test test_expression_explorer(
-            expr=quote
-                module X
-                    import ..imported_from_outside
-                    import Y
-                    import ...where_would_this_even_come_from
-                    import .not_defined_but_sure
-                end
-            end,
-            references=[:imported_from_outside],
-            definitions=[:X],
-        )
-        # More advanced, might not be possible easily
-        @test test_expression_explorer(
-            expr=quote
-                module X
-                    module Y
-                        import ...imported_from_outside
-                    end
-                end
-            end,
-            references=[:imported_from_outside],
-            definitions=[:X]
-        )
-    end
-    @testset "String interpolation & expressions" begin
-        @test testee(:("a $b"), [:b], [], [], [])
-        @test testee(:("a $(b = c)"), [:c], [:b], [], [])
-        # @test_broken testee(:(`a $b`), [:b], [], [], [])
-        # @test_broken testee(:(`a $(b = c)`), [:c], [:b], [], [])
-        @test testee(:(ex = :(yayo)), [], [:ex], [], [])
-        @test testee(:(ex = :(yayo + $r)), [:r], [:ex], [], [])
-        @test test_expression_explorer(
-            expr=:(quote $(x) end),
-            references=[:x],
-        )
-        @test test_expression_explorer(
-            expr=:(quote z = a + $(x) + b() end),
-            references=[:x],
-        )
-        @test test_expression_explorer(
-            expr=:(:($(x))),
-            references=[:x],
-        )
-        @test test_expression_explorer(
-            expr=:(:(z = a + $(x) + b())),
-            references=[:x],
-        )
-    end
-    @testset "Special reactivity rules" begin
-        @test testee(
-            :(BenchmarkTools.generate_benchmark_definition(Main, Symbol[], Any[], Symbol[], (), $(Expr(:copyast, QuoteNode(:(f(x, y, z))))), $(Expr(:copyast, QuoteNode(:()))), $(Expr(:copyast, QuoteNode(nothing))), BenchmarkTools.parameters())),
-            [:Main, :BenchmarkTools, :Any, :Symbol, :x, :y, :z], [], [[:BenchmarkTools, :generate_benchmark_definition], [:BenchmarkTools, :parameters], :f], []
-        )
-        @test testee(
-            :(BenchmarkTools.generate_benchmark_definition(Main, Symbol[], Any[], Symbol[], (), $(Expr(:copyast, QuoteNode(:(f(x, y, z))))), $(Expr(:copyast, QuoteNode(:(x = A + B)))), $(Expr(:copyast, QuoteNode(nothing))), BenchmarkTools.parameters())),
-            [:Main, :BenchmarkTools, :Any, :Symbol, :y, :z, :A, :B], [], [[:BenchmarkTools, :generate_benchmark_definition], [:BenchmarkTools, :parameters], :f, :+], []
-        )
-        @test testee(
-            :(Base.macroexpand(Main, $(QuoteNode(:(@enum a b c))))),
-            [:Main, :Base], [], [[:Base, :macroexpand]], [], [Symbol("@enum")]
-        )
-    end
-    @testset "Invalid code sometimes generated by macros" begin
-        @test testee(
-            :(f(; $(:(x = true)))),
-            [], [], [:f], []
-        )
-        @test testee(
-            :(f(a, b, c; y, z = a, $(:(x = true)))),
-            [:a, :b, :c, :y], [], [:f], []
-        )
-        @test testee(
-            :(f(a, b, c; y, z = a, $(:(x = true))) = nothing),
-            [], [], [], [
-                :f => ([:nothing], [], [], [])
-            ]
-        )
-    end
-    @testset "Extracting `using` and `import`" begin
-        expr = quote
-            using A
-            import B
-            if x
-                using .C: r
-                import ..D.E: f, g
-            else
-                import H.I, J, K.L
-            end
-            
-            quote
-                using Nonono
-            end
+end
+
+"Calls `ExpressionExplorer.compute_symbolreferences` on the given `expr` and test the found SymbolsState against a given one, with convient syntax.
+
+# Example
+
+```jldoctest
+julia> @test testee(:(
+    begin
+        a = b + 1
+        f(x) = x / z
+    end),
+    [:b, :+], # 1st: expected references
+    [:a, :f], # 2nd: expected definitions
+    [:+],     # 3rd: expected function calls
+    [
+        :f => ([:z, :/], [], [:/], [])
+    ])        # 4th: expected function definitions, with inner symstate using the same syntax
+true
+```
+"
+function testee(expr::Any, expected_references, expected_definitions, expected_funccalls, expected_funcdefs, expected_macrocalls = []; verbose::Bool=true, transformer::Function=identify)
+    expected = easy_symstate(expected_references, expected_definitions, expected_funccalls, expected_funcdefs, expected_macrocalls)
+    
+    expr_transformed = transformer(expr)
+
+    original_hash = expr_hash(expr_transformed)
+    result = ExpressionExplorer.compute_symbolreferences(expr_transformed)
+    # should not throw:
+    ReactiveNode(result)
+    
+    new_hash = expr_hash(expr_transformed)
+    if original_hash != new_hash
+        error("\n== The expression explorer modified the expression. Don't do that! ==\n")
+    end
+
+    # Anonymous function are given a random name, which looks like anon67387237861123
+    # To make testing easier, we rename all such functions to anon
+    new_name(fn::FunctionName) = FunctionName(map(new_name, fn.parts)...)
+    new_name(sym::Symbol) = startswith(string(sym), "anon") ? :anon : sym
+
+    result.assignments = Set(new_name.(result.assignments))
+    result.funcdefs = let
+        newfuncdefs = Dict{FunctionNameSignaturePair,SymbolsState}()
+        for (k, v) in result.funcdefs
+            union!(newfuncdefs, Dict(FunctionNameSignaturePair(new_name(k.name), hash("hello")) => v))
         end
-        result = ExpressionExplorer.compute_usings_imports(expr)
-        @test result.usings == Set{Expr}([
-            :(using A),
-            :(using .C: r),
-        ])
-        @test result.imports == Set{Expr}([
-            :(import B),
-            :(import ..D.E: f, g),
-            :(import H.I, J, K.L),
-        ])
-
-        @test ExpressionExplorer.external_package_names(result) == Set{Symbol}([
-            :A, :B, :H, :J, :K
-        ])
-
-        @test ExpressionExplorer.external_package_names(:(using Plots, Something.Else, .LocalModule)) == Set([:Plots, :Something])
-        @test ExpressionExplorer.external_package_names(:(import Plots.A: b, c)) == Set([:Plots])
-
-        @test ExpressionExplorer.external_package_names(Meta.parse("import Foo as Bar, Baz.Naz as Jazz")) == Set([:Foo, :Baz])
-    end
+        newfuncdefs
+    end
+
+    if verbose && expected != result
+        println()
+        println("FAILED TEST")
+        println(expr)
+        println()
+        dump(expr, maxdepth=20)
+        println()
+        dump(expr_transformed, maxdepth=20)
+        println()
+        @show expected
+        resulted = result
+        @show resulted
+        println()
+    end
+    return expected == result
+end
 
-    @testset "ReactiveNode" begin
-        rn = Pluto.ReactiveNode_from_expr(quote
-            () -> Date
-        end)
-        @test :Date ∈ rn.references
-    end
+
+
+
+expr_hash(e::Expr) = objectid(e.head) + mapreduce(p -> objectid((p[1], expr_hash(p[2]))), +, enumerate(e.args); init=zero(ObjectID))
+expr_hash(x) = objectid(x)
+
+
+
+
+
+function easy_symstate(expected_references, expected_definitions, expected_funccalls, expected_funcdefs, expected_macrocalls = [])
+    array_to_set(array) = map(array) do k
+        new_k = FunctionName(k)
+        return new_k
+    end |> Set
+    new_expected_funccalls = array_to_set(expected_funccalls)
+    
+    new_expected_funcdefs = map(expected_funcdefs) do (k, v)
+        new_k = FunctionName(k)
+        new_v = v isa SymbolsState ? v : easy_symstate(v...)
+        return FunctionNameSignaturePair(new_k, hash("hello")) => new_v
+    end |> Dict
+
+    new_expected_macrocalls = array_to_set(expected_macrocalls)
+
+    SymbolsState(Set(expected_references), Set(expected_definitions), new_expected_funccalls, new_expected_funcdefs, new_expected_macrocalls)
 end
 
-@testset "UTF-8 to Codemirror UTF-16 byte mapping" begin
-    # range ends are non inclusives
-    tests = [
-        (" aaaa", (2, 4), (1, 3)), # cm is zero based
-        (" 🍕🍕", (2, 6), (1, 3)), # a 🍕 is two UTF16 codeunits
-        (" 🍕🍕", (6, 10), (3, 5)), # a 🍕 is two UTF16 codeunits
-    ]
-    for (s, (start_byte, end_byte), (from, to)) in tests
-        @test PlutoRunner.map_byte_range_to_utf16_codepoints(s, start_byte, end_byte) == (from, to)
-    end
+
+
+
+
+t(args...; kwargs...) = testee(args...; transformer=Pluto.ExpressionExplorerExtras.pretransform_pluto, kwargs...)
+
+
+"""
+Like `t` but actually a convenient syntax
+"""
+function test_expression_explorer(; expr, references=[], definitions=[], funccalls=[], funcdefs=[], macrocalls=[], kwargs...)
+    t(expr, references, definitions, funccalls, funcdefs, macrocalls; kwargs...)
 end
+
+@testset "Macros w/ Pluto 1" begin
+    # Macros tests are not just in ExpressionExplorer now
+
+    @test t(:(@time a = 2), [], [], [], [], [Symbol("@time")])
+    @test t(:(@f(x; y=z)), [], [], [], [], [Symbol("@f")])
+    @test t(:(@f(x, y = z)), [], [], [], [], [Symbol("@f")]) # https://github.com/fonsp/Pluto.jl/issues/252
+    @test t(:(Base.@time a = 2), [], [], [], [], [[:Base, Symbol("@time")]])
+    # @test_nowarn t(:(@enum a b = d c), [:d], [:a, :b, :c], [Symbol("@enum")], [])
+    # @enum is tested in test/React.jl instead
+    @test t(:(@gensym a b c), [], [:a, :b, :c], [:gensym], [], [Symbol("@gensym")])
+    @test t(:(Base.@gensym a b c), [], [:a, :b, :c], [:gensym], [], [[:Base, Symbol("@gensym")]])
+    @test t(:(Base.@kwdef struct A; x = 1; y::Int = two; z end), [], [], [], [], [[:Base, Symbol("@kwdef")]])
+    @test t(quote "asdf" f(x) = x end, [], [], [], [], [Symbol("@doc")])
+
+    # @test t(:(@bind a b), [], [], [], [], [Symbol("@bind")])
+    # @test t(:(PlutoRunner.@bind a b), [], [], [], [], [[:PlutoRunner, Symbol("@bind")]])
+    # @test_broken t(:(Main.PlutoRunner.@bind a b), [:b], [:a], [[:Base, :get], [:Core, :applicable], [:PlutoRunner, :create_bond], [:PlutoRunner, Symbol("@bind")]], [], verbose=false)
+    # @test t(:(let @bind a b end), [], [], [], [], [Symbol("@bind")])
+
+    @test t(:(`hey $(a = 1) $(b)`), [:b], [], [:cmd_gen], [], [Symbol("@cmd")])
+    # @test t(:(md"hey $(@bind a b) $(a)"), [:a], [], [[:getindex]], [], [Symbol("@md_str"), Symbol("@bind")])
+    # @test t(:(md"hey $(a) $(@bind a b)"), [:a], [], [[:getindex]], [], [Symbol("@md_str"), Symbol("@bind")])
+
+    @test t(:(@asdf a = x1 b = x2 c = x3), [], [], [], [], [Symbol("@asdf")]) # https://github.com/fonsp/Pluto.jl/issues/670
+    
+    @test t(:(@aa @bb xxx), [], [], [], [], [Symbol("@aa"), Symbol("@bb")])
+    @test t(:(@aa @bb(xxx) @cc(yyy)), [], [], [], [], [Symbol("@aa"), Symbol("@bb"), Symbol("@cc")])
+    
+    @test t(:(Pkg.activate()), [:Pkg], [], [[:Pkg,:activate]], [], [])
+    @test t(:(@aa(Pkg.activate())), [:Pkg], [], [[:Pkg,:activate]], [], [Symbol("@aa")])
+    @test t(:(@aa @bb(Pkg.activate())), [:Pkg], [], [[:Pkg,:activate]], [], [Symbol("@aa"), Symbol("@bb")])
+    @test t(:(@aa @assert @bb(Pkg.activate())), [:Pkg], [], [[:Pkg,:activate], [:throw], [:AssertionError]], [], [Symbol("@aa"), Symbol("@assert"), Symbol("@bb")])
+    @test t(:(@aa @bb(Xxx.xxxxxxxx())), [], [], [], [], [Symbol("@aa"), Symbol("@bb")])
+    
+    @test t(:(include()), [], [], [[:include]], [], [])
+    @test t(:(:(include())), [], [], [], [], [])
+    @test t(:(:($(include()))), [], [], [[:include]], [], [])
+    @test t(:(@xx include()), [], [], [[:include]], [], [Symbol("@xx")])
+    @test t(quote
+        module A
+        include()
+        Pkg.activate()
+        @xoxo asdf
+        end
+    end, [], [:A], [], [], [])
+    
+    
+    @test t(:(@aa @bb(using Zozo)), [], [:Zozo], [], [], [Symbol("@aa"), Symbol("@bb")])
+    @test t(:(@aa(using Zozo)), [], [:Zozo], [], [], [Symbol("@aa")])
+    @test t(:(using Zozo), [], [:Zozo], [], [], [])
+
+    e = :(using Zozo)
+    @test ExpressionExplorer.compute_usings_imports(
+        e
+    ).usings == [e]
+    @test ExpressionExplorer.compute_usings_imports(
+        :(@aa @bb($e))
+    ).usings == [e]
+    
+
+    @test t(:(@einsum a[i,j] := x[i]*y[j]), [], [], [], [], [Symbol("@einsum")])
+    @test t(:(@tullio a := f(x)[i+2j, k[j]] init=z), [], [], [], [], [Symbol("@tullio")])
+    @test t(:(Pack.@asdf a[1,k[j]] := log(x[i]/y[j])), [], [], [], [], [[:Pack, Symbol("@asdf")]])
+
+
+    @test t(:(html"a $(b = c)"), [], [], [], [], [Symbol("@html_str")])
+    @test t(:(md"a $(b = c) $(b)"), [:c], [:b], [:getindex], [], [Symbol("@md_str")])
+    @test t(:(md"\* $r"), [:r], [], [:getindex], [], [Symbol("@md_str")])
+    @test t(:(md"a \$(b = c)"), [], [], [:getindex], [], [Symbol("@md_str")])
+    @test t(:(macro a() end), [], [], [], [
+        Symbol("@a") => ([], [], [], [])
+    ])
+    @test t(:(macro a(b::Int); b end), [], [], [], [
+        Symbol("@a") => ([:Int], [], [], [])
+    ])
+    @test t(:(macro a(b::Int=c) end), [], [], [], [
+        Symbol("@a") => ([:Int, :c], [], [], [])
+    ])
+    @test t(:(macro a(); b = c; return b end), [], [], [], [
+        Symbol("@a") => ([:c], [], [], [])
+    ])
+    @test test_expression_explorer(;
+        expr=:(@parent @child 10),
+        macrocalls=[Symbol("@parent"), Symbol("@child")],
+    )
+    @test test_expression_explorer(;
+        expr=:(@parent begin @child 1 + @grandchild 10 end),
+        macrocalls=[Symbol("@parent"), Symbol("@child"), Symbol("@grandchild")],
+    )
+    @test t(macroexpand(Main, :(@noinline f(x) = x)), [], [], [], [
+        Symbol("f") => ([], [], [], [])
+    ])
+end
+
+
+@testset "Macros w/ Pluto 2" begin
+    
+    @test t(:(@bind a b), [:b, :PlutoRunner, :Base, :Core], [:a], [[:PlutoRunner, :create_bond], [:Core, :applicable], [:Base, :get]], [], [Symbol("@bind")])
+    @test t(:(PlutoRunner.@bind a b), [:b, :PlutoRunner, :Base, :Core], [:a], [[:PlutoRunner, :create_bond], [:Core, :applicable], [:Base, :get]], [], [[:PlutoRunner, Symbol("@bind")]])
+    @test_broken t(:(Main.PlutoRunner.@bind a b), [:b, :PlutoRunner, :Base, :Core], [:a], [[:Base, :get], [:Core, :applicable], [:PlutoRunner, :create_bond], [:PlutoRunner, Symbol("@bind")]], [], verbose=false)
+    @test t(:(let @bind a b end), [:b, :PlutoRunner, :Base, :Core], [:a], [[:PlutoRunner, :create_bond], [:Core, :applicable], [:Base, :get]], [], [Symbol("@bind")])
+
+    @test t(:(`hey $(a = 1) $(b)`), [:b], [], [:cmd_gen], [], [Symbol("@cmd")])
+    @test t(:(md"hey $(@bind a b) $(a)"), [:b, :PlutoRunner, :Base, :Core], [:a], [[:PlutoRunner, :create_bond], [:Core, :applicable], [:Base, :get], :getindex], [], [Symbol("@md_str"), Symbol("@bind")])
+    @test t(:(md"hey $(a) $(@bind a b)"), [:a, :b, :PlutoRunner, :Base, :Core], [:a], [[:PlutoRunner, :create_bond], [:Core, :applicable], [:Base, :get], :getindex], [], [Symbol("@md_str"), Symbol("@bind")])
+
+    
+end
\ No newline at end of file
diff --git a/test/MoreAnalysis.jl b/test/MoreAnalysis.jl
index 76d0da4f2e..a08516f299 100644
--- a/test/MoreAnalysis.jl
+++ b/test/MoreAnalysis.jl
@@ -1,4 +1,4 @@
-import Pluto: Pluto, Cell
+import Pluto: Pluto, Cell, ExpressionExplorerExtras
 import Pluto.MoreAnalysis
 
 using Test
@@ -74,4 +74,44 @@ using Test
 
         @test transform(connections) == transform(wanted_connections)
     end
+    
+    
+        
+    @testset "can_be_function_wrapped" begin
+
+        c = ExpressionExplorerExtras.can_be_function_wrapped
+
+
+        @test c(quote
+            a = b + C
+            if d
+                for i = 1:10
+                    while Y
+                    end
+                end
+            end
+        end)
+
+
+        @test c(quote
+            map(1:10) do i
+                i + 1
+            end
+        end)
+
+
+        @test !c(quote
+            function x(x)
+                X
+            end
+        end)
+
+        @test !c(quote
+            if false
+                using Asdf
+            end
+        end)
+
+
+    end
 end
diff --git a/test/helpers.jl b/test/helpers.jl
index 3b745c25fc..ff7406b42d 100644
--- a/test/helpers.jl
+++ b/test/helpers.jl
@@ -11,8 +11,7 @@ function print_timeroutput()
 end
 
 @timeit TOUT "import Pluto" import Pluto
-import Pluto.ExpressionExplorer
-import Pluto.ExpressionExplorer: SymbolsState, compute_symbolreferences, FunctionNameSignaturePair, UsingsImports, compute_usings_imports
+using ExpressionExplorer
 using Sockets
 using Test
 using HTTP
@@ -20,114 +19,7 @@ import Pkg
 import Malt
 import Malt.Distributed
 
-function Base.show(io::IO, s::SymbolsState)
-    print(io, "SymbolsState([")
-    join(io, s.references, ", ")
-    print(io, "], [")
-    join(io, s.assignments, ", ")
-    print(io, "], [")
-    join(io, s.funccalls, ", ")
-    print(io, "], [")
-    if isempty(s.funcdefs)
-        print(io, "]")
-    else
-        println(io)
-        for (k, v) in s.funcdefs
-            print(io, "    ", k, ": ", v)
-            println(io)
-        end
-        print(io, "]")
-    end
-    if !isempty(s.macrocalls)
-        print(io, "], [")
-        print(io, s.macrocalls)
-        print(io, "])")
-    else
-        print(io, ")")
-    end
-end
-
-"Calls `ExpressionExplorer.compute_symbolreferences` on the given `expr` and test the found SymbolsState against a given one, with convient syntax.
 
-# Example
-
-```jldoctest
-julia> @test testee(:(
-    begin
-        a = b + 1
-        f(x) = x / z
-    end),
-    [:b, :+], # 1st: expected references
-    [:a, :f], # 2nd: expected definitions
-    [:+],     # 3rd: expected function calls
-    [
-        :f => ([:z, :/], [], [:/], [])
-    ])        # 4th: expected function definitions, with inner symstate using the same syntax
-true
-```
-"
-function testee(expr::Any, expected_references, expected_definitions, expected_funccalls, expected_funcdefs, expected_macrocalls = []; verbose::Bool=true)
-    expected = easy_symstate(expected_references, expected_definitions, expected_funccalls, expected_funcdefs, expected_macrocalls)
-
-    original_hash = Pluto.PlutoRunner.expr_hash(expr)
-    result = compute_symbolreferences(expr)
-    new_hash = Pluto.PlutoRunner.expr_hash(expr)
-    if original_hash != new_hash
-        error("\n== The expression explorer modified the expression. Don't do that! ==\n")
-    end
-
-    # Anonymous function are given a random name, which looks like anon67387237861123
-    # To make testing easier, we rename all such functions to anon
-    new_name(sym) = startswith(string(sym), "anon") ? :anon : sym
-
-    result.assignments = Set(new_name.(result.assignments))
-    result.funcdefs = let
-        newfuncdefs = Dict{FunctionNameSignaturePair,SymbolsState}()
-        for (k, v) in result.funcdefs
-            union!(newfuncdefs, Dict(FunctionNameSignaturePair(new_name.(k.name), hash("hello")) => v))
-        end
-        newfuncdefs
-    end
-
-    if verbose && expected != result
-        println()
-        println("FAILED TEST")
-        println(expr)
-        println()
-        dump(expr, maxdepth=20)
-        println()
-        @show expected
-        resulted = result
-        @show resulted
-        println()
-    end
-    return expected == result
-end
-
-"""
-Like `testee` but actually a convenient syntax
-"""
-function test_expression_explorer(; expr, references=[], definitions=[], funccalls=[], funcdefs=[], macrocalls=[])
-    testee(expr, references, definitions, funccalls, funcdefs, macrocalls)
-end
-
-function easy_symstate(expected_references, expected_definitions, expected_funccalls, expected_funcdefs, expected_macrocalls = [])
-    array_to_set(array) = map(array) do k
-        new_k = k isa Symbol ? [k] : k
-        return new_k
-    end |> Set
-    new_expected_funccalls = array_to_set(expected_funccalls)
-    
-    new_expected_funcdefs = map(expected_funcdefs) do (k, v)
-        new_k = k isa Symbol ? [k] : k
-        new_v = v isa SymbolsState ? v : easy_symstate(v...)
-        return FunctionNameSignaturePair(new_k, hash("hello")) => new_v
-    end |> Dict
-
-    new_expected_macrocalls = array_to_set(expected_macrocalls)
-
-    SymbolsState(Set(expected_references), Set(expected_definitions), new_expected_funccalls, new_expected_funcdefs, new_expected_macrocalls)
-end
 
 function insert_cell!(notebook, cell)
     notebook.cells_dict[cell.cell_id] = cell
diff --git a/test/runtests.jl b/test/runtests.jl
index 88901d4ae3..bbd8215e86 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -36,7 +36,6 @@ verify_no_running_processes()
 # tests that don't start new processes:
 @timeit_include("ReloadFromFile.jl")
 @timeit_include("packages/PkgCompat.jl")
-@timeit_include("ExpressionExplorer.jl")
 @timeit_include("MethodSignatures.jl")
 @timeit_include("MoreAnalysis.jl")
 @timeit_include("Analysis.jl")
@@ -49,6 +48,7 @@ verify_no_running_processes()
 verify_no_running_processes()
 
 print_timeroutput()
+@timeit_include("ExpressionExplorer.jl")
 
 # TODO: test PlutoRunner functions like:
 # - from_this_notebook
diff --git a/test/webserver.jl b/test/webserver.jl
index 009ff34631..401df2ace0 100644
--- a/test/webserver.jl
+++ b/test/webserver.jl
@@ -49,6 +49,19 @@ using Pluto.WorkspaceManager: WorkspaceManager, poll
     close(server)
 end
 
+@testset "UTF-8 to Codemirror UTF-16 byte mapping" begin
+    # range ends are non inclusives
+    tests = [
+        (" aaaa", (2, 4), (1, 3)), # cm is zero based
+        (" 🍕🍕", (2, 6), (1, 3)), # a 🍕 is two UTF16 codeunits
+        (" 🍕🍕", (6, 10), (3, 5)), # a 🍕 is two UTF16 codeunits
+    ]
+    for (s, (start_byte, end_byte), (from, to)) in tests
+        @test PlutoRunner.map_byte_range_to_utf16_codepoints(s, start_byte, end_byte) == (from, to)
+    end
+end
+
+
 @testset "Exports" begin
     port, socket = 
         @inferred Pluto.port_serversocket(Sockets.ip"0.0.0.0", nothing, 5543) 

From 1d0285b06fe88c4937d428704bd278d8b0b876d2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Nov 2023 14:58:42 +0100
Subject: [PATCH 769/821] refactor macro_has_special_heuristic_inside

---
 src/analysis/ExpressionExplorer.jl | 12 +++------
 src/analysis/topological_order.jl  | 42 ++++++++++++++++--------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index e4d64526a6..5f95a9d486 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -77,19 +77,13 @@ This helps with things like a Pkg.activate() that's in a macro, so Pluto still u
 function macro_has_special_heuristic_inside(; symstate::SymbolsState, expr::Expr)::Bool
     # Also, because I'm lazy and don't want to copy any code, imma use cell_precedence_heuristic here.
     # Sad part is, that this will also include other symbols used in this macro... but come'on
-    local fake_cell = Pluto.Cell()
-    local fake_reactive_node = ReactiveNode(symstate)
-    local fake_expranalysiscache = Pluto.ExprAnalysisCache(
+    node = ReactiveNode(symstate)
+    code = Pluto.ExprAnalysisCache(
         parsedcode = expr,
         module_usings_imports = ExpressionExplorer.compute_usings_imports(expr),
     )
-    local fake_topology = Pluto.NotebookTopology(
-        nodes = Pluto.ImmutableDefaultDict(ReactiveNode, Dict(fake_cell => fake_reactive_node)),
-        codes = Pluto.ImmutableDefaultDict(Pluto.ExprAnalysisCache, Dict(fake_cell => fake_expranalysiscache)),
-        cell_order = Pluto.ImmutableVector([fake_cell]),
-    )
 
-    return Pluto.cell_precedence_heuristic(fake_topology, fake_cell) < Pluto.DEFAULT_PRECEDENCE_HEURISTIC
+    return Pluto.cell_precedence_heuristic(node, code) < Pluto.DEFAULT_PRECEDENCE_HEURISTIC
 end
 
 const can_macroexpand_no_bind = Set(Symbol.(["@md_str", "Markdown.@md_str", "@gensym", "Base.@gensym", "@enum", "Base.@enum", "@assert", "Base.@assert", "@cmd"]))
diff --git a/src/analysis/topological_order.jl b/src/analysis/topological_order.jl
index 8acd976b8a..03ac91c42b 100644
--- a/src/analysis/topological_order.jl
+++ b/src/analysis/topological_order.jl
@@ -237,39 +237,43 @@ function cycle_is_among_functions(topology::NotebookTopology, cycle::AbstractVec
 end
 
 
+function cell_precedence_heuristic(topology::NotebookTopology, cell::Cell)
+	cell_precedence_heuristic(topology.nodes[cell], topology.codes[cell])
+end
+
+
 """Assigns a number to a cell - cells with a lower number might run first. 
 
 This is used to treat reactive dependencies between cells that cannot be found using static code anylsis."""
-function cell_precedence_heuristic(topology::NotebookTopology, cell::Cell)::Real
-	top = topology.nodes[cell]
-	if :Pkg ∈ top.definitions
+function cell_precedence_heuristic(node::ReactiveNode, code::ExprAnalysisCache)::Real
+	if :Pkg ∈ node.definitions
 		1
-	elseif :DrWatson ∈ top.definitions
+	elseif :DrWatson ∈ node.definitions
 		2
-	elseif Symbol("Pkg.API.activate") ∈ top.references || 
-		Symbol("Pkg.activate") ∈ top.references ||
-		Symbol("@pkg_str") ∈ top.references ||
+	elseif Symbol("Pkg.API.activate") ∈ node.references || 
+		Symbol("Pkg.activate") ∈ node.references ||
+		Symbol("@pkg_str") ∈ node.references ||
 		# https://juliadynamics.github.io/DrWatson.jl/dev/project/#DrWatson.quickactivate
-		Symbol("quickactivate") ∈ top.references ||
-		Symbol("@quickactivate") ∈ top.references ||
-		Symbol("DrWatson.@quickactivate") ∈ top.references ||
-		Symbol("DrWatson.quickactivate") ∈ top.references
+		Symbol("quickactivate") ∈ node.references ||
+		Symbol("@quickactivate") ∈ node.references ||
+		Symbol("DrWatson.@quickactivate") ∈ node.references ||
+		Symbol("DrWatson.quickactivate") ∈ node.references
 		3
-	elseif Symbol("Pkg.API.add") ∈ top.references ||
-		Symbol("Pkg.add") ∈ top.references ||
-		Symbol("Pkg.API.develop") ∈ top.references ||
-		Symbol("Pkg.develop") ∈ top.references
+	elseif Symbol("Pkg.API.add") ∈ node.references ||
+		Symbol("Pkg.add") ∈ node.references ||
+		Symbol("Pkg.API.develop") ∈ node.references ||
+		Symbol("Pkg.develop") ∈ node.references
 		4
-	elseif :LOAD_PATH ∈ top.references
+	elseif :LOAD_PATH ∈ node.references
 		# https://github.com/fonsp/Pluto.jl/issues/323
 		5
-	elseif :Revise ∈ top.definitions
+	elseif :Revise ∈ node.definitions
 		# Load Revise before other packages so that it can properly `revise` them.
 		6
-	elseif !isempty(topology.codes[cell].module_usings_imports.usings)
+	elseif !isempty(code.module_usings_imports.usings)
 		# always do `using X` before other cells, because we don't (yet) know which cells depend on it (we only know it with `import X` and `import X: y, z`)
 		7
-	elseif :include ∈ top.references
+	elseif :include ∈ node.references
 		# https://github.com/fonsp/Pluto.jl/issues/193
 		# because we don't (yet) know which cells depend on it
 		8

From 20ed9daff17755e4165731bc35a73675282c086b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 16 Nov 2023 15:06:48 +0100
Subject: [PATCH 770/821] remove FunctionDependencies because it is now in
 ExpressionExplorer

---
 src/Pluto.jl                         |  1 -
 src/analysis/FunctionDependencies.jl | 45 ----------------------------
 2 files changed, 46 deletions(-)
 delete mode 100644 src/analysis/FunctionDependencies.jl

diff --git a/src/Pluto.jl b/src/Pluto.jl
index 07ed7cd285..1579c69fe9 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -48,7 +48,6 @@ include("./evaluation/Tokens.jl")
 include("./evaluation/Throttled.jl")
 include("./runner/PlutoRunner.jl")
 include("./analysis/ExpressionExplorer.jl")
-include("./analysis/FunctionDependencies.jl")
 include("./packages/PkgCompat.jl")
 include("./webserver/Status.jl")
 
diff --git a/src/analysis/FunctionDependencies.jl b/src/analysis/FunctionDependencies.jl
deleted file mode 100644
index 52db2df2b5..0000000000
--- a/src/analysis/FunctionDependencies.jl
+++ /dev/null
@@ -1,45 +0,0 @@
-module FunctionDependencies
-
-const dependency_table = Dict{Symbol,Symbol}(
-    :√ => :sqrt,
-    :adjoint => :conj,
-    :< => :isless,
-    :> => :<,
-    :isgreater => :isless,
-    :ismore => :>,
-    :≥ => :(>=),
-    :≤ => :(<=),
-    :min => :isless,
-    :max => :isless,
-    :cmp => :isless,
-    :isequal => :(==),
-    :(!=) => :(==),
-    :≠ => :(!=),
-    :(!==) => :(===),
-    :≢ => :(!==),
-    :≡ => :(===),
-    :⊻ => :xor,
-    :⊼ => :nand,
-    :⊽ => :nor,
-    :% => :rem,
-    :÷ => :div,
-    :mod1 => :mod,
-    :∈ => :in,
-)
-
-maybe_add_dependent_funccall!(funccalls::Set{Symbol}, ::Nothing) = funccalls
-function maybe_add_dependent_funccall!(funccalls::Set{Symbol}, call)
-    push!(funccalls, call)
-    maybe_add_dependent_funccall!(funccalls, get(dependency_table, call, nothing))
-    funccalls
-end
-
-function maybe_add_dependent_funccalls!(funccalls::Set{Symbol})
-    calls_to_add = intersect(keys(dependency_table), funccalls)
-    for call in calls_to_add
-        maybe_add_dependent_funccall!(funccalls, dependency_table[call])
-    end
-    funccalls
-end
-
-end

From 6224601ec9cff159a865adefe48b80dbf9b2937a Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Mon, 20 Nov 2023 09:54:10 +0100
Subject: [PATCH 771/821] Use `isglobal` for usings (#2711)

* Use `isglobal` for usings

* Update ExpressionExplorer.jl
---
 src/analysis/ExpressionExplorer.jl | 20 +++++++-------
 src/evaluation/MacroAnalysis.jl    |  3 ++-
 src/evaluation/Run.jl              | 43 ++++++++++++------------------
 src/runner/PlutoRunner.jl          |  2 +-
 test/React.jl                      | 25 +++++++++++++++++
 5 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/src/analysis/ExpressionExplorer.jl b/src/analysis/ExpressionExplorer.jl
index 5f95a9d486..183f04da55 100644
--- a/src/analysis/ExpressionExplorer.jl
+++ b/src/analysis/ExpressionExplorer.jl
@@ -124,20 +124,20 @@ maybe_macroexpand_pluto(ex::Any; kwargs...) = ex
 
 ###############
 
+function collect_implicit_usings(usings_imports::ExpressionExplorer.UsingsImports)
+    implicit_usings = Set{Expr}()
+    for (using_, isglobal) in zip(usings_imports.usings, usings_imports.usings_isglobal)
+        if !(isglobal && is_implicit_using(using_))
+            continue
+        end
 
-
-function collect_implicit_usings(ex::Expr)
-    if is_implicit_using(ex)
-        Set{Expr}(Iterators.map(transform_dot_notation, ex.args))
-    else
-        return Set{Expr}()
+        for arg in using_.args
+            push!(implicit_usings, transform_dot_notation(arg))
+        end
     end
+    implicit_usings
 end
 
-collect_implicit_usings(usings::Union{AbstractSet{Expr},AbstractVector{Expr}}) = mapreduce(collect_implicit_usings, union!, usings; init = Set{Expr}())
-collect_implicit_usings(usings_imports::ExpressionExplorer.UsingsImports) = collect_implicit_usings(usings_imports.usings)
-
-
 is_implicit_using(ex::Expr) = Meta.isexpr(ex, :using) && length(ex.args) >= 1 && !Meta.isexpr(ex.args[1], :(:))
 
 function transform_dot_notation(ex::Expr)
diff --git a/src/evaluation/MacroAnalysis.jl b/src/evaluation/MacroAnalysis.jl
index addccd557f..06bb8c779b 100644
--- a/src/evaluation/MacroAnalysis.jl
+++ b/src/evaluation/MacroAnalysis.jl
@@ -30,7 +30,8 @@ function with_new_soft_definitions(topology::NotebookTopology, cell::Cell, soft_
 	)
 end
 
-collect_implicit_usings(topology::NotebookTopology, cell::Cell) = ExpressionExplorerExtras.collect_implicit_usings(topology.codes[cell].module_usings_imports)
+collect_implicit_usings(topology::NotebookTopology, cell::Cell) =
+    ExpressionExplorerExtras.collect_implicit_usings(topology.codes[cell].module_usings_imports)
 
 function cells_with_deleted_macros(old_topology::NotebookTopology, new_topology::NotebookTopology)
     old_macros = mapreduce(c -> defined_macros(old_topology, c), union!, all_cells(old_topology); init=Set{Symbol}())
diff --git a/src/evaluation/Run.jl b/src/evaluation/Run.jl
index 32cfa7c9fa..0ae7570fdc 100644
--- a/src/evaluation/Run.jl
+++ b/src/evaluation/Run.jl
@@ -2,8 +2,6 @@ import REPL: ends_with_semicolon
 import .Configuration
 import .ExpressionExplorer: is_joined_funcname
 
-Base.push!(x::Set{Cell}) = x
-
 """
 Run given cells and all the cells that depend on them, based on the topology information before and after the changes.
 """
@@ -77,31 +75,18 @@ function run_reactive_core!(
     roots = vcat(roots, removed_cells)
 
     # by setting the reactive node and expression caches of deleted cells to "empty", we are essentially pretending that those cells still exist, but now have empty code. this makes our algorithm simpler.
-    new_topology = NotebookTopology(
-        nodes = merge(
-            new_topology.nodes,
-            Dict(cell => ReactiveNode() for cell in removed_cells),
-        ),
-        codes = merge(
-            new_topology.codes,
-            Dict(cell => ExprAnalysisCache() for cell in removed_cells)
-        ),
-        unresolved_cells = new_topology.unresolved_cells,
-        cell_order = new_topology.cell_order,
-        disabled_cells=new_topology.disabled_cells,
-    )
-	
-	
+    new_topology = exclude_roots(new_topology, removed_cells)
+
     # find (indirectly) deactivated cells and update their status
     indirectly_deactivated = collect(topological_order(new_topology, collect(new_topology.disabled_cells); allow_multiple_defs=true, skip_at_partial_multiple_defs=true))
-	
+
     for cell in indirectly_deactivated
         cell.running = false
         cell.queued = false
         cell.depends_on_disabled_cells = true
     end
 
-	new_topology = exclude_roots(new_topology, indirectly_deactivated)
+    new_topology = exclude_roots(new_topology, indirectly_deactivated)
 
     # save the old topological order - we'll delete variables assigned from its
     # and re-evalutate its cells unless the cells have already run previously in the reactive run
@@ -110,13 +95,13 @@ function run_reactive_core!(
     old_runnable = setdiff(old_order.runnable, already_run, indirectly_deactivated)
     to_delete_vars = union!(Set{Symbol}(), defined_variables(old_topology, old_runnable)...)
     to_delete_funcs = union!(Set{Tuple{UUID,FunctionName}}(), defined_functions(old_topology, old_runnable)...)
-	
-	
-	new_roots = setdiff(union(roots, keys(old_order.errable)), indirectly_deactivated)
+
+
+    new_roots = setdiff(union(roots, keys(old_order.errable)), indirectly_deactivated)
     # get the new topological order
     new_order = topological_order(new_topology, new_roots)
     new_runnable = setdiff(new_order.runnable, already_run)
-    to_run = setdiff(union(new_runnable, old_runnable), keys(new_order.errable))::Vector{Cell} # TODO: think if old error cell order matters
+    to_run = setdiff!(union(new_runnable, old_runnable), keys(new_order.errable))::Vector{Cell} # TODO: think if old error cell order matters
 
 
     # change the bar on the sides of cells to "queued"
@@ -159,9 +144,15 @@ function run_reactive_core!(
 
     cells_to_macro_invalidate = Set{UUID}(c.cell_id for c in cells_with_deleted_macros(old_topology, new_topology))
 
-    to_reimport = union!(Set{Expr}(), (
-			new_topology.codes[c].module_usings_imports.usings for c in notebook.cells if c ∉ to_run
-		)...)
+    to_reimport = reduce(all_cells(new_topology); init=Set{Expr}()) do to_reimport, c
+        c ∈ to_run && return to_reimport
+        usings_imports = new_topology.codes[c].module_usings_imports
+        for (using_, isglobal) in zip(usings_imports.usings, usings_imports.usings_isglobal)
+            isglobal || continue
+            push!(to_reimport, using_)
+        end
+        to_reimport
+    end
 
     if will_run_code(notebook)
 		to_delete_funcs_simple = Set{Tuple{UUID,Tuple{Vararg{Symbol}}}}((id, name.parts) for (id,name) in to_delete_funcs)
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 43b60af19c..57a93e6657 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -1683,7 +1683,7 @@ const integrations = Integration[
         code = quote
             @assert v"1.0.0" <= AbstractPlutoDingetjes.MY_VERSION < v"2.0.0"
             
-            supported!(xs...) = push!(supported_integration_features, xs...)
+            supported!(xs...) = append!(supported_integration_features, xs)
             
             # don't need feature checks for these because they existed in every version of AbstractPlutoDingetjes:
             supported!(
diff --git a/test/React.jl b/test/React.jl
index bb249032c9..63e5a8d629 100644
--- a/test/React.jl
+++ b/test/React.jl
@@ -1522,6 +1522,31 @@ import Pluto.Configuration: Options, EvaluationOptions
         WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
     end
 
+    @testset "Using package from module" begin
+        notebook = Notebook([
+            Cell("""module A
+                        using Dates
+                    end"""),
+            Cell(""),
+            Cell("December"),
+        ])
+
+        update_run!(🍭, notebook, notebook.cells)
+
+        @test notebook.cells[begin] |> noerror
+        @test occursinerror("UndefVarError", notebook.cells[end])
+
+        setcode!(notebook.cells[2], "using Dates")
+
+        update_run!(🍭, notebook, [notebook.cells[2]])
+
+        @test notebook.cells[1] |> noerror
+        @test notebook.cells[2] |> noerror
+        @test notebook.cells[3] |> noerror
+
+        WorkspaceManager.unmake_workspace((🍭, notebook); verbose=false)
+    end
+
     @testset "Function wrapping" begin
         notebook = Notebook([
             Cell("false && jlaksdfjalskdfj"),

From 6c72853d29ba7547313d85aa9dbe0d4eef704205 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 21 Nov 2023 13:49:16 +0100
Subject: [PATCH 772/821] whitespace

---
 frontend/components/Editor.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 4aa9bef518..77275ed7e8 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -643,9 +643,9 @@ export class Editor extends Component {
                 this.client.send(
                     "reshow_cell",
                     {
-                        objectid: objectid,
-                        dim: dim,
-                        cell_id: cell_id,
+                        objectid,
+                        dim,
+                        cell_id,
                     },
                     { notebook_id: this.state.notebook.notebook_id },
                     false

From 4bf9d604bd7b13fbcd29c87027e418fb07053ecb Mon Sep 17 00:00:00 2001
From: Luka van der Plas <43678097+lukavdplas@users.noreply.github.com>
Date: Tue, 21 Nov 2023 17:22:01 +0100
Subject: [PATCH 773/821] Multiple authors in feature card (#2723)

---
 frontend/components/welcome/FeaturedCard.js | 21 +++++++++++++++------
 frontend/featured-card.css                  | 12 ++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/frontend/components/welcome/FeaturedCard.js b/frontend/components/welcome/FeaturedCard.js
index 3204a00fcc..7911579e55 100644
--- a/frontend/components/welcome/FeaturedCard.js
+++ b/frontend/components/welcome/FeaturedCard.js
@@ -59,7 +59,11 @@ export const FeaturedCard = ({ entry, source_manifest, direct_html_links, disabl
                 ? null
                 : html`
                       <div class="author">
-                          <a href=${author.url}> <img src=${author.image ?? transparent_svg} /><span>${author.name}</span></a>
+                          <img src=${author.image ?? transparent_svg} />
+                          <span>
+                              <a href=${author.url}>${author.name}</a>
+                              ${author.has_coauthors ? html` and others` : null}
+                          </span>
                       </div>
                   `}
             <h3><a href=${href} title=${entry?.frontmatter?.title}>${entry?.frontmatter?.title ?? entry.id}</a></h3>
@@ -74,9 +78,13 @@ export const FeaturedCard = ({ entry, source_manifest, direct_html_links, disabl
  * name: string?,
  * url: string?,
  * image: string?,
+ * has_coauthors?: boolean,
  * }}
  */
 
+/**
+ * @returns {AuthorInfo?}
+ */
 const author_info = (frontmatter) =>
     author_info_item(frontmatter.author) ??
     author_info_item({
@@ -90,9 +98,11 @@ const author_info = (frontmatter) =>
  */
 const author_info_item = (x) => {
     if (x instanceof Array) {
-        return author_info_item(x[0])
-    } else if (x == null) {
-        return null
+        const first = author_info_item(x[0])
+        if (first?.name) {
+            const has_coauthors = x.length > 1
+            return { ...first, has_coauthors }
+        }
     } else if (typeof x === "string") {
         return {
             name: x,
@@ -111,7 +121,6 @@ const author_info_item = (x) => {
             url,
             image,
         }
-    } else {
-        return null
     }
+    return null
 }
diff --git a/frontend/featured-card.css b/frontend/featured-card.css
index e00e2319e7..8c9bf82f46 100644
--- a/frontend/featured-card.css
+++ b/frontend/featured-card.css
@@ -55,12 +55,15 @@ featured-card .author {
     background: var(--welcome-card-author-backdrop);
     /* background: hsl(var(--card-color-hue) 34% 46% / 59%); */
     backdrop-filter: blur(15px);
-    color: black;
+    color: var(--index-text-color);
     border-radius: 117px;
     /* height: 2.5em; */
     padding: 0.3em;
     padding-right: 0.8em;
     display: flex;
+    align-items: center;
+    gap: 0.4ch;
+    margin-left: 0.3rem;
 }
 
 featured-card .author img {
@@ -76,13 +79,6 @@ featured-card .author img {
     overflow: hidden;
 }
 
-featured-card .author a {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    gap: 0.4ch;
-}
-
 featured-card h3 a {
     padding: 0.6em;
     padding-bottom: 0;

From e10f31b36d4c917b6d65734220d7c0ea1acc2951 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 27 Nov 2023 10:19:42 +0100
Subject: [PATCH 774/821] Fix #2729

---
 src/webserver/WebServer.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 911a325704..3731f75431 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -331,7 +331,7 @@ precompile(run, (ServerSession, HTTP.Handlers.Router{Symbol("##001")}))
 function pretty_address(session::ServerSession, hostIP, port)
     root = if session.options.server.root_url !== nothing
         @assert endswith(session.options.server.root_url, "/")
-        session.options.server.root_url
+        replace(session.options.server.root_url, "{PORT}" => string(Int(port)))
     elseif haskey(ENV, "JH_APP_URL")
         "$(ENV["JH_APP_URL"])proxy/$(Int(port))/"
     else

From 3ed303ec975350b3b1358824923544bf831645bb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 29 Nov 2023 13:58:55 +0100
Subject: [PATCH 775/821] css tweak

---
 frontend/dark_color.css    | 1 +
 frontend/featured-card.css | 2 +-
 frontend/light_color.css   | 1 +
 frontend/welcome.css       | 1 -
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index 4a676bab4a..03893ad473 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -212,6 +212,7 @@
 
         /* Landing colors */
         --index-text-color: rgb(199, 199, 199);
+        --index-light-text-color: rgb(199, 199, 199);
         --index-clickable-text-color: rgb(235, 235, 235);
         --index-card-bg: #313131;
         --welcome-mywork-bg: var(--header-bg-color);
diff --git a/frontend/featured-card.css b/frontend/featured-card.css
index 8c9bf82f46..974278667d 100644
--- a/frontend/featured-card.css
+++ b/frontend/featured-card.css
@@ -96,7 +96,7 @@ featured-card p {
     margin: 0.3rem 0.8rem;
     /* padding-top: 0; */
     /* margin-block: 0; */
-    color: #838383;
+    color: var(--index-light-text-color);
     -webkit-line-clamp: 4;
     display: inline-block;
     display: -webkit-inline-box;
diff --git a/frontend/light_color.css b/frontend/light_color.css
index 0dd3749c1d..c2c59224d5 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -215,6 +215,7 @@
 
         /* Landing colors */
         --index-text-color: hsl(0, 0, 60);
+        --index-light-text-color: #838383;
         --index-clickable-text-color: hsl(0, 0, 30);
         --docs-binding-bg: #8383830a;
         --index-card-bg: white;
diff --git a/frontend/welcome.css b/frontend/welcome.css
index 0aa2f54aef..c1e76db4f2 100644
--- a/frontend/welcome.css
+++ b/frontend/welcome.css
@@ -219,7 +219,6 @@ h1 {
 
 #featured p {
     max-width: 54ch;
-    color: #757575;
 }
 
 #github img {

From c840eaade889ed96bcf1bff7d1c98dbe2b747351 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 2 Dec 2023 13:33:23 +0100
Subject: [PATCH 776/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index b712a39db6..6650eaa094 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.32"
+version = "0.19.33"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From b15d4202e844bfd74a4519056e1255f8bb8fda2a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 2 Dec 2023 13:34:21 +0100
Subject: [PATCH 777/821] No IOContext for `stdout` and `stderr` globals
 (#2727)

---
 src/runner/PlutoRunner.jl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner.jl
index 57a93e6657..f9f4f7b915 100644
--- a/src/runner/PlutoRunner.jl
+++ b/src/runner/PlutoRunner.jl
@@ -2627,8 +2627,8 @@ function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogL
     # Redirect both the `stdout` and `stderr` streams to a single `Pipe` object.
     pipe = Pipe()
     Base.link_pipe!(pipe; reader_supports_async = true, writer_supports_async = true)
-    pe_stdout = IOContext(pipe.in, default_stdout_iocontext)
-    pe_stderr = IOContext(pipe.in, default_stdout_iocontext)
+    pe_stdout = pipe.in
+    pe_stderr = pipe.in
     redirect_stdout(pe_stdout)
     redirect_stderr(pe_stderr)
 
@@ -2661,7 +2661,7 @@ function with_io_to_logs(f::Function; enabled::Bool=true, loglevel::Logging.LogL
     end
 
     # To make the `display` function work.
-    redirect_display = TextDisplay(pe_stdout)
+    redirect_display = TextDisplay(IOContext(pe_stdout, default_stdout_iocontext))
     pushdisplay(redirect_display)
 
     # Run the function `f`, capturing all output that it might have generated.

From d686e4706feaf8c209f400bc3d9307f811d13e35 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Sat, 2 Dec 2023 15:03:25 +0100
Subject: [PATCH 778/821] colour const assignee (#2733)

---
 frontend/components/CellOutput.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index 007f096582..ce35e93da5 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -28,6 +28,11 @@ import { julia_mixed } from "./CellInput/mixedParsers.js"
 import { julia_andrey } from "../imports/CodemirrorPlutoSetup.js"
 import { SafePreviewSanitizeMessage } from "./SafePreviewUI.js"
 
+const prettyAssignee = assignee =>
+        assignee && assignee.startsWith("const ") ?
+        html`<span style="color: var(--cm-keyword-color)">const</span> ${assignee.slice(6,)}` :
+        assignee
+
 export class CellOutput extends Component {
     constructor() {
         super()
@@ -73,6 +78,7 @@ export class CellOutput extends Component {
                 this.props.mime !== "application/vnd.pluto.table+object" &&
                 this.props.mime !== "text/plain")
         const allow_translate = !this.props.errored && rich_output
+        console.log({ro: this.props.rootassignee})
         return html`
             <pluto-output
                 class=${cl({
@@ -82,7 +88,7 @@ export class CellOutput extends Component {
                 translate=${allow_translate}
                 mime=${this.props.mime}
             >
-                <assignee translate=${false}>${this.props.rootassignee}</assignee>
+                <assignee translate=${false}>${prettyAssignee(this.props.rootassignee)}</assignee>
                 <${OutputBody} ...${this.props} />
             </pluto-output>
         `

From 66dca1ace1eb0aaf849def692394e3b8feebcd0c Mon Sep 17 00:00:00 2001
From: sebibek <sebibek@gmail.com>
Date: Sat, 2 Dec 2023 15:09:30 +0100
Subject: [PATCH 779/821] add error handling

---
 frontend/common/PlutoConnection.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/common/PlutoConnection.js b/frontend/common/PlutoConnection.js
index d8c2739048..d441f244be 100644
--- a/frontend/common/PlutoConnection.js
+++ b/frontend/common/PlutoConnection.js
@@ -441,7 +441,9 @@ export const create_pluto_connection = async ({
 
             // let's say hello
             console.log("Hello?")
-            const u = await send("connect", {}, connect_metadata)
+            const u = await send("connect", {}, connect_metadata).catch((error) => {
+                console.error("Failed to connect:", error)
+            })
             console.log("Hello!")
             client.kill = () => {
                 if (ws_connection) ws_connection.socket.close()

From 5a411795d83b8d51487bd4e5944a1b575ef4ca22 Mon Sep 17 00:00:00 2001
From: Michiel Dral <m.c.dral@gmail.com>
Date: Mon, 4 Dec 2023 20:48:56 +0100
Subject: [PATCH 780/821] Import PlutoRunner as module in Loader.jl (#1881)

* Import PlutoRunner as module in Loader.jl

* rewrite

* remove precompile?

* Remove comment

* remove pluto_boot environments

* scratch space!

* docs

* Make pluto_boot const in preamble

---------

Co-authored-by: Fons van der Plas <fonsvdplas@gmail.com>
Co-authored-by: Paul Berg <naydex.mc+github@gmail.com>
Co-authored-by: Paul Berg <paul.berg@univ-ubs.fr>
Co-authored-by: Paul <paul@plutojl.org>
---
 src/Pluto.jl                                  |  7 +-
 src/evaluation/WorkspaceManager.jl            |  1 +
 src/runner/Loader.jl                          | 93 ++++++++++++-------
 .../Project.toml}                             |  5 +
 .../{ => PlutoRunner/src}/PlutoRunner.jl      |  0
 5 files changed, 69 insertions(+), 37 deletions(-)
 rename src/runner/{NotebookProcessProject.toml => PlutoRunner/Project.toml} (74%)
 rename src/runner/{ => PlutoRunner/src}/PlutoRunner.jl (100%)

diff --git a/src/Pluto.jl b/src/Pluto.jl
index 1579c69fe9..36cdbe7323 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -46,7 +46,7 @@ include("./Configuration.jl")
 
 include("./evaluation/Tokens.jl")
 include("./evaluation/Throttled.jl")
-include("./runner/PlutoRunner.jl")
+include("./runner/PlutoRunner/src/PlutoRunner.jl")
 include("./analysis/ExpressionExplorer.jl")
 include("./packages/PkgCompat.jl")
 include("./webserver/Status.jl")
@@ -98,7 +98,12 @@ export activate_notebook_environment
 
 include("./precompile.jl")
 
+const pluto_boot_environment_path = Ref{String}()
+
 function __init__()
+    pluto_boot_environment_name = "pluto-boot-environment-$(VERSION)-$(PLUTO_VERSION)"
+    pluto_boot_environment_path[] = Scratch.@get_scratch!(pluto_boot_environment_name)
+
     # Print a welcome banner
     if (get(ENV, "JULIA_PLUTO_SHOW_BANNER", "1") != "0" &&
         get(ENV, "CI", "🍄") != "true" && isinteractive())
diff --git a/src/evaluation/WorkspaceManager.jl b/src/evaluation/WorkspaceManager.jl
index e670d841d3..f94e96d00a 100644
--- a/src/evaluation/WorkspaceManager.jl
+++ b/src/evaluation/WorkspaceManager.jl
@@ -34,6 +34,7 @@ const SN = Tuple{ServerSession, Notebook}
 "These expressions get evaluated whenever a new `Workspace` process is created."
 process_preamble() = quote
     Base.exit_on_sigint(false)
+    const pluto_boot_environment_path = $(Pluto.pluto_boot_environment_path[])
     include($(project_relative_path(joinpath("src", "runner"), "Loader.jl")))
     ENV["GKSwstype"] = "nul"
     ENV["JULIA_REVISE_WORKER_ONLY"] = "1"
diff --git a/src/runner/Loader.jl b/src/runner/Loader.jl
index bb1f5c5a0b..b83bc4c35b 100644
--- a/src/runner/Loader.jl
+++ b/src/runner/Loader.jl
@@ -1,46 +1,67 @@
-begin
-pushfirst!(LOAD_PATH, "@stdlib")
-import Pkg
-popfirst!(LOAD_PATH)
+# The goal of this file is to import PlutoRunner into Main. 
+# 
+# This is difficult because PlutoRunner uses standard libraries and packages that are not necessarily available in the standard environment. 
+# 
+# Our solution is to create a temporary environment just for loading PlutoRunner. This environment is stored in a scratchspace parameterized by the Pluto version and julia version,
+# and used by all notebook launches. Reusing the environment means extra speed.
+
 
-# We need to Pkg.instantiate the package environment that this notebook worker process will launch in
-local my_dir = @__DIR__
-local pluto_dir = joinpath(my_dir, "..", "..")
+begin
+    pushfirst!(LOAD_PATH, "@stdlib")
+    import Pkg
+    popfirst!(LOAD_PATH)
 
-local runner_env_dir = mkpath(joinpath(Pkg.envdir(Pkg.depots()[1]), "__pluto_boot_v2_" * string(VERSION)))
-local new_ptoml_path = joinpath(runner_env_dir, "Project.toml")
+    local original_LP = LOAD_PATH
+    local original_AP = Base.ACTIVE_PROJECT[]
 
-local ptoml_contents = read(joinpath(my_dir, "NotebookProcessProject.toml"), String)
-write(new_ptoml_path, ptoml_contents)
+    # Path to our notebook boot package environment which is set by WorkspaceManager
+    # when spawning the process.
+    local runner_env_dir = pluto_boot_environment_path
 
-local pkg_ctx = Pkg.Types.Context(env=Pkg.Types.EnvCache(new_ptoml_path))
+    local new_LP = ["@", "@stdlib"]
+    local new_AP = runner_env_dir
 
-try
-    Pkg.resolve(pkg_ctx; io=devnull) # supress IO
-catch
-    # if it failed, do it again without suppressing io
     try
-        Pkg.resolve(pkg_ctx)
-    catch e
-        @error "Failed to resolve notebook boot environment" exception=(e, catch_backtrace())
-    end
-end
-try
-    # we don't suppress IO for this one because it can take very long, and that would be a frustrating experience without IO
-    
-    # precompilation switched off because of https://github.com/fonsp/Pluto.jl/issues/875
-    Pkg.instantiate(pkg_ctx; update_registry=false, allow_autoprecomp=false) 
-
-catch e
-    @error "Failed to instantiate notebook boot environment" exception=(e, catch_backtrace())
-end
+        # Activate the environment
+        copy!(LOAD_PATH, new_LP)
+        Base.ACTIVE_PROJECT[] = new_AP
+
+        # Set up our notebook boot package environment by adding a single package:
+        path = joinpath(@__DIR__, "PlutoRunner")
+        try
+            Pkg.develop([Pkg.PackageSpec(; path)]; io=devnull)
+        catch
+            # if it failed, do it again without suppressing io
+            Pkg.develop([Pkg.PackageSpec(; path)])
+        end
 
+        # Resolve
+        try
+            Pkg.resolve(; io=devnull) # supress IO
+        catch
+            # if it failed, do it again without suppressing io
+            try
+                Pkg.resolve()
+            catch e
+                @error "Failed to resolve notebook boot environment" exception = (e, catch_backtrace())
+            end
+        end
 
-pushfirst!(LOAD_PATH, runner_env_dir)
+        # Instantiate
+        try
+            # we don't suppress IO for this one because it can take very long, and that would be a frustrating experience without IO
+            # precompilation switched off because of https://github.com/fonsp/Pluto.jl/issues/875
+            Pkg.instantiate(; update_registry=false, allow_autoprecomp=false)
+        catch e
+            @error "Failed to instantiate notebook boot environment" exception = (e, catch_backtrace())
+        end
 
-#
-include(joinpath(my_dir, "PlutoRunner.jl"))
-#
+        # Import PlutoRunner into Main
+        import PlutoRunner
 
-popfirst!(LOAD_PATH)
-end
\ No newline at end of file
+    finally
+        # Reset the pkg environment
+        copy!(LOAD_PATH, original_LP)
+        Base.ACTIVE_PROJECT[] = original_AP
+    end
+end
diff --git a/src/runner/NotebookProcessProject.toml b/src/runner/PlutoRunner/Project.toml
similarity index 74%
rename from src/runner/NotebookProcessProject.toml
rename to src/runner/PlutoRunner/Project.toml
index 35b0b10f3d..191b55efc1 100644
--- a/src/runner/NotebookProcessProject.toml
+++ b/src/runner/PlutoRunner/Project.toml
@@ -1,3 +1,8 @@
+name = "PlutoRunner"
+uuid = "dc6b355a-2368-4481-ae6d-ae0351418d79"
+authors = ["Michiel Dral <m.c.dral@gmail.com>", "Fons van der Plas <fons@plutojl.org>", "Paul Berg <paul@plutojl.org>"]
+version = "29.12.98"
+
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
diff --git a/src/runner/PlutoRunner.jl b/src/runner/PlutoRunner/src/PlutoRunner.jl
similarity index 100%
rename from src/runner/PlutoRunner.jl
rename to src/runner/PlutoRunner/src/PlutoRunner.jl

From a4de685da2184741b3d2789f5d95a0e563658633 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Wed, 6 Dec 2023 15:56:21 +0100
Subject: [PATCH 781/821] suppress output of xdg-open (#2736)

---
 src/webserver/WebServer.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webserver/WebServer.jl b/src/webserver/WebServer.jl
index 3731f75431..d8a5fef6d7 100644
--- a/src/webserver/WebServer.jl
+++ b/src/webserver/WebServer.jl
@@ -13,7 +13,7 @@ function open_in_default_browser(url::AbstractString)::Bool
             Base.run(`powershell.exe Start "'$url'"`)
             true
         elseif Sys.islinux()
-            Base.run(`xdg-open $url`)
+            Base.run(`xdg-open $url`, devnull, devnull, devnull)
             true
         else
             false

From b6998a32d1e2b12f2b86c4a3d7f5ae6eef5a6e5e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 6 Dec 2023 15:56:34 +0100
Subject: [PATCH 782/821] =?UTF-8?q?=F0=9F=96=A8=EF=B8=8F=20Some=20PDF=20la?=
 =?UTF-8?q?yout=20improvements=20(#2738)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Editor.js       |  6 ++++-
 frontend/components/ExportBanner.js |  7 ++---
 frontend/editor.css                 |  3 +--
 frontend/hide-ui.css                | 41 +++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 77275ed7e8..628ee51089 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1464,7 +1464,11 @@ patch: ${JSON.stringify(
                     <header id="pluto-nav" className=${export_menu_open ? "show_export" : ""}>
                         <${ExportBanner}
                             notebook_id=${this.state.notebook.notebook_id}
-                            notebook_shortpath=${this.state.notebook.shortpath}
+                            print_title=${
+                                this.state.notebook.metadata?.frontmatter?.title ??
+                                new URLSearchParams(window.location.search).get("name") ??
+                                this.state.notebook.shortpath
+                            }
                             notebookfile_url=${this.export_url("notebookfile")}
                             notebookexport_url=${this.export_url("notebookexport")}
                             open=${export_menu_open}
diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index 34ee367202..043b9afeef 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -44,7 +44,7 @@ export const WarnForVisisblePasswords = () => {
     }
 }
 
-export const ExportBanner = ({ notebook_id, notebook_shortpath, open, onClose, notebookfile_url, notebookexport_url, start_recording }) => {
+export const ExportBanner = ({ notebook_id, print_title, open, onClose, notebookfile_url, notebookexport_url, start_recording }) => {
     // @ts-ignore
     const isDesktop = !!window.plutoDesktop
 
@@ -55,12 +55,13 @@ export const ExportBanner = ({ notebook_id, notebook_shortpath, open, onClose, n
         }
     }
 
+    //
     let print_old_title_ref = useRef("")
     useEffect(() => {
         let a = () => {
             console.log("beforeprint")
             print_old_title_ref.current = document.title
-            document.title = notebook_shortpath.replace(/\.jl$/, "").replace(/\.plutojl$/, "")
+            document.title = print_title.replace(/\.jl$/, "").replace(/\.plutojl$/, "")
         }
         let b = () => {
             document.title = print_old_title_ref.current
@@ -71,7 +72,7 @@ export const ExportBanner = ({ notebook_id, notebook_shortpath, open, onClose, n
             window.removeEventListener("beforeprint", a)
             window.removeEventListener("afterprint", b)
         }
-    }, [notebook_shortpath])
+    }, [print_title])
 
     return html`
         <aside id="export" inert=${!open}>
diff --git a/frontend/editor.css b/frontend/editor.css
index 5ac2ebe9b8..df03c12335 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -69,7 +69,6 @@ pluto-editor {
 
 main {
     flex: 1;
-
     max-width: calc(700px + 25px + 6px); /* 700px + both paddings */
     padding-top: 0px;
     padding-bottom: 4rem;
@@ -286,6 +285,7 @@ pluto-output hr {
     border-top: 3px solid var(--rule-color);
     margin-left: 0;
     margin-right: 0;
+    break-after: page;
 }
 
 pluto-output blockquote {
@@ -1109,7 +1109,6 @@ pluto-cell {
     min-height: calc(23px + 1px + 1px);
     margin-top: var(--pluto-cell-spacing);
     position: relative;
-    break-inside: avoid;
 }
 
 pluto-output {
diff --git a/frontend/hide-ui.css b/frontend/hide-ui.css
index 8d25ce1cce..4312f0fab7 100644
--- a/frontend/hide-ui.css
+++ b/frontend/hide-ui.css
@@ -19,12 +19,53 @@ pluto-runarea,
 /* These next rules only apply to @media print, i.e. the PDF export. We want to hide these items in the PDF, but not in a static HTML. */
 @media print {
     .edit_or_run,
+    .floating_back_button,
     pkg-status-mark,
+    .MJX_ToolTip,
+    .MJX_HoverRegion,
+    .MJX_LiveRegion,
     nav#undo_delete {
         display: none !important;
     }
+    main {
+        padding-bottom: 0;
+    }
     pluto-input .cm-editor {
         border-left: 1px solid var(--normal-cell-color);
         border-radius: 4px !important;
     }
+
+    pluto-cell {
+        break-inside: avoid;
+    }
+    /* Cells with simple prose content should be allowed to break. Here is a hearistic for that: (we could check for the `.markdown` class generated by the Markdown stdlib but we also want to fully support alternatives) */
+    pluto-cell.code_folded:has(p) {
+        break-inside: auto;
+    }
+
+    pluto-output hr {
+        height: 0;
+        margin: 0;
+        visibility: hidden;
+        break-after: page;
+    }
+
+    pluto-output h1 {
+        break-before: page;
+    }
+    pluto-cell:first-of-type pluto-output h1 {
+        break-before: avoid;
+    }
+
+    /* pluto-cell:has(h1) + pluto-cell {
+        break-inside: auto;
+    } */
+
+    pluto-output :is(h1, h2, h3, h4) {
+        break-after: avoid;
+    }
+}
+
+@page {
+    widows: 2;
 }

From 7d3fd237080d621fcd059f1c9e57e382e6cb289c Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 6 Dec 2023 16:51:15 +0100
Subject: [PATCH 783/821] Fix #2728

---
 Project.toml                            |  2 +-
 frontend/binder.css                     | 11 ++++++-----
 frontend/common/useDialog.js            | 19 +------------------
 frontend/components/EditOrRunButton.js  |  2 +-
 frontend/components/FrontmatterInput.js |  2 +-
 5 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/Project.toml b/Project.toml
index 6650eaa094..2f66dbe281 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.33"
+version = "0.19.34"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
diff --git a/frontend/binder.css b/frontend/binder.css
index 4d6f1c6646..1aadb93ec2 100644
--- a/frontend/binder.css
+++ b/frontend/binder.css
@@ -160,11 +160,12 @@ body.wiggle_binder .edit_or_run > button {
 
 .binder_help_text .close {
     position: absolute;
-    top: 12px;
-    right: 12px;
-    width: 24px;
-    height: 24px;
-    background-size: 24px 24px;
+    --size: 32px;
+    top: 5px;
+    right: 5px;
+    width: var(--size);
+    height: var(--size);
+    background-size: var(--size) var(--size);
     cursor: pointer;
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-outline.svg");
 }
diff --git a/frontend/common/useDialog.js b/frontend/common/useDialog.js
index 176c5a99a0..3c03f5fb70 100644
--- a/frontend/common/useDialog.js
+++ b/frontend/common/useDialog.js
@@ -6,7 +6,7 @@ import { useEffect, useLayoutEffect, useRef } from "../imports/Preact.js"
 /**
  * @returns {[import("../imports/Preact.js").Ref<HTMLDialogElement?>, () => void, () => void, () => void]}
  */
-export const useDialog = ({ light_dismiss = false } = {}) => {
+export const useDialog = () => {
     const dialog_ref = useRef(/** @type {HTMLDialogElement?} */ (null))
 
     useLayoutEffect(() => {
@@ -17,22 +17,5 @@ export const useDialog = ({ light_dismiss = false } = {}) => {
     const close = () => dialog_ref.current?.close()
     const toggle = () => (dialog_ref.current?.open === true ? dialog_ref.current?.close() : dialog_ref.current?.showModal())
 
-    useEffect(() => {
-        if (light_dismiss) {
-            const handleclick = (e) => {
-                if (dialog_ref.current?.open && dialog_ref.current.contains(e.target)) {
-                    close()
-                    // Avoid activating whatever was below
-                    e.stopPropagation()
-                    e.preventDefault()
-                }
-            }
-            document.body.addEventListener("click", handleclick)
-            return () => {
-                document.body.removeEventListener("click", handleclick)
-            }
-        }
-    }, [dialog_ref.current])
-
     return [dialog_ref, open, close, toggle]
 }
diff --git a/frontend/components/EditOrRunButton.js b/frontend/components/EditOrRunButton.js
index c6282d4127..c64da7e163 100644
--- a/frontend/components/EditOrRunButton.js
+++ b/frontend/components/EditOrRunButton.js
@@ -33,7 +33,7 @@ export const RunLocalButton = ({ show, start_local }) => {
  * }} props
  * */
 export const BinderButton = ({ offer_binder, start_binder, notebookfile, notebook }) => {
-    const [dialog_ref, openModal, closeModal, toggleModal] = useDialog({ light_dismiss: true })
+    const [dialog_ref, openModal, closeModal, toggleModal] = useDialog()
 
     const [showCopyPopup, setShowCopyPopup] = useState(false)
     const notebookfile_ref = useRef("")
diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index ca99e40da8..26ce5dabd6 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -35,7 +35,7 @@ export const FrontMatterInput = ({ filename, remote_frontmatter, set_remote_fron
             })
         )
 
-    const [dialog_ref, open, close, _toggle] = useDialog({ light_dismiss: false })
+    const [dialog_ref, open, close, _toggle] = useDialog()
 
     const cancel = () => {
         set_frontmatter(remote_frontmatter ?? {})

From c65ec3619dad35307cc5fbf19b06d72b745f7e93 Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Thu, 7 Dec 2023 11:53:51 +0100
Subject: [PATCH 784/821] Bump version (#2741)

This will retrigger a build.
---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 2f66dbe281..0e4a621472 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.34"
+version = "0.19.35"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 7a759e124c09a1ad44297291c2a1b4451489f3ea Mon Sep 17 00:00:00 2001
From: sebibek <sebibek@gmail.com>
Date: Sat, 9 Dec 2023 13:37:45 +0100
Subject: [PATCH 785/821] hard reset frontend (excepting vscode related
 changes)

---
 Project.toml                                  |  4 +-
 frontend/binder.css                           | 11 ++---
 frontend/common/PlutoHash.js                  | 13 +-----
 frontend/common/useDialog.js                  | 19 +--------
 frontend/components/BottomRightPanel.js       | 12 +++++-
 .../CellInput/block_matcher_plugin.js         | 10 +++++
 frontend/components/CellOutput.js             | 13 ++++--
 frontend/components/EditOrRunButton.js        |  2 +-
 frontend/components/ExportBanner.js           | 23 ++++++++++-
 frontend/components/FrontmatterInput.js       |  2 +-
 frontend/components/LiveDocsTab.js            | 10 +++--
 frontend/components/TreeView.js               |  4 +-
 frontend/components/welcome/FeaturedCard.js   | 21 +++++++---
 frontend/dark_color.css                       |  1 +
 frontend/editor.css                           |  7 +---
 frontend/featured-card.css                    | 14 +++----
 frontend/hide-ui.css                          | 41 +++++++++++++++++++
 frontend/light_color.css                      |  1 +
 frontend/welcome.css                          |  1 -
 19 files changed, 139 insertions(+), 70 deletions(-)

diff --git a/Project.toml b/Project.toml
index 1a70200cf0..0e4a621472 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,13 +2,14 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.32"
+version = "0.19.35"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 Configurations = "5218b696-f38b-4ac9-8b61-a12ec717816d"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
+ExpressionExplorer = "21656369-7473-754a-2065-74616d696c43"
 FileWatching = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
 FuzzyCompletions = "fb4132e2-a121-4a70-b8a1-d5b831dcdcc2"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
@@ -38,6 +39,7 @@ Base64 = "1"
 Configurations = "0.15, 0.16, 0.17"
 Dates = "1"
 Downloads = "1"
+ExpressionExplorer = "0.5, 0.6, 1"
 FileWatching = "1"
 FuzzyCompletions = "0.3, 0.4, 0.5"
 HTTP = "^1.5.2"
diff --git a/frontend/binder.css b/frontend/binder.css
index 4d6f1c6646..1aadb93ec2 100644
--- a/frontend/binder.css
+++ b/frontend/binder.css
@@ -160,11 +160,12 @@ body.wiggle_binder .edit_or_run > button {
 
 .binder_help_text .close {
     position: absolute;
-    top: 12px;
-    right: 12px;
-    width: 24px;
-    height: 24px;
-    background-size: 24px 24px;
+    --size: 32px;
+    top: 5px;
+    right: 5px;
+    width: var(--size);
+    height: var(--size);
+    background-size: var(--size) var(--size);
     cursor: pointer;
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-outline.svg");
 }
diff --git a/frontend/common/PlutoHash.js b/frontend/common/PlutoHash.js
index 65e9551ee0..8c71325735 100644
--- a/frontend/common/PlutoHash.js
+++ b/frontend/common/PlutoHash.js
@@ -10,18 +10,7 @@ export const base64_arraybuffer = async (/** @type {BufferSource} */ data) => {
         reader.readAsDataURL(new Blob([data]))
     })
 
-    return base64url.substring(base64url.indexOf(",") + 1)
-}
-
-export const decode_base64_to_arraybuffer = async (/** @type {string} */ data) => {
-    let r = await fetch(`data:;base64,${data}`)
-    return await r.arrayBuffer()
-}
-
-export const hash_arraybuffer = async (/** @type {BufferSource} */ data) => {
-    // @ts-ignore
-    const hashed_buffer = await window.crypto.subtle.digest("SHA-256", data)
-    return await base64_arraybuffer(hashed_buffer)
+    return base64url.substring(base64url.indexOf(',')+1)
 }
 
 /** Encode a buffer using the `base64url` encoding, which uses URL-safe special characters, see https://en.wikipedia.org/wiki/Base64#Variants_summary_table */
diff --git a/frontend/common/useDialog.js b/frontend/common/useDialog.js
index 176c5a99a0..3c03f5fb70 100644
--- a/frontend/common/useDialog.js
+++ b/frontend/common/useDialog.js
@@ -6,7 +6,7 @@ import { useEffect, useLayoutEffect, useRef } from "../imports/Preact.js"
 /**
  * @returns {[import("../imports/Preact.js").Ref<HTMLDialogElement?>, () => void, () => void, () => void]}
  */
-export const useDialog = ({ light_dismiss = false } = {}) => {
+export const useDialog = () => {
     const dialog_ref = useRef(/** @type {HTMLDialogElement?} */ (null))
 
     useLayoutEffect(() => {
@@ -17,22 +17,5 @@ export const useDialog = ({ light_dismiss = false } = {}) => {
     const close = () => dialog_ref.current?.close()
     const toggle = () => (dialog_ref.current?.open === true ? dialog_ref.current?.close() : dialog_ref.current?.showModal())
 
-    useEffect(() => {
-        if (light_dismiss) {
-            const handleclick = (e) => {
-                if (dialog_ref.current?.open && dialog_ref.current.contains(e.target)) {
-                    close()
-                    // Avoid activating whatever was below
-                    e.stopPropagation()
-                    e.preventDefault()
-                }
-            }
-            document.body.addEventListener("click", handleclick)
-            return () => {
-                document.body.removeEventListener("click", handleclick)
-            }
-        }
-    }, [dialog_ref.current])
-
     return [dialog_ref, open, close, toggle]
 }
diff --git a/frontend/components/BottomRightPanel.js b/frontend/components/BottomRightPanel.js
index 25bbbb2649..f7ade801c4 100644
--- a/frontend/components/BottomRightPanel.js
+++ b/frontend/components/BottomRightPanel.js
@@ -21,9 +21,18 @@ export const open_bottom_right_panel = (/** @type {PanelTabName} */ tab) => wind
  * connected: boolean,
  * backend_launch_phase: number?,
  * backend_launch_logs: string?,
+ * sanitize_html?: boolean,
  * }} props
  */
-export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, notebook, connected, backend_launch_phase, backend_launch_logs }) => {
+export let BottomRightPanel = ({
+    desired_doc_query,
+    on_update_doc_query,
+    notebook,
+    connected,
+    backend_launch_phase,
+    backend_launch_logs,
+    sanitize_html = true,
+}) => {
     let container_ref = useRef()
 
     const focus_docs_on_open_ref = useRef(false)
@@ -125,6 +134,7 @@ export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, noteboo
                           desired_doc_query=${desired_doc_query}
                           on_update_doc_query=${on_update_doc_query}
                           notebook=${notebook}
+                          sanitize_html=${sanitize_html}
                       />`
                     : open_tab === "process"
                     ? html`<${ProcessTab}
diff --git a/frontend/components/CellInput/block_matcher_plugin.js b/frontend/components/CellInput/block_matcher_plugin.js
index b6d05bbee8..14e77e8f33 100644
--- a/frontend/components/CellInput/block_matcher_plugin.js
+++ b/frontend/components/CellInput/block_matcher_plugin.js
@@ -223,6 +223,16 @@ function match_block(node) {
         return match_try_node(node)
     }
 
+    if (node.name === "module" || node.name === "baremodule") {
+        let possibly_end = node.parent.lastChild
+        let did_match = possibly_end.name === "end"
+        if (!did_match) return null
+
+        return [
+            { from: node.from, to: node.to },
+            { from: possibly_end.from, to: possibly_end.to },
+        ]
+    }
 
     return null
 }
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index c1000af7dd..ce35e93da5 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -28,6 +28,11 @@ import { julia_mixed } from "./CellInput/mixedParsers.js"
 import { julia_andrey } from "../imports/CodemirrorPlutoSetup.js"
 import { SafePreviewSanitizeMessage } from "./SafePreviewUI.js"
 
+const prettyAssignee = assignee =>
+        assignee && assignee.startsWith("const ") ?
+        html`<span style="color: var(--cm-keyword-color)">const</span> ${assignee.slice(6,)}` :
+        assignee
+
 export class CellOutput extends Component {
     constructor() {
         super()
@@ -73,6 +78,7 @@ export class CellOutput extends Component {
                 this.props.mime !== "application/vnd.pluto.table+object" &&
                 this.props.mime !== "text/plain")
         const allow_translate = !this.props.errored && rich_output
+        console.log({ro: this.props.rootassignee})
         return html`
             <pluto-output
                 class=${cl({
@@ -82,7 +88,7 @@ export class CellOutput extends Component {
                 translate=${allow_translate}
                 mime=${this.props.mime}
             >
-                <assignee translate=${false}>${this.props.rootassignee}</assignee>
+                <assignee translate=${false}>${prettyAssignee(this.props.rootassignee)}</assignee>
                 <${OutputBody} ...${this.props} />
             </pluto-output>
         `
@@ -493,7 +499,7 @@ let declarative_shadow_dom_polyfill = (template) => {
     }
 }
 
-export let RawHTMLContainer = ({ body, className = "", persist_js_state = false, last_run_timestamp, sanitize_html = true }) => {
+export let RawHTMLContainer = ({ body, className = "", persist_js_state = false, last_run_timestamp, sanitize_html = true, sanitize_html_message = true }) => {
     let pluto_actions = useContext(PlutoActionsContext)
     let pluto_bonds = useContext(PlutoBondsContext)
     let js_init_set = useContext(PlutoJSInitializingContext)
@@ -525,13 +531,14 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
         let html_content_to_set = sanitize_html
             ? DOMPurify.sanitize(body, {
                   FORBID_TAGS: ["style"],
+                  ADD_ATTR: ["target"],
               })
             : body
 
         // Actually "load" the html
         container.innerHTML = html_content_to_set
 
-        if (html_content_to_set !== body) {
+        if (sanitize_html_message && html_content_to_set !== body) {
             // DOMPurify also resolves HTML entities, which can give a false positive. To fix this, we use DOMParser to parse both strings, and we compare the innerHTML of the resulting documents.
             const parser = new DOMParser()
             const p1 = parser.parseFromString(body, "text/html")
diff --git a/frontend/components/EditOrRunButton.js b/frontend/components/EditOrRunButton.js
index c6282d4127..c64da7e163 100644
--- a/frontend/components/EditOrRunButton.js
+++ b/frontend/components/EditOrRunButton.js
@@ -33,7 +33,7 @@ export const RunLocalButton = ({ show, start_local }) => {
  * }} props
  * */
 export const BinderButton = ({ offer_binder, start_binder, notebookfile, notebook }) => {
-    const [dialog_ref, openModal, closeModal, toggleModal] = useDialog({ light_dismiss: true })
+    const [dialog_ref, openModal, closeModal, toggleModal] = useDialog()
 
     const [showCopyPopup, setShowCopyPopup] = useState(false)
     const notebookfile_ref = useRef("")
diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index dff5a1fb43..043b9afeef 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -1,4 +1,4 @@
-import { html } from "../imports/Preact.js"
+import { html, useEffect, useRef } from "../imports/Preact.js"
 
 const Circle = ({ fill }) => html`
     <svg
@@ -44,7 +44,7 @@ export const WarnForVisisblePasswords = () => {
     }
 }
 
-export const ExportBanner = ({ notebook_id, open, onClose, notebookfile_url, notebookexport_url, start_recording }) => {
+export const ExportBanner = ({ notebook_id, print_title, open, onClose, notebookfile_url, notebookexport_url, start_recording }) => {
     // @ts-ignore
     const isDesktop = !!window.plutoDesktop
 
@@ -55,6 +55,25 @@ export const ExportBanner = ({ notebook_id, open, onClose, notebookfile_url, not
         }
     }
 
+    //
+    let print_old_title_ref = useRef("")
+    useEffect(() => {
+        let a = () => {
+            console.log("beforeprint")
+            print_old_title_ref.current = document.title
+            document.title = print_title.replace(/\.jl$/, "").replace(/\.plutojl$/, "")
+        }
+        let b = () => {
+            document.title = print_old_title_ref.current
+        }
+        window.addEventListener("beforeprint", a)
+        window.addEventListener("afterprint", b)
+        return () => {
+            window.removeEventListener("beforeprint", a)
+            window.removeEventListener("afterprint", b)
+        }
+    }, [print_title])
+
     return html`
         <aside id="export" inert=${!open}>
             <div id="container">
diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index ca99e40da8..26ce5dabd6 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -35,7 +35,7 @@ export const FrontMatterInput = ({ filename, remote_frontmatter, set_remote_fron
             })
         )
 
-    const [dialog_ref, open, close, _toggle] = useDialog({ light_dismiss: false })
+    const [dialog_ref, open, close, _toggle] = useDialog()
 
     const cancel = () => {
         set_frontmatter(remote_frontmatter ?? {})
diff --git a/frontend/components/LiveDocsTab.js b/frontend/components/LiveDocsTab.js
index 156297445f..b26c1e27bc 100644
--- a/frontend/components/LiveDocsTab.js
+++ b/frontend/components/LiveDocsTab.js
@@ -12,9 +12,10 @@ import { cl } from "../common/ClassTable.js"
  * desired_doc_query: string?,
  * on_update_doc_query: (query: string) => void,
  * notebook: import("./Editor.js").NotebookData,
+ * sanitize_html?: boolean,
  * }} props
  */
-export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_query, notebook }) => {
+export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_query, notebook, sanitize_html = true }) => {
     let pluto_actions = useContext(PlutoActionsContext)
     let live_doc_search_ref = useRef(/** @type {HTMLInputElement?} */ (null))
 
@@ -22,7 +23,7 @@ export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_quer
     let [state, set_state] = useState({
         shown_query: null,
         searched_query: null,
-        body: "<p>Welcome to the <b>Live docs</b>! Keep this little window open while you work on the notebook, and you will get documentation of everything you type!</p><p>You can also type a query above.</p><hr><p><em>Still stuck? Here are <a href='https://julialang.org/about/help/' target='_blank'>some tips</a>.</em></p>",
+        body: `<p>Welcome to the <b>Live docs</b>! Keep this little window open while you work on the notebook, and you will get documentation of everything you type!</p><p>You can also type a query above.</p><hr><p><em>Still stuck? Here are <a target="_blank" href="https://julialang.org/about/help/">some tips</a>.</em></p>`,
         loading: false,
     })
     let update_state = (mutation) => set_state(immer((state) => mutation(state)))
@@ -74,7 +75,10 @@ export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_quer
         })
     }
 
-    let docs_element = useMemo(() => html`<${RawHTMLContainer} body=${without_workspace_stuff(state.body)} />`, [state.body])
+    let docs_element = useMemo(
+        () => html`<${RawHTMLContainer} body=${without_workspace_stuff(state.body)} sanitize_html=${sanitize_html} sanitize_html_message=${false} />`,
+        [state.body, sanitize_html]
+    )
     let no_docs_found = state.loading === false && state.searched_query !== "" && state.searched_query !== state.shown_query
 
     return html`
diff --git a/frontend/components/TreeView.js b/frontend/components/TreeView.js
index ccd1645b63..c15e0c2822 100644
--- a/frontend/components/TreeView.js
+++ b/frontend/components/TreeView.js
@@ -1,6 +1,6 @@
 import { html, useRef, useState, useContext } from "../imports/Preact.js"
 
-import { OutputBody, PlutoImage, RawHTMLContainer } from "./CellOutput.js"
+import { OutputBody, PlutoImage } from "./CellOutput.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
 
 // this is different from OutputBody because:
@@ -24,7 +24,7 @@ export const SimpleOutputBody = ({ mime, body, cell_id, persist_js_state, saniti
         case "text/plain":
             return html`<pre class="no-block">${body}</pre>`
         case "application/vnd.pluto.tree+object":
-            return html`<${TreeView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} />`
+            return html`<${TreeView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} sanitize_html=${sanitize_html} />`
             break
         default:
             return OutputBody({ mime, body, cell_id, persist_js_state, sanitize_html, last_run_timestamp: null })
diff --git a/frontend/components/welcome/FeaturedCard.js b/frontend/components/welcome/FeaturedCard.js
index 3204a00fcc..7911579e55 100644
--- a/frontend/components/welcome/FeaturedCard.js
+++ b/frontend/components/welcome/FeaturedCard.js
@@ -59,7 +59,11 @@ export const FeaturedCard = ({ entry, source_manifest, direct_html_links, disabl
                 ? null
                 : html`
                       <div class="author">
-                          <a href=${author.url}> <img src=${author.image ?? transparent_svg} /><span>${author.name}</span></a>
+                          <img src=${author.image ?? transparent_svg} />
+                          <span>
+                              <a href=${author.url}>${author.name}</a>
+                              ${author.has_coauthors ? html` and others` : null}
+                          </span>
                       </div>
                   `}
             <h3><a href=${href} title=${entry?.frontmatter?.title}>${entry?.frontmatter?.title ?? entry.id}</a></h3>
@@ -74,9 +78,13 @@ export const FeaturedCard = ({ entry, source_manifest, direct_html_links, disabl
  * name: string?,
  * url: string?,
  * image: string?,
+ * has_coauthors?: boolean,
  * }}
  */
 
+/**
+ * @returns {AuthorInfo?}
+ */
 const author_info = (frontmatter) =>
     author_info_item(frontmatter.author) ??
     author_info_item({
@@ -90,9 +98,11 @@ const author_info = (frontmatter) =>
  */
 const author_info_item = (x) => {
     if (x instanceof Array) {
-        return author_info_item(x[0])
-    } else if (x == null) {
-        return null
+        const first = author_info_item(x[0])
+        if (first?.name) {
+            const has_coauthors = x.length > 1
+            return { ...first, has_coauthors }
+        }
     } else if (typeof x === "string") {
         return {
             name: x,
@@ -111,7 +121,6 @@ const author_info_item = (x) => {
             url,
             image,
         }
-    } else {
-        return null
     }
+    return null
 }
diff --git a/frontend/dark_color.css b/frontend/dark_color.css
index 4a676bab4a..03893ad473 100644
--- a/frontend/dark_color.css
+++ b/frontend/dark_color.css
@@ -212,6 +212,7 @@
 
         /* Landing colors */
         --index-text-color: rgb(199, 199, 199);
+        --index-light-text-color: rgb(199, 199, 199);
         --index-clickable-text-color: rgb(235, 235, 235);
         --index-card-bg: #313131;
         --welcome-mywork-bg: var(--header-bg-color);
diff --git a/frontend/editor.css b/frontend/editor.css
index 077c1b299f..df03c12335 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -52,7 +52,6 @@ html {
 
 body {
     margin: 0px;
-    padding: 0px;
     overflow-anchor: none;
     overflow-x: hidden;
     position: relative;
@@ -70,7 +69,6 @@ pluto-editor {
 
 main {
     flex: 1;
-
     max-width: calc(700px + 25px + 6px); /* 700px + both paddings */
     padding-top: 0px;
     padding-bottom: 4rem;
@@ -85,8 +83,7 @@ body:not(.disable_ui) main {
 }
 
 body:not(.disable_ui) {
-    overscroll-behavior-x: contain;
-    background: white;
+    overscroll-behavior: contain;
 }
 
 /* | main=25px+700px+6px=731px | pluto-helpbox=350px - 500px | */
@@ -288,6 +285,7 @@ pluto-output hr {
     border-top: 3px solid var(--rule-color);
     margin-left: 0;
     margin-right: 0;
+    break-after: page;
 }
 
 pluto-output blockquote {
@@ -1111,7 +1109,6 @@ pluto-cell {
     min-height: calc(23px + 1px + 1px);
     margin-top: var(--pluto-cell-spacing);
     position: relative;
-    break-inside: avoid;
 }
 
 pluto-output {
diff --git a/frontend/featured-card.css b/frontend/featured-card.css
index e00e2319e7..974278667d 100644
--- a/frontend/featured-card.css
+++ b/frontend/featured-card.css
@@ -55,12 +55,15 @@ featured-card .author {
     background: var(--welcome-card-author-backdrop);
     /* background: hsl(var(--card-color-hue) 34% 46% / 59%); */
     backdrop-filter: blur(15px);
-    color: black;
+    color: var(--index-text-color);
     border-radius: 117px;
     /* height: 2.5em; */
     padding: 0.3em;
     padding-right: 0.8em;
     display: flex;
+    align-items: center;
+    gap: 0.4ch;
+    margin-left: 0.3rem;
 }
 
 featured-card .author img {
@@ -76,13 +79,6 @@ featured-card .author img {
     overflow: hidden;
 }
 
-featured-card .author a {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    gap: 0.4ch;
-}
-
 featured-card h3 a {
     padding: 0.6em;
     padding-bottom: 0;
@@ -100,7 +96,7 @@ featured-card p {
     margin: 0.3rem 0.8rem;
     /* padding-top: 0; */
     /* margin-block: 0; */
-    color: #838383;
+    color: var(--index-light-text-color);
     -webkit-line-clamp: 4;
     display: inline-block;
     display: -webkit-inline-box;
diff --git a/frontend/hide-ui.css b/frontend/hide-ui.css
index 8d25ce1cce..4312f0fab7 100644
--- a/frontend/hide-ui.css
+++ b/frontend/hide-ui.css
@@ -19,12 +19,53 @@ pluto-runarea,
 /* These next rules only apply to @media print, i.e. the PDF export. We want to hide these items in the PDF, but not in a static HTML. */
 @media print {
     .edit_or_run,
+    .floating_back_button,
     pkg-status-mark,
+    .MJX_ToolTip,
+    .MJX_HoverRegion,
+    .MJX_LiveRegion,
     nav#undo_delete {
         display: none !important;
     }
+    main {
+        padding-bottom: 0;
+    }
     pluto-input .cm-editor {
         border-left: 1px solid var(--normal-cell-color);
         border-radius: 4px !important;
     }
+
+    pluto-cell {
+        break-inside: avoid;
+    }
+    /* Cells with simple prose content should be allowed to break. Here is a hearistic for that: (we could check for the `.markdown` class generated by the Markdown stdlib but we also want to fully support alternatives) */
+    pluto-cell.code_folded:has(p) {
+        break-inside: auto;
+    }
+
+    pluto-output hr {
+        height: 0;
+        margin: 0;
+        visibility: hidden;
+        break-after: page;
+    }
+
+    pluto-output h1 {
+        break-before: page;
+    }
+    pluto-cell:first-of-type pluto-output h1 {
+        break-before: avoid;
+    }
+
+    /* pluto-cell:has(h1) + pluto-cell {
+        break-inside: auto;
+    } */
+
+    pluto-output :is(h1, h2, h3, h4) {
+        break-after: avoid;
+    }
+}
+
+@page {
+    widows: 2;
 }
diff --git a/frontend/light_color.css b/frontend/light_color.css
index 0dd3749c1d..c2c59224d5 100644
--- a/frontend/light_color.css
+++ b/frontend/light_color.css
@@ -215,6 +215,7 @@
 
         /* Landing colors */
         --index-text-color: hsl(0, 0, 60);
+        --index-light-text-color: #838383;
         --index-clickable-text-color: hsl(0, 0, 30);
         --docs-binding-bg: #8383830a;
         --index-card-bg: white;
diff --git a/frontend/welcome.css b/frontend/welcome.css
index 0aa2f54aef..c1e76db4f2 100644
--- a/frontend/welcome.css
+++ b/frontend/welcome.css
@@ -219,7 +219,6 @@ h1 {
 
 #featured p {
     max-width: 54ch;
-    color: #757575;
 }
 
 #github img {

From f39964375d2aa04fbfb083474c3d9df992cf6f7e Mon Sep 17 00:00:00 2001
From: sebibek <sebibek@gmail.com>
Date: Sun, 10 Dec 2023 11:39:12 +0100
Subject: [PATCH 786/821] working state, few tests are still failing

---
 frontend/common/PlutoConnection.js            | 29 +++----------
 frontend/common/useDialog.js                  | 28 +++++++++++--
 frontend/components/BottomRightPanel.js       | 12 +-----
 .../CellInput/block_matcher_plugin.js         | 10 -----
 frontend/components/CellOutput.js             | 37 +++-------------
 frontend/components/EditOrRunButton.js        |  2 +-
 frontend/components/Editor.js                 | 39 ++++-------------
 frontend/components/ExportBanner.js           | 23 +---------
 frontend/components/FrontmatterInput.js       | 23 ++--------
 frontend/components/LiveDocsTab.js            | 10 ++---
 frontend/components/TreeView.js               |  9 ++--
 frontend/components/welcome/Featured.js       | 18 ++++----
 frontend/components/welcome/FeaturedCard.js   | 42 ++++++-------------
 13 files changed, 75 insertions(+), 207 deletions(-)

diff --git a/frontend/common/PlutoConnection.js b/frontend/common/PlutoConnection.js
index d441f244be..f55f902b3a 100644
--- a/frontend/common/PlutoConnection.js
+++ b/frontend/common/PlutoConnection.js
@@ -1,14 +1,11 @@
 import { Promises } from "../common/SetupCellEnvironment.js"
 import { pack, unpack } from "./MsgPack.js"
-import { base64_arraybuffer, decode_base64_to_arraybuffer } from "./PlutoHash.js"
+import { with_query_params } from "./URLTools.js"
+import { base64_arraybuffer } from "./PlutoHash.js"
 import "./Polyfill.js"
 import { available as vscode_available, api as vscode_api } from "./VSCodeApi.js"
 import { alert, confirm } from "./alert_confirm.js"
 
-// https://github.com/denysdovhan/wtfjs/issues/61
-const different_Infinity_because_js_is_yuck = 2147483646
-import { with_query_params } from "./URLTools.js"
-
 const reconnect_after_close_delay = 500
 const retry_after_connect_failure_delay = 5000
 
@@ -195,9 +192,8 @@ const create_vscode_connection = (address, { on_message, on_socket_close }, time
                 try {
                     const raw = event.data // The json-encoded data that the extension sent
                     if (raw.type === "ws_proxy") {
-                        const buffer = await decode_base64_to_arraybuffer(raw.base64_encoded)
+                        const buffer = await base64_arraybuffer(raw.base64_encoded)
                         const message = unpack(new Uint8Array(buffer))
-
                         try {
                             console.info("message received!", message)
                             on_message(message)
@@ -209,21 +205,17 @@ const create_vscode_connection = (address, { on_message, on_socket_close }, time
                     }
                 } catch (unpack_err) {
                     console.error("Failed to unpack message from websocket", unpack_err, { event })
-
                     // prettier-ignore
                     alert(`Something went wrong! You might need to refresh the page.\n\nPlease open an issue on https://github.com/fonsp/Pluto.jl with this info:\n\nFailed to unpack message\n${unpack_err}\n\n${JSON.stringify(event)}`)
                 }
             })
         })
-
         const send_encoded = async (message) => {
             console.log("Sending message!", message)
             const encoded = pack(message)
             await vscode_api.postMessage({ type: "ws_proxy", base64_encoded: await base64_arraybuffer(encoded) })
         }
-
         let last_task = Promise.resolve()
-
         resolve({
             socket: {},
             send: send_encoded,
@@ -404,14 +396,9 @@ export const create_pluto_connection = async ({
         try {
             ws_connection = await (vscode_available ? create_vscode_connection : create_ws_connection)(String(ws_address), {
                 on_message: (update) => {
-                    const for_me = update.recipient_id === client_id
-                    const by_me = update.initiator_id === client_id
+                    const by_me = update.initiator_id == client_id
                     const request_id = update.request_id
 
-                    if (!for_me) {
-                        return
-                    }
-
                     if (by_me && request_id) {
                         const request = sent_requests.get(request_id)
                         if (request) {
@@ -441,9 +428,7 @@ export const create_pluto_connection = async ({
 
             // let's say hello
             console.log("Hello?")
-            const u = await send("connect", {}, connect_metadata).catch((error) => {
-                console.error("Failed to connect:", error)
-            })
+            const u = await send("connect", {}, connect_metadata)
             console.log("Hello!")
             client.kill = () => {
                 if (ws_connection) ws_connection.socket.close()
@@ -455,10 +440,6 @@ export const create_pluto_connection = async ({
             console.log("Client object: ", client)
 
             if (connect_metadata.notebook_id != null && !u.message.notebook_exists) {
-                // https://github.com/fonsp/Pluto.jl/issues/55
-                if (await confirm("A new server was started - this notebook session is no longer running.\n\nWould you like to go back to the main menu?")) {
-                    window.location.href = "./"
-                }
                 on_connection_status(false, true)
                 return {}
             }
diff --git a/frontend/common/useDialog.js b/frontend/common/useDialog.js
index 3c03f5fb70..7f52138f7a 100644
--- a/frontend/common/useDialog.js
+++ b/frontend/common/useDialog.js
@@ -6,16 +6,36 @@ import { useEffect, useLayoutEffect, useRef } from "../imports/Preact.js"
 /**
  * @returns {[import("../imports/Preact.js").Ref<HTMLDialogElement?>, () => void, () => void, () => void]}
  */
-export const useDialog = () => {
+export const useDialog = ({ light_dismiss = false } = {}) => {
     const dialog_ref = useRef(/** @type {HTMLDialogElement?} */ (null))
 
     useLayoutEffect(() => {
         if (dialog_ref.current != null) dialogPolyfill.registerDialog(dialog_ref.current)
     }, [dialog_ref.current])
 
-    const open = () => dialog_ref.current?.showModal()
-    const close = () => dialog_ref.current?.close()
-    const toggle = () => (dialog_ref.current?.open === true ? dialog_ref.current?.close() : dialog_ref.current?.showModal())
+    //@ts-ignore
+    const open = () => dialog_ref.current.showModal()
+    //@ts-ignore
+    const close = () => dialog_ref.current.close()
+    //@ts-ignore
+    const toggle = () => (dialog_ref.current.open ? dialog_ref.current?.close() : dialog_ref.current?.showModal())
+
+    useEffect(() => {
+        if (light_dismiss) {
+            const handleclick = (e) => {
+                if (dialog_ref.current?.open && dialog_ref.current.contains(e.target)) {
+                    close()
+                    // Avoid activating whatever was below
+                    e.stopPropagation()
+                    e.preventDefault()
+                }
+            }
+            document.body.addEventListener("click", handleclick)
+            return () => {
+                document.body.removeEventListener("click", handleclick)
+            }
+        }
+    }, [dialog_ref.current])
 
     return [dialog_ref, open, close, toggle]
 }
diff --git a/frontend/components/BottomRightPanel.js b/frontend/components/BottomRightPanel.js
index f7ade801c4..25bbbb2649 100644
--- a/frontend/components/BottomRightPanel.js
+++ b/frontend/components/BottomRightPanel.js
@@ -21,18 +21,9 @@ export const open_bottom_right_panel = (/** @type {PanelTabName} */ tab) => wind
  * connected: boolean,
  * backend_launch_phase: number?,
  * backend_launch_logs: string?,
- * sanitize_html?: boolean,
  * }} props
  */
-export let BottomRightPanel = ({
-    desired_doc_query,
-    on_update_doc_query,
-    notebook,
-    connected,
-    backend_launch_phase,
-    backend_launch_logs,
-    sanitize_html = true,
-}) => {
+export let BottomRightPanel = ({ desired_doc_query, on_update_doc_query, notebook, connected, backend_launch_phase, backend_launch_logs }) => {
     let container_ref = useRef()
 
     const focus_docs_on_open_ref = useRef(false)
@@ -134,7 +125,6 @@ export let BottomRightPanel = ({
                           desired_doc_query=${desired_doc_query}
                           on_update_doc_query=${on_update_doc_query}
                           notebook=${notebook}
-                          sanitize_html=${sanitize_html}
                       />`
                     : open_tab === "process"
                     ? html`<${ProcessTab}
diff --git a/frontend/components/CellInput/block_matcher_plugin.js b/frontend/components/CellInput/block_matcher_plugin.js
index 14e77e8f33..b6d05bbee8 100644
--- a/frontend/components/CellInput/block_matcher_plugin.js
+++ b/frontend/components/CellInput/block_matcher_plugin.js
@@ -223,16 +223,6 @@ function match_block(node) {
         return match_try_node(node)
     }
 
-    if (node.name === "module" || node.name === "baremodule") {
-        let possibly_end = node.parent.lastChild
-        let did_match = possibly_end.name === "end"
-        if (!did_match) return null
-
-        return [
-            { from: node.from, to: node.to },
-            { from: possibly_end.from, to: possibly_end.to },
-        ]
-    }
 
     return null
 }
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index ce35e93da5..0b65b7dcc7 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -28,11 +28,6 @@ import { julia_mixed } from "./CellInput/mixedParsers.js"
 import { julia_andrey } from "../imports/CodemirrorPlutoSetup.js"
 import { SafePreviewSanitizeMessage } from "./SafePreviewUI.js"
 
-const prettyAssignee = assignee =>
-        assignee && assignee.startsWith("const ") ?
-        html`<span style="color: var(--cm-keyword-color)">const</span> ${assignee.slice(6,)}` :
-        assignee
-
 export class CellOutput extends Component {
     constructor() {
         super()
@@ -78,7 +73,6 @@ export class CellOutput extends Component {
                 this.props.mime !== "application/vnd.pluto.table+object" &&
                 this.props.mime !== "text/plain")
         const allow_translate = !this.props.errored && rich_output
-        console.log({ro: this.props.rootassignee})
         return html`
             <pluto-output
                 class=${cl({
@@ -88,7 +82,7 @@ export class CellOutput extends Component {
                 translate=${allow_translate}
                 mime=${this.props.mime}
             >
-                <assignee translate=${false}>${prettyAssignee(this.props.rootassignee)}</assignee>
+                <assignee translate=${false}>${this.props.rootassignee}</assignee>
                 <${OutputBody} ...${this.props} />
             </pluto-output>
         `
@@ -122,21 +116,7 @@ export let PlutoImage = ({ body, mime }) => {
     return html`<img ref=${imgref} type=${mime} src=${""} />`
 }
 
-/**
- * @param {{
- *  mime: string,
- * body: any,
- * cell_id: string,
- * persist_js_state: boolean | string,
- * last_run_timestamp: number,
- * sanitize_html?: boolean | string,
- * }} args
- */
 export const OutputBody = ({ mime, body, cell_id, persist_js_state = false, last_run_timestamp, sanitize_html = true }) => {
-    // These two arguments might have been passed as strings if OutputBody was used as the custom HTML element <pluto-display>, with string attributes as arguments.
-    sanitize_html = sanitize_html !== "false" && sanitize_html !== false
-    persist_js_state = persist_js_state === "true" || persist_js_state === true
-
     switch (mime) {
         case "image/png":
         case "image/jpg":
@@ -351,14 +331,8 @@ const execute_scripttags = async ({ root_node, script_nodes, previous_results_ma
 
             if (script_el == undefined) {
                 script_el = document.createElement("script")
-                script_el.referrerPolicy = node.referrerPolicy
-                script_el.crossOrigin = node.crossOrigin
-                script_el.integrity = node.integrity
-                script_el.noModule = node.noModule
-                script_el.nonce = node.nonce
-                script_el.type = node.type
                 script_el.src = node.src
-                // Not copying defer or async because this script is not included in the initial HTML document, so it has no effect.
+                script_el.type = node.type === "module" ? "module" : "text/javascript"
                 // @ts-ignore
                 script_el.pluto_is_loading_me = true
             }
@@ -499,7 +473,7 @@ let declarative_shadow_dom_polyfill = (template) => {
     }
 }
 
-export let RawHTMLContainer = ({ body, className = "", persist_js_state = false, last_run_timestamp, sanitize_html = true, sanitize_html_message = true }) => {
+export let RawHTMLContainer = ({ body, className = "", persist_js_state = false, last_run_timestamp, sanitize_html = true }) => {
     let pluto_actions = useContext(PlutoActionsContext)
     let pluto_bonds = useContext(PlutoBondsContext)
     let js_init_set = useContext(PlutoJSInitializingContext)
@@ -531,14 +505,13 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
         let html_content_to_set = sanitize_html
             ? DOMPurify.sanitize(body, {
                   FORBID_TAGS: ["style"],
-                  ADD_ATTR: ["target"],
               })
             : body
 
         // Actually "load" the html
         container.innerHTML = html_content_to_set
 
-        if (sanitize_html_message && html_content_to_set !== body) {
+        if (html_content_to_set !== body) {
             // DOMPurify also resolves HTML entities, which can give a false positive. To fix this, we use DOMParser to parse both strings, and we compare the innerHTML of the resulting documents.
             const parser = new DOMParser()
             const p1 = parser.parseFromString(body, "text/html")
@@ -617,7 +590,7 @@ export let RawHTMLContainer = ({ body, className = "", persist_js_state = false,
             js_init_set?.delete(container)
             invalidate_scripts.current?.()
         }
-    }, [body, last_run_timestamp, pluto_actions, sanitize_html])
+    }, [body, persist_js_state, last_run_timestamp, pluto_actions, sanitize_html])
 
     return html`<div class="raw-html-wrapper ${className}" ref=${container_ref}></div>`
 }
diff --git a/frontend/components/EditOrRunButton.js b/frontend/components/EditOrRunButton.js
index c64da7e163..c6282d4127 100644
--- a/frontend/components/EditOrRunButton.js
+++ b/frontend/components/EditOrRunButton.js
@@ -33,7 +33,7 @@ export const RunLocalButton = ({ show, start_local }) => {
  * }} props
  * */
 export const BinderButton = ({ offer_binder, start_binder, notebookfile, notebook }) => {
-    const [dialog_ref, openModal, closeModal, toggleModal] = useDialog()
+    const [dialog_ref, openModal, closeModal, toggleModal] = useDialog({ light_dismiss: true })
 
     const [showCopyPopup, setShowCopyPopup] = useState(false)
     const notebookfile_ref = useRef("")
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 15d2d8c43e..f44aa803eb 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -39,9 +39,11 @@ import { get_environment } from "../common/Environment.js"
 import { ProcessStatus } from "../common/ProcessStatus.js"
 import { SafePreviewUI } from "./SafePreviewUI.js"
 
-export const default_path = ""
 import { alert, confirm } from "../common/alert_confirm.js"
+// This is imported asynchronously - uncomment for development
+// import environment from "../common/Environment.js"
 
+export const default_path = ""
 const DEBUG_DIFFING = false
 
 // Be sure to keep this in sync with DEFAULT_CELL_METADATA in Cell.jl
@@ -250,31 +252,6 @@ const first_true_key = (obj) => {
 const url_logo_big = document.head.querySelector("link[rel='pluto-logo-big']")?.getAttribute("href") ?? ""
 export const url_logo_small = document.head.querySelector("link[rel='pluto-logo-small']")?.getAttribute("href") ?? ""
 
-const url_params = new URLSearchParams(window.location.search)
-const launch_params = {
-    //@ts-ignore
-    notebook_id: (vscode_available ? null : url_params.get("id")) ?? window.pluto_notebook_id,
-    //@ts-ignore
-    statefile: url_params.get("statefile") ?? window.pluto_statefile,
-    //@ts-ignore
-    notebookfile: url_params.get("notebookfile") ?? window.pluto_notebookfile,
-    //@ts-ignore
-    disable_ui: !!(url_params.get("disable_ui") ?? window.pluto_disable_ui),
-    //@ts-ignore
-    preamble_html: url_params.get("preamble_html") ?? window.pluto_preamble_html,
-    //@ts-ignore
-    isolated_cell_ids: url_params.has("isolated_cell_id") ? url_params.getAll("isolated_cell_id") : window.pluto_isolated_cell_ids,
-    //@ts-ignore
-    binder_url: url_params.get("binder_url") ?? window.pluto_binder_url,
-    //@ts-ignore
-    slider_server_url: url_params.get("slider_server_url") ?? window.pluto_slider_server_url,
-    //@ts-ignore
-    recording_url: url_params.get("recording_url") ?? window.pluto_recording_url,
-    //@ts-ignore
-    recording_audio_url: url_params.get("recording_audio_url") ?? window.pluto_recording_audio_url,
-}
-console.log("Launch parameters: ", launch_params)
-
 /**
  * @typedef EditorProps
  * @type {{
@@ -670,9 +647,9 @@ export class Editor extends Component {
                 this.client.send(
                     "reshow_cell",
                     {
-                        objectid,
-                        dim,
-                        cell_id,
+                        objectid: objectid,
+                        dim: dim,
+                        cell_id: cell_id,
                     },
                     { notebook_id: this.state.notebook.notebook_id },
                     false
@@ -1293,8 +1270,7 @@ patch: ${JSON.stringify(
                 const serialized = this.serialize_selected()
                 if (serialized) {
                     navigator.clipboard.writeText(serialized).catch((err) => {
-                        console.error("Error copying cells", e, err)
-                        alert(`Error copying cells: ${err}`)
+                        alert(`Error copying cells: ${e}`)
                     })
                 }
             }
@@ -1662,7 +1638,6 @@ patch: ${JSON.stringify(
                         backend_launch_phase=${this.state.backend_launch_phase}
                         backend_launch_logs=${this.state.backend_launch_logs}
                         notebook=${this.state.notebook}
-                        sanitize_html=${status.sanitize_html}
                     />
                     <${Popup} 
                         notebook=${this.state.notebook}
diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index 043b9afeef..dff5a1fb43 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -1,4 +1,4 @@
-import { html, useEffect, useRef } from "../imports/Preact.js"
+import { html } from "../imports/Preact.js"
 
 const Circle = ({ fill }) => html`
     <svg
@@ -44,7 +44,7 @@ export const WarnForVisisblePasswords = () => {
     }
 }
 
-export const ExportBanner = ({ notebook_id, print_title, open, onClose, notebookfile_url, notebookexport_url, start_recording }) => {
+export const ExportBanner = ({ notebook_id, open, onClose, notebookfile_url, notebookexport_url, start_recording }) => {
     // @ts-ignore
     const isDesktop = !!window.plutoDesktop
 
@@ -55,25 +55,6 @@ export const ExportBanner = ({ notebook_id, print_title, open, onClose, notebook
         }
     }
 
-    //
-    let print_old_title_ref = useRef("")
-    useEffect(() => {
-        let a = () => {
-            console.log("beforeprint")
-            print_old_title_ref.current = document.title
-            document.title = print_title.replace(/\.jl$/, "").replace(/\.plutojl$/, "")
-        }
-        let b = () => {
-            document.title = print_old_title_ref.current
-        }
-        window.addEventListener("beforeprint", a)
-        window.addEventListener("afterprint", b)
-        return () => {
-            window.removeEventListener("beforeprint", a)
-            window.removeEventListener("afterprint", b)
-        }
-    }, [print_title])
-
     return html`
         <aside id="export" inert=${!open}>
             <div id="container">
diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index 26ce5dabd6..69fe2cc3b1 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -8,16 +8,14 @@ import "https://cdn.jsdelivr.net/gh/fonsp/rebel-tag-input@1.0.6/lib/rebel-tag-in
 import dialogPolyfill from "https://cdn.jsdelivr.net/npm/dialog-polyfill@0.5.6/dist/dialog-polyfill.esm.min.js"
 import immer from "../imports/immer.js"
 import { useDialog } from "../common/useDialog.js"
-import { FeaturedCard } from "./welcome/FeaturedCard.js"
 
 /**
  * @param {{
- *  filename: String,
  *  remote_frontmatter: Record<String,any>?,
  *  set_remote_frontmatter: (newval: Record<String,any>) => Promise<void>,
  * }} props
  * */
-export const FrontMatterInput = ({ filename, remote_frontmatter, set_remote_frontmatter }) => {
+export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter }) => {
     const [frontmatter, set_frontmatter] = useState(remote_frontmatter ?? {})
 
     useEffect(() => {
@@ -35,7 +33,7 @@ export const FrontMatterInput = ({ filename, remote_frontmatter, set_remote_fron
             })
         )
 
-    const [dialog_ref, open, close, _toggle] = useDialog()
+    const [dialog_ref, open, close, _toggle] = useDialog({ light_dismiss: false })
 
     const cancel = () => {
         set_frontmatter(remote_frontmatter ?? {})
@@ -140,19 +138,6 @@ export const FrontMatterInput = ({ filename, remote_frontmatter, set_remote_fron
             If you are publishing this notebook on the web, you can set the parameters below to provide HTML metadata. This is useful for search engines and
             social media.
         </p>
-        <div class="card-preview">
-            <h2>Preview</h2>
-            <${FeaturedCard}
-                entry=${
-                    /** @type {import("./welcome/Featured.js").SourceManifestNotebookEntry} */ ({
-                        id: filename.replace(/\.jl$/, ""),
-                        hash: "xx",
-                        frontmatter: clean_data(frontmatter) ?? {},
-                    })
-                }
-                disable_links=${true}
-            />
-        </div>
         <div class="fm-table">
             ${entries_input(frontmatter_with_defaults, ``)}
             ${!_.isArray(frontmatter_with_defaults.author)
@@ -220,13 +205,11 @@ const Input = ({ value, on_value, type, id }) => {
         }
     }, [input_ref.current])
 
-    const placeholder = type === "url" ? "https://..." : undefined
-
     return type === "tags"
         ? html`<rbl-tag-input id=${id} ref=${input_ref} />`
         : type === "license"
         ? LicenseInput({ ref: input_ref, id })
-        : html`<input type=${type} id=${id} ref=${input_ref} placeholder=${placeholder} />`
+        : html`<input type=${type} id=${id} ref=${input_ref} />`
 }
 
 // https://choosealicense.com/licenses/
diff --git a/frontend/components/LiveDocsTab.js b/frontend/components/LiveDocsTab.js
index b26c1e27bc..156297445f 100644
--- a/frontend/components/LiveDocsTab.js
+++ b/frontend/components/LiveDocsTab.js
@@ -12,10 +12,9 @@ import { cl } from "../common/ClassTable.js"
  * desired_doc_query: string?,
  * on_update_doc_query: (query: string) => void,
  * notebook: import("./Editor.js").NotebookData,
- * sanitize_html?: boolean,
  * }} props
  */
-export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_query, notebook, sanitize_html = true }) => {
+export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_query, notebook }) => {
     let pluto_actions = useContext(PlutoActionsContext)
     let live_doc_search_ref = useRef(/** @type {HTMLInputElement?} */ (null))
 
@@ -23,7 +22,7 @@ export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_quer
     let [state, set_state] = useState({
         shown_query: null,
         searched_query: null,
-        body: `<p>Welcome to the <b>Live docs</b>! Keep this little window open while you work on the notebook, and you will get documentation of everything you type!</p><p>You can also type a query above.</p><hr><p><em>Still stuck? Here are <a target="_blank" href="https://julialang.org/about/help/">some tips</a>.</em></p>`,
+        body: "<p>Welcome to the <b>Live docs</b>! Keep this little window open while you work on the notebook, and you will get documentation of everything you type!</p><p>You can also type a query above.</p><hr><p><em>Still stuck? Here are <a href='https://julialang.org/about/help/' target='_blank'>some tips</a>.</em></p>",
         loading: false,
     })
     let update_state = (mutation) => set_state(immer((state) => mutation(state)))
@@ -75,10 +74,7 @@ export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_quer
         })
     }
 
-    let docs_element = useMemo(
-        () => html`<${RawHTMLContainer} body=${without_workspace_stuff(state.body)} sanitize_html=${sanitize_html} sanitize_html_message=${false} />`,
-        [state.body, sanitize_html]
-    )
+    let docs_element = useMemo(() => html`<${RawHTMLContainer} body=${without_workspace_stuff(state.body)} />`, [state.body])
     let no_docs_found = state.loading === false && state.searched_query !== "" && state.searched_query !== state.shown_query
 
     return html`
diff --git a/frontend/components/TreeView.js b/frontend/components/TreeView.js
index c15e0c2822..48ae5ddedd 100644
--- a/frontend/components/TreeView.js
+++ b/frontend/components/TreeView.js
@@ -1,6 +1,6 @@
 import { html, useRef, useState, useContext } from "../imports/Preact.js"
 
-import { OutputBody, PlutoImage } from "./CellOutput.js"
+import { OutputBody, PlutoImage, RawHTMLContainer } from "./CellOutput.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
 
 // this is different from OutputBody because:
@@ -24,7 +24,7 @@ export const SimpleOutputBody = ({ mime, body, cell_id, persist_js_state, saniti
         case "text/plain":
             return html`<pre class="no-block">${body}</pre>`
         case "application/vnd.pluto.tree+object":
-            return html`<${TreeView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} sanitize_html=${sanitize_html} />`
+            return html`<${TreeView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} />`
             break
         default:
             return OutputBody({ mime, body, cell_id, persist_js_state, sanitize_html, last_run_timestamp: null })
@@ -199,9 +199,8 @@ export const TableView = ({ mime, body, cell_id, persist_js_state }) => {
     </table>`
 }
 
-export let DivElement = ({ cell_id, style, classname, children, persist_js_state = false, sanitize_html = true }) => {
-    const mimepair_output = (pair) =>
-        html`<${SimpleOutputBody} cell_id=${cell_id} mime=${pair[1]} body=${pair[0]} persist_js_state=${persist_js_state} sanitize_html=${sanitize_html} />`
+export let DivElement = ({ cell_id, style, classname, children, persist_js_state = false }) => {
+    const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${cell_id} mime=${pair[1]} body=${pair[0]} persist_js_state=${persist_js_state} />`
 
     return html`<div style=${style} class=${classname}>${children.map(mimepair_output)}</div>`
 }
diff --git a/frontend/components/welcome/Featured.js b/frontend/components/welcome/Featured.js
index 730a4d1ed8..08f9a4e84b 100644
--- a/frontend/components/welcome/Featured.js
+++ b/frontend/components/welcome/Featured.js
@@ -35,8 +35,6 @@ import { FeaturedCard } from "./FeaturedCard.js"
  *   source_url?: String,
  *   title?: String,
  *   description?: String,
- *   binder_url?: String,
- *   slider_server_url?: String,
  * }}
  */
 
@@ -65,13 +63,12 @@ const offline_html = html`
         <p>Here are a couple of notebooks to get started with Pluto.jl:</p>
         <ul>
             <li>1. <a href="sample/Getting%20started.jl">Getting started</a></li>
-            <li>2. <a href="sample/Markdown.jl">Markdown</a></li>
-            <li>3. <a href="sample/Basic%20mathematics.jl">Basic mathematics</a></li>
-            <li>4. <a href="sample/Interactivity.jl">Interactivity</a></li>
-            <li>5. <a href="sample/PlutoUI.jl.jl">PlutoUI.jl</a></li>
-            <li>6. <a href="sample/Plots.jl.jl">Plots.jl</a></li>
-            <li>7. <a href="sample/Tower%20of%20Hanoi.jl">Tower of Hanoi</a></li>
-            <li>8. <a href="sample/JavaScript.jl">JavaScript</a></li>
+            <li>2. <a href="sample/Basic%20mathematics.jl">Basic mathematics</a></li>
+            <li>3. <a href="sample/Interactivity.jl">Interactivity</a></li>
+            <li>4. <a href="sample/PlutoUI.jl.jl">PlutoUI.jl</a></li>
+            <li>5. <a href="sample/Plots.jl.jl">Plots.jl</a></li>
+            <li>6. <a href="sample/Tower%20of%20Hanoi.jl">Tower of Hanoi</a></li>
+            <li>7. <a href="sample/JavaScript.jl">JavaScript</a></li>
         </ul>
         <br />
         <br />
@@ -200,7 +197,8 @@ export const Featured = ({ sources, direct_html_links }) => {
                                       <p>${coll.description}</p>
                                       <div class="card-list">
                                           ${collection(Object.values(data.notebooks), coll.tags ?? []).map(
-                                              (entry) => html`<${FeaturedCard} entry=${entry} source_manifest=${data} direct_html_links=${direct_html_links} />`
+                                              (entry) =>
+                                                  html`<${FeaturedCard} entry=${entry} source_url=${data.source_url} direct_html_links=${direct_html_links} />`
                                           )}
                                       </div>
                                   </div>
diff --git a/frontend/components/welcome/FeaturedCard.js b/frontend/components/welcome/FeaturedCard.js
index 7911579e55..b0d05c9192 100644
--- a/frontend/components/welcome/FeaturedCard.js
+++ b/frontend/components/welcome/FeaturedCard.js
@@ -9,22 +9,17 @@ const str_to_degree = (s) => ([...s].reduce((a, b) => a + b.charCodeAt(0), 0) *
 
 /**
  * @param {{
- *  source_manifest?: import("./Featured.js").SourceManifest,
  *  entry: import("./Featured.js").SourceManifestNotebookEntry,
+ *  source_url?: string,
  *  direct_html_links: boolean,
- *  disable_links: boolean,
  * }} props
  */
-export const FeaturedCard = ({ entry, source_manifest, direct_html_links, disable_links }) => {
+export const FeaturedCard = ({ entry, source_url, direct_html_links }) => {
     const title = entry.frontmatter?.title
 
-    const { source_url } = source_manifest ?? {}
-
     const u = (/** @type {string | null | undefined} */ x) =>
         source_url == null
-            ? _.isEmpty(x)
-                ? null
-                : x
+            ? x
             : x == null
             ? null
             : // URLs are relative to the source URL...
@@ -35,19 +30,15 @@ export const FeaturedCard = ({ entry, source_manifest, direct_html_links, disabl
               ).href
 
     // `direct_html_links` means that we will navigate you directly to the exported HTML file. Otherwise, we use our local editor, with the exported state as parameters. This lets users run the featured notebooks locally.
-    const href = disable_links
-        ? "#"
-        : direct_html_links
+    const href = direct_html_links
         ? u(entry.html_path)
         : with_query_params(`edit`, {
               statefile: u(entry.statefile_path),
               notebookfile: u(entry.notebookfile_path),
               notebookfile_integrity: `sha256-${base64url_to_base64(entry.hash)}`,
               disable_ui: `true`,
-              name: title == null ? null : `sample ${title}`,
               pluto_server_url: `.`,
-              // Little monkey patch because we don't want to use the slider server when for the CDN source, only for the featured.plutojl.org source. But both sources have the same pluto_export.json so this is easiest.
-              slider_server_url: source_url?.includes("cdn.jsdelivr.net/gh/JuliaPluto/featured") ? null : u(source_manifest?.slider_server_url),
+              name: title == null ? null : `sample ${title}`,
           })
 
     const author = author_info(entry.frontmatter)
@@ -59,11 +50,7 @@ export const FeaturedCard = ({ entry, source_manifest, direct_html_links, disabl
                 ? null
                 : html`
                       <div class="author">
-                          <img src=${author.image ?? transparent_svg} />
-                          <span>
-                              <a href=${author.url}>${author.name}</a>
-                              ${author.has_coauthors ? html` and others` : null}
-                          </span>
+                          <a href=${author.url}> <img src=${author.image ?? transparent_svg} /><span>${author.name}</span></a>
                       </div>
                   `}
             <h3><a href=${href} title=${entry?.frontmatter?.title}>${entry?.frontmatter?.title ?? entry.id}</a></h3>
@@ -78,13 +65,9 @@ export const FeaturedCard = ({ entry, source_manifest, direct_html_links, disabl
  * name: string?,
  * url: string?,
  * image: string?,
- * has_coauthors?: boolean,
  * }}
  */
 
-/**
- * @returns {AuthorInfo?}
- */
 const author_info = (frontmatter) =>
     author_info_item(frontmatter.author) ??
     author_info_item({
@@ -98,11 +81,9 @@ const author_info = (frontmatter) =>
  */
 const author_info_item = (x) => {
     if (x instanceof Array) {
-        const first = author_info_item(x[0])
-        if (first?.name) {
-            const has_coauthors = x.length > 1
-            return { ...first, has_coauthors }
-        }
+        return author_info_item(x[0])
+    } else if (x == null) {
+        return null
     } else if (typeof x === "string") {
         return {
             name: x,
@@ -112,7 +93,7 @@ const author_info_item = (x) => {
     } else if (x instanceof Object) {
         let { name, image, url } = x
 
-        if (image == null && !_.isEmpty(url)) {
+        if (image == null && url != null) {
             image = url + ".png?size=48"
         }
 
@@ -121,6 +102,7 @@ const author_info_item = (x) => {
             url,
             image,
         }
+    } else {
+        return null
     }
-    return null
 }

From 76c0d6d5b5b36489520e8152a7cc67e96d9e2ff8 Mon Sep 17 00:00:00 2001
From: sebibek <sebibek@gmail.com>
Date: Sun, 10 Dec 2023 12:16:11 +0100
Subject: [PATCH 787/821] use buffer directly

---
 frontend/common/PlutoConnection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/common/PlutoConnection.js b/frontend/common/PlutoConnection.js
index f55f902b3a..808f7265a9 100644
--- a/frontend/common/PlutoConnection.js
+++ b/frontend/common/PlutoConnection.js
@@ -193,7 +193,7 @@ const create_vscode_connection = (address, { on_message, on_socket_close }, time
                     const raw = event.data // The json-encoded data that the extension sent
                     if (raw.type === "ws_proxy") {
                         const buffer = await base64_arraybuffer(raw.base64_encoded)
-                        const message = unpack(new Uint8Array(buffer))
+                        const message = buffer
                         try {
                             console.info("message received!", message)
                             on_message(message)

From 4869831419937fe3aaed96ee9e1c3e4d36e764af Mon Sep 17 00:00:00 2001
From: sebibek <sebibek@gmail.com>
Date: Sun, 10 Dec 2023 15:15:41 +0100
Subject: [PATCH 788/821] carefully restore

---
 frontend/components/Editor.js               |  4 +-
 frontend/components/ExportBanner.js         | 23 ++++++++++-
 frontend/components/FrontmatterInput.js     | 23 +++++++++--
 frontend/components/LiveDocsTab.js          | 10 +++--
 frontend/components/TreeView.js             |  9 +++--
 frontend/components/welcome/Featured.js     | 18 +++++----
 frontend/components/welcome/FeaturedCard.js | 42 +++++++++++++++------
 src/webserver/Dynamic.jl                    |  2 -
 8 files changed, 96 insertions(+), 35 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index f44aa803eb..c9b4439056 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1270,7 +1270,8 @@ patch: ${JSON.stringify(
                 const serialized = this.serialize_selected()
                 if (serialized) {
                     navigator.clipboard.writeText(serialized).catch((err) => {
-                        alert(`Error copying cells: ${e}`)
+                        console.error("Error copying cells", e, err)
+                        alert(`Error copying cells: ${err}`)
                     })
                 }
             }
@@ -1638,6 +1639,7 @@ patch: ${JSON.stringify(
                         backend_launch_phase=${this.state.backend_launch_phase}
                         backend_launch_logs=${this.state.backend_launch_logs}
                         notebook=${this.state.notebook}
+                        sanitize_html=${status.sanitize_html}
                     />
                     <${Popup} 
                         notebook=${this.state.notebook}
diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index dff5a1fb43..043b9afeef 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -1,4 +1,4 @@
-import { html } from "../imports/Preact.js"
+import { html, useEffect, useRef } from "../imports/Preact.js"
 
 const Circle = ({ fill }) => html`
     <svg
@@ -44,7 +44,7 @@ export const WarnForVisisblePasswords = () => {
     }
 }
 
-export const ExportBanner = ({ notebook_id, open, onClose, notebookfile_url, notebookexport_url, start_recording }) => {
+export const ExportBanner = ({ notebook_id, print_title, open, onClose, notebookfile_url, notebookexport_url, start_recording }) => {
     // @ts-ignore
     const isDesktop = !!window.plutoDesktop
 
@@ -55,6 +55,25 @@ export const ExportBanner = ({ notebook_id, open, onClose, notebookfile_url, not
         }
     }
 
+    //
+    let print_old_title_ref = useRef("")
+    useEffect(() => {
+        let a = () => {
+            console.log("beforeprint")
+            print_old_title_ref.current = document.title
+            document.title = print_title.replace(/\.jl$/, "").replace(/\.plutojl$/, "")
+        }
+        let b = () => {
+            document.title = print_old_title_ref.current
+        }
+        window.addEventListener("beforeprint", a)
+        window.addEventListener("afterprint", b)
+        return () => {
+            window.removeEventListener("beforeprint", a)
+            window.removeEventListener("afterprint", b)
+        }
+    }, [print_title])
+
     return html`
         <aside id="export" inert=${!open}>
             <div id="container">
diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index 69fe2cc3b1..26ce5dabd6 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -8,14 +8,16 @@ import "https://cdn.jsdelivr.net/gh/fonsp/rebel-tag-input@1.0.6/lib/rebel-tag-in
 import dialogPolyfill from "https://cdn.jsdelivr.net/npm/dialog-polyfill@0.5.6/dist/dialog-polyfill.esm.min.js"
 import immer from "../imports/immer.js"
 import { useDialog } from "../common/useDialog.js"
+import { FeaturedCard } from "./welcome/FeaturedCard.js"
 
 /**
  * @param {{
+ *  filename: String,
  *  remote_frontmatter: Record<String,any>?,
  *  set_remote_frontmatter: (newval: Record<String,any>) => Promise<void>,
  * }} props
  * */
-export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter }) => {
+export const FrontMatterInput = ({ filename, remote_frontmatter, set_remote_frontmatter }) => {
     const [frontmatter, set_frontmatter] = useState(remote_frontmatter ?? {})
 
     useEffect(() => {
@@ -33,7 +35,7 @@ export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter })
             })
         )
 
-    const [dialog_ref, open, close, _toggle] = useDialog({ light_dismiss: false })
+    const [dialog_ref, open, close, _toggle] = useDialog()
 
     const cancel = () => {
         set_frontmatter(remote_frontmatter ?? {})
@@ -138,6 +140,19 @@ export const FrontMatterInput = ({ remote_frontmatter, set_remote_frontmatter })
             If you are publishing this notebook on the web, you can set the parameters below to provide HTML metadata. This is useful for search engines and
             social media.
         </p>
+        <div class="card-preview">
+            <h2>Preview</h2>
+            <${FeaturedCard}
+                entry=${
+                    /** @type {import("./welcome/Featured.js").SourceManifestNotebookEntry} */ ({
+                        id: filename.replace(/\.jl$/, ""),
+                        hash: "xx",
+                        frontmatter: clean_data(frontmatter) ?? {},
+                    })
+                }
+                disable_links=${true}
+            />
+        </div>
         <div class="fm-table">
             ${entries_input(frontmatter_with_defaults, ``)}
             ${!_.isArray(frontmatter_with_defaults.author)
@@ -205,11 +220,13 @@ const Input = ({ value, on_value, type, id }) => {
         }
     }, [input_ref.current])
 
+    const placeholder = type === "url" ? "https://..." : undefined
+
     return type === "tags"
         ? html`<rbl-tag-input id=${id} ref=${input_ref} />`
         : type === "license"
         ? LicenseInput({ ref: input_ref, id })
-        : html`<input type=${type} id=${id} ref=${input_ref} />`
+        : html`<input type=${type} id=${id} ref=${input_ref} placeholder=${placeholder} />`
 }
 
 // https://choosealicense.com/licenses/
diff --git a/frontend/components/LiveDocsTab.js b/frontend/components/LiveDocsTab.js
index 156297445f..b26c1e27bc 100644
--- a/frontend/components/LiveDocsTab.js
+++ b/frontend/components/LiveDocsTab.js
@@ -12,9 +12,10 @@ import { cl } from "../common/ClassTable.js"
  * desired_doc_query: string?,
  * on_update_doc_query: (query: string) => void,
  * notebook: import("./Editor.js").NotebookData,
+ * sanitize_html?: boolean,
  * }} props
  */
-export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_query, notebook }) => {
+export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_query, notebook, sanitize_html = true }) => {
     let pluto_actions = useContext(PlutoActionsContext)
     let live_doc_search_ref = useRef(/** @type {HTMLInputElement?} */ (null))
 
@@ -22,7 +23,7 @@ export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_quer
     let [state, set_state] = useState({
         shown_query: null,
         searched_query: null,
-        body: "<p>Welcome to the <b>Live docs</b>! Keep this little window open while you work on the notebook, and you will get documentation of everything you type!</p><p>You can also type a query above.</p><hr><p><em>Still stuck? Here are <a href='https://julialang.org/about/help/' target='_blank'>some tips</a>.</em></p>",
+        body: `<p>Welcome to the <b>Live docs</b>! Keep this little window open while you work on the notebook, and you will get documentation of everything you type!</p><p>You can also type a query above.</p><hr><p><em>Still stuck? Here are <a target="_blank" href="https://julialang.org/about/help/">some tips</a>.</em></p>`,
         loading: false,
     })
     let update_state = (mutation) => set_state(immer((state) => mutation(state)))
@@ -74,7 +75,10 @@ export let LiveDocsTab = ({ focus_on_open, desired_doc_query, on_update_doc_quer
         })
     }
 
-    let docs_element = useMemo(() => html`<${RawHTMLContainer} body=${without_workspace_stuff(state.body)} />`, [state.body])
+    let docs_element = useMemo(
+        () => html`<${RawHTMLContainer} body=${without_workspace_stuff(state.body)} sanitize_html=${sanitize_html} sanitize_html_message=${false} />`,
+        [state.body, sanitize_html]
+    )
     let no_docs_found = state.loading === false && state.searched_query !== "" && state.searched_query !== state.shown_query
 
     return html`
diff --git a/frontend/components/TreeView.js b/frontend/components/TreeView.js
index 48ae5ddedd..c15e0c2822 100644
--- a/frontend/components/TreeView.js
+++ b/frontend/components/TreeView.js
@@ -1,6 +1,6 @@
 import { html, useRef, useState, useContext } from "../imports/Preact.js"
 
-import { OutputBody, PlutoImage, RawHTMLContainer } from "./CellOutput.js"
+import { OutputBody, PlutoImage } from "./CellOutput.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
 
 // this is different from OutputBody because:
@@ -24,7 +24,7 @@ export const SimpleOutputBody = ({ mime, body, cell_id, persist_js_state, saniti
         case "text/plain":
             return html`<pre class="no-block">${body}</pre>`
         case "application/vnd.pluto.tree+object":
-            return html`<${TreeView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} />`
+            return html`<${TreeView} cell_id=${cell_id} body=${body} persist_js_state=${persist_js_state} sanitize_html=${sanitize_html} />`
             break
         default:
             return OutputBody({ mime, body, cell_id, persist_js_state, sanitize_html, last_run_timestamp: null })
@@ -199,8 +199,9 @@ export const TableView = ({ mime, body, cell_id, persist_js_state }) => {
     </table>`
 }
 
-export let DivElement = ({ cell_id, style, classname, children, persist_js_state = false }) => {
-    const mimepair_output = (pair) => html`<${SimpleOutputBody} cell_id=${cell_id} mime=${pair[1]} body=${pair[0]} persist_js_state=${persist_js_state} />`
+export let DivElement = ({ cell_id, style, classname, children, persist_js_state = false, sanitize_html = true }) => {
+    const mimepair_output = (pair) =>
+        html`<${SimpleOutputBody} cell_id=${cell_id} mime=${pair[1]} body=${pair[0]} persist_js_state=${persist_js_state} sanitize_html=${sanitize_html} />`
 
     return html`<div style=${style} class=${classname}>${children.map(mimepair_output)}</div>`
 }
diff --git a/frontend/components/welcome/Featured.js b/frontend/components/welcome/Featured.js
index 08f9a4e84b..730a4d1ed8 100644
--- a/frontend/components/welcome/Featured.js
+++ b/frontend/components/welcome/Featured.js
@@ -35,6 +35,8 @@ import { FeaturedCard } from "./FeaturedCard.js"
  *   source_url?: String,
  *   title?: String,
  *   description?: String,
+ *   binder_url?: String,
+ *   slider_server_url?: String,
  * }}
  */
 
@@ -63,12 +65,13 @@ const offline_html = html`
         <p>Here are a couple of notebooks to get started with Pluto.jl:</p>
         <ul>
             <li>1. <a href="sample/Getting%20started.jl">Getting started</a></li>
-            <li>2. <a href="sample/Basic%20mathematics.jl">Basic mathematics</a></li>
-            <li>3. <a href="sample/Interactivity.jl">Interactivity</a></li>
-            <li>4. <a href="sample/PlutoUI.jl.jl">PlutoUI.jl</a></li>
-            <li>5. <a href="sample/Plots.jl.jl">Plots.jl</a></li>
-            <li>6. <a href="sample/Tower%20of%20Hanoi.jl">Tower of Hanoi</a></li>
-            <li>7. <a href="sample/JavaScript.jl">JavaScript</a></li>
+            <li>2. <a href="sample/Markdown.jl">Markdown</a></li>
+            <li>3. <a href="sample/Basic%20mathematics.jl">Basic mathematics</a></li>
+            <li>4. <a href="sample/Interactivity.jl">Interactivity</a></li>
+            <li>5. <a href="sample/PlutoUI.jl.jl">PlutoUI.jl</a></li>
+            <li>6. <a href="sample/Plots.jl.jl">Plots.jl</a></li>
+            <li>7. <a href="sample/Tower%20of%20Hanoi.jl">Tower of Hanoi</a></li>
+            <li>8. <a href="sample/JavaScript.jl">JavaScript</a></li>
         </ul>
         <br />
         <br />
@@ -197,8 +200,7 @@ export const Featured = ({ sources, direct_html_links }) => {
                                       <p>${coll.description}</p>
                                       <div class="card-list">
                                           ${collection(Object.values(data.notebooks), coll.tags ?? []).map(
-                                              (entry) =>
-                                                  html`<${FeaturedCard} entry=${entry} source_url=${data.source_url} direct_html_links=${direct_html_links} />`
+                                              (entry) => html`<${FeaturedCard} entry=${entry} source_manifest=${data} direct_html_links=${direct_html_links} />`
                                           )}
                                       </div>
                                   </div>
diff --git a/frontend/components/welcome/FeaturedCard.js b/frontend/components/welcome/FeaturedCard.js
index b0d05c9192..7911579e55 100644
--- a/frontend/components/welcome/FeaturedCard.js
+++ b/frontend/components/welcome/FeaturedCard.js
@@ -9,17 +9,22 @@ const str_to_degree = (s) => ([...s].reduce((a, b) => a + b.charCodeAt(0), 0) *
 
 /**
  * @param {{
+ *  source_manifest?: import("./Featured.js").SourceManifest,
  *  entry: import("./Featured.js").SourceManifestNotebookEntry,
- *  source_url?: string,
  *  direct_html_links: boolean,
+ *  disable_links: boolean,
  * }} props
  */
-export const FeaturedCard = ({ entry, source_url, direct_html_links }) => {
+export const FeaturedCard = ({ entry, source_manifest, direct_html_links, disable_links }) => {
     const title = entry.frontmatter?.title
 
+    const { source_url } = source_manifest ?? {}
+
     const u = (/** @type {string | null | undefined} */ x) =>
         source_url == null
-            ? x
+            ? _.isEmpty(x)
+                ? null
+                : x
             : x == null
             ? null
             : // URLs are relative to the source URL...
@@ -30,15 +35,19 @@ export const FeaturedCard = ({ entry, source_url, direct_html_links }) => {
               ).href
 
     // `direct_html_links` means that we will navigate you directly to the exported HTML file. Otherwise, we use our local editor, with the exported state as parameters. This lets users run the featured notebooks locally.
-    const href = direct_html_links
+    const href = disable_links
+        ? "#"
+        : direct_html_links
         ? u(entry.html_path)
         : with_query_params(`edit`, {
               statefile: u(entry.statefile_path),
               notebookfile: u(entry.notebookfile_path),
               notebookfile_integrity: `sha256-${base64url_to_base64(entry.hash)}`,
               disable_ui: `true`,
-              pluto_server_url: `.`,
               name: title == null ? null : `sample ${title}`,
+              pluto_server_url: `.`,
+              // Little monkey patch because we don't want to use the slider server when for the CDN source, only for the featured.plutojl.org source. But both sources have the same pluto_export.json so this is easiest.
+              slider_server_url: source_url?.includes("cdn.jsdelivr.net/gh/JuliaPluto/featured") ? null : u(source_manifest?.slider_server_url),
           })
 
     const author = author_info(entry.frontmatter)
@@ -50,7 +59,11 @@ export const FeaturedCard = ({ entry, source_url, direct_html_links }) => {
                 ? null
                 : html`
                       <div class="author">
-                          <a href=${author.url}> <img src=${author.image ?? transparent_svg} /><span>${author.name}</span></a>
+                          <img src=${author.image ?? transparent_svg} />
+                          <span>
+                              <a href=${author.url}>${author.name}</a>
+                              ${author.has_coauthors ? html` and others` : null}
+                          </span>
                       </div>
                   `}
             <h3><a href=${href} title=${entry?.frontmatter?.title}>${entry?.frontmatter?.title ?? entry.id}</a></h3>
@@ -65,9 +78,13 @@ export const FeaturedCard = ({ entry, source_url, direct_html_links }) => {
  * name: string?,
  * url: string?,
  * image: string?,
+ * has_coauthors?: boolean,
  * }}
  */
 
+/**
+ * @returns {AuthorInfo?}
+ */
 const author_info = (frontmatter) =>
     author_info_item(frontmatter.author) ??
     author_info_item({
@@ -81,9 +98,11 @@ const author_info = (frontmatter) =>
  */
 const author_info_item = (x) => {
     if (x instanceof Array) {
-        return author_info_item(x[0])
-    } else if (x == null) {
-        return null
+        const first = author_info_item(x[0])
+        if (first?.name) {
+            const has_coauthors = x.length > 1
+            return { ...first, has_coauthors }
+        }
     } else if (typeof x === "string") {
         return {
             name: x,
@@ -93,7 +112,7 @@ const author_info_item = (x) => {
     } else if (x instanceof Object) {
         let { name, image, url } = x
 
-        if (image == null && url != null) {
+        if (image == null && !_.isEmpty(url)) {
             image = url + ".png?size=48"
         }
 
@@ -102,7 +121,6 @@ const author_info_item = (x) => {
             url,
             image,
         }
-    } else {
-        return null
     }
+    return null
 }
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index b2a20a64b5..8a138813e9 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -179,7 +179,6 @@ const current_state_for_clients_lock = ReentrantLock()
 """
 Update the local state of all clients connected to this notebook.
 """
-
 function send_notebook_changes!(🙋::ClientRequest; commentary::Any=nothing, skip_send::Bool=false)
     outbox = Set{Tuple{ClientSession,UpdateMessage}}()
     
@@ -303,7 +302,6 @@ responses[:update_notebook] = function response_update_notebook(🙋::ClientRequ
         patches = (Base.convert(Firebasey.JSONPatch, update) for update in 🙋.body["updates"])
 
         if length(patches) == 0
-            # @info "Empty patches"
             send_notebook_changes!(🙋)
             return nothing
         end

From d834f5945826675fa40ca68f663ba6b83d933adb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 11 Dec 2023 15:40:52 +0100
Subject: [PATCH 789/821] Fix invisible button issues on touch displays (#2745)

---
 frontend/editor.css | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index df03c12335..49fad51b2a 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -1573,10 +1573,13 @@ pluto-input > button > span {
     button.toggle_export,
     button.start_stop_recording,
     pluto-cell:hover > button,
+    pluto-cell:focus-within > button,
     pluto-cell:hover > pluto-input > button,
+    pluto-cell:focus-within > pluto-input > button,
     pluto-cell > pluto-runarea > button,
-    pluto-cell:hover > pluto-shoulder > button {
-        opacity: 0.4;
+    pluto-cell:hover > pluto-shoulder > button,
+    pluto-cell:focus-within > pluto-shoulder > button {
+        opacity: 0.6;
         transition: opacity 0.25s ease-in-out;
     }
     .export_small_btns button:hover,
@@ -1595,22 +1598,25 @@ pluto-input > button > span {
 }
 
 @media screen and (pointer: coarse) {
-    pluto-cell > button,
-    pluto-cell > pluto-runarea {
-        opacity: 0;
-        /* to make it feel smooth: */
-        transition: opacity 0.25s ease-in-out;
-    }
+    pluto-cell > button.add_cell,
     pluto-input > button,
     pluto-shoulder > button {
         opacity: 0.25;
         transition: opacity 0.25s ease-in-out;
     }
-    pluto-cell:focus-within > button,
+    pluto-cell:not(:first-of-type, :last-of-type) > button.add_cell {
+        /* because there are two overlapping buttons */
+        opacity: 0.125;
+    }
+    /* pluto-cell:first-of-type > button.add_cell.before,
+    pluto-cell:last-of-type > button.add_cell.after {
+        opacity: 0.25;
+    } */
+    pluto-cell:focus-within > button.add_cell,
     pluto-cell:focus-within > pluto-input > button,
     pluto-cell:focus-within > pluto-runarea,
     pluto-cell:focus-within > pluto-shoulder > button {
-        opacity: 0.25;
+        opacity: 0.6;
         transition: opacity 0.25s ease-in-out;
     }
     pluto-cell > pluto-input > button:focus-within,

From 8d98ceecff019c7ca55af55334aad06a2ced5ff4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 11 Dec 2023 15:50:28 +0100
Subject: [PATCH 790/821] Some tab indexing improvements (#2744)

---
 frontend/components/Cell.js                      | 14 ++++++++------
 frontend/components/CellInput.js                 |  2 ++
 .../components/CellInput/pkg_bubble_plugin.js    |  6 ------
 .../components/CellInput/pluto_autocomplete.js   |  8 +++++---
 frontend/components/CellOutput.js                |  7 ++-----
 frontend/components/Editor.js                    | 16 +++++++++++++---
 frontend/components/Notebook.js                  |  4 ++++
 frontend/editor.css                              |  4 ----
 8 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 8014c24fc9..5cd9932ce7 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -117,6 +117,7 @@ export const Cell = ({
     sanitize_html = true,
     nbpkg,
     global_definition_locations,
+    is_first_cell,
 }) => {
     const { show_logs, disabled: running_disabled, skip_as_script } = metadata
     let pluto_actions = useContext(PlutoActionsContext)
@@ -303,21 +304,22 @@ export const Cell = ({
             id=${cell_id}
         >
             ${variables.map((name) => html`<span id=${encodeURI(name)} />`)}
-            <pluto-shoulder draggable="true" title="Drag to move cell">
-                <button onClick=${on_code_fold} class="foldcode" title="Show/hide code">
-                    <span></span>
-                </button>
-            </pluto-shoulder>
-            <pluto-trafficlight></pluto-trafficlight>
             <button
                 onClick=${() => {
                     pluto_actions.add_remote_cell(cell_id, "before")
                 }}
                 class="add_cell before"
                 title="Add cell (Ctrl + Enter)"
+                tabindex=${is_first_cell ? undefined : "-1"}
             >
                 <span></span>
             </button>
+            <pluto-shoulder draggable="true" title="Drag to move cell">
+                <button onClick=${on_code_fold} class="foldcode" title="Show/hide code">
+                    <span></span>
+                </button>
+            </pluto-shoulder>
+            <pluto-trafficlight></pluto-trafficlight>
             ${code_not_trusted_yet
                 ? html`<${SafePreviewOutput} />`
                 : cell_api_ready
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index cec87eb7d5..50b69f6944 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -437,6 +437,8 @@ export const CellInput = ({
 
         let select_autocomplete_command = autocomplete.completionKeymap.find((keybinding) => keybinding.key === "Enter")
         let keyMapTab = (/** @type {EditorView} */ cm) => {
+            // I think this only gets called when we are not in an autocomplete situation, otherwise `tab_completion_command` is called. I think it only happens when you have a selection.
+
             if (cm.state.readOnly) {
                 return false
             }
diff --git a/frontend/components/CellInput/pkg_bubble_plugin.js b/frontend/components/CellInput/pkg_bubble_plugin.js
index 05d66455bc..fcab9e6a8a 100644
--- a/frontend/components/CellInput/pkg_bubble_plugin.js
+++ b/frontend/components/CellInput/pkg_bubble_plugin.js
@@ -278,11 +278,5 @@ export const pkgBubblePlugin = ({ pluto_actions, notebook_id_ref }) =>
         },
         {
             decorations: (v) => v.decorations,
-
-            eventHandlers: {
-                pointerdown: (e, view) => {
-                    let target = e.target
-                },
-            },
         }
     )
diff --git a/frontend/components/CellInput/pluto_autocomplete.js b/frontend/components/CellInput/pluto_autocomplete.js
index e49fdbd1fb..7b9f5f8ad3 100644
--- a/frontend/components/CellInput/pluto_autocomplete.js
+++ b/frontend/components/CellInput/pluto_autocomplete.js
@@ -22,8 +22,7 @@ let { autocompletion, completionKeymap, completionStatus, acceptCompletion } = a
 
 // Option.source is now the source, we find to find the corresponding ActiveResult
 // https://github.com/codemirror/autocomplete/commit/6d9f24115e9357dc31bc265cd3da7ce2287fdcbd
-const getActiveResult = (view, source) =>
-    view.state.field(completionState).active.find(a => a.source == source)
+const getActiveResult = (view, source) => view.state.field(completionState).active.find((a) => a.source == source)
 
 // These should be imported from  @codemirror/autocomplete, but they are not exported.
 let completionState = autocompletion()[0]
@@ -78,6 +77,9 @@ const tab_completion_command = (cm) => {
     if (acceptCompletion(cm)) {
         return true
     }
+    if (cm.state.readOnly) {
+        return false
+    }
 
     let selection = cm.state.selection.main
     let last_char = cm.state.sliceDoc(selection.from - 1, selection.from)
@@ -137,7 +139,7 @@ let update_docs_from_autocomplete_selection = (on_update_doc_query) => {
         if (!active_result?.from) return // not an ActiveResult instance
 
         const from = active_result.from,
-              to = Math.min(active_result.to, update.state.doc.length)
+            to = Math.min(active_result.to, update.state.doc.length)
 
         // Apply completion to state, which will yield us a `Transaction`.
         // The nice thing about this is that we can use the resulting state from the transaction,
diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index ce35e93da5..a58979b88e 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -28,10 +28,8 @@ import { julia_mixed } from "./CellInput/mixedParsers.js"
 import { julia_andrey } from "../imports/CodemirrorPlutoSetup.js"
 import { SafePreviewSanitizeMessage } from "./SafePreviewUI.js"
 
-const prettyAssignee = assignee =>
-        assignee && assignee.startsWith("const ") ?
-        html`<span style="color: var(--cm-keyword-color)">const</span> ${assignee.slice(6,)}` :
-        assignee
+const prettyAssignee = (assignee) =>
+    assignee && assignee.startsWith("const ") ? html`<span style="color: var(--cm-keyword-color)">const</span> ${assignee.slice(6)}` : assignee
 
 export class CellOutput extends Component {
     constructor() {
@@ -78,7 +76,6 @@ export class CellOutput extends Component {
                 this.props.mime !== "application/vnd.pluto.table+object" &&
                 this.props.mime !== "text/plain")
         const allow_translate = !this.props.errored && rich_output
-        console.log({ro: this.props.rootassignee})
         return html`
             <pluto-output
                 class=${cl({
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 628ee51089..20bcf630a6 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1456,9 +1456,19 @@ patch: ${JSON.stringify(
             <${PlutoActionsContext.Provider} value=${this.actions}>
                 <${PlutoBondsContext.Provider} value=${this.state.notebook.bonds}>
                     <${PlutoJSInitializingContext.Provider} value=${this.js_init_set}>
-                    <button title="Go back" onClick=${() => {
-                        history.back()
-                    }} class="floating_back_button"><span></span></button>
+                    ${
+                        status.static_preview && status.offer_local
+                            ? html`<button
+                                  title="Go back"
+                                  onClick=${() => {
+                                      history.back()
+                                  }}
+                                  class="floating_back_button"
+                              >
+                                  <span></span>
+                              </button>`
+                            : null
+                    }
                     <${Scroller} active=${this.state.scroller} />
                     <${ProgressBar} notebook=${this.state.notebook} backend_launch_phase=${this.state.backend_launch_phase} status=${status}/>
                     <header id="pluto-nav" className=${export_menu_open ? "show_export" : ""}>
diff --git a/frontend/components/Notebook.js b/frontend/components/Notebook.js
index 6158966bba..fcda9dcd46 100644
--- a/frontend/components/Notebook.js
+++ b/frontend/components/Notebook.js
@@ -41,6 +41,7 @@ let CellMemo = ({
     set_show_logs,
     nbpkg,
     global_definition_locations,
+    is_first_cell,
 }) => {
     const { body, last_run_timestamp, mime, persist_js_state, rootassignee } = cell_result?.output || {}
     const { queued, running, runtime, errored, depends_on_disabled_cells, logs, depends_on_skipped_cells } = cell_result || {}
@@ -62,6 +63,7 @@ let CellMemo = ({
                 sanitize_html=${sanitize_html}
                 nbpkg=${nbpkg}
                 global_definition_locations=${global_definition_locations}
+                is_first_cell=${is_first_cell}
             />
         `
     }, [
@@ -95,6 +97,7 @@ let CellMemo = ({
         sanitize_html,
         ...nbpkg_fingerprint(nbpkg),
         global_definition_locations,
+        is_first_cell,
     ])
 }
 
@@ -192,6 +195,7 @@ export const Notebook = ({
                         sanitize_html=${sanitize_html}
                         nbpkg=${notebook.nbpkg}
                         global_definition_locations=${global_definition_locations}
+                        is_first_cell=${i === 0}
                     />`
                 )}
             ${cell_outputs_delayed && notebook.cell_order.length >= render_cell_outputs_minimum
diff --git a/frontend/editor.css b/frontend/editor.css
index 49fad51b2a..083cd9a95b 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -3140,10 +3140,6 @@ nav#slide_controls > button.next > span::after {
 }
 
 button.floating_back_button {
-    display: none;
-}
-
-.static_preview.offer_local button.floating_back_button {
     display: flex;
     position: fixed;
     z-index: 1000;

From 39bfaf156612c990fb90f339ddaff489a5f01eb4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 12 Dec 2023 01:03:34 +0100
Subject: [PATCH 791/821] Show help when stuck in tab index trap (#2746)

---
 frontend/common/Bond.js                       |  2 +-
 frontend/common/open_pluto_popup.js           |  7 ++
 frontend/components/Cell.js                   |  2 +-
 frontend/components/CellInput.js              |  3 +
 .../components/CellInput/tab_help_plugin.js   | 76 +++++++++++++++++++
 frontend/components/Editor.js                 |  3 +-
 frontend/components/FilePicker.js             |  2 +
 frontend/components/Logs.js                   |  3 +-
 frontend/components/PkgStatusMark.js          |  2 +-
 frontend/components/Popup.js                  |  7 +-
 frontend/components/RunArea.js                |  2 +-
 frontend/components/SafePreviewUI.js          |  2 +-
 frontend/components/SlideControls.js          |  1 -
 frontend/imports/AnsiUp.js                    |  1 -
 14 files changed, 99 insertions(+), 14 deletions(-)
 create mode 100644 frontend/common/open_pluto_popup.js
 create mode 100644 frontend/components/CellInput/tab_help_plugin.js

diff --git a/frontend/common/Bond.js b/frontend/common/Bond.js
index 6efc6b2b4d..7cd904fc30 100644
--- a/frontend/common/Bond.js
+++ b/frontend/common/Bond.js
@@ -1,7 +1,7 @@
 // import Generators_input from "https://unpkg.com/@observablehq/stdlib@3.3.1/src/generators/input.js"
 // import Generators_input from "https://unpkg.com/@observablehq/stdlib@3.3.1/src/generators/input.js"
 
-import { open_pluto_popup } from "../components/Popup.js"
+import { open_pluto_popup } from "../common/open_pluto_popup.js"
 import _ from "../imports/lodash.js"
 import { html } from "../imports/Preact.js"
 import observablehq from "./SetupCellEnvironment.js"
diff --git a/frontend/common/open_pluto_popup.js b/frontend/common/open_pluto_popup.js
new file mode 100644
index 0000000000..2f69b7c084
--- /dev/null
+++ b/frontend/common/open_pluto_popup.js
@@ -0,0 +1,7 @@
+export const open_pluto_popup = (/** @type{import("../components/Popup").PkgPopupDetails | import("../components/Popup").MiscPopupDetails} */ detail) => {
+    window.dispatchEvent(
+        new CustomEvent("open pluto popup", {
+            detail,
+        })
+    )
+}
diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index 5cd9932ce7..a6e90612ff 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -7,7 +7,7 @@ import { Logs } from "./Logs.js"
 import { RunArea, useDebouncedTruth } from "./RunArea.js"
 import { cl } from "../common/ClassTable.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
-import { open_pluto_popup } from "./Popup.js"
+import { open_pluto_popup } from "../common/open_pluto_popup.js"
 import { SafePreviewOutput } from "./SafePreviewUI.js"
 
 const useCellApi = (node_ref, published_object_keys, pluto_actions) => {
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 50b69f6944..05d2b64550 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -67,6 +67,7 @@ import { ScopeStateField } from "./CellInput/scopestate_statefield.js"
 import { mod_d_command } from "./CellInput/mod_d_command.js"
 import { open_bottom_right_panel } from "./BottomRightPanel.js"
 import { timeout_promise } from "../common/PlutoConnection.js"
+import { LastFocusWasForcedEffect, tab_help_plugin } from "./CellInput/tab_help_plugin.js"
 
 export const ENABLE_CM_MIXED_PARSER = window.localStorage.getItem("ENABLE_CM_MIXED_PARSER") === "true"
 
@@ -638,6 +639,7 @@ export const CellInput = ({
                     highlightSelectionMatches(),
                     bracketMatching(),
                     docs_updater,
+                    tab_help_plugin,
                     // Remove selection on blur
                     EditorView.domEventHandlers({
                         blur: (event, view) => {
@@ -865,6 +867,7 @@ export const CellInput = ({
                     EditorView.scrollIntoView(EditorSelection.range(new_selection.anchor, new_selection.head), {
                         yMargin: 80,
                     }),
+                    LastFocusWasForcedEffect.of(true),
                 ],
             })
         }
diff --git a/frontend/components/CellInput/tab_help_plugin.js b/frontend/components/CellInput/tab_help_plugin.js
new file mode 100644
index 0000000000..a3394174e0
--- /dev/null
+++ b/frontend/components/CellInput/tab_help_plugin.js
@@ -0,0 +1,76 @@
+import { open_pluto_popup } from "../../common/open_pluto_popup.js"
+import { ViewPlugin, StateEffect, StateField } from "../../imports/CodemirrorPlutoSetup.js"
+import _ from "../../imports/lodash.js"
+import { html } from "../../imports/Preact.js"
+
+/** @type {any} */
+const TabHelpEffect = StateEffect.define()
+const TabHelp = StateField.define({
+    create() {
+        return false
+    },
+    update(value, tr) {
+        for (let effect of tr.effects) {
+            if (effect.is(TabHelpEffect)) return effect.value
+        }
+        return value
+    },
+})
+
+/** @type {any} */
+export const LastFocusWasForcedEffect = StateEffect.define()
+const LastFocusWasForced = StateField.define({
+    create() {
+        return false
+    },
+    update(value, tr) {
+        for (let effect of tr.effects) {
+            if (effect.is(LastFocusWasForcedEffect)) return effect.value
+        }
+        return value
+    },
+})
+
+export const tab_help_plugin = ViewPlugin.define(
+    (view) => ({
+        setready: (x) =>
+            view.dispatch({
+                effects: [TabHelpEffect.of(x)],
+            }),
+    }),
+    {
+        provide: (p) => [TabHelp, LastFocusWasForced],
+        eventObservers: {
+            focus: function (event, view) {
+                // The next key should trigger the popup
+                this.setready(true)
+            },
+            blur: function (event, view) {
+                this.setready(false)
+                view.dispatch({
+                    effects: [LastFocusWasForcedEffect.of(false)],
+                })
+            },
+            click: function (event, view) {
+                // This means you are not doing keyboard navigation :)
+                this.setready(false)
+            },
+            keydown: function (event, view) {
+                console.error(event.key, view.state.field(TabHelp), view.state.field(LastFocusWasForced))
+                if (event.key == "Tab") {
+                    if (view.state.field(TabHelp) && !view.state.field(LastFocusWasForced) && !view.state.readOnly) {
+                        console.log(123)
+                        open_pluto_popup({
+                            type: "info",
+                            source_element: view.dom,
+                            body: html`Press <kbd>Esc</kbd> and then <kbd>Tab</kbd> to continue navigation.`,
+                        })
+                        this.setready(false)
+                    }
+                } else {
+                    this.setready(false)
+                }
+            },
+        },
+    }
+)
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 20bcf630a6..0cbaf8045e 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -18,7 +18,7 @@ import { RecentlyDisabledInfo, UndoDelete } from "./UndoDelete.js"
 import { SlideControls } from "./SlideControls.js"
 import { Scroller } from "./Scroller.js"
 import { ExportBanner } from "./ExportBanner.js"
-import { open_pluto_popup, Popup } from "./Popup.js"
+import { Popup } from "./Popup.js"
 
 import { slice_utf8, length_utf8 } from "../common/UnicodeTools.js"
 import { has_ctrl_or_cmd_pressed, ctrl_or_cmd_name, is_mac_keyboard, in_textarea_or_input } from "../common/KeyboardShortcuts.js"
@@ -36,6 +36,7 @@ import { EditorLaunchBackendButton } from "./Editor/LaunchBackendButton.js"
 import { get_environment } from "../common/Environment.js"
 import { ProcessStatus } from "../common/ProcessStatus.js"
 import { SafePreviewUI } from "./SafePreviewUI.js"
+import { open_pluto_popup } from "../common/open_pluto_popup.js"
 
 // This is imported asynchronously - uncomment for development
 // import environment from "../common/Environment.js"
diff --git a/frontend/components/FilePicker.js b/frontend/components/FilePicker.js
index 18cdfc2f12..c44be28d57 100644
--- a/frontend/components/FilePicker.js
+++ b/frontend/components/FilePicker.js
@@ -16,6 +16,7 @@ import {
     StateEffect,
 } from "../imports/CodemirrorPlutoSetup.js"
 import { guess_notebook_location } from "../common/NotebookLocationFromURL.js"
+import { tab_help_plugin } from "./CellInput/tab_help_plugin.js"
 
 let { autocompletion, completionKeymap } = autocomplete
 
@@ -248,6 +249,7 @@ export const FilePicker = ({ value, suggest_new_file, button_label, placeholder,
                     keymap.of(completionKeymap),
 
                     Placeholder(placeholder),
+                    tab_help_plugin,
                 ],
             }),
         })
diff --git a/frontend/components/Logs.js b/frontend/components/Logs.js
index 529d55bb7a..6dceaae746 100644
--- a/frontend/components/Logs.js
+++ b/frontend/components/Logs.js
@@ -2,8 +2,9 @@ import _ from "../imports/lodash.js"
 import { cl } from "../common/ClassTable.js"
 import { html, useState, useEffect, useLayoutEffect, useRef, useMemo } from "../imports/Preact.js"
 import { SimpleOutputBody } from "./TreeView.js"
-import { help_circle_icon, open_pluto_popup } from "./Popup.js"
+import { help_circle_icon } from "./Popup.js"
 import AnsiUp from "../imports/AnsiUp.js"
+import { open_pluto_popup } from "../common/open_pluto_popup.js"
 
 const LOGS_VISIBLE_START = 60
 const LOGS_VISIBLE_END = 20
diff --git a/frontend/components/PkgStatusMark.js b/frontend/components/PkgStatusMark.js
index 4779948a58..ce52e99659 100644
--- a/frontend/components/PkgStatusMark.js
+++ b/frontend/components/PkgStatusMark.js
@@ -1,6 +1,6 @@
+import { open_pluto_popup } from "../common/open_pluto_popup.js"
 import _ from "../imports/lodash.js"
 import { html, useEffect, useState } from "../imports/Preact.js"
-import { open_pluto_popup } from "./Popup.js"
 
 export const nbpkg_fingerprint = (nbpkg) => (nbpkg == null ? [null] : Object.entries(nbpkg).flat())
 
diff --git a/frontend/components/Popup.js b/frontend/components/Popup.js
index f3b78f6918..f94947c67d 100644
--- a/frontend/components/Popup.js
+++ b/frontend/components/Popup.js
@@ -1,13 +1,10 @@
-import { html, useState, useRef, useLayoutEffect, useEffect, useMemo, useContext } from "../imports/Preact.js"
-import immer from "../imports/immer.js"
-import observablehq from "../common/SetupCellEnvironment.js"
+import { html, useState, useRef, useEffect, useContext } from "../imports/Preact.js"
 import { cl } from "../common/ClassTable.js"
 
-import { RawHTMLContainer, highlight } from "./CellOutput.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
 import { package_status, nbpkg_fingerprint_without_terminal } from "./PkgStatusMark.js"
 import { PkgTerminalView } from "./PkgTerminalView.js"
-import { prettytime, useDebouncedTruth } from "./RunArea.js"
+import { useDebouncedTruth } from "./RunArea.js"
 import { time_estimate, usePackageTimingData } from "../common/InstallTimeEstimate.js"
 import { pretty_long_time } from "./EditOrRunButton.js"
 
diff --git a/frontend/components/RunArea.js b/frontend/components/RunArea.js
index db4b3a5fc3..33a92873e2 100644
--- a/frontend/components/RunArea.js
+++ b/frontend/components/RunArea.js
@@ -3,7 +3,7 @@ import { html, useContext, useEffect, useMemo, useState } from "../imports/Preac
 
 import { in_textarea_or_input } from "../common/KeyboardShortcuts.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
-import { open_pluto_popup } from "./Popup.js"
+import { open_pluto_popup } from "../common/open_pluto_popup.js"
 
 export const RunArea = ({
     runtime,
diff --git a/frontend/components/SafePreviewUI.js b/frontend/components/SafePreviewUI.js
index 8ebb973f3a..0445b985b3 100644
--- a/frontend/components/SafePreviewUI.js
+++ b/frontend/components/SafePreviewUI.js
@@ -1,6 +1,6 @@
+import { open_pluto_popup } from "../common/open_pluto_popup.js"
 import _ from "../imports/lodash.js"
 import { html } from "../imports/Preact.js"
-import { open_pluto_popup } from "./Popup.js"
 
 export const SafePreviewUI = ({ process_waiting_for_permission, risky_file_source, restart, warn_about_untrusted_code }) => {
     return html`
diff --git a/frontend/components/SlideControls.js b/frontend/components/SlideControls.js
index d1295b436c..a6592b1c1f 100644
--- a/frontend/components/SlideControls.js
+++ b/frontend/components/SlideControls.js
@@ -1,5 +1,4 @@
 import { html, useRef, useState, useLayoutEffect, useEffect } from "../imports/Preact.js"
-import { open_pluto_popup } from "./Popup.js"
 
 export const SlideControls = () => {
     const button_prev_ref = useRef(/** @type {HTMLButtonElement?} */ (null))
diff --git a/frontend/imports/AnsiUp.js b/frontend/imports/AnsiUp.js
index 4678c273fe..b85fc8f296 100644
--- a/frontend/imports/AnsiUp.js
+++ b/frontend/imports/AnsiUp.js
@@ -1,3 +1,2 @@
 // @ts-ignore
 export default AnsiUp = window.AnsiUp
-// export default window.AnsiUp

From 58c299c580937c91f6950b08b5ee0400ebc2bc90 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 12 Dec 2023 01:08:17 +0100
Subject: [PATCH 792/821] skkrttt!

---
 frontend/components/CellInput/tab_help_plugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/CellInput/tab_help_plugin.js b/frontend/components/CellInput/tab_help_plugin.js
index a3394174e0..0e35d264cd 100644
--- a/frontend/components/CellInput/tab_help_plugin.js
+++ b/frontend/components/CellInput/tab_help_plugin.js
@@ -63,7 +63,7 @@ export const tab_help_plugin = ViewPlugin.define(
                         open_pluto_popup({
                             type: "info",
                             source_element: view.dom,
-                            body: html`Press <kbd>Esc</kbd> and then <kbd>Tab</kbd> to continue navigation.`,
+                            body: html`Press <kbd>Esc</kbd> and then <kbd>Tab</kbd> to continue navigation. <em style="font-size: .6em;">skkrt!</em>`,
                         })
                         this.setready(false)
                     }

From 3ba1ffa973cf8e8a378454f366e4dd882098e322 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 12 Dec 2023 09:42:50 +0100
Subject: [PATCH 793/821] fix tab help message for new cells

---
 frontend/components/CellInput.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 05d2b64550..79a1d94605 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -775,6 +775,7 @@ export const CellInput = ({
                         anchor: view.state.doc.length,
                         head: view.state.doc.length,
                     },
+                    effects: [LastFocusWasForcedEffect.of(true)],
                 })
                 view.focus()
             })

From 7f8ddf53b32f0db5311bfd6230b231b9b3f42aed Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 12 Dec 2023 14:14:51 +0100
Subject: [PATCH 794/821] little cleanup: useEventListener hook (#2749)

---
 frontend/common/useDialog.js                  | 12 +--
 frontend/common/useEventListener.js           | 10 +++
 frontend/components/BottomRightPanel.js       | 14 ++--
 frontend/components/Cell.js                   | 55 ++++++-------
 .../components/CellInput/tab_help_plugin.js   |  2 -
 frontend/components/ExportBanner.js           | 27 ++++---
 frontend/components/FrontmatterInput.js       | 62 ++++++--------
 .../HijackExternalLinksToOpenInNewTab.js      | 18 +++--
 frontend/components/NonCellOutput.js          | 14 ++--
 frontend/components/PasteHandler.js           | 17 ++--
 frontend/components/Popup.js                  | 81 +++++++++----------
 frontend/components/Scroller.js               | 17 ++--
 frontend/components/UndoDelete.js             |  2 +-
 13 files changed, 161 insertions(+), 170 deletions(-)
 create mode 100644 frontend/common/useEventListener.js

diff --git a/frontend/common/useDialog.js b/frontend/common/useDialog.js
index 3c03f5fb70..9a81064704 100644
--- a/frontend/common/useDialog.js
+++ b/frontend/common/useDialog.js
@@ -1,7 +1,7 @@
 //@ts-ignore
 import dialogPolyfill from "https://cdn.jsdelivr.net/npm/dialog-polyfill@0.5.6/dist/dialog-polyfill.esm.min.js"
 
-import { useEffect, useLayoutEffect, useRef } from "../imports/Preact.js"
+import { useLayoutEffect, useMemo, useRef } from "../imports/Preact.js"
 
 /**
  * @returns {[import("../imports/Preact.js").Ref<HTMLDialogElement?>, () => void, () => void, () => void]}
@@ -13,9 +13,11 @@ export const useDialog = () => {
         if (dialog_ref.current != null) dialogPolyfill.registerDialog(dialog_ref.current)
     }, [dialog_ref.current])
 
-    const open = () => dialog_ref.current?.showModal()
-    const close = () => dialog_ref.current?.close()
-    const toggle = () => (dialog_ref.current?.open === true ? dialog_ref.current?.close() : dialog_ref.current?.showModal())
+    return useMemo(() => {
+        const open = () => dialog_ref.current?.showModal()
+        const close = () => dialog_ref.current?.close()
+        const toggle = () => (dialog_ref.current?.open === true ? dialog_ref.current?.close() : dialog_ref.current?.showModal())
 
-    return [dialog_ref, open, close, toggle]
+        return [dialog_ref, open, close, toggle]
+    }, [dialog_ref])
 }
diff --git a/frontend/common/useEventListener.js b/frontend/common/useEventListener.js
new file mode 100644
index 0000000000..1fcb44514a
--- /dev/null
+++ b/frontend/common/useEventListener.js
@@ -0,0 +1,10 @@
+import { useCallback, useEffect } from "../imports/Preact.js"
+
+export const useEventListener = (element, event_name, handler, deps) => {
+    let handler_cached = useCallback(handler, deps)
+    useEffect(() => {
+        if (element == null) return
+        element.addEventListener(event_name, handler_cached)
+        return () => element.removeEventListener(event_name, handler_cached)
+    }, [element, event_name, handler_cached])
+}
diff --git a/frontend/components/BottomRightPanel.js b/frontend/components/BottomRightPanel.js
index f7ade801c4..df7c8b2a2c 100644
--- a/frontend/components/BottomRightPanel.js
+++ b/frontend/components/BottomRightPanel.js
@@ -5,6 +5,7 @@ import { LiveDocsTab } from "./LiveDocsTab.js"
 import { is_finished, ProcessTab, total_done, total_tasks, useStatusItem } from "./ProcessTab.js"
 import { useMyClockIsAheadBy } from "../common/clock sync.js"
 import { BackendLaunchPhase } from "../common/Binder.js"
+import { useEventListener } from "../common/useEventListener.js"
 
 /**
  * @typedef PanelTabName
@@ -40,8 +41,10 @@ export let BottomRightPanel = ({
     const hidden = open_tab == null
 
     // Open panel when "open_bottom_right_panel" event is triggered
-    useEffect(() => {
-        let handler = (/** @type {CustomEvent} */ e) => {
+    useEventListener(
+        window,
+        "open_bottom_right_panel",
+        (/** @type {CustomEvent} */ e) => {
             console.log(e.detail)
             // https://github.com/fonsp/Pluto.jl/issues/321
             focus_docs_on_open_ref.current = false
@@ -49,10 +52,9 @@ export let BottomRightPanel = ({
             if (window.getComputedStyle(container_ref.current).display === "none") {
                 alert("This browser window is too small to show docs.\n\nMake the window bigger, or try zooming out.")
             }
-        }
-        window.addEventListener("open_bottom_right_panel", handler)
-        return () => window.removeEventListener("open_bottom_right_panel", handler)
-    }, [])
+        },
+        [set_open_tab]
+    )
 
     const status = useWithBackendStatus(notebook, backend_launch_phase)
 
diff --git a/frontend/components/Cell.js b/frontend/components/Cell.js
index a6e90612ff..81afa26d80 100644
--- a/frontend/components/Cell.js
+++ b/frontend/components/Cell.js
@@ -9,6 +9,7 @@ import { cl } from "../common/ClassTable.js"
 import { PlutoActionsContext } from "../common/PlutoContext.js"
 import { open_pluto_popup } from "../common/open_pluto_popup.js"
 import { SafePreviewOutput } from "./SafePreviewUI.js"
+import { useEventListener } from "../common/useEventListener.js"
 
 const useCellApi = (node_ref, published_object_keys, pluto_actions) => {
     const [cell_api_ready, set_cell_api_ready] = useState(false)
@@ -145,30 +146,34 @@ export const Cell = ({
     const [cm_highlighted_line, set_cm_highlighted_line] = useState(null)
     const [cm_diagnostics, set_cm_diagnostics] = useState([])
 
-    useEffect(() => {
-        const diagnosticListener = (e) => {
+    useEventListener(
+        window,
+        "cell_diagnostics",
+        (e) => {
             if (e.detail.cell_id === cell_id) {
                 set_cm_diagnostics(e.detail.diagnostics)
             }
-        }
-        window.addEventListener("cell_diagnostics", diagnosticListener)
-        return () => window.removeEventListener("cell_diagnostics", diagnosticListener)
-    }, [cell_id])
+        },
+        [cell_id, set_cm_diagnostics]
+    )
 
-    useEffect(() => {
-        const highlightRangeListener = (e) => {
+    useEventListener(
+        window,
+        "cell_highlight_range",
+        (e) => {
             if (e.detail.cell_id == cell_id && e.detail.from != null && e.detail.to != null) {
                 set_cm_highlighted_range({ from: e.detail.from, to: e.detail.to })
             } else {
                 set_cm_highlighted_range(null)
             }
-        }
-        window.addEventListener("cell_highlight_range", highlightRangeListener)
-        return () => window.removeEventListener("cell_highlight_range", highlightRangeListener)
-    }, [cell_id])
+        },
+        [cell_id]
+    )
 
-    useEffect(() => {
-        const focusListener = (e) => {
+    useEventListener(
+        window,
+        "cell_focus",
+        useCallback((e) => {
             if (e.detail.cell_id === cell_id) {
                 if (e.detail.line != null) {
                     const ch = e.detail.ch
@@ -187,13 +192,8 @@ export const Cell = ({
                     }
                 }
             }
-        }
-        window.addEventListener("cell_focus", focusListener)
-        // cleanup
-        return () => {
-            window.removeEventListener("cell_focus", focusListener)
-        }
-    }, [])
+        }, [])
+    )
 
     // When you click to run a cell, we use `waiting_to_run` to immediately set the cell's traffic light to 'queued', while waiting for the backend to catch up.
     const [waiting_to_run, set_waiting_to_run] = useState(false)
@@ -219,13 +219,14 @@ export const Cell = ({
     disable_input_ref.current = disable_input
     const should_set_waiting_to_run_ref = useRef(true)
     should_set_waiting_to_run_ref.current = !running_disabled && !depends_on_disabled_cells
-    useEffect(() => {
-        const handler = (e) => {
+    useEventListener(
+        window,
+        "set_waiting_to_run_smart",
+        (e) => {
             if (e.detail.cell_ids.includes(cell_id)) set_waiting_to_run(should_set_waiting_to_run_ref.current)
-        }
-        window.addEventListener("set_waiting_to_run_smart", handler)
-        return () => window.removeEventListener("set_waiting_to_run_smart", handler)
-    }, [cell_id])
+        },
+        [cell_id, set_waiting_to_run]
+    )
 
     const cell_api_ready = useCellApi(node_ref, published_object_keys, pluto_actions)
     const on_delete = useCallback(() => {
diff --git a/frontend/components/CellInput/tab_help_plugin.js b/frontend/components/CellInput/tab_help_plugin.js
index 0e35d264cd..228088a6c9 100644
--- a/frontend/components/CellInput/tab_help_plugin.js
+++ b/frontend/components/CellInput/tab_help_plugin.js
@@ -56,10 +56,8 @@ export const tab_help_plugin = ViewPlugin.define(
                 this.setready(false)
             },
             keydown: function (event, view) {
-                console.error(event.key, view.state.field(TabHelp), view.state.field(LastFocusWasForced))
                 if (event.key == "Tab") {
                     if (view.state.field(TabHelp) && !view.state.field(LastFocusWasForced) && !view.state.readOnly) {
-                        console.log(123)
                         open_pluto_popup({
                             type: "info",
                             source_element: view.dom,
diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index 043b9afeef..959f659262 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -1,3 +1,4 @@
+import { useEventListener } from "../common/useEventListener.js"
 import { html, useEffect, useRef } from "../imports/Preact.js"
 
 const Circle = ({ fill }) => html`
@@ -57,22 +58,24 @@ export const ExportBanner = ({ notebook_id, print_title, open, onClose, notebook
 
     //
     let print_old_title_ref = useRef("")
-    useEffect(() => {
-        let a = () => {
+    useEventListener(
+        window,
+        "beforeprint",
+        () => {
             console.log("beforeprint")
             print_old_title_ref.current = document.title
             document.title = print_title.replace(/\.jl$/, "").replace(/\.plutojl$/, "")
-        }
-        let b = () => {
+        },
+        [print_title]
+    )
+    useEventListener(
+        window,
+        "afterprint",
+        () => {
             document.title = print_old_title_ref.current
-        }
-        window.addEventListener("beforeprint", a)
-        window.addEventListener("afterprint", b)
-        return () => {
-            window.removeEventListener("beforeprint", a)
-            window.removeEventListener("afterprint", b)
-        }
-    }, [print_title])
+        },
+        [print_title]
+    )
 
     return html`
         <aside id="export" inert=${!open}>
diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index 26ce5dabd6..ee792cb2ac 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -1,14 +1,14 @@
-import { html, Component, useRef, useLayoutEffect, useState, useEffect } from "../imports/Preact.js"
+import { html, useRef, useLayoutEffect, useState, useEffect, useCallback } from "../imports/Preact.js"
 import { has_ctrl_or_cmd_pressed } from "../common/KeyboardShortcuts.js"
 import _ from "../imports/lodash.js"
 
 import "https://cdn.jsdelivr.net/gh/fonsp/rebel-tag-input@1.0.6/lib/rebel-tag-input.mjs"
 
 //@ts-ignore
-import dialogPolyfill from "https://cdn.jsdelivr.net/npm/dialog-polyfill@0.5.6/dist/dialog-polyfill.esm.min.js"
 import immer from "../imports/immer.js"
 import { useDialog } from "../common/useDialog.js"
 import { FeaturedCard } from "./welcome/FeaturedCard.js"
+import { useEventListener } from "../common/useEventListener.js"
 
 /**
  * @param {{
@@ -24,10 +24,6 @@ export const FrontMatterInput = ({ filename, remote_frontmatter, set_remote_fron
         set_frontmatter(remote_frontmatter ?? {})
     }, [remote_frontmatter])
 
-    // useEffect(() => {
-    //     console.log("New frontmatter:", frontmatter)
-    // }, [frontmatter])
-
     const fm_setter = (key) => (value) =>
         set_frontmatter(
             immer((fm) => {
@@ -41,43 +37,23 @@ export const FrontMatterInput = ({ filename, remote_frontmatter, set_remote_fron
         set_frontmatter(remote_frontmatter ?? {})
         close()
     }
-    const submit = () => {
+    const submit = useCallback(() => {
         set_remote_frontmatter(clean_data(frontmatter) ?? {}).then(() =>
             alert("Frontmatter synchronized ✔\n\nThese parameters will be used in future exports.")
         )
         close()
-    }
-
-    const clean_data = (obj) => {
-        let a = _.isPlainObject(obj)
-            ? Object.fromEntries(
-                  Object.entries(obj)
-                      .map(([key, val]) => [key, clean_data(val)])
-                      .filter(([key, val]) => val != null)
-              )
-            : _.isArray(obj)
-            ? obj.map(clean_data).filter((x) => x != null)
-            : obj
-
-        return _.isEmpty(a) ? null : a
-    }
+    }, [clean_data, set_remote_frontmatter, frontmatter, close])
 
-    useLayoutEffect(() => {
-        window.addEventListener("open pluto frontmatter", open)
-        return () => {
-            window.removeEventListener("open pluto frontmatter", open)
-        }
-    }, [])
+    useEventListener(window, "open pluto frontmatter", open)
 
-    useLayoutEffect(() => {
-        const listener = (e) => {
+    useEventListener(
+        window,
+        "keydown",
+        (e) => {
             if (dialog_ref.current != null) if (dialog_ref.current.contains(e.target)) if (e.key === "Enter" && has_ctrl_or_cmd_pressed(e)) submit()
-        }
-        window.addEventListener("keydown", listener)
-        return () => {
-            window.removeEventListener("keydown", listener)
-        }
-    }, [])
+        },
+        [dialog_ref, submit]
+    )
 
     const frontmatter_with_defaults = {
         title: null,
@@ -188,6 +164,20 @@ export const FrontMatterInput = ({ filename, remote_frontmatter, set_remote_fron
     </dialog>`
 }
 
+const clean_data = (obj) => {
+    let a = _.isPlainObject(obj)
+        ? Object.fromEntries(
+              Object.entries(obj)
+                  .map(([key, val]) => [key, clean_data(val)])
+                  .filter(([key, val]) => val != null)
+          )
+        : _.isArray(obj)
+        ? obj.map(clean_data).filter((x) => x != null)
+        : obj
+
+    return _.isEmpty(a) ? null : a
+}
+
 const special_field_names = ["tags", "date", "license", "url", "color"]
 
 const field_type = (name) => {
diff --git a/frontend/components/HackySideStuff/HijackExternalLinksToOpenInNewTab.js b/frontend/components/HackySideStuff/HijackExternalLinksToOpenInNewTab.js
index 3871d4bc99..de2818311d 100644
--- a/frontend/components/HackySideStuff/HijackExternalLinksToOpenInNewTab.js
+++ b/frontend/components/HackySideStuff/HijackExternalLinksToOpenInNewTab.js
@@ -1,12 +1,13 @@
+import { useEventListener } from "../../common/useEventListener.js"
 import { useEffect } from "../../imports/Preact.js"
 
 /**
  * Time flies when you're building Pluto...
  * At one moment you self-assignee to issue number #1, next moment we're approaching issue #2000...
- * 
+ *
  * We can't just put `<base target="_blank">` in the `<head>`, because this also opens hash links
  * like `#id` in a new tab...
- * 
+ *
  * This components takes every click event on an <a> that points to another origin (i.e. not `#id`)
  * and sneakily puts in a `target="_blank"` attribute so it opens in a new tab.
  *
@@ -14,8 +15,10 @@ import { useEffect } from "../../imports/Preact.js"
  * Based on https://stackoverflow.com/a/12552017/2681964
  */
 export let HijackExternalLinksToOpenInNewTab = () => {
-    useEffect(() => {
-        let handler = (event) => {
+    useEventListener(
+        document,
+        "click",
+        (event) => {
             if (event.defaultPrevented) return
 
             const origin = event.target.closest(`a`)
@@ -26,10 +29,9 @@ export let HijackExternalLinksToOpenInNewTab = () => {
                     origin.target = "_blank"
                 }
             }
-        }
-        document.addEventListener("click", handler)
-        return () => document.removeEventListener("click", handler)
-    })
+        },
+        []
+    )
 
     return null
 }
diff --git a/frontend/components/NonCellOutput.js b/frontend/components/NonCellOutput.js
index 099491132a..2c82f099d7 100644
--- a/frontend/components/NonCellOutput.js
+++ b/frontend/components/NonCellOutput.js
@@ -1,3 +1,4 @@
+import { useEventListener } from "../common/useEventListener.js"
 import { html, useEffect, useRef, useState } from "../imports/Preact.js"
 /**
  * Sometimes, we want to render HTML outside of the Cell Output,
@@ -20,17 +21,18 @@ import { html, useEffect, useRef, useState } from "../imports/Preact.js"
 export const NonCellOutput = ({ environment_component, notebook_id }) => {
     const surely_the_latest_updated_set = useRef()
     const [component_set, update_component_set] = useState({})
-    useEffect(() => {
-        const hn = (e) => {
+    useEventListener(
+        document,
+        "eexperimental_add_node_non_cell_output",
+        (e) => {
             try {
                 const { name, node, order } = e.detail
                 surely_the_latest_updated_set.current = { ...surely_the_latest_updated_set.current, [name]: { node, order } }
                 update_component_set(surely_the_latest_updated_set.current)
             } catch (e) {}
-        }
-        document.addEventListener("experimental_add_node_non_cell_output", hn)
-        return () => document.removeEventListener("experimental_add_node_non_cell_output", hn)
-    }, [surely_the_latest_updated_set])
+        },
+        [surely_the_latest_updated_set, update_component_set]
+    )
 
     let components = Object.values(component_set)
     components.sort(({ order: o1 }, { order: o2 }) => o1 - o2)
diff --git a/frontend/components/PasteHandler.js b/frontend/components/PasteHandler.js
index 3ecc856af1..1c6ec4395c 100644
--- a/frontend/components/PasteHandler.js
+++ b/frontend/components/PasteHandler.js
@@ -1,3 +1,4 @@
+import { useEventListener } from "../common/useEventListener.js"
 import { html, useEffect, useRef } from "../imports/Preact.js"
 import { link_edit } from "./welcome/Open.js"
 
@@ -86,18 +87,10 @@ export const PasteHandler = ({ on_start_navigation }) => {
         }
     }
 
-    useEffect(() => {
-        document.addEventListener("paste", processFile)
-        document.addEventListener("drop", processFile)
-        document.addEventListener("dragstart", processFile)
-        document.addEventListener("dragover", processFile)
-        return () => {
-            document.removeEventListener("paste", processFile)
-            document.removeEventListener("drop", processFile)
-            document.removeEventListener("dragstart", processFile)
-            document.removeEventListener("dragover", processFile)
-        }
-    })
+    useEventListener(document, "paste", processFile, [processFile])
+    useEventListener(document, "drop", processFile, [processFile])
+    useEventListener(document, "dragstart", processFile, [processFile])
+    useEventListener(document, "dragover", processFile, [processFile])
 
     return html`<span />`
 }
diff --git a/frontend/components/Popup.js b/frontend/components/Popup.js
index f94947c67d..59b5acb8f8 100644
--- a/frontend/components/Popup.js
+++ b/frontend/components/Popup.js
@@ -1,4 +1,4 @@
-import { html, useState, useRef, useEffect, useContext } from "../imports/Preact.js"
+import { html, useState, useRef, useEffect, useContext, useCallback } from "../imports/Preact.js"
 import { cl } from "../common/ClassTable.js"
 
 import { PlutoActionsContext } from "../common/PlutoContext.js"
@@ -7,6 +7,7 @@ import { PkgTerminalView } from "./PkgTerminalView.js"
 import { useDebouncedTruth } from "./RunArea.js"
 import { time_estimate, usePackageTimingData } from "../common/InstallTimeEstimate.js"
 import { pretty_long_time } from "./EditOrRunButton.js"
+import { useEventListener } from "../common/useEventListener.js"
 
 // This funny thing is a way to tell parcel to bundle these files..
 // Eventually I'll write a plugin that is able to parse html`...`, but this is it for now.
@@ -32,14 +33,6 @@ export const help_circle_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/
  * @property {Boolean} [big]
  */
 
-export const open_pluto_popup = (/** @type{PkgPopupDetails | MiscPopupDetails} */ detail) => {
-    window.dispatchEvent(
-        new CustomEvent("open pluto popup", {
-            detail,
-        })
-    )
-}
-
 export const Popup = ({ notebook, disable_input }) => {
     const [recent_event, set_recent_event] = useState(/** @type{(PkgPopupDetails | MiscPopupDetails)?} */ (null))
     const recent_event_ref = useRef(/** @type{(PkgPopupDetails | MiscPopupDetails)?} */ (null))
@@ -47,52 +40,52 @@ export const Popup = ({ notebook, disable_input }) => {
     const recent_source_element_ref = useRef(/** @type{HTMLElement?} */ (null))
     const pos_ref = useRef("")
 
-    const open = (/** @type {CustomEvent} */ e) => {
-        const el = e.detail.source_element
-        recent_source_element_ref.current = el
+    const open = useCallback(
+        (/** @type {CustomEvent} */ e) => {
+            const el = e.detail.source_element
+            recent_source_element_ref.current = el
 
-        if (el == null) {
-            pos_ref.current = `top: 20%; left: 50%; transform: translate(-50%, -50%); position: fixed;`
-        } else {
-            const elb = el.getBoundingClientRect()
-            const bodyb = document.body.getBoundingClientRect()
+            if (el == null) {
+                pos_ref.current = `top: 20%; left: 50%; transform: translate(-50%, -50%); position: fixed;`
+            } else {
+                const elb = el.getBoundingClientRect()
+                const bodyb = document.body.getBoundingClientRect()
 
-            pos_ref.current = `top: ${0.5 * (elb.top + elb.bottom) - bodyb.top}px; left: min(max(0px,100vw - 251px - 30px), ${elb.right - bodyb.left}px);`
-        }
+                pos_ref.current = `top: ${0.5 * (elb.top + elb.bottom) - bodyb.top}px; left: min(max(0px,100vw - 251px - 30px), ${elb.right - bodyb.left}px);`
+            }
 
-        set_recent_event(e.detail)
-    }
+            set_recent_event(e.detail)
+        },
+        [set_recent_event]
+    )
 
-    const close = () => {
+    const close = useCallback(() => {
         set_recent_event(null)
-    }
-
-    useEffect(() => {
-        const onpointerdown = (e) => {
+    }, [set_recent_event])
+
+    useEventListener(window, "open pluto popup", open, [open])
+    useEventListener(window, "close pluto popup", close, [close])
+    useEventListener(
+        window,
+        "pointerdown",
+        (e) => {
             if (recent_event_ref.current == null) return
             if (e.target == null) return
             if (e.target.closest("pluto-popup") != null) return
             if (recent_source_element_ref.current != null && recent_source_element_ref.current.contains(e.target)) return
 
             close()
-        }
-        const onkeydown = (e) => {
-            if (e.key === "Escape") {
-                close()
-            }
-        }
-        window.addEventListener("open pluto popup", open)
-        window.addEventListener("close pluto popup", close)
-        window.addEventListener("pointerdown", onpointerdown)
-        document.addEventListener("keydown", onkeydown)
-
-        return () => {
-            window.removeEventListener("open pluto popup", open)
-            window.removeEventListener("close pluto popup", close)
-            window.removeEventListener("pointerdown", onpointerdown)
-            document.removeEventListener("keydown", onkeydown)
-        }
-    }, [])
+        },
+        [close]
+    )
+    useEventListener(
+        window,
+        "keydown",
+        (e) => {
+            if (e.key === "Escape") close()
+        },
+        [close]
+    )
 
     const type = recent_event?.type
     return html`<pluto-popup
diff --git a/frontend/components/Scroller.js b/frontend/components/Scroller.js
index b3483c4424..d31fc89470 100644
--- a/frontend/components/Scroller.js
+++ b/frontend/components/Scroller.js
@@ -1,3 +1,4 @@
+import { useEventListener } from "../common/useEventListener.js"
 import { useEffect, useRef, useState } from "../imports/Preact.js"
 
 /**
@@ -9,17 +10,11 @@ import { useEffect, useRef, useState } from "../imports/Preact.js"
 export const Scroller = ({ active }) => {
     const pointer = useRef()
 
-    useEffect(() => {
-        const handler = (e) => {
-            pointer.current = { x: e.clientX, y: e.clientY }
-        }
-        document.addEventListener("pointermove", handler)
-        document.addEventListener("dragover", handler)
-        return () => {
-            document.removeEventListener("pointermove", handler)
-            document.removeEventListener("dragover", handler)
-        }
-    }, [])
+    const onmove = (e) => {
+        pointer.current = { x: e.clientX, y: e.clientY }
+    }
+    useEventListener(window, "pointermove", onmove, [])
+    useEventListener(window, "dragover", onmove, [])
 
     useEffect(() => {
         if (active.up || active.down) {
diff --git a/frontend/components/UndoDelete.js b/frontend/components/UndoDelete.js
index 472822621e..8f3898f946 100644
--- a/frontend/components/UndoDelete.js
+++ b/frontend/components/UndoDelete.js
@@ -1,7 +1,7 @@
 import { html, useState, useEffect } from "../imports/Preact.js"
 import { cl } from "../common/ClassTable.js"
-import { open_pluto_popup } from "./Popup.js"
 import { scroll_cell_into_view } from "./Scroller.js"
+import { open_pluto_popup } from "../common/open_pluto_popup.js"
 
 export const UndoDelete = ({ recently_deleted, on_click }) => {
     const [hidden, set_hidden] = useState(true)

From 0cd52bb010163c847fb40aec397ef1a930244324 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 12 Dec 2023 14:15:15 +0100
Subject: [PATCH 795/821] typo

---
 src/analysis/topological_order.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/analysis/topological_order.jl b/src/analysis/topological_order.jl
index 03ac91c42b..7fa0d1b2d5 100644
--- a/src/analysis/topological_order.jl
+++ b/src/analysis/topological_order.jl
@@ -118,7 +118,7 @@ function topological_order(topology::NotebookTopology, roots::AbstractVector{Cel
 					pop!(entries)
 				end
 
-				continue # the cycle was created by us so we can keep exploring other childs
+				continue # the cycle was created by us so we can keep exploring other children
 			end
 		end
 		push!(exits, cell)

From 461f398c2b3b062b2c0408cb3c602fe48df43ce2 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 13 Dec 2023 11:07:48 +0100
Subject: [PATCH 796/821] Use <dialog> for the export menu for better keyboard
 accessibility (#2750)

---
 frontend/components/ExportBanner.js | 77 ++++++++++++++++++-----------
 frontend/editor.css                 | 26 ++++++----
 2 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index 959f659262..261ca5c724 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -1,5 +1,5 @@
 import { useEventListener } from "../common/useEventListener.js"
-import { html, useEffect, useRef } from "../imports/Preact.js"
+import { html, useLayoutEffect, useRef } from "../imports/Preact.js"
 
 const Circle = ({ fill }) => html`
     <svg
@@ -77,8 +77,27 @@ export const ExportBanner = ({ notebook_id, print_title, open, onClose, notebook
         [print_title]
     )
 
+    const element_ref = useRef(/** @type {HTMLDialogElement?} */ (null))
+
+    useLayoutEffect(() => {
+        if (open) {
+            element_ref.current?.show()
+        } else {
+            element_ref.current?.close()
+        }
+    }, [open, element_ref.current])
+
+    useEventListener(
+        element_ref.current,
+        "focusout",
+        () => {
+            if (!element_ref.current?.matches(":focus-within")) onClose()
+        },
+        [onClose]
+    )
+
     return html`
-        <aside id="export" inert=${!open}>
+        <dialog id="export" inert=${!open} ref=${element_ref}>
             <div id="container">
                 <div class="export_title">export</div>
                 <!-- no "download" attribute here: we want the jl contents to be shown in a new tab -->
@@ -119,33 +138,33 @@ export const ExportBanner = ({ notebook_id, print_title, open, onClose, notebook
                         <section>Capture the entire notebook, and any changes you make.</section>
                     </a>
                 `}
-                <div class="export_small_btns">
-                    <button
-                        title="Edit frontmatter"
-                        class="toggle_frontmatter_edit"
-                        onClick=${() => {
-                            onClose()
-                            window.dispatchEvent(new CustomEvent("open pluto frontmatter"))
-                        }}
-                    >
-                        <span></span>
-                    </button>
-                    <button
-                        title="Start presentation"
-                        class="toggle_presentation"
-                        onClick=${() => {
-                            onClose()
-                            // @ts-ignore
-                            window.present()
-                        }}
-                    >
-                        <span></span>
-                    </button>
-                    <button title="Close" class="toggle_export" onClick=${() => onClose()}>
-                        <span></span>
-                    </button>
-                </div>
             </div>
-        </aside>
+            <div class="export_small_btns">
+                <button
+                    title="Edit frontmatter"
+                    class="toggle_frontmatter_edit"
+                    onClick=${() => {
+                        onClose()
+                        window.dispatchEvent(new CustomEvent("open pluto frontmatter"))
+                    }}
+                >
+                    <span></span>
+                </button>
+                <button
+                    title="Start presentation"
+                    class="toggle_presentation"
+                    onClick=${() => {
+                        onClose()
+                        // @ts-ignore
+                        window.present()
+                    }}
+                >
+                    <span></span>
+                </button>
+                <button title="Close" class="toggle_export" onClick=${() => onClose()}>
+                    <span></span>
+                </button>
+            </div>
+        </dialog>
     `
 }
diff --git a/frontend/editor.css b/frontend/editor.css
index 083cd9a95b..a208819c81 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -489,16 +489,24 @@ header#pluto-nav.show_export {
     transform: translateY(130px);
 }
 
-aside#export {
+dialog#export {
     position: absolute;
+    display: block;
     top: 0;
     width: 100%;
     height: 130px;
     background: var(--export-bg-color);
     color: var(--export-color);
     transform: translateY(-100%);
+    /* overlay: none !important; */
+    overflow: visible;
+    margin: 0;
+    padding: 0;
+    max-width: none;
+    max-height: none;
+    border: none;
 }
-aside#export::before {
+dialog#export::before {
     content: "";
     position: absolute;
     bottom: 100%;
@@ -507,7 +515,7 @@ aside#export::before {
     height: 100px;
     background: inherit;
 }
-aside#export div#container {
+dialog#export div#container {
     flex-direction: row;
     display: flex;
     max-width: 1000px;
@@ -515,11 +523,11 @@ aside#export div#container {
     margin: 0 auto;
     position: relative;
 }
-header aside#export div#container {
+header dialog#export div#container {
     /* to prevent the div from taking up horizontal page when the export pane is closed. On small screen this causes overscroll on the right. */
     overflow-x: hidden;
 }
-header.show_export aside#export div#container {
+header.show_export dialog#export div#container {
     overflow-x: auto;
 }
 a.export_card {
@@ -562,7 +570,7 @@ a.export_card section {
     /* font-size: 14px; */
     padding: 3px;
 }
-aside#export .export_small_btns {
+dialog#export .export_small_btns {
     display: flex;
     flex-direction: row;
     padding: 0.9em;
@@ -727,15 +735,15 @@ nav#at_the_top button.toggle_export span {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/share-outline.svg");
     filter: var(--image-filters);
 }
-aside#export button.toggle_export span {
+dialog#export button.toggle_export span {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/close-outline.svg");
     filter: invert(1);
 }
-aside#export button.toggle_frontmatter_edit span {
+dialog#export button.toggle_frontmatter_edit span {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/newspaper-outline.svg");
     filter: invert(1);
 }
-aside#export button.toggle_presentation span {
+dialog#export button.toggle_presentation span {
     background-image: url("https://cdn.jsdelivr.net/gh/ionic-team/ionicons@5.5.1/src/svg/easel-outline.svg");
     filter: invert(1);
 }

From c999c7325aff6727faf83101aa038539d17073dc Mon Sep 17 00:00:00 2001
From: Paul Berg <paul@plutojl.org>
Date: Wed, 13 Dec 2023 11:08:21 +0100
Subject: [PATCH 797/821] preserve original LOAD_PATH (#2748)

---
 src/runner/Loader.jl   |  2 +-
 test/packages/Basic.jl | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/runner/Loader.jl b/src/runner/Loader.jl
index b83bc4c35b..73a65e68f3 100644
--- a/src/runner/Loader.jl
+++ b/src/runner/Loader.jl
@@ -11,7 +11,7 @@ begin
     import Pkg
     popfirst!(LOAD_PATH)
 
-    local original_LP = LOAD_PATH
+    local original_LP = copy(LOAD_PATH)
     local original_AP = Base.ACTIVE_PROJECT[]
 
     # Path to our notebook boot package environment which is set by WorkspaceManager
diff --git a/test/packages/Basic.jl b/test/packages/Basic.jl
index a255865c77..1a6fc93926 100644
--- a/test/packages/Basic.jl
+++ b/test/packages/Basic.jl
@@ -762,6 +762,20 @@ import Malt
         end
     end
 
+    @testset "Inherit load path" begin
+        notebook = Notebook([
+            Cell("import Pkg; Pkg.activate()"),
+            Cell("LOAD_PATH[begin]"),
+            Cell("LOAD_PATH[end]"),
+        ])
+        🍭 = ServerSession()
+        update_run!(🍭, notebook, notebook.cells)
+        @test isnothing(notebook.nbpkg_ctx)
+        @test notebook.cells[2].output.body == sprint(Base.show, LOAD_PATH[begin])
+        @test notebook.cells[3].output.body == sprint(Base.show, LOAD_PATH[end])
+        WorkspaceManager.unmake_workspace((🍭, notebook))
+    end
+
     Pkg.Registry.rm(pluto_test_registry_spec)
     # Pkg.Registry.add("General")
 end

From f7e40ab4cbba36734f79d366188d527e4260607d Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 13 Dec 2023 11:09:01 +0100
Subject: [PATCH 798/821] Update Project.toml

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 0e4a621472..5c2ed3a340 100644
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <fons@plutojl.org>"]
-version = "0.19.35"
+version = "0.19.36"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

From 65f1a45bb7ae2e270ec3a05e17068320a1150635 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 13 Dec 2023 11:27:39 +0100
Subject: [PATCH 799/821] fix CM issue in tab help plugin

---
 frontend/components/CellInput/tab_help_plugin.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/components/CellInput/tab_help_plugin.js b/frontend/components/CellInput/tab_help_plugin.js
index 228088a6c9..72a291aeeb 100644
--- a/frontend/components/CellInput/tab_help_plugin.js
+++ b/frontend/components/CellInput/tab_help_plugin.js
@@ -34,7 +34,7 @@ const LastFocusWasForced = StateField.define({
 export const tab_help_plugin = ViewPlugin.define(
     (view) => ({
         setready: (x) =>
-            view.dispatch({
+            view.state.update({
                 effects: [TabHelpEffect.of(x)],
             }),
     }),
@@ -47,7 +47,7 @@ export const tab_help_plugin = ViewPlugin.define(
             },
             blur: function (event, view) {
                 this.setready(false)
-                view.dispatch({
+                view.state.update({
                     effects: [LastFocusWasForcedEffect.of(false)],
                 })
             },

From 1d6b4da3368dbc709cf57e9ee3d8ba944a191c71 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 13 Dec 2023 11:40:04 +0100
Subject: [PATCH 800/821] Revert "fix CM issue in tab help plugin"

This reverts commit 65f1a45bb7ae2e270ec3a05e17068320a1150635.
---
 frontend/components/CellInput/tab_help_plugin.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/components/CellInput/tab_help_plugin.js b/frontend/components/CellInput/tab_help_plugin.js
index 72a291aeeb..228088a6c9 100644
--- a/frontend/components/CellInput/tab_help_plugin.js
+++ b/frontend/components/CellInput/tab_help_plugin.js
@@ -34,7 +34,7 @@ const LastFocusWasForced = StateField.define({
 export const tab_help_plugin = ViewPlugin.define(
     (view) => ({
         setready: (x) =>
-            view.state.update({
+            view.dispatch({
                 effects: [TabHelpEffect.of(x)],
             }),
     }),
@@ -47,7 +47,7 @@ export const tab_help_plugin = ViewPlugin.define(
             },
             blur: function (event, view) {
                 this.setready(false)
-                view.state.update({
+                view.dispatch({
                     effects: [LastFocusWasForcedEffect.of(false)],
                 })
             },

From bef8a022c41afcdf9c4d4a0590b5750483b37522 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 13 Dec 2023 16:02:59 +0100
Subject: [PATCH 801/821] fix CM issue in tab help plugin in another way

---
 frontend/components/CellInput/tab_help_plugin.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/components/CellInput/tab_help_plugin.js b/frontend/components/CellInput/tab_help_plugin.js
index 228088a6c9..a83368a481 100644
--- a/frontend/components/CellInput/tab_help_plugin.js
+++ b/frontend/components/CellInput/tab_help_plugin.js
@@ -34,8 +34,10 @@ const LastFocusWasForced = StateField.define({
 export const tab_help_plugin = ViewPlugin.define(
     (view) => ({
         setready: (x) =>
-            view.dispatch({
-                effects: [TabHelpEffect.of(x)],
+            requestIdleCallback(() => {
+                view.dispatch({
+                    effects: [TabHelpEffect.of(x)],
+                })
             }),
     }),
     {
@@ -47,8 +49,10 @@ export const tab_help_plugin = ViewPlugin.define(
             },
             blur: function (event, view) {
                 this.setready(false)
-                view.dispatch({
-                    effects: [LastFocusWasForcedEffect.of(false)],
+                requestIdleCallback(() => {
+                    view.dispatch({
+                        effects: [LastFocusWasForcedEffect.of(false)],
+                    })
                 })
             },
             click: function (event, view) {

From b7163e57378e7bf18e433ed0c4cdbd0e30065bf6 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 13 Dec 2023 16:03:08 +0100
Subject: [PATCH 802/821] whitespace

---
 frontend/hide-ui.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/hide-ui.css b/frontend/hide-ui.css
index 4312f0fab7..0cdf1a50ee 100644
--- a/frontend/hide-ui.css
+++ b/frontend/hide-ui.css
@@ -43,6 +43,7 @@ pluto-runarea,
         break-inside: auto;
     }
 
+    /* When printing, hr should act like a page break */
     pluto-output hr {
         height: 0;
         margin: 0;

From fe10e2d481abfafeb754119c67bb566de10fde3a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 14 Dec 2023 11:05:07 +0100
Subject: [PATCH 803/821] Make the pkg popup tab-friendly (#2752)

---
 frontend/components/Editor.js          |   1 +
 frontend/components/PkgStatusMark.js   |   2 +
 frontend/components/PkgTerminalView.js |   2 +-
 frontend/components/Popup.js           | 130 +++++++++++++++++--------
 frontend/components/SafePreviewUI.js   |   1 +
 5 files changed, 96 insertions(+), 40 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 0cbaf8045e..5c7ae43cfe 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -868,6 +868,7 @@ patch: ${JSON.stringify(
                             }}
                             >Stay here</a
                         >`,
+                    should_focus: true,
                 })
             }
         }
diff --git a/frontend/components/PkgStatusMark.js b/frontend/components/PkgStatusMark.js
index ce52e99659..fd2eae561d 100644
--- a/frontend/components/PkgStatusMark.js
+++ b/frontend/components/PkgStatusMark.js
@@ -139,6 +139,7 @@ export const PkgStatusMark = ({ package_name, pluto_actions, notebook_id, nbpkg
                         source_element: event.currentTarget.parentElement,
                         package_name: package_name,
                         is_disable_pkg: false,
+                        should_focus: true,
                     })
                 }}
             >
@@ -165,6 +166,7 @@ export const PkgActivateMark = ({ package_name }) => {
                         source_element: event.currentTarget.parentElement,
                         package_name: package_name,
                         is_disable_pkg: true,
+                        should_focus: true,
                     })
                 }}
             >
diff --git a/frontend/components/PkgTerminalView.js b/frontend/components/PkgTerminalView.js
index 070806342d..14f8e6277f 100644
--- a/frontend/components/PkgTerminalView.js
+++ b/frontend/components/PkgTerminalView.js
@@ -13,7 +13,7 @@ const TerminalViewAnsiUp = ({ value }) => {
 
     return !!value
         ? html`<pkg-terminal
-              ><div class="scroller"><pre ref=${node_ref} class="pkg-terminal"></pre></div
+              ><div class="scroller" tabindex="0"><pre ref=${node_ref} class="pkg-terminal"></pre></div
           ></pkg-terminal>`
         : null
 }
diff --git a/frontend/components/Popup.js b/frontend/components/Popup.js
index 59b5acb8f8..e49b895828 100644
--- a/frontend/components/Popup.js
+++ b/frontend/components/Popup.js
@@ -1,4 +1,4 @@
-import { html, useState, useRef, useEffect, useContext, useCallback } from "../imports/Preact.js"
+import { html, useState, useRef, useEffect, useContext, useCallback, useLayoutEffect } from "../imports/Preact.js"
 import { cl } from "../common/ClassTable.js"
 
 import { PlutoActionsContext } from "../common/PlutoContext.js"
@@ -21,6 +21,7 @@ export const help_circle_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/
  * @property {"nbpkg"} type
  * @property {HTMLElement} [source_element]
  * @property {Boolean} [big]
+ * @property {Boolean} [should_focus] Should the popup receive keyboard focus after opening? Rule of thumb: yes if the popup opens on a click, no if it opens spontaneously.
  * @property {string} package_name
  * @property {boolean} is_disable_pkg
  */
@@ -31,6 +32,7 @@ export const help_circle_icon = new URL("https://cdn.jsdelivr.net/gh/ionic-team/
  * @property {import("../imports/Preact.js").ReactElement} body
  * @property {HTMLElement?} [source_element]
  * @property {Boolean} [big]
+ * @property {Boolean} [should_focus] Should the popup receive keyboard focus after opening? Rule of thumb: yes if the popup opens on a click, no if it opens spontaneously.
  */
 
 export const Popup = ({ notebook, disable_input }) => {
@@ -87,26 +89,75 @@ export const Popup = ({ notebook, disable_input }) => {
         [close]
     )
 
+    // focus the popup when it opens
+    const element_focused_before_popup = useRef(/** @type {any} */ (null))
+    useLayoutEffect(() => {
+        if (recent_event != null) {
+            console.log(recent_event)
+            if (recent_event.should_focus === true) {
+                console.log(element_ref.current?.querySelector("a") ?? element_ref.current)
+                requestAnimationFrame(() => {
+                    element_focused_before_popup.current = document.activeElement
+                    ;(element_ref.current?.querySelector("a") ?? element_ref.current)?.focus?.()
+                })
+            } else {
+                element_focused_before_popup.current = null
+            }
+        }
+    }, [recent_event != null])
+
+    const element_ref = useRef(/** @type {HTMLElement?} */ (null))
+
+    // if the popup was focused on opening:
+    // when the popup loses focus (and the focus did not move to the source element):
+    // 1. close the popup
+    // 2. return focus to the element that was focused before the popup opened
+    useEventListener(
+        element_ref.current,
+        "focusout",
+        (e) => {
+            if (recent_event_ref.current != null && recent_event_ref.current.should_focus === true) {
+                if (element_ref.current?.matches(":focus-within")) return
+                if (
+                    recent_source_element_ref.current != null &&
+                    (recent_source_element_ref.current.contains(e.relatedTarget) || recent_source_element_ref.current.matches(":focus-within"))
+                )
+                    return
+                close()
+                e.preventDefault()
+                element_focused_before_popup.current?.focus?.()
+            }
+        },
+        [close]
+    )
+
     const type = recent_event?.type
     return html`<pluto-popup
-        class=${cl({
-            visible: recent_event != null,
-            [type ?? ""]: type != null,
-            big: recent_event?.big === true,
-        })}
-        style="${pos_ref.current}"
-    >
-        ${type === "nbpkg"
-            ? html`<${PkgPopup}
-                  notebook=${notebook}
-                  disable_input=${disable_input}
-                  recent_event=${recent_event}
-                  clear_recent_event=${() => set_recent_event(null)}
-              />`
-            : type === "info" || type === "warn"
-            ? html`<div>${recent_event?.body}</div>`
-            : null}
-    </pluto-popup>`
+            class=${cl({
+                visible: recent_event != null,
+                [type ?? ""]: type != null,
+                big: recent_event?.big === true,
+            })}
+            style="${pos_ref.current}"
+            ref=${element_ref}
+            tabindex=${
+                "0" /* this makes the popup itself focusable (not just its buttons), just like a <dialog> element. It also makes the `.matches(":focus-within")` trick work. */
+            }
+        >
+            ${type === "nbpkg"
+                ? html`<${PkgPopup}
+                      notebook=${notebook}
+                      disable_input=${disable_input}
+                      recent_event=${recent_event}
+                      clear_recent_event=${() => set_recent_event(null)}
+                  />`
+                : type === "info" || type === "warn"
+                ? html`<div>${recent_event?.body}</div>`
+                : null}
+        </pluto-popup>
+        <div tabindex="0">
+            <!-- We need this dummy tabindexable element here so that the element_focused_before_popup mechanism works on static exports. When tabbing out of the popup, focus would otherwise leave the page altogether because it's the last focusable element in DOM. -->
+        </div>`
 }
 
 /**
@@ -187,26 +238,27 @@ const PkgPopup = ({ notebook, recent_event, clear_recent_event, disable_input })
               </div>`
             : null}
         <div class="pkg-buttons">
-            <a
-                class="pkg-update"
-                target="_blank"
-                title="Update packages"
-                style=${(!!showupdate ? "" : "opacity: .4;") +
-                (recent_event?.is_disable_pkg || disable_input || notebook.nbpkg?.waiting_for_permission ? "display: none;" : "")}
-                href="#"
-                onClick=${(e) => {
-                    if (busy) {
-                        alert("Pkg is currently busy with other packages... come back later!")
-                    } else {
-                        if (confirm("Would you like to check for updates and install them? A backup of the notebook file will be created.")) {
-                            console.warn("Pkg.updating!")
-                            pluto_actions.send("pkg_update", {}, { notebook_id: notebook.notebook_id })
-                        }
-                    }
-                    e.preventDefault()
-                }}
-                ><img alt="⬆️" src=${arrow_up_circle_icon} width="17"
-            /></a>
+            ${recent_event?.is_disable_pkg || disable_input || notebook.nbpkg?.waiting_for_permission
+                ? null
+                : html`<a
+                      class="pkg-update"
+                      target="_blank"
+                      title="Update packages"
+                      style=${!!showupdate ? "" : "opacity: .4;"}
+                      href="#"
+                      onClick=${(e) => {
+                          if (busy) {
+                              alert("Pkg is currently busy with other packages... come back later!")
+                          } else {
+                              if (confirm("Would you like to check for updates and install them? A backup of the notebook file will be created.")) {
+                                  console.warn("Pkg.updating!")
+                                  pluto_actions.send("pkg_update", {}, { notebook_id: notebook.notebook_id })
+                              }
+                          }
+                          e.preventDefault()
+                      }}
+                      ><img alt="⬆️" src=${arrow_up_circle_icon} width="17"
+                  /></a>`}
             <a
                 class="toggle-terminal"
                 target="_blank"
diff --git a/frontend/components/SafePreviewUI.js b/frontend/components/SafePreviewUI.js
index 0445b985b3..07df42d8df 100644
--- a/frontend/components/SafePreviewUI.js
+++ b/frontend/components/SafePreviewUI.js
@@ -15,6 +15,7 @@ export const SafePreviewUI = ({ process_waiting_for_permission, risky_file_sourc
                                   open_pluto_popup({
                                       type: "info",
                                       big: true,
+                                      should_focus: true,
                                       body: html`
                                           <h1>Safe preview</h1>
                                           <p>You are reading and editing this file without running Julia code.</p>

From 1b83614b6fcbc682bfdbcf84239b7b2934a272c1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 14 Dec 2023 11:05:48 +0100
Subject: [PATCH 804/821] tweak F1 help

---
 frontend/components/Editor.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 5c7ae43cfe..ba3e202780 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -1227,12 +1227,13 @@ patch: ${JSON.stringify(
     ${ctrl_or_cmd_name}+Enter:   run cell and add cell below
     Delete or Backspace:   delete empty cell
 
-    PageUp or fn+Up:   select cell above
-    PageDown or fn+Down:   select cell below
+    PageUp or fn+Up:   jump to cell above
+    PageDown or fn+Down:   jump to cell below
 
     ${ctrl_or_cmd_name}+Q:   interrupt notebook
     ${ctrl_or_cmd_name}+S:   submit all changes
 
+    Select multiple cells by dragging a selection box from the space between cells.
     ${ctrl_or_cmd_name}+C:   copy selected cells
     ${ctrl_or_cmd_name}+X:   cut selected cells
     ${ctrl_or_cmd_name}+V:   paste selected cells

From 4a16a52ece8f75fd502e85bd8040e9ebb94b050e Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 14 Dec 2023 11:27:57 +0100
Subject: [PATCH 805/821] Fix #2754

---
 frontend/components/Editor.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index ba3e202780..2fa09e71fe 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -720,6 +720,11 @@ patch: ${JSON.stringify(
                                         },
                                         false
                                     )
+                                } else if (this.state.static_preview && launch_params.slider_server_url != null) {
+                                    open_pluto_popup({
+                                        type: "warn",
+                                        body: html`Something went wrong while updating the notebook state. Please refresh the page to try again.`,
+                                    })
                                 } else {
                                     console.error("Trying to recover: reloading...")
                                     window.parent.location.href = this.state.refresh_target ?? window.location.href

From 9a9eb9ef21df71c64a302fc7437a5b5eafaf3cf8 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 14 Dec 2023 13:19:03 +0100
Subject: [PATCH 806/821] Tab focus tweak

---
 frontend/components/Editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index 2fa09e71fe..cf03d28dca 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -873,7 +873,7 @@ patch: ${JSON.stringify(
                             }}
                             >Stay here</a
                         >`,
-                    should_focus: true,
+                    should_focus: false,
                 })
             }
         }

From 18291b1c73892956b83fa3698221b04bff4e870b Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 14 Dec 2023 13:54:57 +0100
Subject: [PATCH 807/821] printing layout: only treat hr as page break if it is
 top-level

---
 frontend/editor.css  | 1 -
 frontend/hide-ui.css | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/editor.css b/frontend/editor.css
index a208819c81..f97b297873 100644
--- a/frontend/editor.css
+++ b/frontend/editor.css
@@ -285,7 +285,6 @@ pluto-output hr {
     border-top: 3px solid var(--rule-color);
     margin-left: 0;
     margin-right: 0;
-    break-after: page;
 }
 
 pluto-output blockquote {
diff --git a/frontend/hide-ui.css b/frontend/hide-ui.css
index 0cdf1a50ee..4927d0a95b 100644
--- a/frontend/hide-ui.css
+++ b/frontend/hide-ui.css
@@ -18,8 +18,12 @@ pluto-runarea,
 
 /* These next rules only apply to @media print, i.e. the PDF export. We want to hide these items in the PDF, but not in a static HTML. */
 @media print {
+    .pluto-frontmatter,
     .edit_or_run,
+    .loading-bar,
     .floating_back_button,
+    .outline-frame,
+    .outline-frame-actions-container,
     pkg-status-mark,
     .MJX_ToolTip,
     .MJX_HoverRegion,
@@ -44,7 +48,8 @@ pluto-runarea,
     }
 
     /* When printing, hr should act like a page break */
-    pluto-output hr {
+    pluto-output > div > div.markdown > hr,
+    pluto-output > div > div > hr {
         height: 0;
         margin: 0;
         visibility: hidden;

From f6e8407895d7456dc7c115db06aec534a17dd7f3 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 14 Dec 2023 14:04:36 +0100
Subject: [PATCH 808/821] featured card CSS tweaks

---
 frontend/featured-card.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/featured-card.css b/frontend/featured-card.css
index 974278667d..83222b6252 100644
--- a/frontend/featured-card.css
+++ b/frontend/featured-card.css
@@ -55,7 +55,7 @@ featured-card .author {
     background: var(--welcome-card-author-backdrop);
     /* background: hsl(var(--card-color-hue) 34% 46% / 59%); */
     backdrop-filter: blur(15px);
-    color: var(--index-text-color);
+    color: var(--index-light-text-color);
     border-radius: 117px;
     /* height: 2.5em; */
     padding: 0.3em;
@@ -77,6 +77,7 @@ featured-card .author img {
     background: #b6b6b6;
     display: inline-block;
     overflow: hidden;
+    flex: 0 0 auto;
 }
 
 featured-card h3 a {

From 05131df0b725e82b259662fa5a8c822c5ac1ea2f Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 18 Dec 2023 15:20:09 +0100
Subject: [PATCH 809/821] Make global progress bar hidden from screen readers
 (#2758)

---
 frontend/components/ProgressBar.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frontend/components/ProgressBar.js b/frontend/components/ProgressBar.js
index bcfee5ea4a..76b913d96e 100644
--- a/frontend/components/ProgressBar.js
+++ b/frontend/components/ProgressBar.js
@@ -80,10 +80,7 @@ export const ProgressBar = ({ notebook, backend_launch_phase, status }) => {
                 }
             }
         }}
-        aria-valuenow=${100 * progress}
-        aria-valuemin="0"
-        aria-valuemax="100"
-        aria-valuetext=${title}
+        aria-hidden="true"
         title=${title}
     ></loading-bar>`
 }

From ecd34c712741a2cef2a02ec988df5e82f7d37b72 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 18 Dec 2023 15:26:26 +0100
Subject: [PATCH 810/821] Make Pkg update button clickable when the notebook
 crashed

---
 frontend/components/Popup.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/components/Popup.js b/frontend/components/Popup.js
index e49b895828..c72944c108 100644
--- a/frontend/components/Popup.js
+++ b/frontend/components/Popup.js
@@ -206,7 +206,8 @@ const PkgPopup = ({ notebook, recent_event, clear_recent_event, disable_input })
 
     const [showterminal, set_showterminal] = useState(false)
 
-    const busy = recent_event != null && ((notebook.nbpkg?.busy_packages ?? []).includes(recent_event.package_name) || !(notebook.nbpkg?.instantiated ?? true))
+    const needs_first_instatiation = notebook.nbpkg?.restart_required_msg == null && !(notebook.nbpkg?.instantiated ?? true)
+    const busy = recent_event != null && ((notebook.nbpkg?.busy_packages ?? []).includes(recent_event.package_name) || needs_first_instatiation)
 
     const debounced_busy = useDebouncedTruth(busy, 2)
     useEffect(() => {

From 9f287b489611e588d1644cfad58b2c6fedef31c7 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 18 Dec 2023 18:32:21 +0100
Subject: [PATCH 811/821] =?UTF-8?q?=E2=8C=A8=EF=B8=8F=20Keyboard=20shortcu?=
 =?UTF-8?q?t=20Alt-Arrow=20to=20move=20cells=20(#2760)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/common/KeyboardShortcuts.js       |  5 +-
 frontend/components/CellInput.js           | 39 ++++++++++++++
 frontend/components/Editor.js              | 59 ++++++++++++++++------
 frontend/imports/CodemirrorPlutoSetup.d.ts | 10 +++-
 frontend/imports/CodemirrorPlutoSetup.js   |  6 ++-
 5 files changed, 101 insertions(+), 18 deletions(-)

diff --git a/frontend/common/KeyboardShortcuts.js b/frontend/common/KeyboardShortcuts.js
index 2fca1c80a0..ee1aac901e 100644
--- a/frontend/common/KeyboardShortcuts.js
+++ b/frontend/common/KeyboardShortcuts.js
@@ -1,6 +1,9 @@
 export let is_mac_keyboard = /Mac/.test(navigator.platform)
 
-export let ctrl_or_cmd_name = is_mac_keyboard ? "Cmd" : "Ctrl"
+export let control_name = is_mac_keyboard ? "⌃" : "Ctrl"
+export let ctrl_or_cmd_name = is_mac_keyboard ? "⌘" : "Ctrl"
+export let alt_or_options_name = is_mac_keyboard ? "⌥" : "Alt"
+export let and = is_mac_keyboard ? " " : "+"
 
 export let has_ctrl_or_cmd_pressed = (event) => event.ctrlKey || (is_mac_keyboard && event.metaKey)
 
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 79a1d94605..3f7c3266b3 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -50,6 +50,7 @@ import {
     syntaxHighlighting,
     cssLanguage,
     setDiagnostics,
+    moveLineUp,
 } from "../imports/CodemirrorPlutoSetup.js"
 
 import { markdown, html as htmlLang, javascript, sqlLang, python, julia_mixed } from "./CellInput/mixedParsers.js"
@@ -68,6 +69,7 @@ import { mod_d_command } from "./CellInput/mod_d_command.js"
 import { open_bottom_right_panel } from "./BottomRightPanel.js"
 import { timeout_promise } from "../common/PlutoConnection.js"
 import { LastFocusWasForcedEffect, tab_help_plugin } from "./CellInput/tab_help_plugin.js"
+import { moveLineDown } from "../imports/CodemirrorPlutoSetup.js"
 
 export const ENABLE_CM_MIXED_PARSER = window.localStorage.getItem("ENABLE_CM_MIXED_PARSER") === "true"
 
@@ -551,6 +553,40 @@ export const CellInput = ({
             return false
         }
 
+        const keyMapMoveLine = (/** @type {EditorView} */ cm, direction) => {
+            if (cm.state.facet(EditorState.readOnly)) {
+                return false
+            }
+
+            const selection = cm.state.selection.main
+            const all_is_selected = selection.anchor === 0 && selection.head === cm.state.doc.length
+            console.log({ all_is_selected })
+
+            if (all_is_selected || cm.state.doc.lines === 1) {
+                pluto_actions.move_remote_cells([cell_id], pluto_actions.get_notebook().cell_order.indexOf(cell_id) + (direction === -1 ? -1 : 2))
+
+                // workaround for https://github.com/preactjs/preact/issues/4235
+                // but the crollintoview behaviour is nice, also when the preact issue is fixed.
+                requestIdleCallback(() => {
+                    cm.dispatch({
+                        // TODO: remove me after fix
+                        selection: {
+                            anchor: 0,
+                            head: cm.state.doc.length,
+                        },
+
+                        // TODO: keep me after fix
+                        scrollIntoView: true,
+                    })
+                    // TODO: remove me after fix
+                    cm.focus()
+                })
+                return true
+            } else {
+                return direction === 1 ? moveLineDown(cm) : moveLineUp(cm)
+            }
+        }
+
         const plutoKeyMaps = [
             { key: "Shift-Enter", run: keyMapSubmit },
             { key: "Ctrl-Enter", mac: "Cmd-Enter", run: keyMapRun },
@@ -565,6 +601,8 @@ export const CellInput = ({
             { key: "Ctrl-Delete", run: keyMapDelete },
             { key: "Backspace", run: keyMapBackspace },
             { key: "Ctrl-Backspace", run: keyMapBackspace },
+            { key: "Alt-ArrowUp", run: (x) => keyMapMoveLine(x, -1) },
+            { key: "Alt-ArrowDown", run: (x) => keyMapMoveLine(x, 1) },
 
             mod_d_command,
         ]
@@ -643,6 +681,7 @@ export const CellInput = ({
                     // Remove selection on blur
                     EditorView.domEventHandlers({
                         blur: (event, view) => {
+                            console.warn("blur")
                             // it turns out that this condition is true *exactly* if and only if the blur event was triggered by blurring the window
                             let caused_by_window_blur = document.activeElement === view.contentDOM
 
diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index cf03d28dca..e6d31e5fc5 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -21,7 +21,15 @@ import { ExportBanner } from "./ExportBanner.js"
 import { Popup } from "./Popup.js"
 
 import { slice_utf8, length_utf8 } from "../common/UnicodeTools.js"
-import { has_ctrl_or_cmd_pressed, ctrl_or_cmd_name, is_mac_keyboard, in_textarea_or_input } from "../common/KeyboardShortcuts.js"
+import {
+    has_ctrl_or_cmd_pressed,
+    ctrl_or_cmd_name,
+    is_mac_keyboard,
+    in_textarea_or_input,
+    and,
+    control_name,
+    alt_or_options_name,
+} from "../common/KeyboardShortcuts.js"
 import { PlutoActionsContext, PlutoBondsContext, PlutoJSInitializingContext, SetWithEmptyCallback } from "../common/PlutoContext.js"
 import { BackendLaunchPhase, count_stat } from "../common/Binder.js"
 import { setup_mathjax } from "../common/SetupMathJax.js"
@@ -328,7 +336,7 @@ export class Editor extends Component {
             export_menu_open: false,
 
             last_created_cell: null,
-            selected_cells: [],
+            selected_cells: /** @type {string[]} */ ([]),
 
             extended_components: {
                 CustomHeader: null,
@@ -517,7 +525,8 @@ export class Editor extends Component {
                 this.client.send("interrupt_all", {}, { notebook_id: this.state.notebook.notebook_id }, false)
             },
             move_remote_cells: (cell_ids, new_index) => {
-                update_notebook((notebook) => {
+                return update_notebook((notebook) => {
+                    new_index = Math.max(0, new_index)
                     let before = notebook.cell_order.slice(0, new_index).filter((x) => !cell_ids.includes(x))
                     let after = notebook.cell_order.slice(new_index, Infinity).filter((x) => !cell_ids.includes(x))
                     notebook.cell_order = [...before, ...cell_ids, ...after]
@@ -1164,6 +1173,20 @@ patch: ${JSON.stringify(
         this.run_selected = () => {
             return this.actions.set_and_run_multiple(this.state.selected_cells)
         }
+        this.move_selected = (/** @type {KeyboardEvent} */ e, /** @type {1|-1} */ delta) => {
+            if (this.state.selected_cells.length > 0) {
+                const current_indices = this.state.selected_cells.map((id) => this.state.notebook.cell_order.indexOf(id))
+                const new_index = (delta > 0 ? Math.max : Math.min)(...current_indices) + (delta === -1 ? -1 : 2)
+
+                e.preventDefault()
+                return this.actions.move_remote_cells(this.state.selected_cells, new_index).then(
+                    // scroll into view
+                    () => {
+                        document.getElementById((delta > 0 ? _.last : _.first)(this.state.selected_cells) ?? "")?.scrollIntoView({ block: "nearest" })
+                    }
+                )
+            }
+        }
 
         this.serialize_selected = (cell_id = null) => {
             const cells_to_serialize = cell_id == null || this.state.selected_cells.includes(cell_id) ? this.state.selected_cells : [cell_id]
@@ -1221,6 +1244,10 @@ patch: ${JSON.stringify(
                 }
             } else if (e.key === "Enter" && e.shiftKey) {
                 this.run_selected()
+            } else if (e.key === "ArrowUp" && e.altKey) {
+                this.move_selected(e, -1)
+            } else if (e.key === "ArrowDown" && e.altKey) {
+                this.move_selected(e, 1)
             } else if ((e.key === "?" && has_ctrl_or_cmd_pressed(e)) || e.key === "F1") {
                 // On mac "cmd+shift+?" is used by chrome, so that is why this needs to be ctrl as well on mac
                 // Also pressing "ctrl+shift" on mac causes the key to show up as "/", this madness
@@ -1228,22 +1255,24 @@ patch: ${JSON.stringify(
                 alert(
                     `Shortcuts 🎹
 
-    Shift+Enter:   run cell
-    ${ctrl_or_cmd_name}+Enter:   run cell and add cell below
+    ⇧${and}Enter:   run cell
+    ${ctrl_or_cmd_name}${and}Enter:   run cell and add cell below
+    ${ctrl_or_cmd_name}${and}S:   submit all changes
     Delete or Backspace:   delete empty cell
 
-    PageUp or fn+Up:   jump to cell above
-    PageDown or fn+Down:   jump to cell below
-
-    ${ctrl_or_cmd_name}+Q:   interrupt notebook
-    ${ctrl_or_cmd_name}+S:   submit all changes
+    page up or fn${and}↑:   jump to cell above
+    page down or fn${and}↓:   jump to cell below
+    ${alt_or_options_name}${and}↑:   move line/cell up
+    ${alt_or_options_name}${and}↓:   move line/cell down
 
+    
     Select multiple cells by dragging a selection box from the space between cells.
-    ${ctrl_or_cmd_name}+C:   copy selected cells
-    ${ctrl_or_cmd_name}+X:   cut selected cells
-    ${ctrl_or_cmd_name}+V:   paste selected cells
-
-    Ctrl+M:   toggle markdown
+    ${ctrl_or_cmd_name}${and}C:   copy selected cells
+    ${ctrl_or_cmd_name}${and}X:   cut selected cells
+    ${ctrl_or_cmd_name}${and}V:   paste selected cells
+    
+    ${control_name}${and}M:   toggle markdown
+    ${ctrl_or_cmd_name}${and}Q:   interrupt notebook
 
     The notebook file saves every time you run a cell.`
                 )
diff --git a/frontend/imports/CodemirrorPlutoSetup.d.ts b/frontend/imports/CodemirrorPlutoSetup.d.ts
index 11151ceb79..b2af50ea68 100644
--- a/frontend/imports/CodemirrorPlutoSetup.d.ts
+++ b/frontend/imports/CodemirrorPlutoSetup.d.ts
@@ -5542,6 +5542,14 @@ Default key bindings for the undo history.
 */
 declare const historyKeymap: readonly KeyBinding[];
 /**
+Move the selected lines up one line.
+*/
+declare const moveLineUp: StateCommand;
+/**
+Move the selected lines down one line.
+*/
+declare const moveLineDown: StateCommand;
+/**
 Add a [unit](https://codemirror.net/6/docs/ref/#language.indentUnit) of indentation to all selected
 lines.
 */
@@ -6878,4 +6886,4 @@ Get this editor's collaborative editing client ID.
 */
 declare function getClientID(state: EditorState): string;
 
-export { Annotation, ChangeSet, Compartment, Decoration, Diagnostic, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, Text, Tooltip, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index_d as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, completionKeymap, css, cssLanguage, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, getClientID, getSyncedVersion, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, keymap, lineNumbers, linter, markdown, markdownLanguage, parseCode, parseMixed, placeholder, python, pythonLanguage, receiveUpdates, rectangularSelection, searchKeymap, selectNextOccurrence, sendableUpdates, setDiagnostics, showTooltip, sql, syntaxHighlighting, syntaxTree, syntaxTreeAvailable, tags, tooltips };
+export { Annotation, ChangeSet, Compartment, Decoration, Diagnostic, EditorSelection, EditorState, EditorView, Facet, HighlightStyle, NodeProp, PostgreSQL, SelectionRange, StateEffect, StateField, Text, Tooltip, Transaction, TreeCursor, ViewPlugin, ViewUpdate, WidgetType, index_d as autocomplete, bracketMatching, closeBrackets, closeBracketsKeymap, collab, combineConfig, completionKeymap, css, cssLanguage, defaultHighlightStyle, defaultKeymap, drawSelection, foldGutter, foldKeymap, getClientID, getSyncedVersion, highlightSelectionMatches, highlightSpecialChars, history, historyKeymap, html, htmlLanguage, indentLess, indentMore, indentOnInput, indentUnit, javascript, javascriptLanguage, julia as julia_andrey, keymap, lineNumbers, linter, markdown, markdownLanguage, moveLineDown, moveLineUp, parseCode, parseMixed, placeholder, python, pythonLanguage, receiveUpdates, rectangularSelection, searchKeymap, selectNextOccurrence, sendableUpdates, setDiagnostics, showTooltip, sql, syntaxHighlighting, syntaxTree, syntaxTreeAvailable, tags, tooltips };
diff --git a/frontend/imports/CodemirrorPlutoSetup.js b/frontend/imports/CodemirrorPlutoSetup.js
index 8c3111405d..acb00b9ce1 100644
--- a/frontend/imports/CodemirrorPlutoSetup.js
+++ b/frontend/imports/CodemirrorPlutoSetup.js
@@ -12,6 +12,8 @@ import {
     defaultKeymap,
     indentMore,
     indentLess,
+    moveLineUp,
+    moveLineDown,
     tags,
     HighlightStyle,
     lineNumbers,
@@ -62,7 +64,7 @@ import {
     linter,
     setDiagnostics,
     //@ts-ignore
-} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@1234.1.0/dist/index.es.min.js"
+} from "https://cdn.jsdelivr.net/gh/JuliaPluto/codemirror-pluto-setup@1234.2.0/dist/index.es.min.js"
 
 export {
     linter,
@@ -79,6 +81,8 @@ export {
     defaultKeymap,
     indentMore,
     indentLess,
+    moveLineUp,
+    moveLineDown,
     tags,
     HighlightStyle,
     lineNumbers,

From cb9f2b5f24c179c838f9d62f817c42140d31687a Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Tue, 19 Dec 2023 18:07:17 +0100
Subject: [PATCH 812/821] Make cell context menu tab-friendly (#2759)

---
 frontend/common/useEventListener.js |  7 +++-
 frontend/components/CellInput.js    | 55 ++++++++++++++++++++---------
 2 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/frontend/common/useEventListener.js b/frontend/common/useEventListener.js
index 1fcb44514a..94b8911846 100644
--- a/frontend/common/useEventListener.js
+++ b/frontend/common/useEventListener.js
@@ -1,6 +1,11 @@
 import { useCallback, useEffect } from "../imports/Preact.js"
 
-export const useEventListener = (element, event_name, handler, deps) => {
+export const useEventListener = (
+    /** @type {Document | HTMLElement | Window | null} */ element,
+    /** @type {string} */ event_name,
+    /** @type {EventListenerOrEventListenerObject} */ handler,
+    /** @type {any[] | undefined} */ deps
+) => {
     let handler_cached = useCallback(handler, deps)
     useEffect(() => {
         if (element == null) return
diff --git a/frontend/components/CellInput.js b/frontend/components/CellInput.js
index 3f7c3266b3..22b3f6ffbd 100644
--- a/frontend/components/CellInput.js
+++ b/frontend/components/CellInput.js
@@ -1,5 +1,4 @@
 import { html, useState, useEffect, useLayoutEffect, useRef, useContext, useMemo } from "../imports/Preact.js"
-import observablehq_for_myself from "../common/SetupCellEnvironment.js"
 import _ from "../imports/lodash.js"
 
 import { utf8index_to_ut16index } from "../common/UnicodeTools.js"
@@ -24,24 +23,14 @@ import {
     HighlightStyle,
     lineNumbers,
     highlightSpecialChars,
-    foldGutter,
     drawSelection,
     indentOnInput,
-    defaultHighlightStyle,
     closeBrackets,
     rectangularSelection,
     highlightSelectionMatches,
     closeBracketsKeymap,
-    searchKeymap,
     foldKeymap,
-    syntaxTree,
-    Decoration,
-    ViewUpdate,
-    ViewPlugin,
-    WidgetType,
     indentUnit,
-    StateField,
-    StateEffect,
     autocomplete,
     htmlLanguage,
     markdownLanguage,
@@ -69,6 +58,7 @@ import { mod_d_command } from "./CellInput/mod_d_command.js"
 import { open_bottom_right_panel } from "./BottomRightPanel.js"
 import { timeout_promise } from "../common/PlutoConnection.js"
 import { LastFocusWasForcedEffect, tab_help_plugin } from "./CellInput/tab_help_plugin.js"
+import { useEventListener } from "../common/useEventListener.js"
 import { moveLineDown } from "../imports/CodemirrorPlutoSetup.js"
 
 export const ENABLE_CM_MIXED_PARSER = window.localStorage.getItem("ENABLE_CM_MIXED_PARSER") === "true"
@@ -933,7 +923,23 @@ export const CellInput = ({
 const InputContextMenu = ({ on_delete, cell_id, run_cell, skip_as_script, running_disabled, any_logs, show_logs, set_show_logs, set_cell_disabled }) => {
     const timeout = useRef(null)
     let pluto_actions = useContext(PlutoActionsContext)
-    const [open, setOpen] = useState(false)
+    const [open, setOpenState] = useState(false)
+    const element_ref = useRef(/** @type {HTMLButtonElement?} */ (null))
+    const prevously_focused_element_ref = useRef(/** @type {Element?} */ (null))
+    const setOpen = (val) => {
+        if (val) {
+            prevously_focused_element_ref.current = document.activeElement
+        }
+        setOpenState(val)
+    }
+    useLayoutEffect(() => {
+        if (open) {
+            element_ref.current?.querySelector("li")?.focus()
+        } else {
+            if (prevously_focused_element_ref.current instanceof HTMLElement) prevously_focused_element_ref.current?.focus()
+        }
+    }, [open])
+
     const mouseenter = () => {
         if (timeout.current) clearTimeout(timeout.current)
     }
@@ -966,20 +972,36 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, skip_as_script, runnin
             })
     }
 
+    useEventListener(window, "keydown", (e) => {
+        if (e.key === "Escape") {
+            setOpen(false)
+        }
+    })
+
     return html` <button
         onClick=${() => setOpen(!open)}
-        onBlur=${() => setOpen(false)}
+        onfocusout=${(e) => {
+            if (
+                // the focus is not one of the <li>
+                !element_ref.current?.matches(":focus-within") ||
+                // or the focus is on the button itself
+                e.relatedTarget === element_ref.current
+            )
+                setOpen(false)
+        }}
         class=${cl({
             input_context_menu: true,
             open,
         })}
         title="Actions"
+        ref=${element_ref}
     >
         <span class="icon"></span>
         ${open
             ? html`<ul onMouseenter=${mouseenter}>
-                  <li onClick=${on_delete} title="Delete"><span class="delete ctx_icon" />Delete cell</li>
+                  <li tabindex="0" onClick=${on_delete} title="Delete"><span class="delete ctx_icon" />Delete cell</li>
                   <li
+                      tabindex="0"
                       onClick=${toggle_running_disabled}
                       title=${running_disabled ? "Enable and run the cell" : "Disable this cell, and all cells that depend on it"}
                   >
@@ -987,18 +1009,19 @@ const InputContextMenu = ({ on_delete, cell_id, run_cell, skip_as_script, runnin
                       ${running_disabled ? html`<b>Enable cell</b>` : html`Disable cell`}
                   </li>
                   ${any_logs
-                      ? html`<li title="" onClick=${toggle_logs}>
+                      ? html`<li tabindex="0" title="" onClick=${toggle_logs}>
                             ${show_logs
                                 ? html`<span class="hide_logs ctx_icon" /><span>Hide logs</span>`
                                 : html`<span class="show_logs ctx_icon" /><span>Show logs</span>`}
                         </li>`
                       : null}
                   ${is_copy_output_supported()
-                      ? html`<li title="Copy the output of this cell to the clipboard." onClick=${copy_output}>
+                      ? html`<li tabindex="0" title="Copy the output of this cell to the clipboard." onClick=${copy_output}>
                             <span class="copy_output ctx_icon" />Copy output
                         </li>`
                       : null}
                   <li
+                      tabindex="0"
                       onClick=${toggle_skip_as_script}
                       title=${skip_as_script
                           ? "This cell is currently stored in the notebook file as a Julia comment. Click here to disable."

From 68f790f39a06a0e17280aafe3edd6d361656cd05 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 3 Jan 2024 12:20:04 +0100
Subject: [PATCH 813/821] Pluto version in statefile

---
 src/Pluto.jl             | 4 ++--
 src/webserver/Dynamic.jl | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Pluto.jl b/src/Pluto.jl
index 36cdbe7323..575b432783 100644
--- a/src/Pluto.jl
+++ b/src/Pluto.jl
@@ -37,8 +37,8 @@ import Scratch
 
 include_dependency("../Project.toml")
 const PLUTO_VERSION = VersionNumber(Pkg.TOML.parsefile(joinpath(ROOT_DIR, "Project.toml"))["version"])
-const PLUTO_VERSION_STR = 'v' * string(PLUTO_VERSION)
-const JULIA_VERSION_STR = 'v' * string(VERSION)
+const PLUTO_VERSION_STR = "v$(string(PLUTO_VERSION))"
+const JULIA_VERSION_STR = "v$(string(VERSION))"
 
 include("./notebook/path helpers.jl")
 include("./notebook/Export.jl")
diff --git a/src/webserver/Dynamic.jl b/src/webserver/Dynamic.jl
index 8a138813e9..867d5f6399 100644
--- a/src/webserver/Dynamic.jl
+++ b/src/webserver/Dynamic.jl
@@ -99,6 +99,7 @@ Firebasey.use_triple_equals_for_arrays[] = true
 
 function notebook_to_js(notebook::Notebook)
     Dict{String,Any}(
+        "pluto_version" => PLUTO_VERSION_STR,
         "notebook_id" => notebook.notebook_id,
         "path" => notebook.path,
         "shortpath" => basename(notebook.path),

From f7b790a2a08702d3cc00fcec6675ab035e0c33e1 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 3 Jan 2024 12:43:15 +0100
Subject: [PATCH 814/821] Upgrade CI to Julia 1.10

---
 .github/workflows/Test.yml | 2 +-
 README.md                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 27443f0c5a..4f5c78b2a5 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -34,7 +34,7 @@ jobs:
             fail-fast: false
             matrix:
                 # We test quite a lot of versions because we do some OS and version specific things unfortunately
-                julia-version: ["1.6", "1.8", "1.9", "~1.10.0-0"]
+                julia-version: ["1.6", "1.8", "1.10", "~1.11.0-0"]
                 os: [ubuntu-latest, macOS-latest, windows-latest]
 
         steps:
diff --git a/README.md b/README.md
index e601339c0f..b76d99f931 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ and add the Pluto package:
 
 ```julia
 julia> ]
-(v1.7) pkg> add Pluto
+(v1.10) pkg> add Pluto
 ```
 
 _Press `Ctrl+C` to return to the `julia>` prompt._

From a6a285ec123d370b054d69d73d07db934eceb1a7 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 3 Jan 2024 17:07:57 +0100
Subject: [PATCH 815/821] Update featured_sources.js

---
 frontend/featured_sources.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/featured_sources.js b/frontend/featured_sources.js
index acdb80aa8b..dd013debbc 100644
--- a/frontend/featured_sources.js
+++ b/frontend/featured_sources.js
@@ -3,7 +3,8 @@ export default {
     sources: [
         {
             url: "https://featured.plutojl.org/pluto_export.json",
-            valid_until: "2024-10",
+            // this is one month before the expiry date of our domain registration at njal.la
+            valid_until: "2025-10",
             id: "featured pluto",
         },
         {

From be464bca4bdbebb9c7ce65db0988499bb832bfd5 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 3 Jan 2024 23:40:50 +0100
Subject: [PATCH 816/821] Misc ARIA improvements (#2766)

---
 frontend/components/BottomRightPanel.js | 1 +
 frontend/components/ExportBanner.js     | 8 ++++----
 frontend/components/FrontmatterInput.js | 3 ++-
 frontend/components/ProcessTab.js       | 5 ++++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/frontend/components/BottomRightPanel.js b/frontend/components/BottomRightPanel.js
index df7c8b2a2c..40fe5ff245 100644
--- a/frontend/components/BottomRightPanel.js
+++ b/frontend/components/BottomRightPanel.js
@@ -123,6 +123,7 @@ export let BottomRightPanel = ({
                         ? null
                         : html`<button
                               class="helpbox-close"
+                              title="Close panel"
                               onClick=${() => {
                                   set_open_tab(null)
                               }}
diff --git a/frontend/components/ExportBanner.js b/frontend/components/ExportBanner.js
index 261ca5c724..f65d4b92a7 100644
--- a/frontend/components/ExportBanner.js
+++ b/frontend/components/ExportBanner.js
@@ -102,7 +102,7 @@ export const ExportBanner = ({ notebook_id, print_title, open, onClose, notebook
                 <div class="export_title">export</div>
                 <!-- no "download" attribute here: we want the jl contents to be shown in a new tab -->
                 <a href=${notebookfile_url} target="_blank" class="export_card" onClick=${(e) => exportNotebook(e, 0)}>
-                    <header><${Triangle} fill="#a270ba" /> Notebook file</header>
+                    <header role="none"><${Triangle} fill="#a270ba" /> Notebook file</header>
                     <section>Download a copy of the <b>.jl</b> script.</section>
                 </a>
                 <a
@@ -115,11 +115,11 @@ export const ExportBanner = ({ notebook_id, print_title, open, onClose, notebook
                         exportNotebook(e, 1)
                     }}
                 >
-                    <header><${Square} fill="#E86F51" /> Static HTML</header>
+                    <header role="none"><${Square} fill="#E86F51" /> Static HTML</header>
                     <section>An <b>.html</b> file for your web page, or to share online.</section>
                 </a>
                 <a href="#" class="export_card" onClick=${() => window.print()}>
-                    <header><${Square} fill="#619b3d" /> PDF</header>
+                    <header role="none"><${Square} fill="#619b3d" /> PDF</header>
                     <section>A static <b>.pdf</b> file for print or email.</section>
                 </a>
                 ${html`
@@ -134,7 +134,7 @@ export const ExportBanner = ({ notebook_id, print_title, open, onClose, notebook
                         }}
                         class="export_card"
                     >
-                        <header><${Circle} fill="#E86F51" /> Record <em>(preview)</em></header>
+                        <header role="none"><${Circle} fill="#E86F51" /> Record <em>(preview)</em></header>
                         <section>Capture the entire notebook, and any changes you make.</section>
                     </a>
                 `}
diff --git a/frontend/components/FrontmatterInput.js b/frontend/components/FrontmatterInput.js
index ee792cb2ac..b0d8061a96 100644
--- a/frontend/components/FrontmatterInput.js
+++ b/frontend/components/FrontmatterInput.js
@@ -79,6 +79,7 @@ export const FrontMatterInput = ({ filename, remote_frontmatter, set_remote_fron
                         <button
                             class="deletefield"
                             title="Delete field"
+                            aria-label="Delete field"
                             onClick=${() => {
                                 //  TODO
                                 set_frontmatter(
@@ -116,7 +117,7 @@ export const FrontMatterInput = ({ filename, remote_frontmatter, set_remote_fron
             If you are publishing this notebook on the web, you can set the parameters below to provide HTML metadata. This is useful for search engines and
             social media.
         </p>
-        <div class="card-preview">
+        <div class="card-preview" aria-hidden="true">
             <h2>Preview</h2>
             <${FeaturedCard}
                 entry=${
diff --git a/frontend/components/ProcessTab.js b/frontend/components/ProcessTab.js
index b9785023ca..8da46878e2 100644
--- a/frontend/components/ProcessTab.js
+++ b/frontend/components/ProcessTab.js
@@ -190,6 +190,8 @@ const StatusItem = ({ status_tree, path, my_clock_is_ahead_by, nbpkg, backend_la
         }
     }
 
+    const can_open = Object.values(mystatus.subtasks).length > 0
+
     return path.length === 0
         ? inner
         : html`<pl-status
@@ -199,8 +201,9 @@ const StatusItem = ({ status_tree, path, my_clock_is_ahead_by, nbpkg, backend_la
                   finished,
                   busy,
                   is_open,
-                  can_open: Object.values(mystatus.subtasks).length > 0,
+                  can_open,
               })}
+              aria-expanded=${can_open ? is_open : undefined}
           >
               <div
                   onClick=${(e) => {

From 9ade73478325def7b87466c7604263d5d3a94661 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 3 Jan 2024 23:42:18 +0100
Subject: [PATCH 817/821] CI: nightly instead of julia 1.11

---
 .github/workflows/Test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 4f5c78b2a5..359a6a6149 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -34,7 +34,7 @@ jobs:
             fail-fast: false
             matrix:
                 # We test quite a lot of versions because we do some OS and version specific things unfortunately
-                julia-version: ["1.6", "1.8", "1.10", "~1.11.0-0"]
+                julia-version: ["1.6", "1.8", "1.10", "nightly"] # "~1.11.0-0"]
                 os: [ubuntu-latest, macOS-latest, windows-latest]
 
         steps:

From 2e2b5d1e62d08a28f1fe672ffdc5bb154b598966 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 3 Jan 2024 23:56:18 +0100
Subject: [PATCH 818/821] stats: record static view pluto version and which
 featured notebook is read

---
 frontend/components/Editor.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/frontend/components/Editor.js b/frontend/components/Editor.js
index e6d31e5fc5..b243d1a34f 100644
--- a/frontend/components/Editor.js
+++ b/frontend/components/Editor.js
@@ -235,6 +235,7 @@ const first_true_key = (obj) => {
 /**
  * @typedef NotebookData
  * @type {{
+ *  pluto_version?: string,
  *  notebook_id: string,
  *  path: string,
  *  shortpath: string,
@@ -946,7 +947,7 @@ patch: ${JSON.stringify(
             if (!this.state.static_preview && document.visibilityState === "visible") {
                 // view stats on https://stats.plutojl.org/
                 //@ts-ignore
-                count_stat(`editing/${window?.version_info?.pluto ?? "unknown"}${window.plutoDesktop ? "-desktop" : ""}`)
+                count_stat(`editing/${window?.version_info?.pluto ?? this.state.notebook.pluto_version ?? "unknown"}${window.plutoDesktop ? "-desktop" : ""}`)
             }
         }, 1000 * 15 * 60)
         setInterval(() => {
@@ -1366,18 +1367,22 @@ patch: ${JSON.stringify(
     }
 
     componentDidMount() {
+        const lp = this.props.launch_params
         if (this.state.static_preview) {
             this.setState({
                 initializing: false,
             })
+
             // view stats on https://stats.plutojl.org/
-            if (this.state.pluto_server_url != null) {
-                count_stat(`article-view`)
-            } else {
-                count_stat(`article-view`)
-            }
+            count_stat(
+                lp.pluto_server_url != null
+                    ? // record which featured notebook was viewed, e.g. basic/Markdown.jl
+                      `featured-view${lp.notebookfile != null ? new URL(lp.notebookfile).pathname : ""}`
+                    : // @ts-ignore
+                      `article-view/${window?.version_info?.pluto ?? this.state.notebook.pluto_version ?? "unknown"}`
+            )
         } else {
-            this.connect(this.props.launch_params.pluto_server_url ? ws_address_from_base(this.props.launch_params.pluto_server_url) : undefined)
+            this.connect(lp.pluto_server_url ? ws_address_from_base(lp.pluto_server_url) : undefined)
         }
     }
 

From da4d1b6453eb8fc47d73d8de04216872fc66e942 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 00:02:00 +0100
Subject: [PATCH 819/821] Bump msgpackr from 1.5.7 to 1.10.1 in
 /frontend-bundler (#2763)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend-bundler/package-lock.json | 291 +++++++++++++++--------------
 1 file changed, 147 insertions(+), 144 deletions(-)

diff --git a/frontend-bundler/package-lock.json b/frontend-bundler/package-lock.json
index ae21d126ec..338ab687a5 100644
--- a/frontend-bundler/package-lock.json
+++ b/frontend-bundler/package-lock.json
@@ -471,6 +471,78 @@
                 "node": ">=12.0.0"
             }
         },
+        "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz",
+            "integrity": "sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz",
+            "integrity": "sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz",
+            "integrity": "sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==",
+            "cpu": [
+                "arm"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz",
+            "integrity": "sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz",
+            "integrity": "sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz",
+            "integrity": "sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -4632,103 +4704,34 @@
             "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
         "node_modules/msgpackr": {
-            "version": "1.5.7",
-            "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.5.7.tgz",
-            "integrity": "sha512-Hsa80i8W4BiObSMHslfnwC+CC1CYHZzoXJZn0+3EvoCEOgt3c5QlXhdcjgFk2aZxMgpV8aUFZqJyQUCIp4UrzA==",
+            "version": "1.10.1",
+            "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.10.1.tgz",
+            "integrity": "sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ==",
             "optionalDependencies": {
-                "msgpackr-extract": "^1.1.4"
+                "msgpackr-extract": "^3.0.2"
             }
         },
         "node_modules/msgpackr-extract": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.1.4.tgz",
-            "integrity": "sha512-WQbHvsThprXh+EqZYy+SQFEs7z6bNM7a0vgirwUfwUcphWGT2mdPcpyLCNiRsN6w5q5VKJUMblHY+tNEyceb9Q==",
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz",
+            "integrity": "sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==",
             "hasInstallScript": true,
             "optional": true,
             "dependencies": {
-                "node-gyp-build-optional-packages": "^4.3.2"
+                "node-gyp-build-optional-packages": "5.0.7"
+            },
+            "bin": {
+                "download-msgpackr-prebuilds": "bin/download-prebuilds.js"
             },
             "optionalDependencies": {
-                "msgpackr-extract-darwin-arm64": "1.1.0",
-                "msgpackr-extract-darwin-x64": "1.1.0",
-                "msgpackr-extract-linux-arm": "1.1.0",
-                "msgpackr-extract-linux-arm64": "1.1.0",
-                "msgpackr-extract-linux-x64": "1.1.0",
-                "msgpackr-extract-win32-x64": "1.1.0"
+                "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.2",
+                "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.2",
+                "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.2",
+                "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.2",
+                "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.2",
+                "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.2"
             }
         },
-        "node_modules/msgpackr-extract-darwin-arm64": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-1.1.0.tgz",
-            "integrity": "sha512-s1kHoT12tS2cCQOv+Wl3I+/cYNJXBPtwQqGA+dPYoXmchhXiE0Nso+BIfvQ5PxbmAyjj54Q5o7PnLTqVquNfZA==",
-            "cpu": [
-                "arm64"
-            ],
-            "optional": true,
-            "os": [
-                "darwin"
-            ]
-        },
-        "node_modules/msgpackr-extract-darwin-x64": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-1.1.0.tgz",
-            "integrity": "sha512-yx/H/i12IKg4eWGu/eKdKzJD4jaYvvujQSaVmeOMCesbSQnWo5X6YR9TFjoiNoU9Aexk1KufzL9gW+1DozG1yw==",
-            "cpu": [
-                "x64"
-            ],
-            "optional": true,
-            "os": [
-                "darwin"
-            ]
-        },
-        "node_modules/msgpackr-extract-linux-arm": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-1.1.0.tgz",
-            "integrity": "sha512-0VvSCqi12xpavxl14gMrauwIzHqHbmSChUijy/uo3mpjB1Pk4vlisKpZsaOZvNJyNKj0ACi5jYtbWnnOd7hYGw==",
-            "cpu": [
-                "arm"
-            ],
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/msgpackr-extract-linux-arm64": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-1.1.0.tgz",
-            "integrity": "sha512-AxFle3fHNwz2V4CYDIGFxI6o/ZuI0lBKg0uHI8EcCMUmDE5mVAUWYge5WXmORVvb8sVWyVgFlmi3MTu4Ve6tNQ==",
-            "cpu": [
-                "arm64"
-            ],
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/msgpackr-extract-linux-x64": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-1.1.0.tgz",
-            "integrity": "sha512-O+XoyNFWpdB8oQL6O/YyzffPpmG5rTNrr1nKLW70HD2ENJUhcITzbV7eZimHPzkn8LAGls1tBaMTHQezTBpFOw==",
-            "cpu": [
-                "x64"
-            ],
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/msgpackr-extract-win32-x64": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-1.1.0.tgz",
-            "integrity": "sha512-6AJdM5rNsL4yrskRfhujVSPEd6IBpgvsnIT/TPowKNLQ62iIdryizPY2PJNFiW3AJcY249AHEiDBXS1cTDPxzA==",
-            "cpu": [
-                "x64"
-            ],
-            "optional": true,
-            "os": [
-                "win32"
-            ]
-        },
         "node_modules/nan": {
             "version": "2.15.0",
             "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
@@ -4804,14 +4807,14 @@
             }
         },
         "node_modules/node-gyp-build-optional-packages": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-4.3.2.tgz",
-            "integrity": "sha512-P5Ep3ISdmwcCkZIaBaQamQtWAG0facC89phWZgi5Z3hBU//J6S48OIvyZWSPPf6yQMklLZiqoosWAZUj7N+esA==",
+            "version": "5.0.7",
+            "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz",
+            "integrity": "sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==",
             "optional": true,
             "bin": {
-                "node-gyp-build-optional": "optional.js",
                 "node-gyp-build-optional-packages": "bin.js",
-                "node-gyp-build-test": "build-test.js"
+                "node-gyp-build-optional-packages-optional": "optional.js",
+                "node-gyp-build-optional-packages-test": "build-test.js"
             }
         },
         "node_modules/node-releases": {
@@ -7390,6 +7393,42 @@
                 "json5": "^2.2.1"
             }
         },
+        "@msgpackr-extract/msgpackr-extract-darwin-arm64": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz",
+            "integrity": "sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==",
+            "optional": true
+        },
+        "@msgpackr-extract/msgpackr-extract-darwin-x64": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz",
+            "integrity": "sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==",
+            "optional": true
+        },
+        "@msgpackr-extract/msgpackr-extract-linux-arm": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz",
+            "integrity": "sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==",
+            "optional": true
+        },
+        "@msgpackr-extract/msgpackr-extract-linux-arm64": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz",
+            "integrity": "sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==",
+            "optional": true
+        },
+        "@msgpackr-extract/msgpackr-extract-linux-x64": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz",
+            "integrity": "sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==",
+            "optional": true
+        },
+        "@msgpackr-extract/msgpackr-extract-win32-x64": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz",
+            "integrity": "sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==",
+            "optional": true
+        },
         "@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -10371,64 +10410,28 @@
             "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
         "msgpackr": {
-            "version": "1.5.7",
-            "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.5.7.tgz",
-            "integrity": "sha512-Hsa80i8W4BiObSMHslfnwC+CC1CYHZzoXJZn0+3EvoCEOgt3c5QlXhdcjgFk2aZxMgpV8aUFZqJyQUCIp4UrzA==",
+            "version": "1.10.1",
+            "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.10.1.tgz",
+            "integrity": "sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ==",
             "requires": {
-                "msgpackr-extract": "^1.1.4"
+                "msgpackr-extract": "^3.0.2"
             }
         },
         "msgpackr-extract": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.1.4.tgz",
-            "integrity": "sha512-WQbHvsThprXh+EqZYy+SQFEs7z6bNM7a0vgirwUfwUcphWGT2mdPcpyLCNiRsN6w5q5VKJUMblHY+tNEyceb9Q==",
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz",
+            "integrity": "sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==",
             "optional": true,
             "requires": {
-                "msgpackr-extract-darwin-arm64": "1.1.0",
-                "msgpackr-extract-darwin-x64": "1.1.0",
-                "msgpackr-extract-linux-arm": "1.1.0",
-                "msgpackr-extract-linux-arm64": "1.1.0",
-                "msgpackr-extract-linux-x64": "1.1.0",
-                "msgpackr-extract-win32-x64": "1.1.0",
-                "node-gyp-build-optional-packages": "^4.3.2"
+                "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.2",
+                "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.2",
+                "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.2",
+                "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.2",
+                "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.2",
+                "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.2",
+                "node-gyp-build-optional-packages": "5.0.7"
             }
         },
-        "msgpackr-extract-darwin-arm64": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-1.1.0.tgz",
-            "integrity": "sha512-s1kHoT12tS2cCQOv+Wl3I+/cYNJXBPtwQqGA+dPYoXmchhXiE0Nso+BIfvQ5PxbmAyjj54Q5o7PnLTqVquNfZA==",
-            "optional": true
-        },
-        "msgpackr-extract-darwin-x64": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-1.1.0.tgz",
-            "integrity": "sha512-yx/H/i12IKg4eWGu/eKdKzJD4jaYvvujQSaVmeOMCesbSQnWo5X6YR9TFjoiNoU9Aexk1KufzL9gW+1DozG1yw==",
-            "optional": true
-        },
-        "msgpackr-extract-linux-arm": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-1.1.0.tgz",
-            "integrity": "sha512-0VvSCqi12xpavxl14gMrauwIzHqHbmSChUijy/uo3mpjB1Pk4vlisKpZsaOZvNJyNKj0ACi5jYtbWnnOd7hYGw==",
-            "optional": true
-        },
-        "msgpackr-extract-linux-arm64": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-1.1.0.tgz",
-            "integrity": "sha512-AxFle3fHNwz2V4CYDIGFxI6o/ZuI0lBKg0uHI8EcCMUmDE5mVAUWYge5WXmORVvb8sVWyVgFlmi3MTu4Ve6tNQ==",
-            "optional": true
-        },
-        "msgpackr-extract-linux-x64": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-1.1.0.tgz",
-            "integrity": "sha512-O+XoyNFWpdB8oQL6O/YyzffPpmG5rTNrr1nKLW70HD2ENJUhcITzbV7eZimHPzkn8LAGls1tBaMTHQezTBpFOw==",
-            "optional": true
-        },
-        "msgpackr-extract-win32-x64": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-1.1.0.tgz",
-            "integrity": "sha512-6AJdM5rNsL4yrskRfhujVSPEd6IBpgvsnIT/TPowKNLQ62iIdryizPY2PJNFiW3AJcY249AHEiDBXS1cTDPxzA==",
-            "optional": true
-        },
         "nan": {
             "version": "2.15.0",
             "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
@@ -10484,9 +10487,9 @@
             "integrity": "sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q=="
         },
         "node-gyp-build-optional-packages": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-4.3.2.tgz",
-            "integrity": "sha512-P5Ep3ISdmwcCkZIaBaQamQtWAG0facC89phWZgi5Z3hBU//J6S48OIvyZWSPPf6yQMklLZiqoosWAZUj7N+esA==",
+            "version": "5.0.7",
+            "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz",
+            "integrity": "sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==",
             "optional": true
         },
         "node-releases": {

From be51e4bf8ceaf14bbc5977892a9ac74afefb54c0 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Thu, 4 Jan 2024 00:10:25 +0100
Subject: [PATCH 820/821] =?UTF-8?q?=F0=9F=97=A3=EF=B8=8F=20Screen=20reader?=
 =?UTF-8?q?=20support=20for=20reactive=20output=20changes=20(#2757)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/CellOutput.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/frontend/components/CellOutput.js b/frontend/components/CellOutput.js
index a58979b88e..b2a6244b88 100644
--- a/frontend/components/CellOutput.js
+++ b/frontend/components/CellOutput.js
@@ -34,7 +34,9 @@ const prettyAssignee = (assignee) =>
 export class CellOutput extends Component {
     constructor() {
         super()
-        this.state = {}
+        this.state = {
+            output_changed_once: false,
+        }
 
         this.old_height = 0
         // @ts-ignore Is there a way to use the latest DOM spec?
@@ -60,6 +62,12 @@ export class CellOutput extends Component {
         return last_run_timestamp !== this.props.last_run_timestamp || sanitize_html !== this.props.sanitize_html
     }
 
+    componentDidUpdate(old_props) {
+        if (this.props.last_run_timestamp !== old_props.last_run_timestamp) {
+            this.setState({ output_changed_once: true })
+        }
+    }
+
     componentDidMount() {
         this.resize_observer.observe(this.base)
     }
@@ -84,8 +92,12 @@ export class CellOutput extends Component {
                 })}
                 translate=${allow_translate}
                 mime=${this.props.mime}
+                aria-live=${this.state.output_changed_once ? "polite" : "off"}
+                aria-atomic="true"
+                aria-relevant="all"
+                aria-label=${this.props.rootassignee == null ? "Result of unlabeled cell:" : `Result of variable ${this.props.rootassignee}:`}
             >
-                <assignee translate=${false}>${prettyAssignee(this.props.rootassignee)}</assignee>
+                <assignee aria-hidden="true" translate=${false}>${prettyAssignee(this.props.rootassignee)}</assignee>
                 <${OutputBody} ...${this.props} />
             </pluto-output>
         `

From bf35888a4e19449f7b6326bdf756db2e8a56f07f Mon Sep 17 00:00:00 2001
From: sebibek <sebibek@gmail.com>
Date: Sat, 13 Jan 2024 08:57:34 +0100
Subject: [PATCH 821/821] try to bypass the issue

---
 frontend/common/PlutoConnection.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/common/PlutoConnection.js b/frontend/common/PlutoConnection.js
index 808f7265a9..c84479b629 100644
--- a/frontend/common/PlutoConnection.js
+++ b/frontend/common/PlutoConnection.js
@@ -391,7 +391,9 @@ export const create_pluto_connection = async ({
                 console.warn("Error while setting binder url:", error)
             }
         }
-        update_url_with_binder_token()
+        if (!vscode_available) {
+            update_url_with_binder_token()
+        }
 
         try {
             ws_connection = await (vscode_available ? create_vscode_connection : create_ws_connection)(String(ws_address), {