Feat: Clean up repo a bit

Cargo.toml

@@ -5,10 +5,10 @@ members = [
     "packages/core",
     "packages/web",
     "packages/dioxus",
-    
+    "packages/recoil",
+    "packages/docsite",
 ] # "packages/webview",
 
-# "packages/docsite",
 # "packages/ssr",
 # "packages/cli",
 # "packages/webview",

notes/CHANGELOG.md

@@ -77,17 +77,16 @@ Welcome to the first iteration of the Dioxus Virtual DOM! This release brings su
 - [x] keys on components
 - [x] Allow paths for components
 - [x] todo mvc
+- [x] Tweak macro parsing for better errors
+- [x] dirty tagging, compression
+- [x] code health
 - [ ] Make events lazy (use traits + Box<dyn>) - not sure what this means anymore
-- [ ] Attributes on elements should implement format_args instead of string fmt
 - [ ] Beef up the dioxus CLI tool to report build progress
-- [x] Tweak macro parsing for better errors
 - [ ] Extract arena logic out for better safety guarantees
 - [ ] Extract BumpFrame logic out for better safety guarantees
 - [ ] make SSR follow HTML spec
-- [x] dirty tagging, compression
 - [ ] fix keys on elements
 - [ ] MIRI tests
-- [ ] code health
 - [ ] all synthetic events filled out
 - [ ] double check event targets and stuff
 - [ ] Documentation overhaul
@@ -95,6 +94,7 @@ Welcome to the first iteration of the Dioxus Virtual DOM! This release brings su
 - [ ] controlled components
 
 lower priority features
+- [ ] Attributes on elements should implement format_args instead of string fmt
 - [ ] fragments
 - [ ] node refs (postpone for future release?)
 - [ ] styling built-in (future release?)

packages/3d/Cargo.toml

@@ -1,9 +0,0 @@
-[package]
-name = "dioxus3d"
-version = "0.0.0"
-authors = ["Jonathan Kelley <jkelleyrtp@gmail.com>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]

packages/3d/README.md

@@ -1,25 +0,0 @@
-# Dioxus3d: declarative framework for using the `Canvas`
-
-Declarative wrapper over wgpu for creating interactive gpu-enabled visualizations in the browser with Dioxus. This crate's analog is ThreeJS and react-three-fiber. Here, we expose a set of hooks for using the `Canvas` imperatively, and then provide a set of components that interact with this canvas context. From there, declaring scenes is as easy as:
-
-```rust
-use dioxus3d::{Canvas};
-use dioxus::prelude::*;
-
-static HelloWorld = |ctx, props| {
-    ctx.render(rsx! {
-        Canvas {
-            Text {
-                "Hello world"
-                rel_pos: (0,0,1)
-                size: (1,1,1)
-            }
-            Cube {
-                size: (1,1,1)
-            }
-        }
-    })
-};
-```
-
-// dioxus bevy: wrap a bevy instance with reactive controls. 

packages/core/Cargo.toml

@@ -14,7 +14,7 @@ description = "Core functionality for Dioxus - a concurrent renderer-agnostic Vi
 dioxus-core-macro = { path = "../core-macro", version = "0.1.1" }
 
 # Backs scopes and graphs between parent and children
-generational-arena = { version = "0.2.8", features = ["serde"] }
+generational-arena = { version = "0.2.8" }
 
 # Bumpalo backs the VNode creation
 bumpalo = { version = "3.6.0", features = ["collections", "boxed"] }
@@ -36,3 +36,4 @@ serde = { version = "1", features = ["derive"], optional = true }
 
 [features]
 default = []
+serialize = ["serde", "generational-arena/serde"]

packages/core/src/arena.rs

@@ -0,0 +1,48 @@
+use std::{cell::UnsafeCell, collections::HashMap};
+
+use generational_arena::Arena;
+
+use crate::innerlude::*;
+
+pub struct ScopeArena {
+    pub(crate) arena: UnsafeCell<Arena<Scope>>,
+    locks: HashMap<ScopeIdx, MutStatus>,
+}
+
+enum MutStatus {
+    Immut,
+    Mut,
+}
+
+impl ScopeArena {
+    pub fn new(arena: Arena<Scope>) -> Self {
+        Self {
+            arena: UnsafeCell::new(arena),
+            locks: Default::default(),
+        }
+    }
+
+    pub fn get(&self, idx: ScopeIdx) -> Result<&Scope> {
+        todo!()
+    }
+
+    pub fn get_mut(&self, idx: ScopeIdx) -> Result<&Scope> {
+        todo!()
+    }
+
+    fn inner(&self) -> &Arena<Scope> {
+        todo!()
+    }
+
+    fn inner_mut(&mut self) -> &mut Arena<Scope> {
+        todo!()
+    }
+
+    pub fn with<T>(&mut self, f: impl FnOnce(&mut Arena<Scope>) -> T) -> T {
+        todo!()
+    }
+
+    unsafe fn inner_unchecked<'s>() -> &'s mut Arena<Scope> {
+        todo!()
+    }
+}

packages/core/src/context.rs

@@ -120,4 +120,4 @@ impl<'a> crate::virtual_dom::Context<'a> {
 ///
 /// - Dioxus reducer is built on the safe API and provides a useful but slightly limited API.
 /// - Dioxus Dataflow is built on the unsafe API and provides an even snazzier API than Dioxus Reducer.    
-fn blah() {}
+fn _blah() {}

packages/core/src/error.rs

@@ -1,3 +1,7 @@
+//! Internal error handling for Dioxus
+//!
+//!
+
 use thiserror::Error as ThisError;
 pub type Result<T, E = Error> = std::result::Result<T, E>;
 

packages/core/src/lib.rs

@@ -65,6 +65,7 @@
 //! - dioxus-liveview (SSR + StringRenderer)
 //!
 
+pub mod arena;
 pub mod component; // Logic for extending FC
 pub mod context; // Logic for providing hook + context functionality to user components
 pub mod debug_renderer;

packages/core/src/patch.rs

@@ -19,16 +19,11 @@
 //!
 //! # Known Issues
 //! ----
-//! - stack machine approach does not work when 3rd party extensions inject elements (breaking our view of the dom)
-
-use std::cell::Ref;
+//! - stack machine approach does not work when 3rd party extensions inject elements (breaking our view of the dom) - solvable by the renderer
 
 use crate::innerlude::ScopeIdx;
 
 pub type EditList<'src> = Vec<Edit<'src>>;
-// pub struct EditList<'src> {
-//     edits: Vec<Edit<'src>>,
-// }
 
 /// The `Edit` represents a single modifcation of the renderer tree.
 /// todo @jon, go through and make certain fields static. tag names should be known at compile time

packages/docsite/README.md

@@ -2,7 +2,7 @@
 
 Generate the liveview site powering diouxslabs.com.
 
-We use the dioxus SSR crate and the use_router hook to generate a 
+We use the dioxus SSR crate and the use_router hook to generate all the routes
 
 
 

packages/docsite/src/main.rs

@@ -1,105 +1,11 @@
 use dioxus_ssr::{
-    prelude::{builder::IntoDomTree, dioxus::events::on::MouseEvent, *},
+    prelude::*,
+    prelude::{builder::IntoDomTree, dioxus::events::on::MouseEvent},
     TextRenderer,
 };
-mod components {
-    mod app;
-}
 
 fn main() {
     TextRenderer::new(App);
 }
 
-#[derive(Debug, PartialEq)]
-enum Route {
-    Homepage,
-    Examples,
-}
-
-#[derive(Debug, PartialEq, Props)]
-struct AppProps {
-    route: Route,
-}
-
-static App: FC<AppProps> = |ctx, props| {
-    let body = match props.route {
-        Route::Homepage => ctx.render(rsx! {
-            div {
-                "Some Content"
-            }
-        }),
-
-        Route::Examples => ctx.render(rsx! {
-            div {
-                "Other Content"
-            }
-        }),
-    };
-
-    ctx.render(rsx!(
-        div {
-            Header {}
-            {body}
-            ul {
-                {(0..10).map(|f| rsx!{
-                    li {
-                        "this is list item {f}"
-                    }
-                })}
-            }
-        }
-    ))
-};
-
-static Header: FC<()> = |ctx, _| {
-    ctx.render(rsx! {
-        div {
-
-        }
-    })
-};
-
-mod example {
-    use super::*;
-    static ExampleUsage: FC<()> = |ctx, props| {
-        // direct rsx!
-        let body = rsx! {
-            div {}
-        };
-
-        // rendered rsx!
-        let top = ctx.render(rsx! {
-            div {
-                "ack!"
-            }
-        });
-
-        // listy rsx
-        let list2 = (0..10).map(|f| {
-            rsx! {
-                div {}
-            }
-        });
-
-        // rendered list rsx
-        let list = (0..10).map(|f| {
-            ctx.render(rsx! {
-                div {}
-            })
-        });
-
-        ctx.render(rsx!(
-            div {
-                Header {}
-                {body}
-                {top}
-                {list}
-                {list2}
-                // inline rsx
-                {rsx!{
-                    div { "hello" }
-                }}
-            }
-        ))
-    };
-}
+fn App(ctx: Context, props: &()) -> DomTree {}

packages/old/recoil/src/lib.rs

@@ -1,7 +0,0 @@
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}

packages/old/redux/Cargo.toml

@@ -1,9 +0,0 @@
-[package]
-name = "dioxus-redux"
-version = "0.0.0"
-authors = ["Jonathan Kelley <jkelleyrtp@gmail.com>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]

packages/old/redux/src/lib.rs

@@ -1,72 +0,0 @@
-pub struct Store<T> {
-    user_data: T,
-}
-
-/// Select just a small bit of the
-fn use_selector() {}
-
-/*
-
-// borrow a closure so we can copy the reference
-let dispatch = use_dispatch::<UserData>(ctx);
-
-
-dispatch(|| UserData::Logout)
-
-dispatch()
-
-*/
-fn use_dispatch() {}
-
-mod tests {
-
-    struct UserData {}
-
-    // static SelectLoggedIn: FC<T> = |_| {};
-
-    /*
-
-    // Merge the various stores into a single context
-    // This auto generates the appropriate selectors, reducing the need to wrap the app in excess providers
-    let all = combine_stores(vec![store1, store2]);
-
-    <Redux store={all}>
-
-    </Redux>
-    */
-}
-
-struct Context {
-    data: String,
-    logged_in: bool,
-}
-
-// "static" selectors automatically get memoized
-static SelectUserName: Selector<&str> = |root: Context| root.data.as_str();
-static SelectUserName: Selector<bool> = |root: Context| root.data.logged_in;
-
-fn main() {
-    /*
-    use_context is very unsafe! It essentially exposes your data in an unsafecell where &mut T and &T can exist at the same time. It's up to *you* the library implmenetor to make this safe.
-
-    We provide a redux-style system and a recoil-style system that are both saf
-
-    */
-
-    // connect itsy bits of state together
-    let context = use_create_context(
-        ctx,
-        ContextBuilder::new()
-            .with_root(|| Context {})
-            .with_root(|| Context {})
-            .with_root(|| Context {})
-            .with_root(|| Context {})
-            .with_root(|| Context {})
-            .with_root(|| Context {})
-            .with_root(|| Context {})
-            .with_root(|| Context {})
-            .build(),
-    );
-
-    let g: HashMap<TypeId, Box<dyn Any>> = HashMap::new();
-}

packages/old/virtual-dom-rs/CHANGELOG.md

@@ -1,58 +0,0 @@
-# virtual-dom-rs Changelog
-
-Types of changes:
-
-- `[added]` for new features.
-- `[changed]` for changes in existing functionality.
-- `[deprecated]` for once-stable features removed in upcoming releases.
-- `[removed]` for deprecated features removed in this release.
-- `[fixed]` for any bug fixes.
-- `[security]` to invite users to upgrade in case of vulnerabilities.
-
-## Not Yet Published
-
-_Here we list notable things that have been merged into the master branch but have not been released yet._
-
-- [added] SVG support [#104](https://github.com/chinedufn/percy/pull/104)
-- ...
-
-## 0.6.9 - May 23, 2019
-
-- [added] `on_create_elem` [Docs](https://chinedufn.github.io/percy/html-macro/real-elements-and-nodes/on-create-elem/index.html)
-- [added] `inner_html` [Docs](https://chinedufn.github.io/percy/html-macro/setting-inner-html/index.html)
-
-## 0.6.7 - Mar 16, 2019
-
-- [fixed] Spacing between elements is done by inserting space before and after existing text nodes instead of creating new ones.
-
-## 0.6.6 - Mar 6, 2019
-
-- [fixed] Proper spacing in between text nodes and elements in most use cases [PR](https://github.com/chinedufn/percy/pull/97)
-  - Still need to address [#98](https://github.com/chinedufn/percy/issues/98) and then we should have all cases handled.
-
-## 0.6.5 - Mar 4, 2019
-
-- [added] Start supporting braced text in the `html!` macro [#96](https://github.com/chinedufn/percy/pull/96)
-- [removed] Removed the `text!` macro
-
- ```rust
- let hello = "hello world";
- html! { {hello} }
- ```
-
-
-## 0.6.4 - Feb 24, 2019
-
-- [fixed] Using the `html!` macro to create an event now uses the fully qualified path to `std::rc::Rc`
-- [added] Started adding key support. If a VirtualNode's key attribute changes it will lead to a `Replace` patch.
-
-```rust
-// example
-html! { <div key="5"></div> }`;
-````
-
-## 0.6.1 - Feb 22, 2019
-
-- [fixed] Fix DomUpdater not storing closures for nodes that were created during `Patch::AppendChildren`
- and `Patch::Replace`
-  - [Issue](https://github.com/chinedufn/percy/issues/70)

packages/old/virtual-dom-rs/Cargo.toml

@@ -1,47 +0,0 @@
-[package]
-name = "virtual-dom-rs"
-version = "0.6.14"
-authors = ["Chinedu Francis Nwafili <frankie.nwafili@gmail.com>"]
-description = "A standalone Virtual DOM creation, diffing and patching implementation"
-keywords = ["virtual", "dom", "wasm", "assembly", "webassembly"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/chinedufn/percy"
-documentation = "https://chinedufn.github.io/percy/api/virtual_dom_rs/"
-edition = "2018"
-
-[dependencies]
-js-sys = "0.3"
-wasm-bindgen = "0.2.33"
-virtual-node = { path = "../virtual-node", version = "0.2.7" }
-html-macro = { path = "../html-macro", version = "0.1.8"}
-
-[dependencies.web-sys]
-version = "0.3"
-features = [
-    "Comment",
-    "Document",
-    "Element",
-    "HtmlElement",
-    "EventTarget",
-    "HtmlCollection",
-    "Node",
-    "NodeList",
-    "Text",
-    "CharacterData",
-    "Window",
-]
-
-[dev-dependencies]
-wasm-bindgen-test = "0.2.33"
-console_error_panic_hook = "0.1.5"
-
-[dev-dependencies.web-sys]
-version = "0.3"
-features = [
-    "DomTokenList",
-    "HtmlInputElement",
-    "Event",
-    "MouseEvent",
-    "InputEvent",
-    "console",
-]

packages/old/virtual-dom-rs/README.md

@@ -1,3 +0,0 @@
-# virtual-dom-rs
-
-> A standalone Virtual DOM creation, diffing and patching implementation

packages/old/virtual-dom-rs/src/diff/diff_test_case.rs

@@ -1,26 +0,0 @@
-//! Kept in it's own file to more easily import into the Percy book.
-
-use crate::diff::diff;
-use crate::patch::Patch;
-use virtual_node::VirtualNode;
-
-/// Test that we generate the right Vec<Patch> for some start and end virtual dom.
-pub struct DiffTestCase<'a> {
-    // ex: "Patching root level nodes works"
-    pub description: &'static str,
-    // ex: html! { <div> </div> }
-    pub old: VirtualNode,
-    // ex: html! { <strong> </strong> }
-    pub new: VirtualNode,
-    // ex: vec![Patch::Replace(0, &html! { <strong></strong> })],
-    pub expected: Vec<Patch<'a>>,
-}
-
-impl<'a> DiffTestCase<'a> {
-    pub fn test(&self) {
-        // ex: vec![Patch::Replace(0, &html! { <strong></strong> })],
-        let patches = diff(&self.old, &self.new);
-
-        assert_eq!(patches, self.expected, "{}", self.description);
-    }
-}

packages/old/virtual-dom-rs/src/diff/mod.rs

@@ -1,351 +0,0 @@
-use crate::Patch;
-use crate::VirtualNode;
-use std::cmp::min;
-use std::collections::HashMap;
-use std::mem;
-
-/// Given two VirtualNode's generate Patch's that would turn the old virtual node's
-/// real DOM node equivalent into the new VirtualNode's real DOM node equivalent.
-pub fn diff<'a>(old: &'a VirtualNode, new: &'a VirtualNode) -> Vec<Patch<'a>> {
-    diff_recursive(&old, &new, &mut 0)
-}
-
-fn diff_recursive<'a, 'b>(
-    old: &'a VirtualNode,
-    new: &'a VirtualNode,
-    cur_node_idx: &'b mut usize,
-) -> Vec<Patch<'a>> {
-    let mut patches = vec![];
-    let mut replace = false;
-
-    // Different enum variants, replace!
-    if mem::discriminant(old) != mem::discriminant(new) {
-        replace = true;
-    }
-
-    if let (VirtualNode::Element(old_element), VirtualNode::Element(new_element)) = (old, new) {
-        // Replace if there are different element tags
-        if old_element.tag != new_element.tag {
-            replace = true;
-        }
-
-        // Replace if two elements have different keys
-        // TODO: More robust key support. This is just an early stopgap to allow you to force replace
-        // an element... say if it's event changed. Just change the key name for now.
-        // In the future we want keys to be used to create a Patch::ReOrder to re-order siblings
-        if old_element.attrs.get("key").is_some()
-            && old_element.attrs.get("key") != new_element.attrs.get("key")
-        {
-            replace = true;
-        }
-    }
-
-    // Handle replacing of a node
-    if replace {
-        patches.push(Patch::Replace(*cur_node_idx, &new));
-        if let VirtualNode::Element(old_element_node) = old {
-            for child in old_element_node.children.iter() {
-                increment_node_idx_for_children(child, cur_node_idx);
-            }
-        }
-        return patches;
-    }
-
-    // The following comparison can only contain identical variants, other
-    // cases have already been handled above by comparing variant
-    // discriminants.
-    match (old, new) {
-        // We're comparing two text nodes
-        (VirtualNode::Text(old_text), VirtualNode::Text(new_text)) => {
-            if old_text != new_text {
-                patches.push(Patch::ChangeText(*cur_node_idx, &new_text));
-            }
-        }
-
-        // We're comparing two element nodes
-        (VirtualNode::Element(old_element), VirtualNode::Element(new_element)) => {
-            let mut add_attributes: HashMap<&str, &str> = HashMap::new();
-            let mut remove_attributes: Vec<&str> = vec![];
-
-            // TODO: -> split out into func
-            for (new_attr_name, new_attr_val) in new_element.attrs.iter() {
-                match old_element.attrs.get(new_attr_name) {
-                    Some(ref old_attr_val) => {
-                        if old_attr_val != &new_attr_val {
-                            add_attributes.insert(new_attr_name, new_attr_val);
-                        }
-                    }
-                    None => {
-                        add_attributes.insert(new_attr_name, new_attr_val);
-                    }
-                };
-            }
-
-            // TODO: -> split out into func
-            for (old_attr_name, old_attr_val) in old_element.attrs.iter() {
-                if add_attributes.get(&old_attr_name[..]).is_some() {
-                    continue;
-                };
-
-                match new_element.attrs.get(old_attr_name) {
-                    Some(ref new_attr_val) => {
-                        if new_attr_val != &old_attr_val {
-                            remove_attributes.push(old_attr_name);
-                        }
-                    }
-                    None => {
-                        remove_attributes.push(old_attr_name);
-                    }
-                };
-            }
-
-            if add_attributes.len() > 0 {
-                patches.push(Patch::AddAttributes(*cur_node_idx, add_attributes));
-            }
-            if remove_attributes.len() > 0 {
-                patches.push(Patch::RemoveAttributes(*cur_node_idx, remove_attributes));
-            }
-
-            let old_child_count = old_element.children.len();
-            let new_child_count = new_element.children.len();
-
-            if new_child_count > old_child_count {
-                let append_patch: Vec<&'a VirtualNode> =
-                    new_element.children[old_child_count..].iter().collect();
-                patches.push(Patch::AppendChildren(*cur_node_idx, append_patch))
-            }
-
-            if new_child_count < old_child_count {
-                patches.push(Patch::TruncateChildren(*cur_node_idx, new_child_count))
-            }
-
-            let min_count = min(old_child_count, new_child_count);
-            for index in 0..min_count {
-                *cur_node_idx = *cur_node_idx + 1;
-                let old_child = &old_element.children[index];
-                let new_child = &new_element.children[index];
-                patches.append(&mut diff_recursive(&old_child, &new_child, cur_node_idx))
-            }
-            if new_child_count < old_child_count {
-                for child in old_element.children[min_count..].iter() {
-                    increment_node_idx_for_children(child, cur_node_idx);
-                }
-            }
-        }
-        (VirtualNode::Text(_), VirtualNode::Element(_))
-        | (VirtualNode::Element(_), VirtualNode::Text(_)) => {
-            unreachable!("Unequal variant discriminants should already have been handled");
-        }
-    };
-
-    //    new_root.create_element()
-    patches
-}
-
-fn increment_node_idx_for_children<'a, 'b>(old: &'a VirtualNode, cur_node_idx: &'b mut usize) {
-    *cur_node_idx += 1;
-    if let VirtualNode::Element(element_node) = old {
-        for child in element_node.children.iter() {
-            increment_node_idx_for_children(&child, cur_node_idx);
-        }
-    }
-}
-
-#[cfg(test)]
-mod diff_test_case;
-#[cfg(test)]
-use self::diff_test_case::*;
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{html, VText, VirtualNode};
-    use std::collections::HashMap;
-
-    #[test]
-    fn replace_node() {
-        DiffTestCase {
-            description: "Replace the root if the tag changed",
-            old: html! { <div> </div> },
-            new: html! { <span> </span> },
-            expected: vec![Patch::Replace(0, &html! { <span></span> })],
-        }
-        .test();
-        DiffTestCase {
-            description: "Replace a child node",
-            old: html! { <div> <b></b> </div> },
-            new: html! { <div> <strong></strong> </div> },
-            expected: vec![Patch::Replace(1, &html! { <strong></strong> })],
-        }
-        .test();
-        DiffTestCase {
-            description: "Replace node with a child",
-            old: html! { <div> <b>1</b> <b></b> </div> },
-            new: html! { <div> <i>1</i> <i></i> </div>},
-            expected: vec![
-                Patch::Replace(1, &html! { <i>1</i> }),
-                Patch::Replace(3, &html! { <i></i> }),
-            ], //required to check correct index
-        }
-        .test();
-    }
-
-    #[test]
-    fn add_children() {
-        DiffTestCase {
-            description: "Added a new node to the root node",
-            old: html! { <div> <b></b> </div> },
-            new: html! { <div> <b></b> <span></span> </div> },
-            expected: vec![Patch::AppendChildren(0, vec![&html! { <span></span> }])],
-        }
-        .test();
-    }
-
-    #[test]
-    fn remove_nodes() {
-        DiffTestCase {
-            description: "Remove all child nodes at and after child sibling index 1",
-            old: html! { <div> <b></b> <span></span> </div> },
-            new: html! { <div> </div> },
-            expected: vec![Patch::TruncateChildren(0, 0)],
-        }
-        .test();
-        DiffTestCase {
-            description: "Remove a child and a grandchild node",
-            old: html! {
-            <div>
-             <span>
-               <b></b>
-               // This `i` tag will get removed
-               <i></i>
-             </span>
-             // This `strong` tag will get removed
-             <strong></strong>
-            </div> },
-            new: html! {
-            <div>
-             <span>
-              <b></b>
-             </span>
-            </div> },
-            expected: vec![Patch::TruncateChildren(0, 1), Patch::TruncateChildren(1, 1)],
-        }
-        .test();
-        DiffTestCase {
-            description: "Removing child and change next node after parent",
-            old: html! { <div> <b> <i></i> <i></i> </b> <b></b> </div> },
-            new: html! { <div> <b> <i></i> </b> <i></i> </div>},
-            expected: vec![
-                Patch::TruncateChildren(1, 1),
-                Patch::Replace(4, &html! { <i></i> }),
-            ], //required to check correct index
-        }
-        .test();
-    }
-
-    #[test]
-    fn add_attributes() {
-        let mut attributes = HashMap::new();
-        attributes.insert("id", "hello");
-
-        DiffTestCase {
-            old: html! { <div> </div> },
-            new: html! { <div id="hello"> </div> },
-            expected: vec![Patch::AddAttributes(0, attributes.clone())],
-            description: "Add attributes",
-        }
-        .test();
-
-        DiffTestCase {
-            old: html! { <div id="foobar"> </div> },
-            new: html! { <div id="hello"> </div> },
-            expected: vec![Patch::AddAttributes(0, attributes)],
-            description: "Change attribute",
-        }
-        .test();
-    }
-
-    #[test]
-    fn remove_attributes() {
-        DiffTestCase {
-            old: html! { <div id="hey-there"></div> },
-            new: html! { <div> </div> },
-            expected: vec![Patch::RemoveAttributes(0, vec!["id"])],
-            description: "Add attributes",
-        }
-        .test();
-    }
-
-    #[test]
-    fn change_attribute() {
-        let mut attributes = HashMap::new();
-        attributes.insert("id", "changed");
-
-        DiffTestCase {
-            description: "Add attributes",
-            old: html! { <div id="hey-there"></div> },
-            new: html! { <div id="changed"> </div> },
-            expected: vec![Patch::AddAttributes(0, attributes)],
-        }
-        .test();
-    }
-
-    #[test]
-    fn replace_text_node() {
-        DiffTestCase {
-            description: "Replace text node",
-            old: html! { Old },
-            new: html! { New },
-            expected: vec![Patch::ChangeText(0, &VText::new("New"))],
-        }
-        .test();
-    }
-
-    // Initially motivated by having two elements where all that changed was an event listener
-    // because right now we don't patch event listeners. So.. until we have a solution
-    // for that we can just give them different keys to force a replace.
-    #[test]
-    fn replace_if_different_keys() {
-        DiffTestCase {
-            description: "If two nodes have different keys always generate a full replace.",
-            old: html! { <div key="1"> </div> },
-            new: html! { <div key="2"> </div> },
-            expected: vec![Patch::Replace(0, &html! {<div key="2"> </div>})],
-        }
-        .test()
-    }
-
-    //    // TODO: Key support
-    //    #[test]
-    //    fn reorder_chldren() {
-    //        let mut attributes = HashMap::new();
-    //        attributes.insert("class", "foo");
-    //
-    //        let old_children = vec![
-    //            // old node 0
-    //            html! { <div key="hello", id="same-id", style="",></div> },
-    //            // removed
-    //            html! { <div key="gets-removed",> { "This node gets removed"} </div>},
-    //            // old node 2
-    //            html! { <div key="world", class="changed-class",></div>},
-    //            // removed
-    //            html! { <div key="this-got-removed",> { "This node gets removed"} </div>},
-    //        ];
-    //
-    //        let new_children = vec![
-    //            html! { <div key="world", class="foo",></div> },
-    //            html! { <div key="new",> </div>},
-    //            html! { <div key="hello", id="same-id",></div>},
-    //        ];
-    //
-    //        test(DiffTestCase {
-    //            old: html! { <div> { old_children } </div> },
-    //            new: html! { <div> { new_children } </div> },
-    //            expected: vec![
-    //                // TODO: Come up with the patch structure for keyed nodes..
-    //                // keying should only work if all children have keys..
-    //            ],
-    //            description: "Add attributes",
-    //        })
-    //    }
-}

packages/old/virtual-dom-rs/src/dom_updater.rs

@@ -1,103 +0,0 @@
-//! Diff virtual-doms and patch the real DOM
-
-use crate::diff::diff;
-use crate::patch::patch;
-use std::collections::HashMap;
-use virtual_node::DynClosure;
-use virtual_node::VirtualNode;
-use web_sys::{Element, Node};
-
-/// Closures that we are holding on to to make sure that they don't get invalidated after a
-/// VirtualNode is dropped.
-///
-/// The u32 is a unique identifier that is associated with the DOM element that this closure is
-/// attached to.
-///
-/// TODO: Periodically check if the DOM element is still there, and if not drop the closure.
-///   Maybe whenever a DOM node is replaced or truncated we figure out all of it's
-///   descendants somehow and invalidate those closures..? Need to plan this out..
-///   At it stands now this hashmap will grow anytime a new element with closures is
-///   appended or replaced and we will never free those closures.
-pub type ActiveClosures = HashMap<u32, Vec<DynClosure>>;
-
-/// Used for keeping a real DOM node up to date based on the current VirtualNode
-/// and a new incoming VirtualNode that represents our latest DOM state.
-pub struct DomUpdater {
-    current_vdom: VirtualNode,
-    /// The closures that are currently attached to elements in the page.
-    ///
-    /// We keep these around so that they don't get dropped (and thus stop working);
-    ///
-    /// FIXME: Drop them when the element is no longer in the page. Need to figure out
-    /// a good strategy for when to do this.
-    pub active_closures: ActiveClosures,
-    root_node: Node,
-}
-
-impl DomUpdater {
-    /// Create a new `DomUpdater`.
-    ///
-    /// A root `Node` will be created but not added to your DOM.
-    pub fn new(current_vdom: VirtualNode) -> DomUpdater {
-        let created_node = current_vdom.create_dom_node();
-        DomUpdater {
-            current_vdom,
-            active_closures: created_node.closures,
-            root_node: created_node.node,
-        }
-    }
-
-    /// Create a new `DomUpdater`.
-    ///
-    /// A root `Node` will be created and appended (as a child) to your passed
-    /// in mount element.
-    pub fn new_append_to_mount(current_vdom: VirtualNode, mount: &Element) -> DomUpdater {
-        let created_node = current_vdom.create_dom_node();
-        mount
-            .append_child(&created_node.node)
-            .expect("Could not append child to mount");
-        DomUpdater {
-            current_vdom,
-            active_closures: created_node.closures,
-            root_node: created_node.node,
-        }
-    }
-
-    /// Create a new `DomUpdater`.
-    ///
-    /// A root `Node` will be created and it will replace your passed in mount
-    /// element.
-    pub fn new_replace_mount(current_vdom: VirtualNode, mount: Element) -> DomUpdater {
-        let created_node = current_vdom.create_dom_node();
-        mount
-            .replace_with_with_node_1(&created_node.node)
-            .expect("Could not replace mount element");
-        DomUpdater {
-            current_vdom,
-            active_closures: created_node.closures,
-            root_node: created_node.node,
-        }
-    }
-
-    /// Diff the current virtual dom with the new virtual dom that is being passed in.
-    ///
-    /// Then use that diff to patch the real DOM in the user's browser so that they are
-    /// seeing the latest state of the application.
-    pub fn update(&mut self, new_vdom: VirtualNode) {
-        let patches = diff(&self.current_vdom, &new_vdom);
-
-        let active_closures = patch(self.root_node.clone(), &patches).unwrap();
-
-        self.active_closures.extend(active_closures);
-
-        self.current_vdom = new_vdom;
-    }
-
-    /// Return the root node of your application, the highest ancestor of all other nodes in
-    /// your real DOM tree.
-    pub fn root_node(&self) -> Node {
-        // Note that we're cloning the `web_sys::Node`, not the DOM element.
-        // So we're effectively cloning a pointer here, which is fast.
-        self.root_node.clone()
-    }
-}

packages/old/virtual-dom-rs/src/lib.rs

@@ -1,44 +0,0 @@
-//! virtual-dom-rs provides a virtual dom implementation as well as an `html!` macro
-//! that you can use to generate a virtual dom.
-//!
-//! The virtual dom works on both the client and server. On the client we'll render
-//! to an `HtmlElement`, and on the server we render to a `String`.
-
-#![deny(missing_docs)]
-// #![cfg_attr(test, feature(proc_macro_hygiene))]
-
-extern crate wasm_bindgen;
-
-// Used so that `html!` calls work when people depend on this crate since `html!` needs
-// access to `Closure` when creating event handlers.
-pub use wasm_bindgen::prelude::Closure;
-#[cfg(target_arch = "wasm32")]
-pub use wasm_bindgen::JsCast;
-
-pub extern crate web_sys;
-pub use web_sys::*;
-
-pub use virtual_node::*;
-
-mod diff;
-pub use crate::diff::*;
-
-mod patch;
-pub use crate::patch::*;
-
-pub use html_macro::html;
-
-mod dom_updater;
-pub use self::dom_updater::DomUpdater;
-
-/// Exports structs and macros that you'll almost always want access to in a virtual-dom
-/// powered application
-pub mod prelude {
-    pub use crate::dom_updater::DomUpdater;
-    pub use crate::VirtualNode;
-    pub use html_macro::html;
-    pub use std::vec::IntoIter;
-    pub use virtual_node::IterableNodes;
-    pub use virtual_node::View;
-    pub use wasm_bindgen::prelude::Closure;
-}

packages/old/virtual-dom-rs/src/patch/apply_patches.rs

@@ -1,217 +0,0 @@
-use crate::dom_updater::ActiveClosures;
-use crate::patch::Patch;
-
-use std::cmp::min;
-use std::collections::HashMap;
-use std::collections::HashSet;
-use wasm_bindgen::JsCast;
-use wasm_bindgen::JsValue;
-use web_sys::{Element, Node, Text};
-
-/// Apply all of the patches to our old root node in order to create the new root node
-/// that we desire.
-/// This is usually used after diffing two virtual nodes.
-pub fn patch<N: Into<Node>>(root_node: N, patches: &Vec<Patch>) -> Result<ActiveClosures, JsValue> {
-    let root_node: Node = root_node.into();
-
-    let mut cur_node_idx = 0;
-
-    let mut nodes_to_find = HashSet::new();
-
-    for patch in patches {
-        nodes_to_find.insert(patch.node_idx());
-    }
-
-    let mut element_nodes_to_patch = HashMap::new();
-    let mut text_nodes_to_patch = HashMap::new();
-
-    // Closures that were added to the DOM during this patch operation.
-    let mut active_closures = HashMap::new();
-
-    find_nodes(
-        root_node,
-        &mut cur_node_idx,
-        &mut nodes_to_find,
-        &mut element_nodes_to_patch,
-        &mut text_nodes_to_patch,
-    );
-
-    for patch in patches {
-        let patch_node_idx = patch.node_idx();
-
-        if let Some(element) = element_nodes_to_patch.get(&patch_node_idx) {
-            let new_closures = apply_element_patch(&element, &patch)?;
-            active_closures.extend(new_closures);
-            continue;
-        }
-
-        if let Some(text_node) = text_nodes_to_patch.get(&patch_node_idx) {
-            apply_text_patch(&text_node, &patch)?;
-            continue;
-        }
-
-        unreachable!("Getting here means we didn't find the element or next node that we were supposed to patch.")
-    }
-
-    Ok(active_closures)
-}
-
-fn find_nodes(
-    root_node: Node,
-    cur_node_idx: &mut usize,
-    nodes_to_find: &mut HashSet<usize>,
-    element_nodes_to_patch: &mut HashMap<usize, Element>,
-    text_nodes_to_patch: &mut HashMap<usize, Text>,
-) {
-    if nodes_to_find.len() == 0 {
-        return;
-    }
-
-    // We use child_nodes() instead of children() because children() ignores text nodes
-    let children = root_node.child_nodes();
-    let child_node_count = children.length();
-
-    // If the root node matches, mark it for patching
-    if nodes_to_find.get(&cur_node_idx).is_some() {
-        match root_node.node_type() {
-            Node::ELEMENT_NODE => {
-                element_nodes_to_patch.insert(*cur_node_idx, root_node.unchecked_into());
-            }
-            Node::TEXT_NODE => {
-                text_nodes_to_patch.insert(*cur_node_idx, root_node.unchecked_into());
-            }
-            other => unimplemented!("Unsupported root node type: {}", other),
-        }
-        nodes_to_find.remove(&cur_node_idx);
-    }
-
-    *cur_node_idx += 1;
-
-    for i in 0..child_node_count {
-        let node = children.item(i).unwrap();
-
-        match node.node_type() {
-            Node::ELEMENT_NODE => {
-                find_nodes(
-                    node,
-                    cur_node_idx,
-                    nodes_to_find,
-                    element_nodes_to_patch,
-                    text_nodes_to_patch,
-                );
-            }
-            Node::TEXT_NODE => {
-                if nodes_to_find.get(&cur_node_idx).is_some() {
-                    text_nodes_to_patch.insert(*cur_node_idx, node.unchecked_into());
-                }
-
-                *cur_node_idx += 1;
-            }
-            Node::COMMENT_NODE => {
-                // At this time we do not support user entered comment nodes, so if we see a comment
-                // then it was a delimiter created by virtual-dom-rs in order to ensure that two
-                // neighboring text nodes did not get merged into one by the browser. So we skip
-                // over this virtual-dom-rs generated comment node.
-            }
-            _other => {
-                // Ignoring unsupported child node type
-                // TODO: What do we do with this situation? Log a warning?
-            }
-        }
-    }
-}
-
-fn apply_element_patch(node: &Element, patch: &Patch) -> Result<ActiveClosures, JsValue> {
-    let active_closures = HashMap::new();
-
-    match patch {
-        Patch::AddAttributes(_node_idx, attributes) => {
-            for (attrib_name, attrib_val) in attributes.iter() {
-                node.set_attribute(attrib_name, attrib_val)?;
-            }
-
-            Ok(active_closures)
-        }
-        Patch::RemoveAttributes(_node_idx, attributes) => {
-            for attrib_name in attributes.iter() {
-                node.remove_attribute(attrib_name)?;
-            }
-
-            Ok(active_closures)
-        }
-        Patch::Replace(_node_idx, new_node) => {
-            let created_node = new_node.create_dom_node();
-
-            node.replace_with_with_node_1(&created_node.node)?;
-
-            Ok(created_node.closures)
-        }
-        Patch::TruncateChildren(_node_idx, num_children_remaining) => {
-            let children = node.child_nodes();
-            let mut child_count = children.length();
-
-            // We skip over any separators that we placed between two text nodes
-            //   -> `<!--ptns-->`
-            //  and trim all children that come after our new desired `num_children_remaining`
-            let mut non_separator_children_found = 0;
-
-            for index in 0 as u32..child_count {
-                let child = children
-                    .get(min(index, child_count - 1))
-                    .expect("Potential child to truncate");
-
-                // If this is a comment node then we know that it is a `<!--ptns-->`
-                // text node separator that was created in virtual_node/mod.rs.
-                if child.node_type() == Node::COMMENT_NODE {
-                    continue;
-                }
-
-                non_separator_children_found += 1;
-
-                if non_separator_children_found <= *num_children_remaining as u32 {
-                    continue;
-                }
-
-                node.remove_child(&child).expect("Truncated children");
-                child_count -= 1;
-            }
-
-            Ok(active_closures)
-        }
-        Patch::AppendChildren(_node_idx, new_nodes) => {
-            let parent = &node;
-
-            let mut active_closures = HashMap::new();
-
-            for new_node in new_nodes {
-                let created_node = new_node.create_dom_node();
-
-                parent.append_child(&created_node.node)?;
-
-                active_closures.extend(created_node.closures);
-            }
-
-            Ok(active_closures)
-        }
-        Patch::ChangeText(_node_idx, _new_node) => {
-            unreachable!("Elements should not receive ChangeText patches.")
-        }
-    }
-}
-
-fn apply_text_patch(node: &Text, patch: &Patch) -> Result<(), JsValue> {
-    match patch {
-        Patch::ChangeText(_node_idx, new_node) => {
-            node.set_node_value(Some(&new_node.text));
-        }
-        Patch::Replace(_node_idx, new_node) => {
-            node.replace_with_with_node_1(&new_node.create_dom_node().node)?;
-        }
-        other => unreachable!(
-            "Text nodes should only receive ChangeText or Replace patches, not {:?}.",
-            other,
-        ),
-    };
-
-    Ok(())
-}

packages/old/virtual-dom-rs/src/patch/mod.rs

@@ -1,75 +0,0 @@
-//! Our Patch enum is intentionally kept in it's own file for easy inclusion into
-//! The Percy Book.
-
-use crate::{VText, VirtualNode};
-use std::collections::HashMap;
-
-mod apply_patches;
-pub use apply_patches::patch;
-
-/// A Patch encodes an operation that modifies a real DOM element.
-///
-/// To update the real DOM that a user sees you'll want to first diff your
-/// old virtual dom and new virtual dom.
-///
-/// This diff operation will generate `Vec<Patch>` with zero or more patches that, when
-/// applied to your real DOM, will make your real DOM look like your new virtual dom.
-///
-/// Each Patch has a u32 node index that helps us identify the real DOM node that it applies to.
-///
-/// Our old virtual dom's nodes are indexed depth first, as shown in this illustration
-/// (0 being the root node, 1 being it's first child, 2 being it's first child's first child).
-///
-/// ```text
-///             .─.
-///            ( 0 )
-///             `┬'
-///         ┌────┴──────┐
-///         │           │
-///         ▼           ▼
-///        .─.         .─.
-///       ( 1 )       ( 4 )
-///        `┬'         `─'
-///    ┌────┴───┐       ├─────┬─────┐
-///    │        │       │     │     │
-///    ▼        ▼       ▼     ▼     ▼
-///   .─.      .─.     .─.   .─.   .─.
-///  ( 2 )    ( 3 )   ( 5 ) ( 6 ) ( 7 )
-///   `─'      `─'     `─'   `─'   `─'                  
-/// ```
-///
-/// The patching process is tested in a real browser in crates/virtual-dom-rs/tests/diff_patch.rs
-#[derive(Debug, PartialEq)]
-pub enum Patch<'a> {
-    /// Append a vector of child nodes to a parent node id.
-    AppendChildren(NodeIdx, Vec<&'a VirtualNode>),
-    /// For a `node_i32`, remove all children besides the first `len`
-    TruncateChildren(NodeIdx, usize),
-    /// Replace a node with another node. This typically happens when a node's tag changes.
-    /// ex: <div> becomes <span>
-    Replace(NodeIdx, &'a VirtualNode),
-    /// Add attributes that the new node has that the old node does not
-    AddAttributes(NodeIdx, HashMap<&'a str, &'a str>),
-    /// Remove attributes that the old node had that the new node doesn't
-    RemoveAttributes(NodeIdx, Vec<&'a str>),
-    /// Change the text of a Text node.
-    ChangeText(NodeIdx, &'a VText),
-}
-
-type NodeIdx = usize;
-
-impl<'a> Patch<'a> {
-    /// Every Patch is meant to be applied to a specific node within the DOM. Get the
-    /// index of the DOM node that this patch should apply to. DOM nodes are indexed
-    /// depth first with the root node in the tree having index 0.
-    pub fn node_idx(&self) -> usize {
-        match self {
-            Patch::AppendChildren(node_idx, _) => *node_idx,
-            Patch::TruncateChildren(node_idx, _) => *node_idx,
-            Patch::Replace(node_idx, _) => *node_idx,
-            Patch::AddAttributes(node_idx, _) => *node_idx,
-            Patch::RemoveAttributes(node_idx, _) => *node_idx,
-            Patch::ChangeText(node_idx, _) => *node_idx,
-        }
-    }
-}

packages/old/virtual-dom-rs/tests/closures.rs

@@ -1,116 +0,0 @@
-//! Ensure that our DomUpdater maintains Rc's to closures so that they work even
-//! after dropping virtual dom nodes.
-//!
-//! To run all tests in this file:
-//!
-//! wasm-pack test crates/virtual-dom-rs --chrome --headless -- --test closures
-
-// #![feature(proc_macro_hygiene)]
-
-use std::cell::RefCell;
-use std::collections::hash_map::DefaultHasher;
-use std::rc::Rc;
-use virtual_dom_rs::prelude::*;
-use virtual_dom_rs::DomUpdater;
-use wasm_bindgen::JsCast;
-use wasm_bindgen_test;
-use wasm_bindgen_test::*;
-use web_sys::*;
-
-wasm_bindgen_test_configure!(run_in_browser);
-
-// TODO: This test current fails in headless browsers but works in non headless browsers
-// (tested in both geckodriver and chromedriver)
-// Need to figure out why
-#[wasm_bindgen_test]
-fn closure_not_dropped() {
-    let text = Rc::new(RefCell::new("Start Text".to_string()));
-
-    let document = web_sys::window().unwrap().document().unwrap();
-
-    let mut dom_updater = None;
-
-    {
-        let mut input = make_input_component(Rc::clone(&text));
-        input
-            .as_velement_mut()
-            .expect("Not an element")
-            .attrs
-            .insert("id".into(), "old-input-elem".into());
-
-        let mount = document.create_element("div").unwrap();
-        mount.set_id("mount");
-        document.body().unwrap().append_child(&mount).unwrap();
-
-        dom_updater = Some(DomUpdater::new_replace_mount(input, mount));
-
-        let mut dom_updater = dom_updater.as_mut().unwrap();
-
-        // Input VirtualNode from above gets dropped at the end of this block,
-        // yet that element held Rc's to the Closure's that power the oninput event.
-        //
-        // We're patching the DOM with a new vdom, but since our new vdom doesn't contain any
-        // new elements, `.create_element` won't get called and so no new Closures will be
-        // created.
-        //
-        // So, we're testing that our old Closure's still work. The reason that they work is
-        // that dom_updater maintains Rc's to those Closures.
-        let mut new_node = make_input_component(Rc::clone(&text));
-        new_node
-            .as_velement_mut()
-            .expect("Not an element")
-            .attrs
-            .insert("id".into(), "new-input-elem".into());
-
-        dom_updater.update(new_node);
-    }
-
-    let dom_updater = dom_updater.as_ref().unwrap();
-
-    let input: HtmlInputElement = document
-        .get_element_by_id("new-input-elem")
-        .expect("Input element")
-        .dyn_into()
-        .unwrap();
-    let input_event = InputEvent::new("input").unwrap();
-
-    assert_eq!(&*text.borrow(), "Start Text");
-
-    // After dispatching the oninput event our `text` should have a value of the input elements value.
-    web_sys::EventTarget::from(input)
-        .dispatch_event(&input_event)
-        .unwrap();
-
-    assert_eq!(&*text.borrow(), "End Text");
-
-    assert_eq!(
-        dom_updater.active_closures.get(&1).as_ref().unwrap().len(),
-        1
-    );
-}
-
-// We're just making sure that things compile - other tests give us confidence that the closure
-// will work just fine.
-//
-// https://github.com/chinedufn/percy/issues/81
-//
-//#[wasm_bindgen_test]
-//fn closure_with_no_params_compiles() {
-//    let _making_sure_this_works = html! {
-//        <div onclick=|| {}></div>
-//    };
-//}
-
-fn make_input_component(text_clone: Rc<RefCell<String>>) -> VirtualNode {
-    html! {
-        <input
-           // On input we'll set our Rc<RefCell<String>> value to the input elements value
-           oninput=move |event: Event| {
-              let input_elem = event.target().unwrap();
-              let input_elem = input_elem.dyn_into::<HtmlInputElement>().unwrap();
-              *text_clone.borrow_mut() = input_elem.value();
-           }
-           value="End Text"
-        >
-    }
-}

packages/old/virtual-dom-rs/tests/create_element.rs

@@ -1,118 +0,0 @@
-//! Tests that ensure that we create the right DOM element from a VirtualNode
-//!
-//! To run all tests in this file:
-//!
-//! wasm-pack test crates/virtual-dom-rs --chrome --headless -- --test create_element
-
-// #![feature(proc_macro_hygiene)]
-
-extern crate wasm_bindgen_test;
-extern crate web_sys;
-use std::cell::Cell;
-use std::rc::Rc;
-use wasm_bindgen::JsCast;
-use wasm_bindgen_test::*;
-use web_sys::{Element, Event, EventTarget, MouseEvent};
-
-use virtual_dom_rs::prelude::*;
-
-wasm_bindgen_test_configure!(run_in_browser);
-
-/// wasm-pack test crates/virtual-dom-rs --chrome --headless -- --test create_element nested_divs
-#[wasm_bindgen_test]
-fn nested_divs() {
-    let vdiv = html! { <div> <div> <div></div> </div> </div> };
-    let div: Element = vdiv.create_dom_node().node.unchecked_into();
-
-    assert_eq!(&div.inner_html(), "<div><div></div></div>");
-}
-
-/// wasm-pack test crates/virtual-dom-rs --chrome --headless -- --test create_element svg_element
-/// TODO: Temporarily disabled until we figure out why it's failing in CI but not failing locally
-// #[wasm_bindgen_test]
-// fn svg_element() {
-//     let vdiv = html! { <div><svg xmlns="http://www.w3.org/2000/svg">
-//       <circle cx="50" cy="50" r="50"/>
-//     </svg></div> };
-//     let div: Element = vdiv.create_dom_node().node.unchecked_into();
-
-//     assert_eq!(
-//         &div.inner_html(),
-//         r#"<svg xmlns="http://www.w3.org/2000/svg"><circle cx="50" cy="50" r="50"></circle></svg>"#
-//     );
-// }
-
-/// wasm-pack test crates/virtual-dom-rs --chrome --headless -- --test create_element div_with_attributes
-#[wasm_bindgen_test]
-fn div_with_attributes() {
-    let vdiv = html! { <div id="id-here" class="two classes"></div> };
-    let div: Element = vdiv.create_dom_node().node.unchecked_into();
-
-    assert_eq!(&div.id(), "id-here");
-
-    assert!(div.class_list().contains("two"));
-    assert!(div.class_list().contains("classes"));
-
-    assert_eq!(div.class_list().length(), 2);
-}
-
-/// wasm-pack test crates/virtual-dom-rs --chrome --headless -- --test create_element click_event
-#[wasm_bindgen_test]
-fn click_event() {
-    let clicked = Rc::new(Cell::new(false));
-    let clicked_clone = Rc::clone(&clicked);
-
-    let div = html! {
-     <div
-         onclick=move |_ev: MouseEvent| {
-             clicked_clone.set(true);
-         }
-     >
-     </div>
-    };
-
-    let click_event = Event::new("click").unwrap();
-
-    let div = div.create_dom_node().node;
-
-    (EventTarget::from(div))
-        .dispatch_event(&click_event)
-        .unwrap();
-
-    assert_eq!(*clicked, Cell::new(true));
-}
-
-/// wasm-pack test crates/virtual-dom-rs --chrome --headless -- --test create_element inner_html
-/// @book start inner-html
-#[wasm_bindgen_test]
-fn inner_html() {
-    let div = html! {
-    <div
-      unsafe_inner_html="<span>hi</span>"
-    >
-    </div>
-    };
-    let div: Element = div.create_dom_node().node.unchecked_into();
-
-    assert_eq!(div.inner_html(), "<span>hi</span>");
-}
-// @book end inner-html
-
-/// wasm-pack test crates/virtual-dom-rs --chrome --headless -- --test create_element on_create_elem
-/// @book start on-create-elem
-#[wasm_bindgen_test]
-fn on_create_elem() {
-    let div = html! {
-    <div
-      on_create_elem=|elem: web_sys::Element| {
-        elem.set_inner_html("Hello world");
-      }
-    >
-        <span>This span should get replaced</span>
-    </div>
-    };
-    let div: Element = div.create_dom_node().node.unchecked_into();
-
-    assert_eq!(div.inner_html(), "Hello world");
-}
-// @book end on-create-elem

packages/old/virtual-dom-rs/tests/diff_patch.rs

@@ -1,197 +0,0 @@
-//! Tests that ensure that diffing and patching work properly in a real browser.
-//!
-//! To run all tests in this file:
-//!
-//! wasm-pack test crates/virtual-dom-rs --chrome --headless -- --test diff_patch
-
-// #![feature(proc_macro_hygiene)]
-
-extern crate wasm_bindgen_test;
-extern crate web_sys;
-use wasm_bindgen_test::*;
-
-use virtual_dom_rs::prelude::*;
-
-wasm_bindgen_test_configure!(run_in_browser);
-
-mod diff_patch_test_case;
-use self::diff_patch_test_case::DiffPatchTest;
-
-#[wasm_bindgen_test]
-fn replace_child() {
-    DiffPatchTest {
-        desc: "Replace a root node attribute attribute and a child text node",
-        old: html! {
-         <div>
-           Original element
-         </div>
-        },
-        new: html! { <div> Patched element</div> },
-        override_expected: None,
-    }
-    .test();
-}
-
-#[wasm_bindgen_test]
-fn truncate_children() {
-    DiffPatchTest {
-        desc: "Truncates extra children",
-        old: html! {
-         <div>
-           <div> <div> <b></b> <em></em> </div> </div>
-         </div>
-        },
-        new: html! {
-         <div>
-           <div> <div> <b></b> </div> </div>
-         </div>
-        },
-        override_expected: None,
-    }
-    .test();
-
-    DiffPatchTest {
-        desc: "https://github.com/chinedufn/percy/issues/48",
-        old: html! {
-         <div>
-          ab <p></p> c
-         </div>
-        },
-        new: html! {
-         <div>
-           ab <p></p>
-         </div>
-        },
-        override_expected: None,
-    }
-    .test();
-}
-
-#[wasm_bindgen_test]
-fn remove_attributes() {
-    DiffPatchTest {
-        desc: "Removes attributes",
-        old: html! { <div style=""> </div>
-        },
-        new: html! { <div></div> },
-        override_expected: None,
-    }
-    .test();
-}
-
-#[wasm_bindgen_test]
-fn append_children() {
-    DiffPatchTest {
-        desc: "Append a child node",
-        old: html! { <div> </div>
-        },
-        new: html! { <div> <span></span> </div> },
-        override_expected: None,
-    }
-    .test();
-}
-
-#[wasm_bindgen_test]
-fn text_node_siblings() {
-    // NOTE: Since there are two text nodes next to eachother we expect a `<!--ptns-->` separator in
-    // between them.
-    // @see virtual_node/mod.rs -> create_dom_node() for more information
-    // TODO: A little more spacing than there should be in between the text nodes ... but doesn't
-    // impact the user experience so we can look into that later..
-    let override_expected = Some(
-        r#"<div id="after"><span> The button has been clicked:  <!--ptns--> world </span></div>"#,
-    );
-
-    let old1 = VirtualNode::text("The button has been clicked: ");
-    let old2 = VirtualNode::text("hello");
-
-    let new1 = VirtualNode::text("The button has been clicked: ");
-    let new2 = VirtualNode::text("world");
-
-    DiffPatchTest {
-        desc: "Diff patch on text node siblings",
-        old: html! {
-        <div id="before">
-            <span> { {old1} {old2} } </span>
-        </div>
-        },
-        new: html! {
-        <div id="after">
-            <span> { {new1} {new2} } </span>
-        </div>
-        },
-        override_expected,
-    }
-    .test();
-}
-
-#[wasm_bindgen_test]
-fn append_text_node() {
-    DiffPatchTest {
-        desc: "Append text node",
-        old: html! { <div> </div> },
-        new: html! { <div> Hello </div> },
-        override_expected: None,
-    }
-    .test();
-}
-
-#[wasm_bindgen_test]
-fn append_sibling_text_nodes() {
-    let text1 = VirtualNode::text("Hello");
-    let text2 = VirtualNode::text("World");
-
-    DiffPatchTest {
-        desc: "Append sibling text nodes",
-        old: html! { <div> </div> },
-        new: html! { <div> {text1} {text2} </div> },
-        override_expected: None,
-    }
-    .test();
-}
-
-#[wasm_bindgen_test]
-fn replace_with_children() {
-    DiffPatchTest {
-        desc: "Replace node that has children",
-        old: html! { <table><tr><th>0</th></tr><tr><td>1</td></tr></table> },
-        new: html! { <table><tr><td>2</td></tr><tr><th>3</th></tr></table> },
-        override_expected: None,
-    }
-    .test();
-}
-
-// https://github.com/chinedufn/percy/issues/62
-#[wasm_bindgen_test]
-fn replace_element_with_text_node() {
-    DiffPatchTest {
-        desc: "#62: Replace element with text node",
-        old: html! { <span> <br> </span> },
-        new: html! { <span> a </span> },
-        override_expected: None,
-    }
-    .test();
-}
-
-// https://github.com/chinedufn/percy/issues/68
-#[wasm_bindgen_test]
-fn text_root_node() {
-    DiffPatchTest {
-        desc: "Patching of text root node works",
-        old: html! { Old text },
-        new: html! { New text },
-        override_expected: None,
-    }
-    .test();
-}
-
-#[wasm_bindgen_test]
-fn replace_text_with_element() {
-    DiffPatchTest {
-        desc: "Replacing a text node with an element works",
-        old: html! { <div>a</div> },
-        new: html! { <div><br></div> },
-        override_expected: None,
-    }
-    .test();
-}

packages/old/virtual-dom-rs/tests/diff_patch_test_case/mod.rs

@@ -1,53 +0,0 @@
-//! Kept in its own file to more easily import into the book
-
-use console_error_panic_hook;
-use virtual_dom_rs::prelude::*;
-use wasm_bindgen::JsCast;
-use web_sys::{Element, Node};
-
-/// A test case that both diffing and patching are working in a real browser
-pub struct DiffPatchTest<'a> {
-    /// Description of the test case.
-    pub desc: &'static str,
-    /// The old virtual node.
-    pub old: VirtualNode,
-    /// The new virtual node.
-    pub new: VirtualNode,
-    /// By default we generate the expected based on `new.to_string()`. You can
-    /// use this field to override the expected HTML after patching.
-    pub override_expected: Option<&'a str>,
-}
-
-impl<'a> DiffPatchTest<'a> {
-    pub fn test(&mut self) {
-        console_error_panic_hook::set_once();
-
-        let document = web_sys::window().unwrap().document().unwrap();
-
-        // Create a DOM node of the virtual root node
-        let root_node: Node = self.old.create_dom_node().node;
-
-        // Clone since virtual_dom_rs::patch takes ownership of the root node.
-        let patched_root_node: Node = root_node.clone();
-
-        // Generate patches
-        let patches = virtual_dom_rs::diff(&self.old, &self.new);
-
-        // Patch our root node. It should now look like `self.new`
-        virtual_dom_rs::patch(root_node, &patches);
-
-        // Determine the expected outer HTML
-        let expected_outer_html = match self.override_expected {
-            Some(ref expected) => expected.to_string(),
-            None => self.new.to_string(),
-        };
-
-        let actual_outer_html = match patched_root_node.node_type() {
-            Node::ELEMENT_NODE => patched_root_node.unchecked_into::<Element>().outer_html(),
-            Node::TEXT_NODE => patched_root_node.text_content().unwrap_or("".into()),
-            _ => panic!("Unhandled node type"),
-        };
-
-        assert_eq!(&actual_outer_html, &expected_outer_html, "{}", self.desc);
-    }
-}

packages/old/virtual-dom-rs/tests/dom_updater.rs

@@ -1,147 +0,0 @@
-//! Ensure that our DomUpdater maintains Rc's to closures so that they work even
-//! after dropping virtual dom nodes.
-//!
-//! To run all tests in this file:
-//!
-//! wasm-pack test crates/virtual-dom-rs --chrome --headless -- --test dom_updater
-
-// #![feature(proc_macro_hygiene)]
-
-use console_error_panic_hook;
-use std::cell::RefCell;
-use std::collections::hash_map::DefaultHasher;
-use std::hash::{Hash, Hasher};
-use std::rc::Rc;
-use virtual_dom_rs::prelude::*;
-use virtual_dom_rs::DomUpdater;
-use wasm_bindgen::JsCast;
-use wasm_bindgen_test;
-use wasm_bindgen_test::*;
-use web_sys::*;
-
-wasm_bindgen_test_configure!(run_in_browser);
-
-// Verify that our DomUpdater's patch method works.
-// We test a simple case here, since diff_patch.rs is responsible for testing more complex
-// diffing and patching.
-#[wasm_bindgen_test]
-fn patches_dom() {
-    console_error_panic_hook::set_once();
-
-    let document = web_sys::window().unwrap().document().unwrap();
-
-    let vdom = html! { <div></div> };
-
-    let mut dom_updater = DomUpdater::new(vdom);
-
-    let new_vdom = html! { <div id="patched"></div> };
-    dom_updater.update(new_vdom);
-
-    document
-        .body()
-        .unwrap()
-        .append_child(&dom_updater.root_node());
-    assert_eq!(document.query_selector("#patched").unwrap().is_some(), true);
-}
-
-// When you replace a DOM node with another DOM node we need to make sure that the closures
-// from the new DOM node are stored by the DomUpdater otherwise they'll get dropped and
-// won't work.
-#[wasm_bindgen_test]
-fn updates_active_closure_on_replace() {
-    console_error_panic_hook::set_once();
-
-    let document = web_sys::window().unwrap().document().unwrap();
-    let body = document.body().unwrap();
-
-    let old = html! { <div> </div> };
-    let mut dom_updater = DomUpdater::new_append_to_mount(old, &body);
-
-    let text = Rc::new(RefCell::new("Start Text".to_string()));
-    let text_clone = Rc::clone(&text);
-
-    let id = "update-active-closures-on-replace";
-
-    {
-        let replace_node = html! {
-         <input
-            id=id
-            oninput=move |event: Event| {
-               let input_elem = event.target().unwrap();
-               let input_elem = input_elem.dyn_into::<HtmlInputElement>().unwrap();
-               *text_clone.borrow_mut() = input_elem.value();
-            }
-            value="End Text"
-         >
-        };
-
-        // New node replaces old node.
-        // We are testing that we've stored this new node's closures even though `new` will be dropped
-        // at the end of this block.
-        dom_updater.update(replace_node);
-    }
-
-    let input_event = InputEvent::new("input").unwrap();
-
-    assert_eq!(&*text.borrow(), "Start Text");
-
-    // After dispatching the oninput event our `text` should have a value of the input elements value.
-    let input = document.get_element_by_id(&id).unwrap();
-    web_sys::EventTarget::from(input)
-        .dispatch_event(&input_event)
-        .unwrap();
-
-    assert_eq!(&*text.borrow(), "End Text");
-}
-
-// When you replace a DOM node with another DOM node we need to make sure that the closures
-// from the new DOM node are stored by the DomUpdater otherwise they'll get dropped and
-// won't work.
-#[wasm_bindgen_test]
-fn updates_active_closures_on_append() {
-    console_error_panic_hook::set_once();
-
-    let document = web_sys::window().unwrap().document().unwrap();
-    let body = document.body().unwrap();
-
-    let old = html! { <div> </div> };
-    let mut dom_updater = DomUpdater::new_append_to_mount(old, &body);
-
-    let text = Rc::new(RefCell::new("Start Text".to_string()));
-    let text_clone = Rc::clone(&text);
-
-    let id = "update-active-closures-on-append";
-
-    {
-        let append_node = html! {
-        <div>
-           <input
-              id=id
-              oninput=move |event: Event| {
-                 let input_elem = event.target().unwrap();
-                 let input_elem = input_elem.dyn_into::<HtmlInputElement>().unwrap();
-                 *text_clone.borrow_mut() = input_elem.value();
-              }
-              value="End Text"
-           >
-         </div>
-        };
-
-        // New node gets appended into the DOM.
-        // We are testing that we've stored this new node's closures even though `new` will be dropped
-        // at the end of this block.
-        dom_updater.update(append_node);
-    }
-
-    let input_event = InputEvent::new("input").unwrap();
-
-    assert_eq!(&*text.borrow(), "Start Text");
-
-    // After dispatching the oninput event our `text` should have a value of the input elements value.
-    let input = document.get_element_by_id(id).unwrap();
-    web_sys::EventTarget::from(input)
-        .dispatch_event(&input_event)
-        .unwrap();
-
-    assert_eq!(&*text.borrow(), "End Text");
-}

packages/old/virtual-dom-rs/tests/events.rs

@@ -1,47 +0,0 @@
-// #![feature(proc_macro_hygiene)]
-
-extern crate wasm_bindgen_test;
-extern crate web_sys;
-use std::cell::Cell;
-use std::rc::Rc;
-use wasm_bindgen_test::*;
-
-use std::cell::RefCell;
-use wasm_bindgen::prelude::*;
-use wasm_bindgen::JsCast;
-use web_sys::*;
-
-use virtual_dom_rs::prelude::*;
-
-wasm_bindgen_test_configure!(run_in_browser);
-
-// Make sure that we successfully attach an event listener and see it work.
-#[wasm_bindgen_test]
-fn on_input() {
-    let text = Rc::new(RefCell::new("Start Text".to_string()));
-    let text_clone = Rc::clone(&text);
-
-    let input = html! {
-        <input
-            // On input we'll set our Rc<RefCell<String>> value to the input elements value
-            oninput=move |event: Event| {
-                let input_elem = event.target().unwrap();
-                let input_elem = input_elem.dyn_into::<HtmlInputElement>().unwrap();
-                *text_clone.borrow_mut() = input_elem.value();
-            }
-            value="End Text"
-        >
-    };
-
-    let input_event = InputEvent::new("input").unwrap();
-    let input = input.create_dom_node().node;
-
-    assert_eq!(&*text.borrow(), "Start Text");
-
-    // After dispatching the oninput event our `text` should have a value of the input elements value.
-    web_sys::EventTarget::from(input)
-        .dispatch_event(&input_event)
-        .unwrap();
-
-    assert_eq!(&*text.borrow(), "End Text");
-}

packages/ssr/src/tostring.rs

@@ -11,9 +11,10 @@ impl Display for SsrRenderer {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let node = self
             .dom
-            .components
-            .get(self.dom.base_scope)
-            .unwrap()
+            .base_scope()
+            // .components
+            // .get(self.dom.base_scope)
+            // .unwrap()
             .frames
             .current_head_node();
 

packages/vscode-ext/.gitignore

@@ -1,4 +0,0 @@
-out
-node_modules
-client/server
-.vscode-test

packages/vscode-ext/.vscode/launch.json

@@ -1,44 +0,0 @@
-// A launch configuration that compiles the extension and then opens it inside a new window
-{
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "Launch Client",
-			"runtimeExecutable": "${execPath}",
-			"args": ["--extensionDevelopmentPath=${workspaceRoot}"],
-			"outFiles": ["${workspaceRoot}/client/out/**/*.js"],
-			"preLaunchTask": {
-				"type": "npm",
-				"script": "watch"
-			}
-		},
-		{
-			"type": "node",
-			"request": "attach",
-			"name": "Attach to Server",
-			"port": 6009,
-			"restart": true,
-			"outFiles": ["${workspaceRoot}/server/out/**/*.js"]
-		},
-		{
-			"name": "Language Server E2E Test",
-			"type": "extensionHost",
-			"request": "launch",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"--extensionDevelopmentPath=${workspaceRoot}",
-				"--extensionTestsPath=${workspaceRoot}/client/out/test",
-				"${workspaceRoot}/client/testFixture"
-			],
-			"outFiles": ["${workspaceRoot}/client/out/test/**/*.js"]
-		}
-	],
-	"compounds": [
-		{
-			"name": "Client + Server",
-			"configurations": ["Launch Client", "Attach to Server"]
-		}
-	]
-}

packages/vscode-ext/.vscode/tasks.json

@@ -1,33 +0,0 @@
-{
-	"version": "2.0.0",
-	"tasks": [
-		{
-			"type": "npm",
-			"script": "compile",
-			"group": "build",
-			"presentation": {
-				"panel": "dedicated",
-				"reveal": "never"
-			},
-			"problemMatcher": [
-				"$tsc"
-			]
-		},
-		{
-			"type": "npm",
-			"script": "watch",
-			"isBackground": true,
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			},
-			"presentation": {
-				"panel": "dedicated",
-				"reveal": "never"
-			},
-			"problemMatcher": [
-				"$tsc-watch"
-			]
-		}
-	]
-}

packages/vscode-ext/.vscodeignore

@@ -1,14 +0,0 @@
-.vscode/**
-**/*.ts
-**/*.map
-.gitignore
-**/tsconfig.json
-**/tsconfig.base.json
-contributing.md
-.travis.yml
-client/node_modules/**
-!client/node_modules/vscode-jsonrpc/**
-!client/node_modules/vscode-languageclient/**
-!client/node_modules/vscode-languageserver-protocol/**
-!client/node_modules/vscode-languageserver-types/**
-!client/node_modules/semver/**

packages/vscode-ext/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "syntax-gen"
-version = "0.1.0"
-authors = ["Jonathan Kelley <jkelleyrtp@gmail.com>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-
-
-[[bin]]
-path = "./rust/main.rs"
-name = "main"

packages/vscode-ext/README.md

@@ -1,17 +0,0 @@
-# VSCode support for Dioxus html macro
-
-This macro provides syntax highlighting for the html! macro used in Dioxus projects. Users should feel at home writing html and css alongside the custom attributes used by Dioxus.
-
-
-## How it works
-This extension works by:
-- Creating a custom HTML ruleset for dioxus html! nodes
-- Request forwarding content
-
-
-## Resources
-Request forwarding is performed intelligently by the extension. 
-Requests within the html! tag are forwarded to the html language service. It's simple and doesn't 
-
-https://code.visualstudio.com/api/language-extensions/embedded-languages#language-services
-

packages/vscode-ext/client/package-lock.json

@@ -1,81 +0,0 @@
-{
-	"name": "lsp-sample-client",
-	"version": "0.0.1",
-	"lockfileVersion": 1,
-	"requires": true,
-	"dependencies": {
-		"@types/vscode": {
-			"version": "1.43.0",
-			"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.43.0.tgz",
-			"integrity": "sha512-kIaR9qzd80rJOxePKpCB/mdy00mz8Apt2QA5Y6rdrKFn13QNFNeP3Hzmsf37Bwh/3cS7QjtAeGSK7wSqAU0sYQ==",
-			"dev": true
-		},
-		"vscode-html-languageservice": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-3.0.3.tgz",
-			"integrity": "sha512-U+upM3gHp3HaF3wXAnUduA6IDKcz6frWS/dTAju3cZVIyZwOLBBFElQVlLH0ycHyMzqUFrjvdv+kEyPAEWfQ/g==",
-			"requires": {
-				"vscode-languageserver-types": "^3.15.0-next.2",
-				"vscode-nls": "^4.1.1",
-				"vscode-uri": "^2.0.3"
-			},
-			"dependencies": {
-				"vscode-languageserver-types": {
-					"version": "3.15.1",
-					"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
-					"integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
-				}
-			}
-		},
-		"vscode-jsonrpc": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
-			"integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="
-		},
-		"vscode-languageclient": {
-			"version": "6.1.3",
-			"resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.3.tgz",
-			"integrity": "sha512-YciJxk08iU5LmWu7j5dUt9/1OLjokKET6rME3cI4BRpiF6HZlusm2ZwPt0MYJ0lV5y43sZsQHhyon2xBg4ZJVA==",
-			"requires": {
-				"semver": "^6.3.0",
-				"vscode-languageserver-protocol": "^3.15.3"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-				}
-			}
-		},
-		"vscode-languageserver-protocol": {
-			"version": "3.15.3",
-			"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
-			"integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
-			"requires": {
-				"vscode-jsonrpc": "^5.0.1",
-				"vscode-languageserver-types": "3.15.1"
-			}
-		},
-		"vscode-languageserver-textdocument": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz",
-			"integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA=="
-		},
-		"vscode-languageserver-types": {
-			"version": "3.15.1",
-			"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
-			"integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
-		},
-		"vscode-nls": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz",
-			"integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="
-		},
-		"vscode-uri": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.1.tgz",
-			"integrity": "sha512-eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A=="
-		}
-	}
-}

packages/vscode-ext/client/package.json

@@ -1,23 +0,0 @@
-{
-	"name": "lsp-sample-client",
-	"description": "VSCode part of a language server",
-	"author": "Microsoft Corporation",
-	"license": "MIT",
-	"version": "0.0.1",
-	"publisher": "vscode",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/Microsoft/vscode-extension-samples"
-	},
-	"engines": {
-		"vscode": "^1.43.0"
-	},
-	"dependencies": {
-		"vscode-html-languageservice": "^3.0.3",
-		"vscode-languageclient": "^6.1.3",
-		"vscode-languageserver-textdocument": "^1.0.1"
-	},
-	"devDependencies": {
-		"@types/vscode": "^1.43.0"
-	}
-}

packages/vscode-ext/client/src/embeddedSupport.ts

@@ -1,449 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { TextDocument } from "vscode-languageserver-textdocument";
-import { Position, Range } from "vscode-languageclient";
-import { LanguageService, TokenType } from "vscode-html-languageservice";
-
-export interface LanguageRange extends Range {
-  languageId: string | undefined;
-  attributeValue?: boolean;
-}
-
-export interface HTMLDocumentRegions {
-  getEmbeddedDocument(
-    languageId: string,
-    ignoreAttributeValues?: boolean
-  ): TextDocument;
-  getLanguageRanges(range: Range): LanguageRange[];
-  getLanguageAtPosition(position: Position): string | undefined;
-  getLanguagesInDocument(): string[];
-  getImportedScripts(): string[];
-}
-
-export const CSS_STYLE_RULE = "__";
-
-interface EmbeddedRegion {
-  languageId: string | undefined;
-  start: number;
-  end: number;
-  attributeValue?: boolean;
-}
-
-// Check if the request is coming from inside a special region
-export function isInsideStyleRegion(
-  languageService: LanguageService,
-  documentText: string,
-  offset: number
-) {
-  let scanner = languageService.createScanner(documentText);
-
-  let token = scanner.scan();
-  while (token !== TokenType.EOS) {
-    switch (token) {
-      case TokenType.Styles:
-        if (
-          offset >= scanner.getTokenOffset() &&
-          offset <= scanner.getTokenEnd()
-        ) {
-          return true;
-        }
-    }
-    token = scanner.scan();
-  }
-
-  return false;
-}
-
-export function getCSSVirtualContent(
-  languageService: LanguageService,
-  documentText: string
-): string {
-  let regions: EmbeddedRegion[] = [];
-  let scanner = languageService.createScanner(documentText);
-  let lastTagName: string = "";
-  let lastAttributeName: string | null = null;
-  let languageIdFromType: string | undefined = undefined;
-  let importedScripts: string[] = [];
-
-  let token = scanner.scan();
-  while (token !== TokenType.EOS) {
-    switch (token) {
-      case TokenType.StartTag:
-        lastTagName = scanner.getTokenText();
-        lastAttributeName = null;
-        languageIdFromType = "javascript";
-        break;
-      case TokenType.Styles:
-        regions.push({
-          languageId: "css",
-          start: scanner.getTokenOffset(),
-          end: scanner.getTokenEnd(),
-        });
-        break;
-      case TokenType.Script:
-        regions.push({
-          languageId: languageIdFromType,
-          start: scanner.getTokenOffset(),
-          end: scanner.getTokenEnd(),
-        });
-        break;
-      case TokenType.AttributeName:
-        lastAttributeName = scanner.getTokenText();
-        break;
-      case TokenType.AttributeValue:
-        if (
-          lastAttributeName === "src" &&
-          lastTagName.toLowerCase() === "script"
-        ) {
-          let value = scanner.getTokenText();
-          if (value[0] === "'" || value[0] === '"') {
-            value = value.substr(1, value.length - 1);
-          }
-          importedScripts.push(value);
-        } else if (
-          lastAttributeName === "type" &&
-          lastTagName.toLowerCase() === "script"
-        ) {
-          if (
-            /["'](module|(text|application)\/(java|ecma)script|text\/babel)["']/.test(
-              scanner.getTokenText()
-            )
-          ) {
-            languageIdFromType = "javascript";
-          } else if (/["']text\/typescript["']/.test(scanner.getTokenText())) {
-            languageIdFromType = "typescript";
-          } else {
-            languageIdFromType = undefined;
-          }
-        } else {
-          let attributeLanguageId = getAttributeLanguage(lastAttributeName!);
-          if (attributeLanguageId) {
-            let start = scanner.getTokenOffset();
-            let end = scanner.getTokenEnd();
-            let firstChar = documentText[start];
-            if (firstChar === "'" || firstChar === '"') {
-              start++;
-              end--;
-            }
-            regions.push({
-              languageId: attributeLanguageId,
-              start,
-              end,
-              attributeValue: true,
-            });
-          }
-        }
-        lastAttributeName = null;
-        break;
-    }
-    token = scanner.scan();
-  }
-
-  let content = documentText
-    .split("\n")
-    .map((line) => {
-      return " ".repeat(line.length);
-    })
-    .join("\n");
-
-  regions.forEach((r) => {
-    if (r.languageId === "css") {
-      content =
-        content.slice(0, r.start) +
-        documentText.slice(r.start, r.end) +
-        content.slice(r.end);
-    }
-  });
-
-  return content;
-}
-
-export function getDocumentRegions(
-  languageService: LanguageService,
-  document: TextDocument
-): HTMLDocumentRegions {
-  let regions: EmbeddedRegion[] = [];
-  let scanner = languageService.createScanner(document.getText());
-  let lastTagName: string = "";
-  let lastAttributeName: string | null = null;
-  let languageIdFromType: string | undefined = undefined;
-  let importedScripts: string[] = [];
-
-  let token = scanner.scan();
-  while (token !== TokenType.EOS) {
-    switch (token) {
-      case TokenType.StartTag:
-        lastTagName = scanner.getTokenText();
-        lastAttributeName = null;
-        languageIdFromType = "javascript";
-        break;
-      case TokenType.Styles:
-        regions.push({
-          languageId: "css",
-          start: scanner.getTokenOffset(),
-          end: scanner.getTokenEnd(),
-        });
-        break;
-      case TokenType.Script:
-        regions.push({
-          languageId: languageIdFromType,
-          start: scanner.getTokenOffset(),
-          end: scanner.getTokenEnd(),
-        });
-        break;
-      case TokenType.AttributeName:
-        lastAttributeName = scanner.getTokenText();
-        break;
-      case TokenType.AttributeValue:
-        if (
-          lastAttributeName === "src" &&
-          lastTagName.toLowerCase() === "script"
-        ) {
-          let value = scanner.getTokenText();
-          if (value[0] === "'" || value[0] === '"') {
-            value = value.substr(1, value.length - 1);
-          }
-          importedScripts.push(value);
-        } else if (
-          lastAttributeName === "type" &&
-          lastTagName.toLowerCase() === "script"
-        ) {
-          if (
-            /["'](module|(text|application)\/(java|ecma)script|text\/babel)["']/.test(
-              scanner.getTokenText()
-            )
-          ) {
-            languageIdFromType = "javascript";
-          } else if (/["']text\/typescript["']/.test(scanner.getTokenText())) {
-            languageIdFromType = "typescript";
-          } else {
-            languageIdFromType = undefined;
-          }
-        } else {
-          let attributeLanguageId = getAttributeLanguage(lastAttributeName!);
-          if (attributeLanguageId) {
-            let start = scanner.getTokenOffset();
-            let end = scanner.getTokenEnd();
-            let firstChar = document.getText()[start];
-            if (firstChar === "'" || firstChar === '"') {
-              start++;
-              end--;
-            }
-            regions.push({
-              languageId: attributeLanguageId,
-              start,
-              end,
-              attributeValue: true,
-            });
-          }
-        }
-        lastAttributeName = null;
-        break;
-    }
-    token = scanner.scan();
-  }
-  return {
-    getLanguageRanges: (range: Range) =>
-      getLanguageRanges(document, regions, range),
-    getEmbeddedDocument: (languageId: string, ignoreAttributeValues: boolean) =>
-      getEmbeddedDocument(document, regions, languageId, ignoreAttributeValues),
-    getLanguageAtPosition: (position: Position) =>
-      getLanguageAtPosition(document, regions, position),
-    getLanguagesInDocument: () => getLanguagesInDocument(document, regions),
-    getImportedScripts: () => importedScripts,
-  };
-}
-
-function getLanguageRanges(
-  document: TextDocument,
-  regions: EmbeddedRegion[],
-  range: Range
-): LanguageRange[] {
-  let result: LanguageRange[] = [];
-  let currentPos = range ? range.start : Position.create(0, 0);
-  let currentOffset = range ? document.offsetAt(range.start) : 0;
-  let endOffset = range
-    ? document.offsetAt(range.end)
-    : document.getText().length;
-  for (let region of regions) {
-    if (region.end > currentOffset && region.start < endOffset) {
-      let start = Math.max(region.start, currentOffset);
-      let startPos = document.positionAt(start);
-      if (currentOffset < region.start) {
-        result.push({
-          start: currentPos,
-          end: startPos,
-          languageId: "html",
-        });
-      }
-      let end = Math.min(region.end, endOffset);
-      let endPos = document.positionAt(end);
-      if (end > region.start) {
-        result.push({
-          start: startPos,
-          end: endPos,
-          languageId: region.languageId,
-          attributeValue: region.attributeValue,
-        });
-      }
-      currentOffset = end;
-      currentPos = endPos;
-    }
-  }
-  if (currentOffset < endOffset) {
-    let endPos = range ? range.end : document.positionAt(endOffset);
-    result.push({
-      start: currentPos,
-      end: endPos,
-      languageId: "html",
-    });
-  }
-  return result;
-}
-
-function getLanguagesInDocument(
-  _document: TextDocument,
-  regions: EmbeddedRegion[]
-): string[] {
-  let result = [];
-  for (let region of regions) {
-    if (region.languageId && result.indexOf(region.languageId) === -1) {
-      result.push(region.languageId);
-      if (result.length === 3) {
-        return result;
-      }
-    }
-  }
-  result.push("html");
-  return result;
-}
-
-function getLanguageAtPosition(
-  document: TextDocument,
-  regions: EmbeddedRegion[],
-  position: Position
-): string | undefined {
-  let offset = document.offsetAt(position);
-  for (let region of regions) {
-    if (region.start <= offset) {
-      if (offset <= region.end) {
-        return region.languageId;
-      }
-    } else {
-      break;
-    }
-  }
-  return "html";
-}
-
-function getEmbeddedDocument(
-  document: TextDocument,
-  contents: EmbeddedRegion[],
-  languageId: string,
-  ignoreAttributeValues: boolean
-): TextDocument {
-  let currentPos = 0;
-  let oldContent = document.getText();
-  let result = "";
-  let lastSuffix = "";
-  for (let c of contents) {
-    if (
-      c.languageId === languageId &&
-      (!ignoreAttributeValues || !c.attributeValue)
-    ) {
-      result = substituteWithWhitespace(
-        result,
-        currentPos,
-        c.start,
-        oldContent,
-        lastSuffix,
-        getPrefix(c)
-      );
-      result += oldContent.substring(c.start, c.end);
-      currentPos = c.end;
-      lastSuffix = getSuffix(c);
-    }
-  }
-  result = substituteWithWhitespace(
-    result,
-    currentPos,
-    oldContent.length,
-    oldContent,
-    lastSuffix,
-    ""
-  );
-  return TextDocument.create(
-    document.uri,
-    languageId,
-    document.version,
-    result
-  );
-}
-
-function getPrefix(c: EmbeddedRegion) {
-  if (c.attributeValue) {
-    switch (c.languageId) {
-      case "css":
-        return CSS_STYLE_RULE + "{";
-    }
-  }
-  return "";
-}
-function getSuffix(c: EmbeddedRegion) {
-  if (c.attributeValue) {
-    switch (c.languageId) {
-      case "css":
-        return "}";
-      case "javascript":
-        return ";";
-    }
-  }
-  return "";
-}
-
-function substituteWithWhitespace(
-  result: string,
-  start: number,
-  end: number,
-  oldContent: string,
-  before: string,
-  after: string
-) {
-  let accumulatedWS = 0;
-  result += before;
-  for (let i = start + before.length; i < end; i++) {
-    let ch = oldContent[i];
-    if (ch === "\n" || ch === "\r") {
-      // only write new lines, skip the whitespace
-      accumulatedWS = 0;
-      result += ch;
-    } else {
-      accumulatedWS++;
-    }
-  }
-  result = append(result, " ", accumulatedWS - after.length);
-  result += after;
-  return result;
-}
-
-function append(result: string, str: string, n: number): string {
-  while (n > 0) {
-    if (n & 1) {
-      result += str;
-    }
-    n >>= 1;
-    str += str;
-  }
-  return result;
-}
-
-function getAttributeLanguage(attributeName: string): string | null {
-  let match = attributeName.match(/^(style)$|^(on\w+)$/i);
-  if (!match) {
-    return null;
-  }
-  return match[1] ? "css" : "javascript";
-}

packages/vscode-ext/client/src/extension.ts

@@ -1,147 +0,0 @@
-/* --------------------------------------------------------------------------------------------
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- * ------------------------------------------------------------------------------------------ */
-
-import * as path from "path";
-import {
-  commands,
-  CompletionList,
-  ExtensionContext,
-  Uri,
-  workspace,
-} from "vscode";
-import { getLanguageService } from "vscode-html-languageservice";
-import {
-  LanguageClient,
-  LanguageClientOptions,
-  ServerOptions,
-  TransportKind,
-} from "vscode-languageclient";
-import { isInsideHtmlMacro } from "./rustSupport";
-// import { getCSSVirtualContent, isInsideStyleRegion } from "./embeddedSupport";
-
-let client: LanguageClient;
-
-const htmlLanguageService = getLanguageService();
-
-export function activate(context: ExtensionContext) {
-  // The server is implemented in node
-  let serverModule = context.asAbsolutePath(
-    path.join("server", "out", "server.js")
-  );
-  // The debug options for the server
-  // --inspect=6009: runs the server in Node's Inspector mode so VS Code can attach to the server for debugging
-  let debugOptions = { execArgv: ["--nolazy", "--inspect=6009"] };
-
-  // If the extension is launched in debug mode then the debug server options are used
-  // Otherwise the run options are used
-  let serverOptions: ServerOptions = {
-    run: { module: serverModule, transport: TransportKind.ipc },
-    debug: {
-      module: serverModule,
-      transport: TransportKind.ipc,
-      options: debugOptions,
-    },
-  };
-
-  const virtualDocumentContents = new Map<string, string>();
-
-  workspace.registerTextDocumentContentProvider("embedded-content", {
-    provideTextDocumentContent: (uri) => {
-      const originalUri = uri.path.slice(1).slice(0, -4);
-      console.error(originalUri);
-      const decodedUri = decodeURIComponent(originalUri);
-      return virtualDocumentContents.get(decodedUri);
-    },
-  });
-
-  let clientOptions: LanguageClientOptions = {
-    documentSelector: [{ scheme: "file", language: "rust" }],
-    middleware: {
-      provideCompletionItem: async (
-        document,
-        position,
-        context,
-        token,
-        next
-      ) => {
-        /*
-				1: Find the occurences of the html! macro using regex
-				2: Check if any of the occurences match the cursor offset
-				3: If so, direct the captured block to the html to the rsx language service
-        */
-        const docSrc = document.getText();
-        const offset = document.offsetAt(position);
-        const matches = docSrc.matchAll(macroRegex);
-
-        // Lazily loop through matches, abort early if the cursor is after the match
-        // let start = 0;
-        // let end = 0;
-        let matchBody: string | undefined = undefined;
-
-        for (const match of matches) {
-          // // Check if the cursor is inbetween the previous end and the new start
-          // // This means the cursor is between html! invocations and we should bail early
-          // if (offset > end && offset < match.index) {
-          //   // Ensure the match
-          //   // defer to the "next?" symbol
-          //   return await next(document, position, context, token);
-          // }
-
-          // Otherwise, move the counters forward
-          const start = match.index;
-          const end = start + match.length;
-
-          // Ensure the cursor is within the match
-          // Break if so
-          if (offset >= start && offset <= end) {
-            matchBody = match[1];
-            break;
-          }
-        }
-
-        // If we looped through all the matches and the match wasn't defined, then bail
-        if (matchBody === undefined) {
-          return await next(document, position, context, token);
-        }
-
-        // If we're inside the style region, then provide CSS completions with the CSS provider
-        const originalUri = document.uri.toString();
-        virtualDocumentContents.set(originalUri, matchBody);
-        // getCSSVirtualContent(htmlLanguageService, document.getText())
-
-        const vdocUriString = `embedded-content://html/${encodeURIComponent(
-          originalUri
-        )}.html`;
-
-        const vdocUri = Uri.parse(vdocUriString);
-        return await commands.executeCommand<CompletionList>(
-          "vscode.executeCompletionItemProvider",
-          vdocUri,
-          position,
-          context.triggerCharacter
-        );
-      },
-    },
-  };
-
-  // Create the language client and start the client.
-  client = new LanguageClient(
-    "languageServerExample",
-    "Language Server Example",
-    serverOptions,
-    clientOptions
-  );
-  // Start the client. This will also launch the server
-  client.start();
-}
-
-export function deactivate(): Thenable<void> | undefined {
-  if (!client) {
-    return undefined;
-  }
-  return client.stop();
-}
-
-const macroRegex = /html! {([\s\S]*?)}/g;

packages/vscode-ext/client/src/rustSupport.ts

@@ -1,8 +0,0 @@
-const macroRegex = /html! {([\s\S]*?)}/g;
-
-export function isInsideHtmlMacro(
-  match: RegExpMatchArray,
-  cursor: number
-): boolean {
-  return false;
-}

packages/vscode-ext/client/tsconfig.json

@@ -1,12 +0,0 @@
-{
-	"compilerOptions": {
-		"module": "commonjs",
-		"target": "ESNext",
-		"lib": ["ESNext"],
-		"outDir": "out",
-		"rootDir": "src",
-		"sourceMap": true
-	},
-	"include": ["src"],
-	"exclude": ["node_modules", ".vscode-test"]
-}

packages/vscode-ext/package-lock.json

@@ -1,1050 +0,0 @@
-{
-  "name": "dioxus-rsx-plugin",
-  "version": "0.1.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "@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.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        }
-      }
-    },
-    "@eslint/eslintrc": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz",
-      "integrity": "sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
-        "globals": "^12.1.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
-        "lodash": "^4.17.20",
-        "minimatch": "^3.0.4",
-        "strip-json-comments": "^3.1.1"
-      }
-    },
-    "@types/eslint-visitor-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==",
-      "dev": true
-    },
-    "@types/json-schema": {
-      "version": "7.0.7",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
-      "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
-      "dev": true
-    },
-    "@types/mocha": {
-      "version": "5.2.7",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz",
-      "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "12.19.15",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz",
-      "integrity": "sha512-lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw==",
-      "dev": true
-    },
-    "@typescript-eslint/eslint-plugin": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.1.tgz",
-      "integrity": "sha512-PQg0emRtzZFWq6PxBcdxRH3QIQiyFO3WCVpRL3fgj5oQS3CDs3AeAKfv4DxNhzn8ITdNJGJ4D3Qw8eAJf3lXeQ==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/experimental-utils": "3.10.1",
-        "debug": "^4.1.1",
-        "functional-red-black-tree": "^1.0.1",
-        "regexpp": "^3.0.0",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
-      }
-    },
-    "@typescript-eslint/experimental-utils": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz",
-      "integrity": "sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/types": "3.10.1",
-        "@typescript-eslint/typescript-estree": "3.10.1",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^2.0.0"
-      }
-    },
-    "@typescript-eslint/parser": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.10.1.tgz",
-      "integrity": "sha512-Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==",
-      "dev": true,
-      "requires": {
-        "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "3.10.1",
-        "@typescript-eslint/types": "3.10.1",
-        "@typescript-eslint/typescript-estree": "3.10.1",
-        "eslint-visitor-keys": "^1.1.0"
-      }
-    },
-    "@typescript-eslint/types": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz",
-      "integrity": "sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==",
-      "dev": true
-    },
-    "@typescript-eslint/typescript-estree": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz",
-      "integrity": "sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "3.10.1",
-        "@typescript-eslint/visitor-keys": "3.10.1",
-        "debug": "^4.1.1",
-        "glob": "^7.1.6",
-        "is-glob": "^4.0.1",
-        "lodash": "^4.17.15",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
-      }
-    },
-    "@typescript-eslint/visitor-keys": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz",
-      "integrity": "sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^1.1.0"
-      }
-    },
-    "acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true
-    },
-    "acorn-jsx": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-      "dev": true
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "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-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "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"
-      }
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.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
-        },
-        "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"
-          }
-        }
-      }
-    },
-    "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
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "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"
-      }
-    },
-    "debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "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=",
-      "dev": true
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^4.1.1"
-      }
-    },
-    "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=",
-      "dev": true
-    },
-    "eslint": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz",
-      "integrity": "sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@eslint/eslintrc": "^0.3.0",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "espree": "^7.3.1",
-        "esquery": "^1.2.0",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^6.0.0",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
-        "globals": "^12.1.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash": "^4.17.20",
-        "minimatch": "^3.0.4",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
-        "strip-json-comments": "^3.1.0",
-        "table": "^6.0.4",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
-          "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^1.1.0"
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true
-    },
-    "espree": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
-      "dev": true,
-      "requires": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
-    },
-    "esquery": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
-      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-          "dev": true
-        }
-      }
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-          "dev": true
-        }
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "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",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "file-entry-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz",
-      "integrity": "sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "flatted": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
-      "dev": true
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "globals": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.8.1"
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "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=",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "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-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-      "dev": true
-    },
-    "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==",
-      "dev": true,
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "requires": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      }
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "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
-    },
-    "prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true
-    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
-    },
-    "regexpp": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
-      "dev": true
-    },
-    "require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "semver": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-      "dev": true,
-      "requires": {
-        "lru-cache": "^6.0.0"
-      }
-    },
-    "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==",
-      "dev": true
-    },
-    "slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "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==",
-          "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
-        }
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^5.0.0"
-      }
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "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"
-      }
-    },
-    "table": {
-      "version": "6.0.7",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.0.7.tgz",
-      "integrity": "sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==",
-      "dev": true,
-      "requires": {
-        "ajv": "^7.0.2",
-        "lodash": "^4.17.20",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.0.3.tgz",
-          "integrity": "sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
-        }
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "tsutils": {
-      "version": "3.20.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.20.0.tgz",
-      "integrity": "sha512-RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.8.1"
-      }
-    },
-    "type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1"
-      }
-    },
-    "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
-    },
-    "typescript": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz",
-      "integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==",
-      "dev": true
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "v8-compile-cache": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz",
-      "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==",
-      "dev": true
-    },
-    "which": {
-      "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"
-      }
-    },
-    "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==",
-      "dev": true
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    }
-  }
-}

packages/vscode-ext/package.json

@@ -1,37 +0,0 @@
-{
-  "name": "dioxus-rsx-plugin",
-  "description": "Get HTML completion inside the html! macro for dioxus projects",
-  "author": "Jonathan Kelley",
-  "license": "MIT",
-  "version": "0.1.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/jkelleyrtp/dioxus"
-  },
-  "publisher": "jkelleyrtp",
-  "categories": [],
-  "keywords": [],
-  "engines": {
-    "vscode": "^1.43.0",
-    "node": "*"
-  },
-  "activationEvents": [
-    "onLanguage:rust"
-  ],
-  "main": "./client/out/extension",
-  "scripts": {
-    "vscode:prepublish": "cd client && npm install && cd .. && npm run compile",
-    "compile": "tsc -b",
-    "watch": "tsc -b -w",
-    "// postinstall": "cd client && npm install && cd ../server && npm install && cd ..",
-    "test": "sh ./scripts/e2e.sh"
-  },
-  "devDependencies": {
-    "@types/mocha": "^5.2.7",
-    "@types/node": "^12.12.0",
-    "@typescript-eslint/eslint-plugin": "^3.0.2",
-    "@typescript-eslint/parser": "^3.0.2",
-    "eslint": "^7.1.0",
-    "typescript": "^4.0.2"
-  }
-}

packages/vscode-ext/rust/main.rs

@@ -1,3 +0,0 @@
-//! Generate the syntax for the RSX language
-
-fn main() {}

packages/vscode-ext/server/package-lock.json

@@ -1,67 +0,0 @@
-{
-	"name": "lsp-sample-server",
-	"version": "1.0.0",
-	"lockfileVersion": 1,
-	"requires": true,
-	"dependencies": {
-		"vscode-html-languageservice": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-3.0.3.tgz",
-			"integrity": "sha512-U+upM3gHp3HaF3wXAnUduA6IDKcz6frWS/dTAju3cZVIyZwOLBBFElQVlLH0ycHyMzqUFrjvdv+kEyPAEWfQ/g==",
-			"requires": {
-				"vscode-languageserver-types": "^3.15.0-next.2",
-				"vscode-nls": "^4.1.1",
-				"vscode-uri": "^2.0.3"
-			},
-			"dependencies": {
-				"vscode-languageserver-types": {
-					"version": "3.15.1",
-					"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
-					"integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
-				},
-				"vscode-uri": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.1.tgz",
-					"integrity": "sha512-eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A=="
-				}
-			}
-		},
-		"vscode-jsonrpc": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
-			"integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="
-		},
-		"vscode-languageserver": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz",
-			"integrity": "sha512-DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==",
-			"requires": {
-				"vscode-languageserver-protocol": "^3.15.3"
-			}
-		},
-		"vscode-languageserver-protocol": {
-			"version": "3.15.3",
-			"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
-			"integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
-			"requires": {
-				"vscode-jsonrpc": "^5.0.1",
-				"vscode-languageserver-types": "3.15.1"
-			}
-		},
-		"vscode-languageserver-textdocument": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz",
-			"integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA=="
-		},
-		"vscode-languageserver-types": {
-			"version": "3.15.1",
-			"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
-			"integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
-		},
-		"vscode-nls": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz",
-			"integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="
-		}
-	}
-}

packages/vscode-ext/server/package.json

@@ -1,20 +0,0 @@
-{
-	"name": "lsp-sample-server",
-	"description": "Example implementation of a language server in node.",
-	"version": "1.0.0",
-	"author": "Microsoft Corporation",
-	"license": "MIT",
-	"engines": {
-		"node": "*"
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/Microsoft/vscode-extension-samples"
-	},
-	"dependencies": {
-		"vscode-html-languageservice": "^3.0.3",
-		"vscode-languageserver": "^6.1.1",
-		"vscode-languageserver-textdocument": "^1.0.1"
-	},
-	"scripts": {}
-}

packages/vscode-ext/server/src/server.ts

@@ -1,54 +0,0 @@
-/* --------------------------------------------------------------------------------------------
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- * ------------------------------------------------------------------------------------------ */
-
-import { getLanguageService } from "vscode-html-languageservice";
-import {
-  createConnection,
-  InitializeParams,
-  ProposedFeatures,
-  TextDocuments,
-  TextDocumentSyncKind,
-} from "vscode-languageserver";
-import { TextDocument } from "vscode-languageserver-textdocument";
-
-// Create a connection for the server. The connection uses Node's IPC as a transport.
-// Also include all preview / proposed LSP features.
-let connection = createConnection(ProposedFeatures.all);
-
-// Create a simple text document manager. The text document manager
-// supports full document sync only
-let documents: TextDocuments<TextDocument> = new TextDocuments(TextDocument);
-
-const htmlLanguageService = getLanguageService();
-
-connection.onInitialize((_params: InitializeParams) => {
-  return {
-    capabilities: {
-      textDocumentSync: TextDocumentSyncKind.Full,
-      // Tell the client that the server supports code completion
-      completionProvider: {
-        resolveProvider: false,
-      },
-    },
-  };
-});
-
-connection.onInitialized(() => {});
-
-connection.onCompletion(async (textDocumentPosition, token) => {
-  const document = documents.get(textDocumentPosition.textDocument.uri);
-  if (!document) {
-    return null;
-  }
-
-  return htmlLanguageService.doComplete(
-    document,
-    textDocumentPosition.position,
-    htmlLanguageService.parseHTMLDocument(document)
-  );
-});
-
-documents.listen(connection);
-connection.listen();

packages/vscode-ext/server/tsconfig.json

@@ -1,14 +0,0 @@
-{
-	"compilerOptions": {
-		"target": "ESNext",
-		"lib": ["ESNext"],
-		"module": "commonjs",
-		"moduleResolution": "node",
-		"sourceMap": true,
-		"strict": true,
-		"outDir": "out",
-		"rootDir": "src"
-	},
-	"include": ["src"],
-	"exclude": ["node_modules", ".vscode-test"]
-}

packages/vscode-ext/syntaxes/rsx.tmLanguage.json

@@ -1,2643 +0,0 @@
-{
-  "information_for_contributors": [
-    "This file has been converted from https://github.com/textmate/html.tmbundle/blob/master/Syntaxes/HTML.plist",
-    "If you want to provide a fix or improvement, please create a pull request against the original repository.",
-    "Once accepted there, we are happy to receive an update request."
-  ],
-  "version": "https://github.com/textmate/html.tmbundle/commit/0c3d5ee54de3a993f747f54186b73a4d2d3c44a2",
-  "name": "rsx",
-  "scopeName": "text.rsx.basic",
-  "injections": {
-    "R:text.html - (comment.block, text.html meta.embedded, meta.tag.*.*.html, meta.tag.*.*.*.html, meta.tag.*.*.*.*.html)": {
-      "comment": "Uses R: to ensure this matches after any other injections.",
-      "patterns": [
-        {
-          "match": "<",
-          "name": "invalid.illegal.bad-angle-bracket.html"
-        }
-      ]
-    }
-  },
-  "patterns": [
-    {
-      "include": "#xml-processing"
-    },
-    {
-      "include": "#comment"
-    },
-    {
-      "include": "#doctype"
-    },
-    {
-      "include": "#cdata"
-    },
-    {
-      "include": "#tags-valid"
-    },
-    {
-      "include": "#tags-invalid"
-    },
-    {
-      "include": "#entities"
-    }
-  ],
-  "repository": {
-    "attribute": {
-      "patterns": [
-        {
-          "begin": "(s(hape|cope|t(ep|art)|ize(s)?|p(ellcheck|an)|elected|lot|andbox|rc(set|doc|lang)?)|h(ttp-equiv|i(dden|gh)|e(ight|aders)|ref(lang)?)|n(o(nce|validate|module)|ame)|c(h(ecked|arset)|ite|o(nt(ent(editable)?|rols)|ords|l(s(pan)?|or))|lass|rossorigin)|t(ype(mustmatch)?|itle|a(rget|bindex)|ranslate)|i(s(map)?|n(tegrity|putmode)|tem(scope|type|id|prop|ref)|d)|op(timum|en)|d(i(sabled|r(name)?)|ownload|e(coding|f(er|ault))|at(etime|a)|raggable)|usemap|p(ing|oster|la(ysinline|ceholder)|attern|reload)|enctype|value|kind|for(m(novalidate|target|enctype|action|method)?)?|w(idth|rap)|l(ist|o(op|w)|a(ng|bel))|a(s(ync)?|c(ce(sskey|pt(-charset)?)|tion)|uto(c(omplete|apitalize)|play|focus)|l(t|low(usermedia|paymentrequest|fullscreen))|bbr)|r(ows(pan)?|e(versed|quired|ferrerpolicy|l|adonly))|m(in(length)?|u(ted|ltiple)|e(thod|dia)|a(nifest|x(length)?)))(?![\\w:-])",
-          "beginCaptures": {
-            "0": {
-              "name": "entity.other.attribute-name.html"
-            }
-          },
-          "comment": "HTML5 attributes, not event handlers",
-          "end": "(?=\\s*+[^=\\s])",
-          "name": "meta.attribute.$1.html",
-          "patterns": [
-            {
-              "include": "#attribute-interior"
-            }
-          ]
-        },
-        {
-          "begin": "style(?![\\w:-])",
-          "beginCaptures": {
-            "0": {
-              "name": "entity.other.attribute-name.html"
-            }
-          },
-          "comment": "HTML5 style attribute",
-          "end": "(?=\\s*+[^=\\s])",
-          "name": "meta.attribute.style.html",
-          "patterns": [
-            {
-              "begin": "=",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.separator.key-value.html"
-                }
-              },
-              "end": "(?<=[^\\s=])(?!\\s*=)|(?=/?>)",
-              "patterns": [
-                {
-                  "begin": "(?=[^\\s=<>`/]|/(?!>))",
-                  "end": "(?!\\G)",
-                  "name": "meta.embedded.line.css",
-                  "patterns": [
-                    {
-                      "captures": {
-                        "0": {
-                          "name": "source.css"
-                        }
-                      },
-                      "match": "([^\\s\"'=<>`/]|/(?!>))+",
-                      "name": "string.unquoted.html"
-                    },
-                    {
-                      "begin": "\"",
-                      "beginCaptures": {
-                        "0": {
-                          "name": "punctuation.definition.string.begin.html"
-                        }
-                      },
-                      "contentName": "source.css",
-                      "end": "(\")",
-                      "endCaptures": {
-                        "0": {
-                          "name": "punctuation.definition.string.end.html"
-                        },
-                        "1": {
-                          "name": "source.css-ignored-vscode"
-                        }
-                      },
-                      "name": "string.quoted.double.html",
-                      "patterns": [
-                        {
-                          "include": "#entities"
-                        }
-                      ]
-                    },
-                    {
-                      "begin": "'",
-                      "beginCaptures": {
-                        "0": {
-                          "name": "punctuation.definition.string.begin.html"
-                        }
-                      },
-                      "contentName": "source.css",
-                      "end": "(')",
-                      "endCaptures": {
-                        "0": {
-                          "name": "punctuation.definition.string.end.html"
-                        },
-                        "1": {
-                          "name": "source.css-ignored-vscode"
-                        }
-                      },
-                      "name": "string.quoted.single.html",
-                      "patterns": [
-                        {
-                          "include": "#entities"
-                        }
-                      ]
-                    }
-                  ]
-                },
-                {
-                  "match": "=",
-                  "name": "invalid.illegal.unexpected-equals-sign.html"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "begin": "on(s(croll|t(orage|alled)|u(spend|bmit)|e(curitypolicyviolation|ek(ing|ed)|lect))|hashchange|c(hange|o(ntextmenu|py)|u(t|echange)|l(ick|ose)|an(cel|play(through)?))|t(imeupdate|oggle)|in(put|valid)|o(nline|ffline)|d(urationchange|r(op|ag(start|over|e(n(ter|d)|xit)|leave)?)|blclick)|un(handledrejection|load)|p(opstate|lay(ing)?|a(ste|use|ge(show|hide))|rogress)|e(nded|rror|mptied)|volumechange|key(down|up|press)|focus|w(heel|aiting)|l(oad(start|e(nd|d(data|metadata)))?|anguagechange)|a(uxclick|fterprint|bort)|r(e(s(ize|et)|jectionhandled)|atechange)|m(ouse(o(ut|ver)|down|up|enter|leave|move)|essage(error)?)|b(efore(unload|print)|lur))(?![\\w:-])",
-          "beginCaptures": {
-            "0": {
-              "name": "entity.other.attribute-name.html"
-            }
-          },
-          "comment": "HTML5 attributes, event handlers",
-          "end": "(?=\\s*+[^=\\s])",
-          "name": "meta.attribute.event-handler.$1.html",
-          "patterns": [
-            {
-              "begin": "=",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.separator.key-value.html"
-                }
-              },
-              "end": "(?<=[^\\s=])(?!\\s*=)|(?=/?>)",
-              "patterns": [
-                {
-                  "begin": "(?=[^\\s=<>`/]|/(?!>))",
-                  "end": "(?!\\G)",
-                  "name": "meta.embedded.line.js",
-                  "patterns": [
-                    {
-                      "captures": {
-                        "0": {
-                          "name": "source.js"
-                        },
-                        "1": {
-                          "patterns": [
-                            {
-                              "include": "source.js"
-                            }
-                          ]
-                        }
-                      },
-                      "match": "(([^\\s\"'=<>`/]|/(?!>))+)",
-                      "name": "string.unquoted.html"
-                    },
-                    {
-                      "begin": "\"",
-                      "beginCaptures": {
-                        "0": {
-                          "name": "punctuation.definition.string.begin.html"
-                        }
-                      },
-                      "contentName": "source.js",
-                      "end": "(\")",
-                      "endCaptures": {
-                        "0": {
-                          "name": "punctuation.definition.string.end.html"
-                        },
-                        "1": {
-                          "name": "source.js-ignored-vscode"
-                        }
-                      },
-                      "name": "string.quoted.double.html",
-                      "patterns": [
-                        {
-                          "captures": {
-                            "0": {
-                              "patterns": [
-                                {
-                                  "include": "source.js"
-                                }
-                              ]
-                            }
-                          },
-                          "match": "([^\\n\"/]|/(?![/*]))+"
-                        },
-                        {
-                          "begin": "//",
-                          "beginCaptures": {
-                            "0": {
-                              "name": "punctuation.definition.comment.js"
-                            }
-                          },
-                          "end": "(?=\")|\\n",
-                          "name": "comment.line.double-slash.js"
-                        },
-                        {
-                          "begin": "/\\*",
-                          "beginCaptures": {
-                            "0": {
-                              "name": "punctuation.definition.comment.begin.js"
-                            }
-                          },
-                          "end": "(?=\")|\\*/",
-                          "endCaptures": {
-                            "0": {
-                              "name": "punctuation.definition.comment.end.js"
-                            }
-                          },
-                          "name": "comment.block.js"
-                        }
-                      ]
-                    },
-                    {
-                      "begin": "'",
-                      "beginCaptures": {
-                        "0": {
-                          "name": "punctuation.definition.string.begin.html"
-                        }
-                      },
-                      "contentName": "source.js",
-                      "end": "(')",
-                      "endCaptures": {
-                        "0": {
-                          "name": "punctuation.definition.string.end.html"
-                        },
-                        "1": {
-                          "name": "source.js-ignored-vscode"
-                        }
-                      },
-                      "name": "string.quoted.single.html",
-                      "patterns": [
-                        {
-                          "captures": {
-                            "0": {
-                              "patterns": [
-                                {
-                                  "include": "source.js"
-                                }
-                              ]
-                            }
-                          },
-                          "match": "([^\\n'/]|/(?![/*]))+"
-                        },
-                        {
-                          "begin": "//",
-                          "beginCaptures": {
-                            "0": {
-                              "name": "punctuation.definition.comment.js"
-                            }
-                          },
-                          "end": "(?=')|\\n",
-                          "name": "comment.line.double-slash.js"
-                        },
-                        {
-                          "begin": "/\\*",
-                          "beginCaptures": {
-                            "0": {
-                              "name": "punctuation.definition.comment.begin.js"
-                            }
-                          },
-                          "end": "(?=')|\\*/",
-                          "endCaptures": {
-                            "0": {
-                              "name": "punctuation.definition.comment.end.js"
-                            }
-                          },
-                          "name": "comment.block.js"
-                        }
-                      ]
-                    }
-                  ]
-                },
-                {
-                  "match": "=",
-                  "name": "invalid.illegal.unexpected-equals-sign.html"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "begin": "(data-[a-z\\-]+)(?![\\w:-])",
-          "beginCaptures": {
-            "0": {
-              "name": "entity.other.attribute-name.html"
-            }
-          },
-          "comment": "HTML5 attributes, data-*",
-          "end": "(?=\\s*+[^=\\s])",
-          "name": "meta.attribute.data-x.$1.html",
-          "patterns": [
-            {
-              "include": "#attribute-interior"
-            }
-          ]
-        },
-        {
-          "begin": "(align|bgcolor|border)(?![\\w:-])",
-          "beginCaptures": {
-            "0": {
-              "name": "invalid.deprecated.entity.other.attribute-name.html"
-            }
-          },
-          "comment": "HTML attributes, deprecated",
-          "end": "(?=\\s*+[^=\\s])",
-          "name": "meta.attribute.$1.html",
-          "patterns": [
-            {
-              "include": "#attribute-interior"
-            }
-          ]
-        },
-        {
-          "begin": "([^\\x{0020}\"'<>/=\\x{0000}-\\x{001F}\\x{007F}-\\x{009F}\\x{FDD0}-\\x{FDEF}\\x{FFFE}\\x{FFFF}\\x{1FFFE}\\x{1FFFF}\\x{2FFFE}\\x{2FFFF}\\x{3FFFE}\\x{3FFFF}\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
-          "beginCaptures": {
-            "0": {
-              "name": "entity.other.attribute-name.html"
-            }
-          },
-          "comment": "Anything else that is valid",
-          "end": "(?=\\s*+[^=\\s])",
-          "name": "meta.attribute.unrecognized.$1.html",
-          "patterns": [
-            {
-              "include": "#attribute-interior"
-            }
-          ]
-        },
-        {
-          "match": "[^\\s>]+",
-          "name": "invalid.illegal.character-not-allowed-here.html"
-        }
-      ]
-    },
-    "attribute-interior": {
-      "patterns": [
-        {
-          "begin": "=",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.separator.key-value.html"
-            }
-          },
-          "end": "(?<=[^\\s=])(?!\\s*=)|(?=/?>)",
-          "patterns": [
-            {
-              "match": "([^\\s\"'=<>`/]|/(?!>))+",
-              "name": "string.unquoted.html"
-            },
-            {
-              "begin": "\"",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.string.begin.html"
-                }
-              },
-              "end": "\"",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.string.end.html"
-                }
-              },
-              "name": "string.quoted.double.html",
-              "patterns": [
-                {
-                  "include": "#entities"
-                }
-              ]
-            },
-            {
-              "begin": "'",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.string.begin.html"
-                }
-              },
-              "end": "'",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.string.end.html"
-                }
-              },
-              "name": "string.quoted.single.html",
-              "patterns": [
-                {
-                  "include": "#entities"
-                }
-              ]
-            },
-            {
-              "match": "=",
-              "name": "invalid.illegal.unexpected-equals-sign.html"
-            }
-          ]
-        }
-      ]
-    },
-    "cdata": {
-      "begin": "<!\\[CDATA\\[",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.tag.begin.html"
-        }
-      },
-      "contentName": "string.other.inline-data.html",
-      "end": "]]>",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.tag.end.html"
-        }
-      },
-      "name": "meta.tag.metadata.cdata.html"
-    },
-    "comment": {
-      "begin": "<!--",
-      "captures": {
-        "0": {
-          "name": "punctuation.definition.comment.html"
-        }
-      },
-      "end": "-->",
-      "name": "comment.block.html",
-      "patterns": [
-        {
-          "match": "\\G-?>",
-          "name": "invalid.illegal.characters-not-allowed-here.html"
-        },
-        {
-          "match": "<!--(?!>)|<!-(?=-->)",
-          "name": "invalid.illegal.characters-not-allowed-here.html"
-        },
-        {
-          "match": "--!>",
-          "name": "invalid.illegal.characters-not-allowed-here.html"
-        }
-      ]
-    },
-    "core-minus-invalid": {
-      "comment": "This should be the root pattern array includes minus #tags-invalid",
-      "patterns": [
-        {
-          "include": "#xml-processing"
-        },
-        {
-          "include": "#comment"
-        },
-        {
-          "include": "#doctype"
-        },
-        {
-          "include": "#cdata"
-        },
-        {
-          "include": "#tags-valid"
-        },
-        {
-          "include": "#entities"
-        }
-      ]
-    },
-    "doctype": {
-      "begin": "<!(?=(?i:DOCTYPE\\s))",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.tag.begin.html"
-        }
-      },
-      "end": ">",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.tag.end.html"
-        }
-      },
-      "name": "meta.tag.metadata.doctype.html",
-      "patterns": [
-        {
-          "match": "\\G(?i:DOCTYPE)",
-          "name": "entity.name.tag.html"
-        },
-        {
-          "begin": "\"",
-          "end": "\"",
-          "name": "string.quoted.double.html"
-        },
-        {
-          "match": "[^\\s>]+",
-          "name": "entity.other.attribute-name.html"
-        }
-      ]
-    },
-    "entities": {
-      "patterns": [
-        {
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.entity.html"
-            },
-            "912": {
-              "name": "punctuation.definition.entity.html"
-            }
-          },
-          "comment": "Yes this is a bit ridiculous, there are quite a lot of these",
-          "match": "(?x)\n\t\t\t\t\t\t(&)\t(?=[a-zA-Z])\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t(a(s(ymp(eq)?|cr|t)|n(d(slope|d|v|and)?|g(s(t|ph)|zarr|e|le|rt(vb(d)?)?|msd(a(h|c|d|e|f|a|g|b))?)?)|c(y|irc|d|ute|E)?|tilde|o(pf|gon)|uml|p(id|os|prox(eq)?|e|E|acir)?|elig|f(r)?|w(conint|int)|l(pha|e(ph|fsym))|acute|ring|grave|m(p|a(cr|lg))|breve)|A(s(sign|cr)|nd|MP|c(y|irc)|tilde|o(pf|gon)|uml|pplyFunction|fr|Elig|lpha|acute|ring|grave|macr|breve))\n\t\t\t\t\t\t  | (B(scr|cy|opf|umpeq|e(cause|ta|rnoullis)|fr|a(ckslash|r(v|wed))|reve)|b(s(cr|im(e)?|ol(hsub|b)?|emi)|n(ot|e(quiv)?)|c(y|ong)|ig(s(tar|qcup)|c(irc|up|ap)|triangle(down|up)|o(times|dot|plus)|uplus|vee|wedge)|o(t(tom)?|pf|wtie|x(h(d|u|D|U)?|times|H(d|u|D|U)?|d(R|l|r|L)|u(R|l|r|L)|plus|D(R|l|r|L)|v(R|h|H|l|r|L)?|U(R|l|r|L)|V(R|h|H|l|r|L)?|minus|box))|Not|dquo|u(ll(et)?|mp(e(q)?|E)?)|prime|e(caus(e)?|t(h|ween|a)|psi|rnou|mptyv)|karow|fr|l(ock|k(1(2|4)|34)|a(nk|ck(square|triangle(down|left|right)?|lozenge)))|a(ck(sim(eq)?|cong|prime|epsilon)|r(vee|wed(ge)?))|r(eve|vbar)|brk(tbrk)?))\n\t\t\t\t\t\t  | (c(s(cr|u(p(e)?|b(e)?))|h(cy|i|eck(mark)?)|ylcty|c(irc|ups(sm)?|edil|a(ps|ron))|tdot|ir(scir|c(eq|le(d(R|circ|S|dash|ast)|arrow(left|right)))?|e|fnint|E|mid)?|o(n(int|g(dot)?)|p(y(sr)?|f|rod)|lon(e(q)?)?|m(p(fn|le(xes|ment))?|ma(t)?))|dot|u(darr(l|r)|p(s|c(up|ap)|or|dot|brcap)?|e(sc|pr)|vee|wed|larr(p)?|r(vearrow(left|right)|ly(eq(succ|prec)|vee|wedge)|arr(m)?|ren))|e(nt(erdot)?|dil|mptyv)|fr|w(conint|int)|lubs(uit)?|a(cute|p(s|c(up|ap)|dot|and|brcup)?|r(on|et))|r(oss|arr))|C(scr|hi|c(irc|onint|edil|aron)|ircle(Minus|Times|Dot|Plus)|Hcy|o(n(tourIntegral|int|gruent)|unterClockwiseContourIntegral|p(f|roduct)|lon(e)?)|dot|up(Cap)?|OPY|e(nterDot|dilla)|fr|lo(seCurly(DoubleQuote|Quote)|ckwiseContourIntegral)|a(yleys|cute|p(italDifferentialD)?)|ross))\n\t\t\t\t\t\t  | (d(s(c(y|r)|trok|ol)|har(l|r)|c(y|aron)|t(dot|ri(f)?)|i(sin|e|v(ide(ontimes)?|onx)?|am(s|ond(suit)?)?|gamma)|Har|z(cy|igrarr)|o(t(square|plus|eq(dot)?|minus)?|ublebarwedge|pf|wn(harpoon(left|right)|downarrows|arrow)|llar)|d(otseq|a(rr|gger))?|u(har|arr)|jcy|e(lta|g|mptyv)|f(isht|r)|wangle|lc(orn|rop)|a(sh(v)?|leth|rr|gger)|r(c(orn|rop)|bkarow)|b(karow|lac)|Arr)|D(s(cr|trok)|c(y|aron)|Scy|i(fferentialD|a(critical(Grave|Tilde|Do(t|ubleAcute)|Acute)|mond))|o(t(Dot|Equal)?|uble(Right(Tee|Arrow)|ContourIntegral|Do(t|wnArrow)|Up(DownArrow|Arrow)|VerticalBar|L(ong(RightArrow|Left(RightArrow|Arrow))|eft(RightArrow|Tee|Arrow)))|pf|wn(Right(TeeVector|Vector(Bar)?)|Breve|Tee(Arrow)?|arrow|Left(RightVector|TeeVector|Vector(Bar)?)|Arrow(Bar|UpArrow)?))|Zcy|el(ta)?|D(otrahd)?|Jcy|fr|a(shv|rr|gger)))\n\t\t\t\t\t\t  | (e(s(cr|im|dot)|n(sp|g)|c(y|ir(c)?|olon|aron)|t(h|a)|o(pf|gon)|dot|u(ro|ml)|p(si(v|lon)?|lus|ar(sl)?)|e|D(ot|Dot)|q(s(im|lant(less|gtr))|c(irc|olon)|u(iv(DD)?|est|als)|vparsl)|f(Dot|r)|l(s(dot)?|inters|l)?|a(ster|cute)|r(Dot|arr)|g(s(dot)?|rave)?|x(cl|ist|p(onentiale|ectation))|m(sp(1(3|4))?|pty(set|v)?|acr))|E(s(cr|im)|c(y|irc|aron)|ta|o(pf|gon)|NG|dot|uml|TH|psilon|qu(ilibrium|al(Tilde)?)|fr|lement|acute|grave|x(ists|ponentialE)|m(pty(SmallSquare|VerySmallSquare)|acr)))\n\t\t\t\t\t\t  | (f(scr|nof|cy|ilig|o(pf|r(k(v)?|all))|jlig|partint|emale|f(ilig|l(ig|lig)|r)|l(tns|lig|at)|allingdotseq|r(own|a(sl|c(1(2|8|3|4|5|6)|78|2(3|5)|3(8|4|5)|45|5(8|6)))))|F(scr|cy|illed(SmallSquare|VerySmallSquare)|o(uriertrf|pf|rAll)|fr))\n\t\t\t\t\t\t  | (G(scr|c(y|irc|edil)|t|opf|dot|T|Jcy|fr|amma(d)?|reater(Greater|SlantEqual|Tilde|Equal(Less)?|FullEqual|Less)|g|breve)|g(s(cr|im(e|l)?)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|irc)|t(c(c|ir)|dot|quest|lPar|r(sim|dot|eq(qless|less)|less|a(pprox|rr)))?|imel|opf|dot|jcy|e(s(cc|dot(o(l)?)?|l(es)?)?|q(slant|q)?|l)?|v(nE|ertneqq)|fr|E(l)?|l(j|E|a)?|a(cute|p|mma(d)?)|rave|g(g)?|breve))\n\t\t\t\t\t\t  | (h(s(cr|trok|lash)|y(phen|bull)|circ|o(ok(leftarrow|rightarrow)|pf|arr|rbar|mtht)|e(llip|arts(uit)?|rcon)|ks(earow|warow)|fr|a(irsp|lf|r(dcy|r(cir|w)?)|milt)|bar|Arr)|H(s(cr|trok)|circ|ilbertSpace|o(pf|rizontalLine)|ump(DownHump|Equal)|fr|a(cek|t)|ARDcy))\n\t\t\t\t\t\t  | (i(s(cr|in(s(v)?|dot|v|E)?)|n(care|t(cal|prod|e(rcal|gers)|larhk)?|odot|fin(tie)?)?|c(y|irc)?|t(ilde)?|i(nfin|i(nt|int)|ota)?|o(cy|ta|pf|gon)|u(kcy|ml)|jlig|prod|e(cy|xcl)|quest|f(f|r)|acute|grave|m(of|ped|a(cr|th|g(part|e|line))))|I(scr|n(t(e(rsection|gral))?|visible(Comma|Times))|c(y|irc)|tilde|o(ta|pf|gon)|dot|u(kcy|ml)|Ocy|Jlig|fr|Ecy|acute|grave|m(plies|a(cr|ginaryI))?))\n\t\t\t\t\t\t  | (j(s(cr|ercy)|c(y|irc)|opf|ukcy|fr|math)|J(s(cr|ercy)|c(y|irc)|opf|ukcy|fr))\n\t\t\t\t\t\t  | (k(scr|hcy|c(y|edil)|opf|jcy|fr|appa(v)?|green)|K(scr|c(y|edil)|Hcy|opf|Jcy|fr|appa))\n\t\t\t\t\t\t  | (l(s(h|cr|trok|im(e|g)?|q(uo(r)?|b)|aquo)|h(ar(d|u(l)?)|blk)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|ub|e(il|dil)|aron)|Barr|t(hree|c(c|ir)|imes|dot|quest|larr|r(i(e|f)?|Par))?|Har|o(ng(left(arrow|rightarrow)|rightarrow|mapsto)|times|z(enge|f)?|oparrow(left|right)|p(f|lus|ar)|w(ast|bar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|r(dhar|ushar))|ur(dshar|uhar)|jcy|par(lt)?|e(s(s(sim|dot|eq(qgtr|gtr)|approx|gtr)|cc|dot(o(r)?)?|g(es)?)?|q(slant|q)?|ft(harpoon(down|up)|threetimes|leftarrows|arrow(tail)?|right(squigarrow|harpoons|arrow(s)?))|g)?|v(nE|ertneqq)|f(isht|loor|r)|E(g)?|l(hard|corner|tri|arr)?|a(ng(d|le)?|cute|t(e(s)?|ail)?|p|emptyv|quo|rr(sim|hk|tl|pl|fs|lp|b(fs)?)?|gran|mbda)|r(har(d)?|corner|tri|arr|m)|g(E)?|m(idot|oust(ache)?)|b(arr|r(k(sl(d|u)|e)|ac(e|k))|brk)|A(tail|arr|rr))|L(s(h|cr|trok)|c(y|edil|aron)|t|o(ng(RightArrow|left(arrow|rightarrow)|rightarrow|Left(RightArrow|Arrow))|pf|wer(RightArrow|LeftArrow))|T|e(ss(Greater|SlantEqual|Tilde|EqualGreater|FullEqual|Less)|ft(Right(Vector|Arrow)|Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|rightarrow|Floor|A(ngleBracket|rrow(RightArrow|Bar)?)))|Jcy|fr|l(eftarrow)?|a(ng|cute|placetrf|rr|mbda)|midot))\n\t\t\t\t\t\t  | (M(scr|cy|inusPlus|opf|u|e(diumSpace|llintrf)|fr|ap)|m(s(cr|tpos)|ho|nplus|c(y|omma)|i(nus(d(u)?|b)?|cro|d(cir|dot|ast)?)|o(dels|pf)|dash|u(ltimap|map)?|p|easuredangle|DDot|fr|l(cp|dr)|a(cr|p(sto(down|up|left)?)?|l(t(ese)?|e)|rker)))\n\t\t\t\t\t\t  | (n(s(hort(parallel|mid)|c(cue|e|r)?|im(e(q)?)?|u(cc(eq)?|p(set(eq(q)?)?|e|E)?|b(set(eq(q)?)?|e|E)?)|par|qsu(pe|be)|mid)|Rightarrow|h(par|arr|Arr)|G(t(v)?|g)|c(y|ong(dot)?|up|edil|a(p|ron))|t(ilde|lg|riangle(left(eq)?|right(eq)?)|gl)|i(s(d)?|v)?|o(t(ni(v(c|a|b))?|in(dot|v(c|a|b)|E)?)?|pf)|dash|u(m(sp|ero)?)?|jcy|p(olint|ar(sl|t|allel)?|r(cue|e(c(eq)?)?)?)|e(s(im|ear)|dot|quiv|ar(hk|r(ow)?)|xist(s)?|Arr)?|v(sim|infin|Harr|dash|Dash|l(t(rie)?|e|Arr)|ap|r(trie|Arr)|g(t|e))|fr|w(near|ar(hk|r(ow)?)|Arr)|V(dash|Dash)|l(sim|t(ri(e)?)?|dr|e(s(s)?|q(slant|q)?|ft(arrow|rightarrow))?|E|arr|Arr)|a(ng|cute|tur(al(s)?)?|p(id|os|prox|E)?|bla)|r(tri(e)?|ightarrow|arr(c|w)?|Arr)|g(sim|t(r)?|e(s|q(slant|q)?)?|E)|mid|L(t(v)?|eft(arrow|rightarrow)|l)|b(sp|ump(e)?))|N(scr|c(y|edil|aron)|tilde|o(nBreakingSpace|Break|t(R(ightTriangle(Bar|Equal)?|everseElement)|Greater(Greater|SlantEqual|Tilde|Equal|FullEqual|Less)?|S(u(cceeds(SlantEqual|Tilde|Equal)?|perset(Equal)?|bset(Equal)?)|quareSu(perset(Equal)?|bset(Equal)?))|Hump(DownHump|Equal)|Nested(GreaterGreater|LessLess)|C(ongruent|upCap)|Tilde(Tilde|Equal|FullEqual)?|DoubleVerticalBar|Precedes(SlantEqual|Equal)?|E(qual(Tilde)?|lement|xists)|VerticalBar|Le(ss(Greater|SlantEqual|Tilde|Equal|Less)?|ftTriangle(Bar|Equal)?))?|pf)|u|e(sted(GreaterGreater|LessLess)|wLine|gative(MediumSpace|Thi(nSpace|ckSpace)|VeryThinSpace))|Jcy|fr|acute))\n\t\t\t\t\t\t  | (o(s(cr|ol|lash)|h(m|bar)|c(y|ir(c)?)|ti(lde|mes(as)?)|S|int|opf|d(sold|iv|ot|ash|blac)|uml|p(erp|lus|ar)|elig|vbar|f(cir|r)|l(c(ir|ross)|t|ine|arr)|a(st|cute)|r(slope|igof|or|d(er(of)?|f|m)?|v|arr)?|g(t|on|rave)|m(i(nus|cron|d)|ega|acr))|O(s(cr|lash)|c(y|irc)|ti(lde|mes)|opf|dblac|uml|penCurly(DoubleQuote|Quote)|ver(B(ar|rac(e|ket))|Parenthesis)|fr|Elig|acute|r|grave|m(icron|ega|acr)))\n\t\t\t\t\t\t  | (p(s(cr|i)|h(i(v)?|one|mmat)|cy|i(tchfork|v)?|o(intint|und|pf)|uncsp|er(cnt|tenk|iod|p|mil)|fr|l(us(sim|cir|two|d(o|u)|e|acir|mn|b)?|an(ck(h)?|kv))|ar(s(im|l)|t|a(llel)?)?|r(sim|n(sim|E|ap)|cue|ime(s)?|o(d|p(to)?|f(surf|line|alar))|urel|e(c(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?)?|E|ap)?|m)|P(s(cr|i)|hi|cy|i|o(incareplane|pf)|fr|lusMinus|artialD|r(ime|o(duct|portion(al)?)|ecedes(SlantEqual|Tilde|Equal)?)?))\n\t\t\t\t\t\t  | (q(scr|int|opf|u(ot|est(eq)?|at(int|ernions))|prime|fr)|Q(scr|opf|UOT|fr))\n\t\t\t\t\t\t  | (R(s(h|cr)|ho|c(y|edil|aron)|Barr|ight(Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|Floor|A(ngleBracket|rrow(Bar|LeftArrow)?))|o(undImplies|pf)|uleDelayed|e(verse(UpEquilibrium|E(quilibrium|lement)))?|fr|EG|a(ng|cute|rr(tl)?)|rightarrow)|r(s(h|cr|q(uo(r)?|b)|aquo)|h(o(v)?|ar(d|u(l)?))|nmid|c(y|ub|e(il|dil)|aron)|Barr|t(hree|imes|ri(e|f|ltri)?)|i(singdotseq|ng|ght(squigarrow|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(tail)?|rightarrows))|Har|o(times|p(f|lus|ar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|ldhar)|uluhar|p(polint|ar(gt)?)|e(ct|al(s|ine|part)?|g)|f(isht|loor|r)|l(har|arr|m)|a(ng(d|e|le)?|c(ute|e)|t(io(nals)?|ail)|dic|emptyv|quo|rr(sim|hk|c|tl|pl|fs|w|lp|ap|b(fs)?)?)|rarr|x|moust(ache)?|b(arr|r(k(sl(d|u)|e)|ac(e|k))|brk)|A(tail|arr|rr)))\n\t\t\t\t\t\t  | (s(s(cr|tarf|etmn|mile)|h(y|c(hcy|y)|ort(parallel|mid)|arp)|c(sim|y|n(sim|E|ap)|cue|irc|polint|e(dil)?|E|a(p|ron))?|t(ar(f)?|r(ns|aight(phi|epsilon)))|i(gma(v|f)?|m(ne|dot|plus|e(q)?|l(E)?|rarr|g(E)?)?)|zlig|o(pf|ftcy|l(b(ar)?)?)|dot(e|b)?|u(ng|cc(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?|p(s(im|u(p|b)|et(neq(q)?|eq(q)?)?)|hs(ol|ub)|1|n(e|E)|2|d(sub|ot)|3|plus|e(dot)?|E|larr|mult)?|m|b(s(im|u(p|b)|et(neq(q)?|eq(q)?)?)|n(e|E)|dot|plus|e(dot)?|E|rarr|mult)?)|pa(des(uit)?|r)|e(swar|ct|tm(n|inus)|ar(hk|r(ow)?)|xt|mi|Arr)|q(su(p(set(eq)?|e)?|b(set(eq)?|e)?)|c(up(s)?|ap(s)?)|u(f|ar(e|f))?)|fr(own)?|w(nwar|ar(hk|r(ow)?)|Arr)|larr|acute|rarr|m(t(e(s)?)?|i(d|le)|eparsl|a(shp|llsetminus))|bquo)|S(scr|hort(RightArrow|DownArrow|UpArrow|LeftArrow)|c(y|irc|edil|aron)?|tar|igma|H(cy|CHcy)|opf|u(c(hThat|ceeds(SlantEqual|Tilde|Equal)?)|p(set|erset(Equal)?)?|m|b(set(Equal)?)?)|OFTcy|q(uare(Su(perset(Equal)?|bset(Equal)?)|Intersection|Union)?|rt)|fr|acute|mallCircle))\n\t\t\t\t\t\t  | (t(s(hcy|c(y|r)|trok)|h(i(nsp|ck(sim|approx))|orn|e(ta(sym|v)?|re(4|fore))|k(sim|ap))|c(y|edil|aron)|i(nt|lde|mes(d|b(ar)?)?)|o(sa|p(cir|f(ork)?|bot)?|ea)|dot|prime|elrec|fr|w(ixt|ohead(leftarrow|rightarrow))|a(u|rget)|r(i(sb|time|dot|plus|e|angle(down|q|left(eq)?|right(eq)?)?|minus)|pezium|ade)|brk)|T(s(cr|trok)|RADE|h(i(nSpace|ckSpace)|e(ta|refore))|c(y|edil|aron)|S(cy|Hcy)|ilde(Tilde|Equal|FullEqual)?|HORN|opf|fr|a(u|b)|ripleDot))\n\t\t\t\t\t\t  | (u(scr|h(ar(l|r)|blk)|c(y|irc)|t(ilde|dot|ri(f)?)|Har|o(pf|gon)|d(har|arr|blac)|u(arr|ml)|p(si(h|lon)?|harpoon(left|right)|downarrow|uparrows|lus|arrow)|f(isht|r)|wangle|l(c(orn(er)?|rop)|tri)|a(cute|rr)|r(c(orn(er)?|rop)|tri|ing)|grave|m(l|acr)|br(cy|eve)|Arr)|U(scr|n(ion(Plus)?|der(B(ar|rac(e|ket))|Parenthesis))|c(y|irc)|tilde|o(pf|gon)|dblac|uml|p(si(lon)?|downarrow|Tee(Arrow)?|per(RightArrow|LeftArrow)|DownArrow|Equilibrium|arrow|Arrow(Bar|DownArrow)?)|fr|a(cute|rr(ocir)?)|ring|grave|macr|br(cy|eve)))\n\t\t\t\t\t\t  | (v(s(cr|u(pn(e|E)|bn(e|E)))|nsu(p|b)|cy|Bar(v)?|zigzag|opf|dash|prop|e(e(eq|bar)?|llip|r(t|bar))|Dash|fr|ltri|a(ngrt|r(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|t(heta|riangle(left|right))|p(hi|i|ropto)|epsilon|kappa|r(ho)?))|rtri|Arr)|V(scr|cy|opf|dash(l)?|e(e|r(yThinSpace|t(ical(Bar|Separator|Tilde|Line))?|bar))|Dash|vdash|fr|bar))\n\t\t\t\t\t\t  | (w(scr|circ|opf|p|e(ierp|d(ge(q)?|bar))|fr|r(eath)?)|W(scr|circ|opf|edge|fr))\n\t\t\t\t\t\t  | (X(scr|i|opf|fr)|x(s(cr|qcup)|h(arr|Arr)|nis|c(irc|up|ap)|i|o(time|dot|p(f|lus))|dtri|u(tri|plus)|vee|fr|wedge|l(arr|Arr)|r(arr|Arr)|map))\n\t\t\t\t\t\t  | (y(scr|c(y|irc)|icy|opf|u(cy|ml)|en|fr|ac(y|ute))|Y(scr|c(y|irc)|opf|uml|Icy|Ucy|fr|acute|Acy))\n\t\t\t\t\t\t  | (z(scr|hcy|c(y|aron)|igrarr|opf|dot|e(ta|etrf)|fr|w(nj|j)|acute)|Z(scr|c(y|aron)|Hcy|opf|dot|e(ta|roWidthSpace)|fr|acute))\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(;)\n\t\t\t\t\t",
-          "name": "constant.character.entity.named.$2.html"
-        },
-        {
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.entity.html"
-            },
-            "3": {
-              "name": "punctuation.definition.entity.html"
-            }
-          },
-          "match": "(&)#[0-9]+(;)",
-          "name": "constant.character.entity.numeric.decimal.html"
-        },
-        {
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.entity.html"
-            },
-            "3": {
-              "name": "punctuation.definition.entity.html"
-            }
-          },
-          "match": "(&)#[xX][0-9a-fA-F]+(;)",
-          "name": "constant.character.entity.numeric.hexadecimal.html"
-        },
-        {
-          "match": "&(?=[a-zA-Z0-9]+;)",
-          "name": "invalid.illegal.ambiguous-ampersand.html"
-        }
-      ]
-    },
-    "math": {
-      "patterns": [
-        {
-          "begin": "(?i)(<)(math)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
-          "beginCaptures": {
-            "0": {
-              "name": "meta.tag.structure.$2.start.html"
-            },
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "patterns": [
-                {
-                  "include": "#attribute"
-                }
-              ]
-            },
-            "5": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "end": "(?i)(</)(\\2)\\s*(>)",
-          "endCaptures": {
-            "0": {
-              "name": "meta.tag.structure.$2.end.html"
-            },
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.element.structure.$2.html",
-          "patterns": [
-            {
-              "begin": "(?<!>)\\G",
-              "end": ">",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "name": "meta.tag.structure.start.html",
-              "patterns": [
-                {
-                  "include": "#attribute"
-                }
-              ]
-            },
-            {
-              "include": "#tags"
-            }
-          ]
-        }
-      ],
-      "repository": {
-        "attribute": {
-          "patterns": [
-            {
-              "begin": "(s(hift|ymmetric|cript(sizemultiplier|level|minsize)|t(ackalign|retchy)|ide|u(pscriptshift|bscriptshift)|e(parator(s)?|lection)|rc)|h(eight|ref)|n(otation|umalign)|c(haralign|olumn(spa(n|cing)|width|lines|align)|lose|rossout)|i(n(dent(shift(first|last)?|target|align(first|last)?)|fixlinebreakstyle)|d)|o(pen|verflow)|d(i(splay(style)?|r)|e(nomalign|cimalpoint|pth))|position|e(dge|qual(columns|rows))|voffset|f(orm|ence|rame(spacing)?)|width|l(space|ine(thickness|leading|break(style|multchar)?)|o(ngdivstyle|cation)|ength|quote|argeop)|a(c(cent(under)?|tiontype)|l(t(text|img(-(height|valign|width))?)|ign(mentscope)?))|r(space|ow(spa(n|cing)|lines|align)|quote)|groupalign|x(link:href|mlns)|m(in(size|labelspacing)|ovablelimits|a(th(size|color|variant|background)|xsize))|bevelled)(?![\\w:-])",
-              "beginCaptures": {
-                "0": {
-                  "name": "entity.other.attribute-name.html"
-                }
-              },
-              "end": "(?=\\s*+[^=\\s])",
-              "name": "meta.attribute.$1.html",
-              "patterns": [
-                {
-                  "include": "#attribute-interior"
-                }
-              ]
-            },
-            {
-              "begin": "([^\\x{0020}\"'<>/=\\x{0000}-\\x{001F}\\x{007F}-\\x{009F}\\x{FDD0}-\\x{FDEF}\\x{FFFE}\\x{FFFF}\\x{1FFFE}\\x{1FFFF}\\x{2FFFE}\\x{2FFFF}\\x{3FFFE}\\x{3FFFF}\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
-              "beginCaptures": {
-                "0": {
-                  "name": "entity.other.attribute-name.html"
-                }
-              },
-              "comment": "Anything else that is valid",
-              "end": "(?=\\s*+[^=\\s])",
-              "name": "meta.attribute.unrecognized.$1.html",
-              "patterns": [
-                {
-                  "include": "#attribute-interior"
-                }
-              ]
-            },
-            {
-              "match": "[^\\s>]+",
-              "name": "invalid.illegal.character-not-allowed-here.html"
-            }
-          ]
-        },
-        "tags": {
-          "patterns": [
-            {
-              "include": "#comment"
-            },
-            {
-              "include": "#cdata"
-            },
-            {
-              "captures": {
-                "0": {
-                  "name": "meta.tag.structure.math.$2.void.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "match": "(?i)(<)(annotation|annotation-xml|semantics|menclose|merror|mfenced|mfrac|mpadded|mphantom|mroot|mrow|msqrt|mstyle|mmultiscripts|mover|mprescripts|msub|msubsup|msup|munder|munderover|none|mlabeledtr|mtable|mtd|mtr|mlongdiv|mscarries|mscarry|msgroup|msline|msrow|mstack|maction)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
-              "name": "meta.element.structure.math.$2.html"
-            },
-            {
-              "begin": "(?i)(<)(annotation|annotation-xml|semantics|menclose|merror|mfenced|mfrac|mpadded|mphantom|mroot|mrow|msqrt|mstyle|mmultiscripts|mover|mprescripts|msub|msubsup|msup|munder|munderover|none|mlabeledtr|mtable|mtd|mtr|mlongdiv|mscarries|mscarry|msgroup|msline|msrow|mstack|maction)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.tag.structure.math.$2.start.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
-              "endCaptures": {
-                "0": {
-                  "name": "meta.tag.structure.math.$2.end.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "punctuation.definition.tag.end.html"
-                },
-                "4": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "name": "meta.element.structure.math.$2.html",
-              "patterns": [
-                {
-                  "begin": "(?<!>)\\G",
-                  "end": "(?=/>)|>",
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.tag.end.html"
-                    }
-                  },
-                  "name": "meta.tag.structure.start.html",
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                {
-                  "include": "#tags"
-                }
-              ]
-            },
-            {
-              "captures": {
-                "0": {
-                  "name": "meta.tag.inline.math.$2.void.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "match": "(?i)(<)(mi|mn|mo|ms|mspace|mtext|maligngroup|malignmark)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
-              "name": "meta.element.inline.math.$2.html"
-            },
-            {
-              "begin": "(?i)(<)(mi|mn|mo|ms|mspace|mtext|maligngroup|malignmark)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.tag.inline.math.$2.start.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
-              "endCaptures": {
-                "0": {
-                  "name": "meta.tag.inline.math.$2.end.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "punctuation.definition.tag.end.html"
-                },
-                "4": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "name": "meta.element.inline.math.$2.html",
-              "patterns": [
-                {
-                  "begin": "(?<!>)\\G",
-                  "end": "(?=/>)|>",
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.tag.end.html"
-                    }
-                  },
-                  "name": "meta.tag.inline.start.html",
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                {
-                  "include": "#tags"
-                }
-              ]
-            },
-            {
-              "captures": {
-                "0": {
-                  "name": "meta.tag.object.math.$2.void.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "match": "(?i)(<)(mglyph)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
-              "name": "meta.element.object.math.$2.html"
-            },
-            {
-              "begin": "(?i)(<)(mglyph)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.tag.object.math.$2.start.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
-              "endCaptures": {
-                "0": {
-                  "name": "meta.tag.object.math.$2.end.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "punctuation.definition.tag.end.html"
-                },
-                "4": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "name": "meta.element.object.math.$2.html",
-              "patterns": [
-                {
-                  "begin": "(?<!>)\\G",
-                  "end": "(?=/>)|>",
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.tag.end.html"
-                    }
-                  },
-                  "name": "meta.tag.object.start.html",
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                {
-                  "include": "#tags"
-                }
-              ]
-            },
-            {
-              "captures": {
-                "0": {
-                  "name": "meta.tag.other.invalid.void.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "invalid.illegal.unrecognized-tag.html"
-                },
-                "4": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "6": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "match": "(?i)(<)(([\\w:]+))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
-              "name": "meta.element.other.invalid.html"
-            },
-            {
-              "begin": "(?i)(<)((\\w[^\\s>]*))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.tag.other.invalid.start.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "invalid.illegal.unrecognized-tag.html"
-                },
-                "4": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "6": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "end": "(?i)(</)((\\2))\\s*(>)|(/>)|(?=</\\w+)",
-              "endCaptures": {
-                "0": {
-                  "name": "meta.tag.other.invalid.end.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "invalid.illegal.unrecognized-tag.html"
-                },
-                "4": {
-                  "name": "punctuation.definition.tag.end.html"
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "name": "meta.element.other.invalid.html",
-              "patterns": [
-                {
-                  "begin": "(?<!>)\\G",
-                  "end": "(?=/>)|>",
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.tag.end.html"
-                    }
-                  },
-                  "name": "meta.tag.other.invalid.start.html",
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                {
-                  "include": "#tags"
-                }
-              ]
-            },
-            {
-              "include": "#tags-invalid"
-            }
-          ]
-        }
-      }
-    },
-    "svg": {
-      "patterns": [
-        {
-          "begin": "(?i)(<)(svg)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
-          "beginCaptures": {
-            "0": {
-              "name": "meta.tag.structure.$2.start.html"
-            },
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "patterns": [
-                {
-                  "include": "#attribute"
-                }
-              ]
-            },
-            "5": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "end": "(?i)(</)(\\2)\\s*(>)",
-          "endCaptures": {
-            "0": {
-              "name": "meta.tag.structure.$2.end.html"
-            },
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.element.structure.$2.html",
-          "patterns": [
-            {
-              "begin": "(?<!>)\\G",
-              "end": ">",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "name": "meta.tag.structure.start.html",
-              "patterns": [
-                {
-                  "include": "#attribute"
-                }
-              ]
-            },
-            {
-              "include": "#tags"
-            }
-          ]
-        }
-      ],
-      "repository": {
-        "attribute": {
-          "patterns": [
-            {
-              "begin": "(s(hape-rendering|ystemLanguage|cale|t(yle|itchTiles|op-(color|opacity)|dDeviation|em(h|v)|artOffset|r(i(ng|kethrough-(thickness|position))|oke(-(opacity|dash(offset|array)|width|line(cap|join)|miterlimit))?))|urfaceScale|p(e(cular(Constant|Exponent)|ed)|acing|readMethod)|eed|lope)|h(oriz-(origin-x|adv-x)|eight|anging|ref(lang)?)|y(1|2|ChannelSelector)?|n(umOctaves|ame)|c(y|o(ntentS(criptType|tyleType)|lor(-(interpolation(-filters)?|profile|rendering))?)|ursor|l(ip(-(path|rule)|PathUnits)?|ass)|a(p-height|lcMode)|x)|t(ype|o|ext(-(decoration|anchor|rendering)|Length)|a(rget(X|Y)?|b(index|leValues))|ransform)|i(n(tercept|2)?|d(eographic)?|mage-rendering)|z(oomAndPan)?|o(p(erator|acity)|ver(flow|line-(thickness|position))|ffset|r(i(ent(ation)?|gin)|der))|d(y|i(splay|visor|ffuseConstant|rection)|ominant-baseline|ur|e(scent|celerate)|x)?|u(1|n(i(code(-(range|bidi))?|ts-per-em)|derline-(thickness|position))|2)|p(ing|oint(s(At(X|Y|Z))?|er-events)|a(nose-1|t(h(Length)?|tern(ContentUnits|Transform|Units))|int-order)|r(imitiveUnits|eserveA(spectRatio|lpha)))|e(n(d|able-background)|dgeMode|levation|x(ternalResourcesRequired|ponent))|v(i(sibility|ew(Box|Target))|-(hanging|ideographic|alphabetic|mathematical)|e(ctor-effect|r(sion|t-(origin-(y|x)|adv-y)))|alues)|k(1|2|3|e(y(Splines|Times|Points)|rn(ing|el(Matrix|UnitLength)))|4)?|f(y|il(ter(Res|Units)?|l(-(opacity|rule))?)|o(nt-(s(t(yle|retch)|ize(-adjust)?)|variant|family|weight)|rmat)|lood-(color|opacity)|r(om)?|x)|w(idth(s)?|ord-spacing|riting-mode)|l(i(ghting-color|mitingConeAngle)|ocal|e(ngthAdjust|tter-spacing)|ang)|a(scent|cc(umulate|ent-height)|ttribute(Name|Type)|zimuth|dditive|utoReverse|l(ignment-baseline|phabetic|lowReorder)|rabic-form|mplitude)|r(y|otate|e(s(tart|ult)|ndering-intent|peat(Count|Dur)|quired(Extensions|Features)|f(X|Y|errerPolicy)|l)|adius|x)?|g(1|2|lyph(Ref|-(name|orientation-(horizontal|vertical)))|radient(Transform|Units))|x(1|2|ChannelSelector|-height|link:(show|href|t(ype|itle)|a(ctuate|rcrole)|role)|ml:(space|lang|base))?|m(in|ode|e(thod|dia)|a(sk(ContentUnits|Units)?|thematical|rker(Height|-(start|end|mid)|Units|Width)|x))|b(y|ias|egin|ase(Profile|line-shift|Frequency)|box))(?![\\w:-])",
-              "beginCaptures": {
-                "0": {
-                  "name": "entity.other.attribute-name.html"
-                }
-              },
-              "end": "(?=\\s*+[^=\\s])",
-              "name": "meta.attribute.$1.html",
-              "patterns": [
-                {
-                  "include": "#attribute-interior"
-                }
-              ]
-            },
-            {
-              "begin": "([^\\x{0020}\"'<>/=\\x{0000}-\\x{001F}\\x{007F}-\\x{009F}\\x{FDD0}-\\x{FDEF}\\x{FFFE}\\x{FFFF}\\x{1FFFE}\\x{1FFFF}\\x{2FFFE}\\x{2FFFF}\\x{3FFFE}\\x{3FFFF}\\x{4FFFE}\\x{4FFFF}\\x{5FFFE}\\x{5FFFF}\\x{6FFFE}\\x{6FFFF}\\x{7FFFE}\\x{7FFFF}\\x{8FFFE}\\x{8FFFF}\\x{9FFFE}\\x{9FFFF}\\x{AFFFE}\\x{AFFFF}\\x{BFFFE}\\x{BFFFF}\\x{CFFFE}\\x{CFFFF}\\x{DFFFE}\\x{DFFFF}\\x{EFFFE}\\x{EFFFF}\\x{FFFFE}\\x{FFFFF}\\x{10FFFE}\\x{10FFFF}]+)",
-              "beginCaptures": {
-                "0": {
-                  "name": "entity.other.attribute-name.html"
-                }
-              },
-              "comment": "Anything else that is valid",
-              "end": "(?=\\s*+[^=\\s])",
-              "name": "meta.attribute.unrecognized.$1.html",
-              "patterns": [
-                {
-                  "include": "#attribute-interior"
-                }
-              ]
-            },
-            {
-              "match": "[^\\s>]+",
-              "name": "invalid.illegal.character-not-allowed-here.html"
-            }
-          ]
-        },
-        "tags": {
-          "patterns": [
-            {
-              "include": "#comment"
-            },
-            {
-              "include": "#cdata"
-            },
-            {
-              "captures": {
-                "0": {
-                  "name": "meta.tag.metadata.svg.$2.void.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "match": "(?i)(<)(color-profile|desc|metadata|script|style|title)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
-              "name": "meta.element.metadata.svg.$2.html"
-            },
-            {
-              "begin": "(?i)(<)(color-profile|desc|metadata|script|style|title)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.tag.metadata.svg.$2.start.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
-              "endCaptures": {
-                "0": {
-                  "name": "meta.tag.metadata.svg.$2.end.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "punctuation.definition.tag.end.html"
-                },
-                "4": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "name": "meta.element.metadata.svg.$2.html",
-              "patterns": [
-                {
-                  "begin": "(?<!>)\\G",
-                  "end": "(?=/>)|>",
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.tag.end.html"
-                    }
-                  },
-                  "name": "meta.tag.metadata.start.html",
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                {
-                  "include": "#tags"
-                }
-              ]
-            },
-            {
-              "captures": {
-                "0": {
-                  "name": "meta.tag.structure.svg.$2.void.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "match": "(?i)(<)(animateMotion|clipPath|defs|feComponentTransfer|feDiffuseLighting|feMerge|feSpecularLighting|filter|g|hatch|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|pattern|radialGradient|switch|text|textPath)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
-              "name": "meta.element.structure.svg.$2.html"
-            },
-            {
-              "begin": "(?i)(<)(animateMotion|clipPath|defs|feComponentTransfer|feDiffuseLighting|feMerge|feSpecularLighting|filter|g|hatch|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|pattern|radialGradient|switch|text|textPath)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.tag.structure.svg.$2.start.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
-              "endCaptures": {
-                "0": {
-                  "name": "meta.tag.structure.svg.$2.end.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "punctuation.definition.tag.end.html"
-                },
-                "4": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "name": "meta.element.structure.svg.$2.html",
-              "patterns": [
-                {
-                  "begin": "(?<!>)\\G",
-                  "end": "(?=/>)|>",
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.tag.end.html"
-                    }
-                  },
-                  "name": "meta.tag.structure.start.html",
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                {
-                  "include": "#tags"
-                }
-              ]
-            },
-            {
-              "captures": {
-                "0": {
-                  "name": "meta.tag.inline.svg.$2.void.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "match": "(?i)(<)(a|animate|discard|feBlend|feColorMatrix|feComposite|feConvolveMatrix|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feMergeNode|feMorphology|feOffset|fePointLight|feSpotLight|feTile|feTurbulence|hatchPath|mpath|set|solidcolor|stop|tspan)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
-              "name": "meta.element.inline.svg.$2.html"
-            },
-            {
-              "begin": "(?i)(<)(a|animate|discard|feBlend|feColorMatrix|feComposite|feConvolveMatrix|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feMergeNode|feMorphology|feOffset|fePointLight|feSpotLight|feTile|feTurbulence|hatchPath|mpath|set|solidcolor|stop|tspan)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.tag.inline.svg.$2.start.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
-              "endCaptures": {
-                "0": {
-                  "name": "meta.tag.inline.svg.$2.end.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "punctuation.definition.tag.end.html"
-                },
-                "4": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "name": "meta.element.inline.svg.$2.html",
-              "patterns": [
-                {
-                  "begin": "(?<!>)\\G",
-                  "end": "(?=/>)|>",
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.tag.end.html"
-                    }
-                  },
-                  "name": "meta.tag.inline.start.html",
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                {
-                  "include": "#tags"
-                }
-              ]
-            },
-            {
-              "captures": {
-                "0": {
-                  "name": "meta.tag.object.svg.$2.void.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "match": "(?i)(<)(circle|ellipse|feImage|foreignObject|image|line|path|polygon|polyline|rect|symbol|use|view)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
-              "name": "meta.element.object.svg.$2.html"
-            },
-            {
-              "begin": "(?i)(<)(a|circle|ellipse|feImage|foreignObject|image|line|path|polygon|polyline|rect|symbol|use|view)(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.tag.object.svg.$2.start.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "end": "(?i)(</)(\\2)\\s*(>)|(/>)|(?=</\\w+)",
-              "endCaptures": {
-                "0": {
-                  "name": "meta.tag.object.svg.$2.end.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "punctuation.definition.tag.end.html"
-                },
-                "4": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "name": "meta.element.object.svg.$2.html",
-              "patterns": [
-                {
-                  "begin": "(?<!>)\\G",
-                  "end": "(?=/>)|>",
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.tag.end.html"
-                    }
-                  },
-                  "name": "meta.tag.object.start.html",
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                {
-                  "include": "#tags"
-                }
-              ]
-            },
-            {
-              "captures": {
-                "0": {
-                  "name": "meta.tag.other.svg.$2.void.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "invalid.deprecated.html"
-                },
-                "4": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "6": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "match": "(?i)(<)((altGlyph|altGlyphDef|altGlyphItem|animateColor|animateTransform|cursor|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|glyph|glyphRef|hkern|missing-glyph|tref|vkern))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
-              "name": "meta.element.other.svg.$2.html"
-            },
-            {
-              "begin": "(?i)(<)((altGlyph|altGlyphDef|altGlyphItem|animateColor|animateTransform|cursor|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|glyph|glyphRef|hkern|missing-glyph|tref|vkern))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.tag.other.svg.$2.start.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "invalid.deprecated.html"
-                },
-                "4": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "6": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "end": "(?i)(</)((\\2))\\s*(>)|(/>)|(?=</\\w+)",
-              "endCaptures": {
-                "0": {
-                  "name": "meta.tag.other.svg.$2.end.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "invalid.deprecated.html"
-                },
-                "4": {
-                  "name": "punctuation.definition.tag.end.html"
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "name": "meta.element.other.svg.$2.html",
-              "patterns": [
-                {
-                  "begin": "(?<!>)\\G",
-                  "end": "(?=/>)|>",
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.tag.end.html"
-                    }
-                  },
-                  "name": "meta.tag.other.start.html",
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                {
-                  "include": "#tags"
-                }
-              ]
-            },
-            {
-              "captures": {
-                "0": {
-                  "name": "meta.tag.other.invalid.void.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "invalid.illegal.unrecognized-tag.html"
-                },
-                "4": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "6": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "match": "(?i)(<)(([\\w:]+))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(/>))",
-              "name": "meta.element.other.invalid.html"
-            },
-            {
-              "begin": "(?i)(<)((\\w[^\\s>]*))(?=\\s|/?>)(?:(([^\"'>]|\"[^\"]*\"|'[^']*')*)(>))?",
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.tag.other.invalid.start.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "invalid.illegal.unrecognized-tag.html"
-                },
-                "4": {
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                "6": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "end": "(?i)(</)((\\2))\\s*(>)|(/>)|(?=</\\w+)",
-              "endCaptures": {
-                "0": {
-                  "name": "meta.tag.other.invalid.end.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "invalid.illegal.unrecognized-tag.html"
-                },
-                "4": {
-                  "name": "punctuation.definition.tag.end.html"
-                },
-                "5": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "name": "meta.element.other.invalid.html",
-              "patterns": [
-                {
-                  "begin": "(?<!>)\\G",
-                  "end": "(?=/>)|>",
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.tag.end.html"
-                    }
-                  },
-                  "name": "meta.tag.other.invalid.start.html",
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                {
-                  "include": "#tags"
-                }
-              ]
-            },
-            {
-              "include": "#tags-invalid"
-            }
-          ]
-        }
-      }
-    },
-    "tags-invalid": {
-      "patterns": [
-        {
-          "begin": "(</?)((\\w[^\\s>]*))(?<!/)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "name": "invalid.illegal.unrecognized-tag.html"
-            }
-          },
-          "end": "((?: ?/)?>)",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.other.$2.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        }
-      ]
-    },
-    "tags-valid": {
-      "patterns": [
-        {
-          "begin": "(^[ \\t]+)?(?=<(?i:style)\\b(?!-))",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.embedded.leading.html"
-            }
-          },
-          "end": "(?!\\G)([ \\t]*$\\n?)?",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.embedded.trailing.html"
-            }
-          },
-          "patterns": [
-            {
-              "begin": "(?i)(<)(style)(?=\\s|/?>)",
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.tag.metadata.style.start.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                }
-              },
-              "end": "(?i)((<)/)(style)\\s*(>)",
-              "endCaptures": {
-                "0": {
-                  "name": "meta.tag.metadata.style.end.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "source.css-ignored-vscode"
-                },
-                "3": {
-                  "name": "entity.name.tag.html"
-                },
-                "4": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "name": "meta.embedded.block.html",
-              "patterns": [
-                {
-                  "begin": "\\G",
-                  "captures": {
-                    "1": {
-                      "name": "punctuation.definition.tag.end.html"
-                    }
-                  },
-                  "end": "(>)",
-                  "name": "meta.tag.metadata.style.start.html",
-                  "patterns": [
-                    {
-                      "include": "#attribute"
-                    }
-                  ]
-                },
-                {
-                  "begin": "(?!\\G)",
-                  "end": "(?=</(?i:style))",
-                  "name": "source.css",
-                  "patterns": [
-                    {
-                      "include": "source.css"
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "begin": "(^[ \\t]+)?(?=<(?i:script)\\b(?!-))",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.embedded.leading.html"
-            }
-          },
-          "end": "(?!\\G)([ \\t]*$\\n?)?",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.embedded.trailing.html"
-            }
-          },
-          "patterns": [
-            {
-              "begin": "(<)((?i:script))\\b",
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.tag.metadata.script.start.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                }
-              },
-              "end": "(/)((?i:script))(>)",
-              "endCaptures": {
-                "0": {
-                  "name": "meta.tag.metadata.script.end.html"
-                },
-                "1": {
-                  "name": "punctuation.definition.tag.begin.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.html"
-                },
-                "3": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "name": "meta.embedded.block.html",
-              "patterns": [
-                {
-                  "begin": "\\G",
-                  "end": "(?=/)",
-                  "patterns": [
-                    {
-                      "begin": "(>)",
-                      "beginCaptures": {
-                        "0": {
-                          "name": "meta.tag.metadata.script.start.html"
-                        },
-                        "1": {
-                          "name": "punctuation.definition.tag.end.html"
-                        }
-                      },
-                      "end": "((<))(?=/(?i:script))",
-                      "endCaptures": {
-                        "0": {
-                          "name": "meta.tag.metadata.script.end.html"
-                        },
-                        "1": {
-                          "name": "punctuation.definition.tag.begin.html"
-                        },
-                        "2": {
-                          "name": "source.js-ignored-vscode"
-                        }
-                      },
-                      "patterns": [
-                        {
-                          "begin": "\\G",
-                          "end": "(?=</(?i:script))",
-                          "name": "source.js",
-                          "patterns": [
-                            {
-                              "begin": "(^[ \\t]+)?(?=//)",
-                              "beginCaptures": {
-                                "1": {
-                                  "name": "punctuation.whitespace.comment.leading.js"
-                                }
-                              },
-                              "end": "(?!\\G)",
-                              "patterns": [
-                                {
-                                  "begin": "//",
-                                  "beginCaptures": {
-                                    "0": {
-                                      "name": "punctuation.definition.comment.js"
-                                    }
-                                  },
-                                  "end": "(?=</script)|\\n",
-                                  "name": "comment.line.double-slash.js"
-                                }
-                              ]
-                            },
-                            {
-                              "begin": "/\\*",
-                              "captures": {
-                                "0": {
-                                  "name": "punctuation.definition.comment.js"
-                                }
-                              },
-                              "end": "\\*/|(?=</script)",
-                              "name": "comment.block.js"
-                            },
-                            {
-                              "include": "source.js"
-                            }
-                          ]
-                        }
-                      ]
-                    },
-                    {
-                      "begin": "\\G",
-                      "end": "(?ix:\n\t\t\t\t\t\t\t\t\t\t\t\t(?=>\t\t\t\t\t\t\t\t\t\t\t# Tag without type attribute\n\t\t\t\t\t\t\t\t\t\t\t\t  | type(?=[\\s=])\n\t\t\t\t\t\t\t\t\t\t\t\t  \t(?!\\s*=\\s*\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t''\t\t\t\t\t\t\t\t# Empty\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | \"\"\t\t\t\t\t\t\t\t\t#   Values\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | ('|\"|)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\ttext/\t\t\t\t\t\t\t# Text mime-types\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tjavascript(1\\.[0-5])?\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | x-javascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | jscript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | livescript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-)?ecmascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | babel\t\t\t\t\t\t# Javascript variant currently\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t\t\t\t\t\t\t\t#   recognized as such\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | application/\t\t\t\t\t# Application mime-types\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(x-)?javascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-)?ecmascript\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t  | module\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t  \t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t[\\s\"'>]\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t)",
-                      "name": "meta.tag.metadata.script.start.html",
-                      "patterns": [
-                        {
-                          "include": "#attribute"
-                        }
-                      ]
-                    },
-                    {
-                      "begin": "(?ix:\n\t\t\t\t\t\t\t\t\t\t\t\t(?=\n\t\t\t\t\t\t\t\t\t\t\t\t\ttype\\s*=\\s*\n\t\t\t\t\t\t\t\t\t\t\t\t\t('|\"|)\n\t\t\t\t\t\t\t\t\t\t\t\t\ttext/\n\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\tx-handlebars\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-(handlebars-)?|ng-)?template\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | html\n\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t[\\s\"'>]\n\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t)",
-                      "end": "((<))(?=/(?i:script))",
-                      "endCaptures": {
-                        "0": {
-                          "name": "meta.tag.metadata.script.end.html"
-                        },
-                        "1": {
-                          "name": "punctuation.definition.tag.begin.html"
-                        },
-                        "2": {
-                          "name": "text.html.basic"
-                        }
-                      },
-                      "patterns": [
-                        {
-                          "begin": "\\G",
-                          "end": "(>)",
-                          "endCaptures": {
-                            "1": {
-                              "name": "punctuation.definition.tag.end.html"
-                            }
-                          },
-                          "name": "meta.tag.metadata.script.start.html",
-                          "patterns": [
-                            {
-                              "include": "#attribute"
-                            }
-                          ]
-                        },
-                        {
-                          "begin": "(?!\\G)",
-                          "end": "(?=</(?i:script))",
-                          "name": "text.html.basic",
-                          "patterns": [
-                            {
-                              "include": "text.html.basic"
-                            }
-                          ]
-                        }
-                      ]
-                    },
-                    {
-                      "begin": "(?=(?i:type))",
-                      "end": "(<)(?=/(?i:script))",
-                      "endCaptures": {
-                        "0": {
-                          "name": "meta.tag.metadata.script.end.html"
-                        },
-                        "1": {
-                          "name": "punctuation.definition.tag.begin.html"
-                        }
-                      },
-                      "patterns": [
-                        {
-                          "begin": "\\G",
-                          "end": "(>)",
-                          "endCaptures": {
-                            "1": {
-                              "name": "punctuation.definition.tag.end.html"
-                            }
-                          },
-                          "name": "meta.tag.metadata.script.start.html",
-                          "patterns": [
-                            {
-                              "include": "#attribute"
-                            }
-                          ]
-                        },
-                        {
-                          "begin": "(?!\\G)",
-                          "end": "(?=</(?i:script))",
-                          "name": "source.unknown"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(<)(base|link|meta)(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": "/?>",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.metadata.$2.void.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(<)(noscript|title)(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.metadata.$2.start.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(</)(noscript|title)(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.metadata.$2.end.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(<)(col|hr|input)(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": "/?>",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.structure.$2.void.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(<)(address|article|aside|blockquote|body|button|caption|colgroup|datalist|dd|details|dialog|div|dl|dt|fieldset|figcaption|figure|footer|form|head|header|hgroup|html|h[1-6]|label|legend|li|main|map|menu|meter|nav|ol|optgroup|option|output|p|pre|progress|section|select|slot|summary|table|tbody|td|template|textarea|tfoot|th|thead|tr|ul)(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.structure.$2.start.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(</)(address|article|aside|blockquote|body|button|caption|colgroup|datalist|dd|details|dialog|div|dl|dt|fieldset|figcaption|figure|footer|form|head|header|hgroup|html|h[1-6]|label|legend|li|main|map|menu|meter|nav|ol|optgroup|option|output|p|pre|progress|section|select|slot|summary|table|tbody|td|template|textarea|tfoot|th|thead|tr|ul)(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.structure.$2.end.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(<)(area|br|wbr)(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": "/?>",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.inline.$2.void.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(<)(a|abbr|b|bdi|bdo|cite|code|data|del|dfn|em|i|ins|kbd|mark|q|rp|rt|ruby|s|samp|small|span|strong|sub|sup|time|u|var)(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.inline.$2.start.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(</)(a|abbr|b|bdi|bdo|cite|code|data|del|dfn|em|i|ins|kbd|mark|q|rp|rt|ruby|s|samp|small|span|strong|sub|sup|time|u|var)(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.inline.$2.end.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(<)(embed|img|param|source|track)(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": "/?>",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.object.$2.void.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(<)(audio|canvas|iframe|object|picture|video)(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.object.$2.start.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(</)(audio|canvas|iframe|object|picture|video)(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.object.$2.end.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(<)((basefont|isindex))(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "name": "invalid.deprecated.html"
-            }
-          },
-          "end": "/?>",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.metadata.$2.void.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(<)((center|frameset|noembed|noframes))(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "name": "invalid.deprecated.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.structure.$2.start.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(</)((center|frameset|noembed|noframes))(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "name": "invalid.deprecated.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.structure.$2.end.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(<)((acronym|big|blink|font|strike|tt|xmp))(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "name": "invalid.deprecated.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.inline.$2.start.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(</)((acronym|big|blink|font|strike|tt|xmp))(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "name": "invalid.deprecated.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.inline.$2.end.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(<)((frame))(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "name": "invalid.deprecated.html"
-            }
-          },
-          "end": "/?>",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.object.$2.void.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(<)((applet))(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "name": "invalid.deprecated.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.object.$2.start.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(</)((applet))(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "name": "invalid.deprecated.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.object.$2.end.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(<)((dir|keygen|listing|menuitem|plaintext|spacer))(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "name": "invalid.illegal.no-longer-supported.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.other.$2.start.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(?i)(</)((dir|keygen|listing|menuitem|plaintext|spacer))(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            },
-            "3": {
-              "name": "invalid.illegal.no-longer-supported.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.other.$2.end.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "include": "#math"
-        },
-        {
-          "include": "#svg"
-        },
-        {
-          "begin": "(<)([a-zA-Z][.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*-[\\-.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*)(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": "/?>",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.custom.start.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        },
-        {
-          "begin": "(</)([a-zA-Z][.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*-[\\-.0-9_a-zA-Z\\x{00B7}\\x{00C0}-\\x{00D6}\\x{00D8}-\\x{00F6}\\x{00F8}-\\x{037D}\\x{037F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{203F}-\\x{2040}\\x{2070}-\\x{218F}\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}]*)(?=\\s|/?>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
-          "name": "meta.tag.custom.end.html",
-          "patterns": [
-            {
-              "include": "#attribute"
-            }
-          ]
-        }
-      ]
-    },
-    "xml-processing": {
-      "begin": "(<\\?)(xml)",
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.tag.html"
-        },
-        "2": {
-          "name": "entity.name.tag.html"
-        }
-      },
-      "end": "(\\?>)",
-      "name": "meta.tag.metadata.processing.xml.html",
-      "patterns": [
-        {
-          "include": "#attribute"
-        }
-      ]
-    }
-  }
-}

packages/vscode-ext/tsconfig.json

@@ -1,27 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "ESNext",
-        "lib": [
-            "ESNext"
-        ],
-        "outDir": "out",
-        "rootDir": "src",
-        "sourceMap": true
-    },
-    "include": [
-        "src"
-    ],
-    "exclude": [
-        "node_modules",
-        ".vscode-test"
-    ],
-    "references": [
-        {
-            "path": "./client"
-        },
-        {
-            "path": "./server"
-        }
-    ]
-}

packages/web/Cargo.toml

@@ -11,10 +11,8 @@ license = "MIT/Apache-2.0"
 dioxus-core = { path = "../core", version = "0.1.2" }
 js-sys = "0.3"
 wasm-bindgen = "0.2.71"
-# wasm-bindgen = "0.2.70"
 lazy_static = "1.4.0"
 wasm-bindgen-futures = "0.4.20"
-# futures = "0.3.12"
 wasm-logger = "0.2.0"
 log = "0.4.14"
 fxhash = "0.2.1"
@@ -23,6 +21,9 @@ console_error_panic_hook = "0.1.6"
 generational-arena = "0.2.8"
 wasm-bindgen-test = "0.3.21"
 once_cell = "1.7.2"
+
+# wasm-bindgen = "0.2.70"
+# futures = "0.3.12"
 # html-validation = { path = "../html-validation", version = "0.1.1" }
 
 async-channel = "1.6.1"
@@ -57,11 +58,7 @@ features = [
     "DocumentType",
     "CharacterData",
     "HtmlOptionElement",
-] # "FormEvent",
-# "UIEvent",
-# "ToggleEvent",
-# "MediaEvent",
-# "SelectionEvent",
+]
 
 [profile.release]
 debug = true
@@ -69,7 +66,6 @@ debug = true
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-
 [dev-dependencies]
 uuid = { version = "0.8.2", features = ["v4", "wasm-bindgen"] }